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

feat: support querying partition tables through select in #530

Merged
merged 3 commits into from
Jan 16, 2023
Merged
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
69 changes: 67 additions & 2 deletions table_engine/src/partition/rule/df_adapter/extractor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,39 @@ impl FilterExtractor for KeyExtractor {
(Expr::Column(col), Operator::Eq, Expr::Literal(val))
| (Expr::Literal(val), Operator::Eq, Expr::Column(col)) => {
let datum_opt = Datum::from_scalar_value(&val);
datum_opt.map(|d| PartitionFilter::new(col.name, PartitionCondition::Eq(d)))
datum_opt.map(|datum| {
PartitionFilter::new(col.name, PartitionCondition::Eq(datum))
})
}
_ => None,
},
Expr::InList {
expr,
list,
negated,
} => {
if let (Expr::Column(col), list, false) = (*expr, list, negated) {
let mut datums = Vec::with_capacity(list.len());
for entry in list {
if let Expr::Literal(val) = entry {
let datum_opt = Datum::from_scalar_value(&val);
if let Some(datum) = datum_opt {
datums.push(datum)
}
}
}
if datums.is_empty() {
None
} else {
Some(PartitionFilter::new(
col.name,
PartitionCondition::In(datums),
))
}
} else {
None
}
}
_ => None,
};

Expand All @@ -84,7 +113,7 @@ pub type FilterExtractorRef = Box<dyn FilterExtractor>;
#[cfg(test)]
mod tests {
use datafusion::scalar::ScalarValue;
use datafusion_expr::col;
use datafusion_expr::{col, Expr::Literal};

use super::{FilterExtractor, *};

Expand All @@ -107,4 +136,40 @@ mod tests {
let partition_filter = extractor.extract(&[rejected_expr], &columns);
assert!(partition_filter.is_empty());
}

#[test]
fn test_key_extractor_in_list_filter() {
let extractor = KeyExtractor;

let columns = vec!["col1".to_string()];
let accepted_expr = col("col1").in_list(
vec![
Literal(ScalarValue::Int32(Some(42))),
Literal(ScalarValue::Int32(Some(38))),
],
false,
ZuLiangWang marked this conversation as resolved.
Show resolved Hide resolved
);
let partition_filter = extractor.extract(&[accepted_expr], &columns);
let expected = PartitionFilter {
column: "col1".to_string(),
condition: PartitionCondition::In(vec![Datum::Int32(42), Datum::Int32(38)]),
};
assert_eq!(partition_filter.get(0).unwrap(), &expected);
}

#[test]
fn test_key_extractor_in_list_filter_with_negated() {
let extractor = KeyExtractor;

let columns = vec!["col1".to_string()];
let accepted_expr = col("col1").in_list(
vec![
Literal(ScalarValue::Int32(Some(42))),
Literal(ScalarValue::Int32(Some(38))),
],
true,
);
let partition_filter = extractor.extract(&[accepted_expr], &columns);
assert!(partition_filter.is_empty())
}
}