fold const

apache · Nov 29, 2024 · dfa39da · dfa39da
1 parent 97bd558
commit dfa39da
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/...e/src/main/java/org/apache/doris/nereids/rules/expression/rules/FoldConstantRuleOnFE.java b/...e/src/main/java/org/apache/doris/nereids/rules/expression/rules/FoldConstantRuleOnFE.java
@@ -402,8 +402,12 @@ public Expression visitAnd(And and, ExpressionRewriteContext context) {
                     return and.withChildren(nonTrueLiteral);
             }
         } else if (nullCount < and.children().size()) {
-            // null and x
-            return and.withChildren(nonTrueLiteral);
+            if (nonTrueLiteral.size() == 1) {
+                return nonTrueLiteral.get(0);
+            } else {
+                // null and x
+                return and.withChildren(nonTrueLiteral);
+            }
         } else {
             // null and null and null and ...
             return new NullLiteral(BooleanType.INSTANCE);
@@ -438,10 +442,10 @@ public Expression visitOr(Or or, ExpressionRewriteContext context) {
                     // x or y
                     return or.withChildren(nonFalseLiteral);
             }
-        } else if (nullCount == 1) {
+        } else if (nullCount < nonFalseLiteral.size()) {
             if (nonFalseLiteral.size() == 1) {
                 // null or false
-                return new NullLiteral(BooleanType.INSTANCE);
+                return nonFalseLiteral.get(0);
             }
             // null or x
             return or.withChildren(nonFalseLiteral);