adriangb commented on code in PR #27288:
URL: https://github.com/apache/datafusion/pull/27288#discussion_r4559196171
##########
datafusion/datasource/src/file_scan_config/mod.rs:
##########
@@ -1384,23 +1384,39 @@ impl FileScanConfig {
eq_properties: &mut EquivalenceProperties,
schema: &Schema,
) -> Result<()> {
- // Gather valid equality pairs from the filter expression
- let equal_pairs =
split_conjunction(filter).into_iter().filter_map(|expr| {
+ let input_eq_properties = eq_properties.clone();
+ let mut constants = vec![];
+ for expr in split_conjunction(filter) {
// Ignore any binary expressions that reference non-existent
columns in the current schema
// (e.g. due to unnecessary projections being removed)
- reassign_expr_columns(Arc::clone(expr), schema)
- .ok()
- .and_then(|expr| match expr.downcast_ref::<BinaryExpr>() {
- Some(expr) if expr.op() == &Operator::Eq => {
- Some((Arc::clone(expr.left()),
Arc::clone(expr.right())))
- }
- _ => None,
- })
- });
-
- for (lhs, rhs) in equal_pairs {
- eq_properties.add_equal_conditions(lhs, rhs)?
+ let Ok(expr) = reassign_expr_columns(Arc::clone(expr), schema)
else {
+ continue;
+ };
+ let Some(binary) = expr.downcast_ref::<BinaryExpr>() else {
+ continue;
+ };
+ if binary.op() != &Operator::Eq {
+ continue;
+ }
+ // Follow `FilterExec`: only an equality with a column on one side
Review Comment:
Could we put this sort of logic in a shared place so that we can avoid
duplicating diverging bits of code?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
