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.

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: don't push down filter that contains derived column #10201

Merged
merged 1 commit into from
Feb 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion src/query/sql/src/planner/optimizer/rule/factory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ impl RuleFactory {
RuleID::PushDownFilterJoin => {
Ok(Box::new(RulePushDownFilterJoin::new(metadata.unwrap())))
}
RuleID::PushDownFilterScan => Ok(Box::new(RulePushDownFilterScan::new())),
RuleID::PushDownFilterScan => {
Ok(Box::new(RulePushDownFilterScan::new(metadata.unwrap())))
}
RuleID::PushDownLimitUnion => Ok(Box::new(RulePushDownLimitUnion::new())),
RuleID::PushDownLimitScan => Ok(Box::new(RulePushDownLimitScan::new())),
RuleID::PushDownSortScan => Ok(Box::new(RulePushDownSortScan::new())),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,18 @@ use crate::plans::Filter;
use crate::plans::PatternPlan;
use crate::plans::RelOp;
use crate::plans::Scan;
use crate::ColumnEntry;
use crate::MetadataRef;
use crate::ScalarExpr;

pub struct RulePushDownFilterScan {
id: RuleID,
pattern: SExpr,
metadata: MetadataRef,
}

impl RulePushDownFilterScan {
pub fn new() -> Self {
pub fn new(metadata: MetadataRef) -> Self {
Self {
id: RuleID::PushDownFilterScan,
// Filter
Expand All @@ -47,8 +51,37 @@ impl RulePushDownFilterScan {
.into(),
),
),
metadata,
}
}

fn find_push_down_predicates(&self, predicates: &[ScalarExpr]) -> Result<Vec<ScalarExpr>> {
let mut filtered_predicates = vec![];
for predicate in predicates {
let used_columns = predicate.used_columns();
let metadata = self.metadata.read();
let column_entries = metadata.columns();
let mut contain_derived_column = false;
for column_entry in column_entries {
match column_entry {
ColumnEntry::BaseTableColumn(_) => {}
ColumnEntry::DerivedColumn(column) => {
// Don't push down predicate that contains derived column
// Because storage can't know such columns.
if used_columns.contains(&column.column_index) {
contain_derived_column = true;
break;
}
}
}
}
if !contain_derived_column {
filtered_predicates.push(predicate.clone());
}
}

Ok(filtered_predicates)
}
}

impl Rule for RulePushDownFilterScan {
Expand All @@ -64,7 +97,7 @@ impl Rule for RulePushDownFilterScan {
return Ok(());
}

get.push_down_predicates = Some(filter.predicates.clone());
get.push_down_predicates = Some(self.find_push_down_predicates(&filter.predicates)?);

let result = SExpr::create_unary(filter.into(), SExpr::create_leaf(get.into()));
state.add_result(result);
Expand Down