jh-v3

Author: dwdwqfwe

fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/ExpressionNormalization.java

@@ -18,6 +18,7 @@
 package org.apache.doris.nereids.rules.expression;
 
 import org.apache.doris.nereids.rules.expression.check.CheckCast;
+import org.apache.doris.nereids.rules.expression.rules.ConcatWsMultiArrayToOne;
 import org.apache.doris.nereids.rules.expression.rules.ConvertAggStateCast;
 import org.apache.doris.nereids.rules.expression.rules.DigitalMaskingConvert;
 import org.apache.doris.nereids.rules.expression.rules.FoldConstantRule;
@@ -55,7 +56,8 @@ public class ExpressionNormalization extends ExpressionRewrite {
                 SimplifyArithmeticComparisonRule.INSTANCE,
                 ConvertAggStateCast.INSTANCE,
                 MergeDateTrunc.INSTANCE,
-                CheckCast.INSTANCE
+                CheckCast.INSTANCE,
+                ConcatWsMultiArrayToOne.INSTANCE,
             )
     );
 

fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/ExpressionOptimization.java

@@ -20,7 +20,6 @@
 import org.apache.doris.nereids.rules.expression.rules.ArrayContainToArrayOverlap;
 import org.apache.doris.nereids.rules.expression.rules.BetweenToEqual;
 import org.apache.doris.nereids.rules.expression.rules.CaseWhenToIf;
-import org.apache.doris.nereids.rules.expression.rules.ConcatWsMultiArrayToOne;
 import org.apache.doris.nereids.rules.expression.rules.DateFunctionRewrite;
 import org.apache.doris.nereids.rules.expression.rules.DistinctPredicatesRule;
 import org.apache.doris.nereids.rules.expression.rules.ExtractCommonFactorRule;
@@ -30,6 +29,7 @@
 import org.apache.doris.nereids.rules.expression.rules.SimplifyInPredicate;
 import org.apache.doris.nereids.rules.expression.rules.SimplifyRange;
 import org.apache.doris.nereids.rules.expression.rules.TopnToMax;
+import org.apache.doris.nereids.rules.expression.rules.LogToLn;
 
 import com.google.common.collect.ImmutableList;
 
@@ -61,7 +61,6 @@ public class ExpressionOptimization extends ExpressionRewrite {
                     LikeToEqualRewrite.INSTANCE,
                     BetweenToEqual.INSTANCE,
                     LogToLn.INSTANCE,
-                    ConcatWsMultiArrayToOne.INSTANCE
             )
     );
     private static final ExpressionRuleExecutor EXECUTOR = new ExpressionRuleExecutor(OPTIMIZE_REWRITE_RULES);

fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/ExpressionRuleType.java

@@ -26,6 +26,7 @@ public enum ExpressionRuleType {
     BETWEEN_TO_EQUAL,
     CASE_WHEN_TO_IF,
     CHECK_CAST,
+    LOG_TO_LN,
     CONVERT_AGG_STATE_CAST,
     CONCATWS_MULTI_ARRAY_TO_ONE,
     DATE_FUNCTION_REWRITE,
@@ -35,7 +36,6 @@ public enum ExpressionRuleType {
     EXTRACT_COMMON_FACTOR,
     FOLD_CONSTANT_ON_BE,
     FOLD_CONSTANT_ON_FE,
-    LOG_TO_LN,
     IN_PREDICATE_DEDUP,
     IN_PREDICATE_EXTRACT_NON_CONSTANT,
     IN_PREDICATE_TO_EQUAL_TO,