apache · yiguolei · Aug 29, 2024 · Aug 26, 2024
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/NereidsSqlCacheManager.java b/fe/fe-core/src/main/java/org/apache/doris/common/NereidsSqlCacheManager.java
@@ -46,7 +46,7 @@
 import org.apache.doris.nereids.rules.expression.rules.FoldConstantRuleOnFE;
 import org.apache.doris.nereids.trees.expressions.Expression;
 import org.apache.doris.nereids.trees.expressions.Variable;
-import org.apache.doris.nereids.trees.expressions.functions.Nondeterministic;
+import org.apache.doris.nereids.trees.expressions.functions.ExpressionTrait;
 import org.apache.doris.nereids.trees.plans.Plan;
 import org.apache.doris.nereids.trees.plans.RelationId;
 import org.apache.doris.nereids.trees.plans.logical.LogicalEmptyRelation;
@@ -400,7 +400,8 @@ private boolean usedVariablesChanged(List<Variable> currentVariables, SqlCacheCo
             Variable currentVariable = currentVariables.get(i);
             Variable cachedVariable = cachedUsedVariables.get(i);
             if (!Objects.equals(currentVariable, cachedVariable)
-                    || cachedVariable.getRealExpression().anyMatch(Nondeterministic.class::isInstance)) {
+                    || cachedVariable.getRealExpression().anyMatch(
+                            expr -> !((ExpressionTrait) expr).isDeterministic())) {
                 return true;
             }
         }

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/ExpressionAnalyzer.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/ExpressionAnalyzer.java
@@ -65,7 +65,6 @@
 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.FunctionBuilder;
-import org.apache.doris.nereids.trees.expressions.functions.Nondeterministic;
 import org.apache.doris.nereids.trees.expressions.functions.agg.Count;
 import org.apache.doris.nereids.trees.expressions.functions.scalar.ElementAt;
 import org.apache.doris.nereids.trees.expressions.functions.scalar.Lambda;
