[Fix](nereids) fix partition_prune or expression evaluate wrongly (ap…

…ache#38897) (apache#38998) cherry-pick apache#38897 to branch-2.1
eldenmoon · Aug 7, 2024 · f9788b4 · f9788b4
1 parent 7550fba
commit f9788b4
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 33 deletions.
diff --git a/...main/java/org/apache/doris/nereids/rules/expression/rules/OneRangePartitionEvaluator.java b/...main/java/org/apache/doris/nereids/rules/expression/rules/OneRangePartitionEvaluator.java
@@ -409,17 +409,8 @@ public EvaluateRangeResult visitIsNull(IsNull isNull, EvaluateRangeInput context
     @Override
     public EvaluateRangeResult visitAnd(And and, EvaluateRangeInput context) {
         EvaluateRangeResult result = evaluateChildrenThenThis(and, context);
-
         result = mergeRanges(result.result, result.childrenResult.get(0), result.childrenResult.get(1),
-                (leftRange, rightRange) -> {
-                if (leftRange == null) {
-                    return rightRange;
-                }
-                if (rightRange == null) {
-                    return leftRange;
-                }
-                return leftRange.intersect(rightRange);
-            });
+                (leftRange, rightRange) -> leftRange.intersect(rightRange));
 
         result = returnFalseIfExistEmptyRange(result);
         if (result.result.equals(BooleanLiteral.FALSE)) {
@@ -435,18 +426,20 @@ public EvaluateRangeResult visitAnd(And and, EvaluateRangeInput context) {
     @Override
     public EvaluateRangeResult visitOr(Or or, EvaluateRangeInput context) {
         EvaluateRangeResult result = evaluateChildrenThenThis(or, context);
-
+        if (result.result.equals(BooleanLiteral.FALSE)) {
+            return result;
+        } else if (result.childrenResult.get(0).result.equals(BooleanLiteral.FALSE)) {
+            // false or a<1 -> return range a<1
+            return new EvaluateRangeResult(result.result, result.childrenResult.get(1).columnRanges,
+                    result.childrenResult);
+        } else if (result.childrenResult.get(1).result.equals(BooleanLiteral.FALSE)) {
+            // a<1 or false -> return range a<1
+            return new EvaluateRangeResult(result.result, result.childrenResult.get(0).columnRanges,
+                    result.childrenResult);
+        }
         result = mergeRanges(result.result, result.childrenResult.get(0), result.childrenResult.get(1),
-                (leftRange, rightRange) -> {
-                    if (leftRange == null) {
-                        return rightRange;
-                    }
-                    if (rightRange == null) {
-                        return leftRange;
-                    }
-                    return leftRange.union(rightRange);
-                });
-        return removeEmptyRange(result);
+                (leftRange, rightRange) -> leftRange.union(rightRange));
+        return returnFalseIfExistEmptyRange(result);
     }
 
     @Override
@@ -596,7 +589,9 @@ private EvaluateRangeResult mergeRanges(
                 .build();
 
         Map<Expression, ColumnRange> mergedRange = exprs.stream()
-                .map(expr -> Pair.of(expr, mergeFunction.apply(leftRanges.get(expr), rightRanges.get(expr))))
+                .map(expr -> Pair.of(expr, mergeFunction.apply(
+                        leftRanges.containsKey(expr) ? leftRanges.get(expr) : rangeMap.get(expr),
+                        rightRanges.containsKey(expr) ? rightRanges.get(expr) : rangeMap.get(expr))))
                 .collect(ImmutableMap.toImmutableMap(Pair::key, Pair::value));
         return new EvaluateRangeResult(originResult, mergedRange, ImmutableList.of(left, right));
     }
@@ -821,17 +816,6 @@ private List<Map<Slot, PartitionSlotInput>> commonComputeOnePartitionInputs() {
         return onePartitionInputs;
     }
 
-    private EvaluateRangeResult removeEmptyRange(EvaluateRangeResult result) {
-        ImmutableMap.Builder<Expression, ColumnRange> builder = ImmutableMap.builder();
-        for (Map.Entry<Expression, ColumnRange> entry : result.columnRanges.entrySet()) {
-            if (entry.getValue().isEmptyRange()) {
-                continue;
-            }
-            builder.put(entry);
-        }
-        return new EvaluateRangeResult(result.result, builder.build(), result.childrenResult);
-    }
-
     private EvaluateRangeResult computeMonotonicFunctionRange(EvaluateRangeResult result) {
         Monotonic func = (Monotonic) result.result;
         if (rangeMap.containsKey(func)) {

diff --git a/regression-test/data/nereids_rules_p0/partition_prune/test_date_trunc_prune.out b/regression-test/data/nereids_rules_p0/partition_prune/test_date_trunc_prune.out
@@ -0,0 +1,10 @@
+-- This file is automatically generated. You should know what you did if you want to edit this
+-- !or_evaluate --
+0
+3
+5
+6
+7
+8
+9
+