diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ExpressionFunctions.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ExpressionFunctions.java index a45954a9b93c7c..ea63a8ffabeac3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ExpressionFunctions.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ExpressionFunctions.java @@ -52,13 +52,8 @@ public enum ExpressionFunctions { private static final Logger LOG = LogManager.getLogger(ExpressionFunctions.class); private ImmutableMultimap functions; public static final Set unfixedFn = ImmutableSet.of( - "now", - "current_time", - "current_date", - "utc_timestamp", "uuid", - "random", - "unix_timestamp" + "random" ); private ExpressionFunctions() { diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/Nondeterministic.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/Nondeterministic.java index 88955c0c4da07c..56aa5ebb3b9ccf 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/Nondeterministic.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/Nondeterministic.java @@ -17,8 +17,6 @@ package org.apache.doris.nereids.trees.expressions.functions; -import org.apache.doris.qe.ConnectContext; - /** * Nondeterministic functions. * @@ -26,10 +24,4 @@ * */ public interface Nondeterministic extends ExpressionTrait { - @Override - default boolean foldable() { - return ConnectContext.get() == null - || ConnectContext.get().getSessionVariable() == null - || ConnectContext.get().getSessionVariable().isEnableFoldNondeterministicFn(); - } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/executable/DateTimeAcquire.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/executable/DateTimeAcquire.java index e5dca783fd4bee..17403bd83c0770 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/executable/DateTimeAcquire.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/executable/DateTimeAcquire.java @@ -86,18 +86,19 @@ public static Expression currentDate() { return DateLiteral.fromJavaDateType(LocalDateTime.now(DateUtils.getTimeZone())); } - /** - * date acquire function: current_time - */ - @ExecFunction(name = "curtime", argTypes = {}, returnType = "DATETIME") - public static Expression curTime() { - return DateTimeLiteral.fromJavaDateType(LocalDateTime.now(DateUtils.getTimeZone())); - } + // comment these function temporally until we support TimeLiteral + // /** + // * date acquire function: current_time + // */ + // @ExecFunction(name = "curtime", argTypes = {}, returnType = "TIME") + // public static Expression curTime() { + // return DateTimeLiteral.fromJavaDateType(LocalDateTime.now(DateUtils.getTimeZone())); + // } - @ExecFunction(name = "current_time", argTypes = {}, returnType = "DATETIME") - public static Expression currentTime() { - return DateTimeLiteral.fromJavaDateType(LocalDateTime.now(DateUtils.getTimeZone())); - } + // @ExecFunction(name = "current_time", argTypes = {}, returnType = "TIME") + // public static Expression currentTime() { + // return DateTimeLiteral.fromJavaDateType(LocalDateTime.now(DateUtils.getTimeZone())); + // } /** * date transformation function: unix_timestamp diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Random.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Random.java index 1ee251c305dac5..29530adfa0aa4e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Random.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Random.java @@ -70,6 +70,11 @@ public boolean nullable() { } } + @Override + public boolean foldable() { + return false; + } + /** * withChildren. */ diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/UnixTimestamp.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/UnixTimestamp.java index 20958dd45af4f5..bdeabb74c89380 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/UnixTimestamp.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/UnixTimestamp.java @@ -40,7 +40,7 @@ * ScalarFunction 'unix_timestamp'. This class is generated by GenerateFunction. */ public class UnixTimestamp extends ScalarFunction - implements Nondeterministic, ExplicitlyCastableSignature, PropagateNullableOnDateLikeV2Args { + implements ExplicitlyCastableSignature, PropagateNullableOnDateLikeV2Args, Nondeterministic { private static final List SIGNATURES = ImmutableList.of( FunctionSignature.ret(IntegerType.INSTANCE).args(), @@ -101,14 +101,6 @@ public UnixTimestamp withChildren(List children) { } } - @Override - public boolean foldable() { - if (children.size() != 0) { - return true; - } - return Nondeterministic.super.foldable(); - } - @Override public List getSignatures() { return SIGNATURES; diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Uuid.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Uuid.java index 2f0f162b5fcefb..8949290783256b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Uuid.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Uuid.java @@ -46,6 +46,11 @@ public Uuid() { super("uuid"); } + @Override + public boolean foldable() { + return false; + } + @Override public R accept(ExpressionVisitor visitor, C context) { return visitor.visitUuid(this, context); diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/UuidNumeric.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/UuidNumeric.java index 3e2267b4370c74..bbbd2e81a9994a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/UuidNumeric.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/UuidNumeric.java @@ -46,6 +46,11 @@ public UuidNumeric() { super("uuid_numeric"); } + @Override + public boolean foldable() { + return false; + } + @Override public R accept(ExpressionVisitor visitor, C context) { return visitor.visitUuidNumeric(this, context); diff --git a/regression-test/suites/nereids_p0/datatype/test_date_acquire.groovy b/regression-test/suites/nereids_p0/datatype/test_date_acquire.groovy index b6afad759d34ec..981b28eac4065c 100644 --- a/regression-test/suites/nereids_p0/datatype/test_date_acquire.groovy +++ b/regression-test/suites/nereids_p0/datatype/test_date_acquire.groovy @@ -20,7 +20,7 @@ suite("test_date_acquire") { sql 'set enable_fallback_to_original_planner=false' sql 'set enable_fold_nondeterministic_fn=true' - String res = sql 'explain select now(), now(3), curdate(), current_date(), curtime(), current_time(), current_timestamp(), current_timestamp(3)' + String res = sql 'explain select now(), now(3), curdate(), current_date(), current_timestamp(), current_timestamp(3)' res = res.split('VUNION')[1] assertFalse(res.contains("()") || res.contains("(3)"))