@@ -177,11 +176,11 @@ public Expression analyze(Expression expression, ExpressionRewriteContext contex
                 @Override
                 public Expression visitBoundFunction(BoundFunction boundFunction, ExpressionRewriteContext context) {
                     Expression fold = super.visitBoundFunction(boundFunction, context);
-                    boolean unfold = fold instanceof Nondeterministic;
+                    boolean unfold = !fold.isDeterministic();
                     if (unfold) {
                         sqlCacheContext.setCannotProcessExpression(true);
                     }
-                    if (boundFunction instanceof Nondeterministic && !unfold) {
+                    if (!boundFunction.isDeterministic() && !unfold) {
                         sqlCacheContext.addFoldNondeterministicPair(boundFunction, fold);
                     }
                     return fold;
@@ -407,7 +406,7 @@ public Expression visitUnboundFunction(UnboundFunction unboundFunction, Expressi
         Optional<SqlCacheContext> sqlCacheContext = Optional.empty();
         if (wantToParseSqlFromSqlCache) {
             StatementContext statementContext = context.cascadesContext.getStatementContext();
-            if (buildResult.second instanceof Nondeterministic) {
+            if (!buildResult.second.isDeterministic()) {
                 hasNondeterministic = true;
             }
             sqlCacheContext = statementContext.getSqlCacheContext();

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Expression.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/Expression.java
@@ -25,7 +25,6 @@
 import org.apache.doris.nereids.trees.AbstractTreeNode;
 import org.apache.doris.nereids.trees.expressions.ArrayItemReference.ArrayItemSlot;
 import org.apache.doris.nereids.trees.expressions.functions.ExpressionTrait;
-import org.apache.doris.nereids.trees.expressions.functions.Nondeterministic;
 import org.apache.doris.nereids.trees.expressions.functions.agg.AggregateFunction;
 import org.apache.doris.nereids.trees.expressions.functions.scalar.Lambda;
 import org.apache.doris.nereids.trees.expressions.literal.Literal;
@@ -350,7 +349,7 @@ public boolean isConstant() {
         if (this instanceof LeafExpression) {
             return this instanceof Literal;
         } else {
-            return !(this instanceof Nondeterministic) && ExpressionUtils.allMatch(children(), Expression::isConstant);
+            return this.isDeterministic() && ExpressionUtils.allMatch(children(), Expression::isConstant);
         }
     }
 

diff --git a/...e/src/main/java/org/apache/doris/nereids/trees/expressions/functions/ExpressionTrait.java b/...e/src/main/java/org/apache/doris/nereids/trees/expressions/functions/ExpressionTrait.java
@@ -26,7 +26,6 @@
 import com.google.common.collect.ImmutableList;
 
 import java.util.List;
-import java.util.Optional;
 
 /**
  * ExpressionTrait.
@@ -79,23 +78,16 @@ default boolean foldable() {
     }
 
     /**
-     * Identify the expression is deterministic or not
+     * Identify the expression itself is deterministic or not, default true
      */
     default boolean isDeterministic() {
-        boolean isDeterministic = true;
-        List<Expression> children = this.children();
-        if (children.isEmpty()) {
-            return isDeterministic;
-        }
-        for (Expression child : children) {
-            Optional<ExpressionTrait> nonDeterministic =
-                    child.collectFirst(expressionTreeNode -> expressionTreeNode instanceof ExpressionTrait
-                    && !((ExpressionTrait) expressionTreeNode).isDeterministic());
-            if (nonDeterministic.isPresent()) {
-                isDeterministic = false;
-                break;
-            }
-        }
-        return isDeterministic;
+        return true;
+    }
+
+    /**
+     * Identify the expression is containing deterministic expr or not
+     */
+    default boolean containsNondeterministic() {
+        return anyMatch(expr -> !((ExpressionTrait) expr).isDeterministic());
     }
 }
diff --git a/...c/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/ConnectionId.java b/...c/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/ConnectionId.java
@@ -20,7 +20,6 @@
 import org.apache.doris.catalog.FunctionSignature;
 import org.apache.doris.nereids.trees.expressions.functions.AlwaysNotNullable;
 import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
-import org.apache.doris.nereids.trees.expressions.functions.Nondeterministic;
 import org.apache.doris.nereids.trees.expressions.shape.LeafExpression;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
 import org.apache.doris.nereids.types.BigIntType;
@@ -33,7 +32,7 @@
  * ScalarFunction 'ConnectionId'.
  */
 public class ConnectionId extends ScalarFunction
-        implements LeafExpression, ExplicitlyCastableSignature, AlwaysNotNullable, Nondeterministic {
+        implements LeafExpression, ExplicitlyCastableSignature, AlwaysNotNullable {
 
     public static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
             FunctionSignature.ret(BigIntType.INSTANCE).args()
@@ -52,4 +51,9 @@ public List<FunctionSignature> getSignatures() {
     public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
         return visitor.visitConnectionId(this, context);
     }
+
+    @Override
+    public boolean isDeterministic() {
+        return false;
+    }
 }
diff --git a/...rc/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/CurrentDate.java b/...rc/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/CurrentDate.java
@@ -20,7 +20,6 @@
 import org.apache.doris.catalog.FunctionSignature;
 import org.apache.doris.nereids.trees.expressions.functions.AlwaysNotNullable;
 import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
-import org.apache.doris.nereids.trees.expressions.functions.Nondeterministic;
 import org.apache.doris.nereids.trees.expressions.shape.LeafExpression;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
 import org.apache.doris.nereids.types.DateType;
@@ -33,7 +32,7 @@
  * ScalarFunction 'current_date'. This class is generated by GenerateFunction.
  */
 public class CurrentDate extends ScalarFunction
-        implements LeafExpression, ExplicitlyCastableSignature, Nondeterministic, AlwaysNotNullable {
+        implements LeafExpression, ExplicitlyCastableSignature, AlwaysNotNullable {
 
     public static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
             FunctionSignature.ret(DateType.INSTANCE).args()
@@ -55,4 +54,9 @@ public List<FunctionSignature> getSignatures() {
     public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
         return visitor.visitCurrentDate(this, context);
     }
+
+    @Override
+    public boolean isDeterministic() {
+        return false;
+    }
 }
diff --git a/...rc/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/CurrentTime.java b/...rc/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/CurrentTime.java
@@ -20,7 +20,6 @@
 import org.apache.doris.catalog.FunctionSignature;
 import org.apache.doris.nereids.trees.expressions.functions.AlwaysNotNullable;
 import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
-import org.apache.doris.nereids.trees.expressions.functions.Nondeterministic;
 import org.apache.doris.nereids.trees.expressions.shape.LeafExpression;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
 import org.apache.doris.nereids.types.TimeType;
@@ -33,7 +32,7 @@
  * ScalarFunction 'current_time'. This class is generated by GenerateFunction.
  */
 public class CurrentTime extends ScalarFunction
-        implements LeafExpression, ExplicitlyCastableSignature, Nondeterministic, AlwaysNotNullable {
+        implements LeafExpression, ExplicitlyCastableSignature, AlwaysNotNullable {
 
     public static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
             FunctionSignature.ret(TimeType.INSTANCE).args()
@@ -55,4 +54,9 @@ public List<FunctionSignature> getSignatures() {
     public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
         return visitor.visitCurrentTime(this, context);
     }
+
+    @Override
+    public boolean isDeterministic() {
+        return false;
+    }
 }
diff --git a/...rc/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/CurrentUser.java b/...rc/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/CurrentUser.java
@@ -20,7 +20,6 @@
 import org.apache.doris.catalog.FunctionSignature;
 import org.apache.doris.nereids.trees.expressions.functions.AlwaysNotNullable;
 import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
-import org.apache.doris.nereids.trees.expressions.functions.Nondeterministic;
 import org.apache.doris.nereids.trees.expressions.shape.LeafExpression;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
 import org.apache.doris.nereids.types.StringType;
@@ -33,7 +32,7 @@
  * ScalarFunction 'CurrentUser'.
  */
 public class CurrentUser extends ScalarFunction
-        implements LeafExpression, ExplicitlyCastableSignature, AlwaysNotNullable, Nondeterministic {
+        implements LeafExpression, ExplicitlyCastableSignature, AlwaysNotNullable {
 
     public static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
             FunctionSignature.ret(StringType.INSTANCE).args()
@@ -52,4 +51,9 @@ public List<FunctionSignature> getSignatures() {
     public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
         return visitor.visitCurrentUser(this, context);
     }
+
+    @Override
+    public boolean isDeterministic() {
+        return false;
+    }
 }
diff --git a/...e/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Database.java b/...e/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Database.java
@@ -20,7 +20,6 @@
 import org.apache.doris.catalog.FunctionSignature;
 import org.apache.doris.nereids.trees.expressions.functions.AlwaysNotNullable;
 import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
-import org.apache.doris.nereids.trees.expressions.functions.Nondeterministic;
 import org.apache.doris.nereids.trees.expressions.shape.LeafExpression;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
 import org.apache.doris.nereids.types.VarcharType;
@@ -33,7 +32,7 @@
  * ScalarFunction 'database'.
  */
 public class Database extends ScalarFunction
-        implements LeafExpression, ExplicitlyCastableSignature, AlwaysNotNullable, Nondeterministic {
+        implements LeafExpression, ExplicitlyCastableSignature, AlwaysNotNullable {
 
     public static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
             FunctionSignature.ret(VarcharType.SYSTEM_DEFAULT).args()
@@ -52,4 +51,9 @@ public List<FunctionSignature> getSignatures() {
     public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
         return visitor.visitDatabase(this, context);
     }
+
+    @Override
+    public boolean isDeterministic() {
+        return false;
+    }
 }
diff --git a/...e-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Now.java b/...e-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Now.java
@@ -21,7 +21,6 @@
 import org.apache.doris.nereids.trees.expressions.Expression;
 import org.apache.doris.nereids.trees.expressions.functions.DateTimeWithPrecision;
 import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
-import org.apache.doris.nereids.trees.expressions.functions.Nondeterministic;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
 import org.apache.doris.nereids.types.DateTimeType;
 import org.apache.doris.nereids.types.DateTimeV2Type;
@@ -35,7 +34,7 @@
 /**
  * ScalarFunction 'now'. This class is generated by GenerateFunction.
  */
-public class Now extends DateTimeWithPrecision implements ExplicitlyCastableSignature, Nondeterministic {
+public class Now extends DateTimeWithPrecision implements ExplicitlyCastableSignature {
 
     public static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
             FunctionSignature.ret(DateTimeType.INSTANCE).args(),
@@ -91,4 +90,9 @@ public List<FunctionSignature> getSignatures() {
     public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
         return visitor.visitNow(this, context);
     }
+
+    @Override
+    public boolean isDeterministic() {
+        return false;
+    }
 }
diff --git a/...ore/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Random.java b/...ore/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Random.java
@@ -21,7 +21,6 @@
 import org.apache.doris.nereids.exceptions.AnalysisException;
 import org.apache.doris.nereids.trees.expressions.Expression;
 import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
-import org.apache.doris.nereids.trees.expressions.functions.Nondeterministic;
 import org.apache.doris.nereids.trees.expressions.literal.Literal;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
 import org.apache.doris.nereids.types.BigIntType;
@@ -36,7 +35,7 @@
  * ScalarFunction 'random'. This class is generated by GenerateFunction.
  */
 public class Random extends ScalarFunction
-        implements ExplicitlyCastableSignature, Nondeterministic {
+        implements ExplicitlyCastableSignature {
 
     public static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
             FunctionSignature.ret(DoubleType.INSTANCE).args(),
@@ -119,4 +118,9 @@ public List<FunctionSignature> getSignatures() {
     public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
         return visitor.visitRandom(this, context);
     }
+
+    @Override
+    public boolean isDeterministic() {
+        return false;
+    }
 }
diff --git a/...-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/User.java b/...-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/User.java
@@ -20,7 +20,6 @@
 import org.apache.doris.catalog.FunctionSignature;
 import org.apache.doris.nereids.trees.expressions.functions.AlwaysNotNullable;
 import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
-import org.apache.doris.nereids.trees.expressions.functions.Nondeterministic;
 import org.apache.doris.nereids.trees.expressions.shape.LeafExpression;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
 import org.apache.doris.nereids.types.VarcharType;
@@ -33,7 +32,7 @@
  * ScalarFunction 'User'.
  */
 public class User extends ScalarFunction
-        implements LeafExpression, ExplicitlyCastableSignature, AlwaysNotNullable, Nondeterministic {
+        implements LeafExpression, ExplicitlyCastableSignature, AlwaysNotNullable {
 
     public static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
             FunctionSignature.ret(VarcharType.SYSTEM_DEFAULT).args()
@@ -52,4 +51,9 @@ public List<FunctionSignature> getSignatures() {
     public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
         return visitor.visitUser(this, context);
     }
+
+    @Override
+    public boolean isDeterministic() {
+        return false;
+    }
 }
diff --git a/...c/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/UtcTimestamp.java b/...c/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/UtcTimestamp.java
@@ -20,7 +20,6 @@
 import org.apache.doris.catalog.FunctionSignature;
 import org.apache.doris.nereids.trees.expressions.functions.AlwaysNotNullable;
 import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
-import org.apache.doris.nereids.trees.expressions.functions.Nondeterministic;
 import org.apache.doris.nereids.trees.expressions.shape.LeafExpression;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
 import org.apache.doris.nereids.types.DateTimeType;
@@ -33,7 +32,7 @@
  * ScalarFunction 'utc_timestamp'. This class is generated by GenerateFunction.
  */
 public class UtcTimestamp extends ScalarFunction
-        implements LeafExpression, ExplicitlyCastableSignature, Nondeterministic, AlwaysNotNullable {
+        implements LeafExpression, ExplicitlyCastableSignature, AlwaysNotNullable {
 
     public static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
             FunctionSignature.ret(DateTimeType.INSTANCE).args()
@@ -55,4 +54,9 @@ public List<FunctionSignature> getSignatures() {
     public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
         return visitor.visitUtcTimestamp(this, context);
     }
+
+    @Override
+    public boolean isDeterministic() {
+        return false;
+    }
 }
diff --git a/...-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Uuid.java b/...-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Uuid.java
@@ -20,7 +20,6 @@
 import org.apache.doris.catalog.FunctionSignature;
 import org.apache.doris.nereids.trees.expressions.functions.AlwaysNotNullable;
 import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
-import org.apache.doris.nereids.trees.expressions.functions.Nondeterministic;
 import org.apache.doris.nereids.trees.expressions.shape.LeafExpression;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
 import org.apache.doris.nereids.types.VarcharType;
@@ -33,7 +32,7 @@
  * ScalarFunction 'uuid'. This class is generated by GenerateFunction.
  */
 public class Uuid extends ScalarFunction
-        implements LeafExpression, ExplicitlyCastableSignature, Nondeterministic, AlwaysNotNullable {
+        implements LeafExpression, ExplicitlyCastableSignature, AlwaysNotNullable {
 
     public static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
             FunctionSignature.ret(VarcharType.SYSTEM_DEFAULT).args()
@@ -60,4 +59,9 @@ public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
     public List<FunctionSignature> getSignatures() {
         return SIGNATURES;
     }
+
+    @Override
+    public boolean isDeterministic() {
+        return false;
+    }
 }