Apache DataFusion SQL Query Engine
fix: wrong simplification for >= >, <= < (#18222)
Chen Chongchen144f1554aa30
diff --git a/datafusion/optimizer/src/simplify_expressions/simplify_predicates.rs b/datafusion/optimizer/src/simplify_expressions/simplify_predicates.rsindex 131404e607..e811ce7313 100644--- a/datafusion/optimizer/src/simplify_expressions/simplify_predicates.rs+++ b/datafusion/optimizer/src/simplify_expressions/simplify_predicates.rs@@ -194,7 +194,7 @@ fn find_most_restrictive_predicate(let mut best_value: Option<&ScalarValue> = None;for (idx, pred) in predicates.iter().enumerate() {- if let Expr::BinaryExpr(BinaryExpr { left, op: _, right }) = pred {+ if let Expr::BinaryExpr(BinaryExpr { left, op, right }) = pred {// Extract the literal value based on which side has itlet scalar_value = match (right.as_literal(), left.as_literal()) {(Some(scalar), _) => Some(scalar),@@ -207,8 +207,12 @@ fn find_most_restrictive_predicate(let comparison = scalar.try_cmp(current_best)?;let is_better = if find_greater {comparison == std::cmp::Ordering::Greater+ || (comparison == std::cmp::Ordering::Equal+ && op == &Operator::Gt)} else {comparison == std::cmp::Ordering::Less+ || (comparison == std::cmp::Ordering::Equal+ && op == &Operator::Lt)};if is_better {diff --git a/datafusion/sqllogictest/test_files/simplify_predicates.slt b/datafusion/sqllogictest/test_files/simplify_predicates.sltindex 31ce1efd21..c2a21ea710 100644--- a/datafusion/sqllogictest/test_files/simplify_predicates.slt+++ b/datafusion/sqllogictest/test_files/simplify_predicates.slt@@ -230,5 +230,17 @@ logical_plan01)Filter: test_data.int_col > Int32(5) AND test_data.int_col > Int32(6) OR test_data.float_col < Float32(10) AND test_data.float_col < Float32(8)02)--TableScan: test_data projection=[int_col, float_col, str_col, date_col, bool_col]++query TT+EXPLAIN SELECT * FROM (+ SELECT * FROM test_data+ WHERE int_col > 1 AND int_col < 10+) WHERE int_col >= 1 AND int_col <= 10;+----+logical_plan+01)Filter: test_data.int_col > Int32(1) AND test_data.int_col < Int32(10)+02)--TableScan: test_data projection=[int_col, float_col, str_col, date_col, bool_col]++statement okset datafusion.explain.logical_plan_only=false;