Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: filter pushdown over table scan #2063

Merged
merged 2 commits into from
Dec 16, 2024
Merged

fix: filter pushdown over table scan #2063

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a978ebe
test: rewriter noop
joshua-spacetime Dec 16, 2024
292f9fc
fix: filter pushdown over table scan
joshua-spacetime Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 92 additions & 13 deletions crates/physical-plan/src/plan.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pub enum PhysicalProject {
impl PhysicalProject {
pub fn optimize(self) -> Self {
match self {
Self::None(_) => self,
Self::None(plan) => Self::None(plan.optimize(vec![])),
Self::Relvar(plan, var) => Self::None(plan.optimize(vec![var])),
Self::Fields(plan, fields) => {
Self::Fields(plan.optimize(fields.iter().map(|(_, proj)| proj.var).collect()), fields)
Expand Down Expand Up @@ -753,12 +753,15 @@ impl RewriteRule for PushEqFilter {
fn matches(plan: &PhysicalPlan) -> Option<Self::Info> {
if let PhysicalPlan::Filter(input, PhysicalExpr::BinOp(BinOp::Eq, expr, value)) = plan {
if let (PhysicalExpr::Field(ProjectField { var, .. }), PhysicalExpr::Value(_)) = (&**expr, &**value) {
return input
.any(&|plan| match plan {
PhysicalPlan::TableScan(_, label) => label == var,
_ => false,
})
.then_some(*var);
return match &**input {
PhysicalPlan::TableScan(..) => None,
input => input
.any(&|plan| match plan {
PhysicalPlan::TableScan(_, label) => label == var,
_ => false,
})
.then_some(*var),
};
}
}
None
Expand Down Expand Up @@ -825,12 +828,15 @@ impl RewriteRule for PushConjunction {
if let PhysicalExpr::BinOp(BinOp::Eq, expr, value) = expr {
if let (PhysicalExpr::Field(ProjectField { var, .. }), PhysicalExpr::Value(_)) = (&**expr, &**value)
{
return input
.any(&|plan| match plan {
PhysicalPlan::TableScan(_, label) => label == var,
_ => false,
})
.then_some(*var);
return match &**input {
PhysicalPlan::TableScan(..) => None,
input => input
.any(&|plan| match plan {
PhysicalPlan::TableScan(_, label) => label == var,
_ => false,
})
.then_some(*var),
};
}
}
None
Expand Down Expand Up @@ -1237,12 +1243,15 @@ mod tests {
def::{BTreeAlgorithm, ConstraintData, IndexAlgorithm, UniqueConstraintData},
schema::{ColumnSchema, ConstraintSchema, IndexSchema, TableSchema},
};
use spacetimedb_sql_parser::ast::BinOp;

use crate::{
compile::compile,
plan::{HashJoin, IxJoin, IxScan, PhysicalPlan, PhysicalProject, ProjectField, Sarg, Semi},
};

use super::PhysicalExpr;

struct SchemaViewer {
schemas: Vec<Arc<TableSchema>>,
}
Expand Down Expand Up @@ -1309,6 +1318,76 @@ mod tests {
)
}

/// No rewrites applied to a simple table scan
#[test]
fn table_scan_noop() {
let t_id = TableId(1);

let t = Arc::new(schema(
t_id,
"t",
&[("id", AlgebraicType::U64), ("x", AlgebraicType::U64)],
&[&[0]],
&[&[0]],
Some(0),
));

let db = SchemaViewer {
schemas: vec![t.clone()],
};

let sql = "select * from t";

let lp = compile_sql_sub(sql, &db).unwrap();
let pp = compile(lp).plan.optimize();

match pp {
PhysicalProject::None(PhysicalPlan::TableScan(schema, _)) => {
assert_eq!(schema.table_id, t_id);
}
proj => panic!("unexpected project: {:#?}", proj),
};
}

/// No rewrites applied to a table scan + filter
#[test]
fn filter_noop() {
let t_id = TableId(1);

let t = Arc::new(schema(
t_id,
"t",
&[("id", AlgebraicType::U64), ("x", AlgebraicType::U64)],
&[&[0]],
&[&[0]],
Some(0),
));

let db = SchemaViewer {
schemas: vec![t.clone()],
};

let sql = "select * from t where x = 5";

let lp = compile_sql_sub(sql, &db).unwrap();
let pp = compile(lp).plan.optimize();

match pp {
PhysicalProject::None(PhysicalPlan::Filter(input, PhysicalExpr::BinOp(BinOp::Eq, field, value))) => {
assert!(matches!(*field, PhysicalExpr::Field(ProjectField { pos: 1, .. })));
assert!(matches!(*value, PhysicalExpr::Value(AlgebraicValue::U64(5))));

match *input {
PhysicalPlan::TableScan(schema, _) => {
assert_eq!(schema.table_id, t_id);
}
plan => panic!("unexpected plan: {:#?}", plan),
}
}
proj => panic!("unexpected project: {:#?}", proj),
};
}

/// Given the following operator notation:
///
/// x: join
Expand Down
Loading