fix code too large

LiBinfeng-01 · Nov 5, 2024 · 9dacca5 · 9dacca5
1 parent 3ac387e
commit 9dacca5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 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
@@ -56,6 +56,7 @@
 import org.apache.doris.nereids.trees.expressions.WhenClause;
 import org.apache.doris.nereids.trees.expressions.functions.BoundFunction;
 import org.apache.doris.nereids.trees.expressions.functions.PropagateNullLiteral;
+import org.apache.doris.nereids.trees.expressions.functions.PropagateNullable;
 import org.apache.doris.nereids.trees.expressions.functions.agg.AggregateFunction;
 import org.apache.doris.nereids.trees.expressions.functions.generator.TableGeneratingFunction;
 import org.apache.doris.nereids.trees.expressions.functions.scalar.Array;
@@ -715,7 +716,8 @@ private Optional<Expression> preProcess(Expression expression) {
         if (expression instanceof AggregateFunction || expression instanceof TableGeneratingFunction) {
             return Optional.of(expression);
         }
-        if (ExpressionUtils.hasNullLiteral(expression.getArguments()) && expression instanceof PropagateNullLiteral) {
+        if (ExpressionUtils.hasNullLiteral(expression.getArguments())
+                && (expression instanceof PropagateNullLiteral || expression instanceof PropagateNullable)) {
             return Optional.of(new NullLiteral(expression.getDataType()));
         }
         if (!ExpressionUtils.isAllLiteral(expression.getArguments())) {

diff --git a/...src/main/java/org/apache/doris/nereids/trees/expressions/functions/PropagateNullable.java b/...src/main/java/org/apache/doris/nereids/trees/expressions/functions/PropagateNullable.java
@@ -26,7 +26,7 @@
  *
  * e.g. `substring(null, 1)` is nullable, `substring('abc', 1)` is not nullable.
  */
-public interface PropagateNullable extends ComputeNullable, PropagateNullLiteral {
+public interface PropagateNullable extends ComputeNullable {
     @Override
     default boolean nullable() {
         return children().stream().anyMatch(Expression::nullable);