[fix](Nereids) could not do partition prunning when predicates is NULL (

apache#27)
yiguolei · Dec 14, 2023 · c70980e · c70980e
1 parent d037d58
commit c70980e
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
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
@@ -44,6 +44,7 @@
 import org.apache.doris.nereids.trees.expressions.functions.scalar.Date;
 import org.apache.doris.nereids.trees.expressions.literal.BooleanLiteral;
 import org.apache.doris.nereids.trees.expressions.literal.Literal;
+import org.apache.doris.nereids.trees.expressions.literal.NullLiteral;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
 import org.apache.doris.nereids.types.BooleanType;
 import org.apache.doris.nereids.types.DataType;
@@ -227,6 +228,15 @@ public EvaluateRangeResult visit(Expression expr, EvaluateRangeInput context) {
         return result;
     }
 
+    @Override
+    public EvaluateRangeResult visitNullLiteral(NullLiteral nullLiteral, EvaluateRangeInput context) {
+        Map<Slot, ColumnRange> emptyRanges = Maps.newHashMap();
+        for (Slot key : context.defaultColumnRanges.keySet()) {
+            emptyRanges.put(key, new ColumnRange());
+        }
+        return new EvaluateRangeResult(nullLiteral, emptyRanges, ImmutableList.of());
+    }
+
     @Override
     public EvaluateRangeResult visitSlot(Slot slot, EvaluateRangeInput context) {
         // try to replace partition slot to literal

diff --git a/...e-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/PartitionPruner.java b/...e-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/PartitionPruner.java
@@ -32,6 +32,7 @@
 import org.apache.doris.nereids.trees.expressions.literal.BooleanLiteral;
 import org.apache.doris.nereids.trees.expressions.literal.DateLiteral;
 import org.apache.doris.nereids.trees.expressions.literal.DateTimeLiteral;
+import org.apache.doris.nereids.trees.expressions.literal.NullLiteral;
 import org.apache.doris.nereids.trees.expressions.visitor.DefaultExpressionRewriter;
 import org.apache.doris.nereids.types.DateTimeType;
 
@@ -239,7 +240,7 @@ private boolean canPrune(OnePartitionEvaluator evaluator) {
         List<Map<Slot, PartitionSlotInput>> onePartitionInputs = evaluator.getOnePartitionInputs();
         for (Map<Slot, PartitionSlotInput> currentInputs : onePartitionInputs) {
             Expression result = evaluator.evaluateWithDefaultPartition(partitionPredicate, currentInputs);
-            if (!result.equals(BooleanLiteral.FALSE)) {
+            if (!result.equals(BooleanLiteral.FALSE) && !(result instanceof NullLiteral)) {
                 return false;
             }
         }

diff --git a/...a/org/apache/doris/nereids/rules/expression/rules/TryEliminateUninterestedPredicates.java b/...a/org/apache/doris/nereids/rules/expression/rules/TryEliminateUninterestedPredicates.java
@@ -20,6 +20,7 @@
 import org.apache.doris.nereids.CascadesContext;
 import org.apache.doris.nereids.rules.expression.ExpressionRewriteContext;
 import org.apache.doris.nereids.rules.expression.rules.TryEliminateUninterestedPredicates.Context;
+import org.apache.doris.nereids.trees.expressions.And;
 import org.apache.doris.nereids.trees.expressions.Expression;
 import org.apache.doris.nereids.trees.expressions.Slot;
 import org.apache.doris.nereids.trees.expressions.literal.BooleanLiteral;
@@ -107,6 +108,29 @@ public Expression visit(Expression originExpr, Context parentContext) {
         return expr;
     }
 
+    @Override
+    public Expression visitAnd(And and, Context parentContext) {
+        Expression left = and.left();
+        Context leftContext = new Context();
+        // Expression newLeft = this.visit(left, leftContext);
+        Expression newLeft = left.accept(this, leftContext);
+
+        if (leftContext.childrenContainsNonInterestedSlots) {
+            newLeft = BooleanLiteral.TRUE;
+        }
+
+        Expression right = and.right();
+        Context rightContext = new Context();
+        Expression newRight = this.visit(right, rightContext);
+        if (rightContext.childrenContainsNonInterestedSlots) {
+            newRight = BooleanLiteral.TRUE;
+        }
+        Expression expr = new And(newLeft, newRight).accept(FoldConstantRuleOnFE.INSTANCE, expressionRewriteContext);
+        parentContext.childrenContainsInterestedSlots =
+            rightContext.childrenContainsInterestedSlots || leftContext.childrenContainsInterestedSlots;
+        return expr;
+    }
+
     @Override
     public Expression visitSlot(Slot slot, Context context) {
         boolean isInterestedSlot = interestedSlots.contains(slot);