fix p0 again

LiBinfeng-01 · Nov 5, 2024 · 6164780 · 6164780
1 parent f4952b4
commit 6164780
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/InferAggNotNull.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/InferAggNotNull.java
@@ -73,6 +73,9 @@ public Rule build() {
                             }
                         }
                     }
+                    for (Expression predicate : predicates) {
+                        predicate.setInferNotNull(true);
+                    }
                     Set<Expression> needGenerateNotNulls = needGenerateNotNullsBuilder.build();
                     if (needGenerateNotNulls.isEmpty()) {
                         return null;

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/InferFilterNotNull.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/InferFilterNotNull.java
@@ -58,6 +58,9 @@ public Rule build() {
                         needGenerateNotNullsBuilder.add(((Not) isNotNull).withGeneratedIsNotNull(true));
                     }
                 }
+                for (Expression predicate : predicates) {
+                    predicate.setInferNotNull(true);
+                }
                 Set<Expression> needGenerateNotNulls = needGenerateNotNullsBuilder.build();
                 if (needGenerateNotNulls.isEmpty()) {
                     return null;

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/InferJoinNotNull.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/InferJoinNotNull.java
@@ -68,6 +68,9 @@ public Rule build() {
                             conjuncts, join.right().getOutputSet(), ctx.cascadesContext);
                     right = PlanUtils.filterOrSelf(rightNotNull, join.right());
                 }
+                for (Expression conjunct : conjuncts) {
+                    conjunct.setInferNotNull(true);
+                }
 
                 if (left.equals(join.left()) && right.equals(join.right())) {
                     return null;

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/util/ExpressionUtils.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/util/ExpressionUtils.java
@@ -608,7 +608,6 @@ public static Set<Slot> inferNotNullSlots(Set<Expression> predicates, CascadesCo
                         new ExpressionRewriteContext(cascadesContext)
                 );
                 if (evalExpr.isNullLiteral() || BooleanLiteral.FALSE.equals(evalExpr)) {
-                    predicate.setInferNotNull(true);
                     notNullSlots.add(slot);
                 }
             }