jh-v1

Author: dwdwqfwe

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

@@ -18,13 +18,15 @@
 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;
 import org.apache.doris.nereids.rules.expression.rules.InPredicateDedup;
 import org.apache.doris.nereids.rules.expression.rules.InPredicateExtractNonConstant;
 import org.apache.doris.nereids.rules.expression.rules.InPredicateToEqualToRule;
 import org.apache.doris.nereids.rules.expression.rules.JsonFunctionRewrite;
+import org.apache.doris.nereids.rules.expression.rules.LogToLn;
 import org.apache.doris.nereids.rules.expression.rules.MedianConvert;
 import org.apache.doris.nereids.rules.expression.rules.MergeDateTrunc;
 import org.apache.doris.nereids.rules.expression.rules.NormalizeBinaryPredicatesRule;
@@ -63,7 +65,9 @@ public class ExpressionNormalization extends ExpressionRewrite {
                 ConvertAggStateCast.INSTANCE,
                 MergeDateTrunc.INSTANCE,
                 JsonFunctionRewrite.INSTANCE,
-                CheckCast.INSTANCE
+                CheckCast.INSTANCE,
+                LogToLn.INSTANCE,
+                ConcatWsMultiArrayToOne.INSTANCE
             )
     );
 

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

@@ -25,7 +25,6 @@
 import org.apache.doris.nereids.rules.expression.rules.DistinctPredicatesRule;
 import org.apache.doris.nereids.rules.expression.rules.ExtractCommonFactorRule;
 import org.apache.doris.nereids.rules.expression.rules.LikeToEqualRewrite;
-import org.apache.doris.nereids.rules.expression.rules.LogToLn;
 import org.apache.doris.nereids.rules.expression.rules.NullSafeEqualToEqual;
 import org.apache.doris.nereids.rules.expression.rules.SimplifyComparisonPredicate;
 import org.apache.doris.nereids.rules.expression.rules.SimplifyConflictCompound;
@@ -62,8 +61,7 @@ public class ExpressionOptimization extends ExpressionRewrite {
                     TopnToMax.INSTANCE,
                     NullSafeEqualToEqual.INSTANCE,
                     LikeToEqualRewrite.INSTANCE,
-                    BetweenToEqual.INSTANCE,
-                    LogToLn.INSTANCE
+                    BetweenToEqual.INSTANCE
             )
     );
 

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

@@ -27,14 +27,15 @@ public enum ExpressionRuleType {
     CASE_WHEN_TO_IF,
     CHECK_CAST,
     CONVERT_AGG_STATE_CAST,
+    CONCATWS_MULTI_ARRAY_TO_ONE,
     DATE_FUNCTION_REWRITE,
     DIGITAL_MASKING_CONVERT,
     DISTINCT_PREDICATES,
     EXPR_ID_REWRITE_REPLACE,
     EXTRACT_COMMON_FACTOR,
+    LOG_TO_LN,
     FOLD_CONSTANT_ON_BE,
     FOLD_CONSTANT_ON_FE,
-    LOG_TO_LN,
     IN_PREDICATE_DEDUP,
     IN_PREDICATE_EXTRACT_NON_CONSTANT,
     IN_PREDICATE_TO_EQUAL_TO,

regression-test/data/nereids_function_p0/scalar_function/FixConcatWsAndLog.out

@@ -0,0 +1,51 @@
+-- This file is automatically generated. You should know what you did if you want to edit this
+-- !concat_ws_ArrayWithNullElement --
+a-b-css-d-g-f-s
+
+-- !concat_ws_ArrayWithEmptyString --
+a---css-d-
+
+-- !concat_ws_WithEmptyArray --
+a-b-css-d
+
+-- !concat_ws_SeparatorSpecial --
+x|y|m|n|p
+
+-- !concat_ws_SeparatorEmpty --
+abcd
+
+-- !concat_ws_ArrayWithNumber --
+1-2-3-4-5-6
+
+-- !concat_ws_WithNullArray --
+
+
+-- !concat_ws_SingleArray --
+x,y,z
+
+-- !concat_ws_ArrayAllNull --
+a-b
+
+-- !concat_ws_MixedTypeElement --
+a|123|456|b
+
+-- !concat_ws_chinese --
+你好，世界，Doris，Nereids，测试
+
+-- !concat_ws_insert_1 --
+a-b-css-d
+x-y-z
+你好-世界-Doris-Nereids
+
+-- !log_function --
+2.0	3.0	3.0	3.0000000000000004	2.9999999999999996
+
+-- !log_function_with_null --
+\N	\N	\N	\N	\N
+
+-- !log_function_wiht_one_argument --
+4.605170185988092	2.0794415416798357	3.295836866004329	4.8283137373023015	6.907755278982137
+
+-- !log_function_with_null_and_one_argument --
+\N	\N	0.0	2.302585092994046
+

regression-test/suites/nereids_function_p0/scalar_function/FixConcatWsAndLog.groovy

@@ -0,0 +1,31 @@
+suite("nereids_scalar_fn_concat_ws_and_log") {
+
+    sql 'use regression_test_nereids_function_p0_scalar_function'
+    sql 'set enable_fold_constant_by_be=false'
+    qt_concat_ws_ArrayWithNullElement "select concat_ws('-',['a','b'],['css',null,'d'],['g','f'],['s'])"
+
+
+    qt_concat_ws_ArrayWithEmptyString "select concat_ws('-',['a',''],['','css'],['d',''])"
+    qt_concat_ws_WithEmptyArray "select concat_ws('-',['a','b'],[],['css','d'],[])"
+    qt_concat_ws_SeparatorSpecial "select concat_ws('|',['x','y'],['m',null,'n'],['p'])"
+
+    qt_concat_ws_SeparatorEmpty "select concat_ws('',['a','b'],['c',null],['d'])"
+
+    qt_concat_ws_ArrayWithNumber "select concat_ws('-',['1','2'],['3',null,'4'],['5','6'])"
+    qt_concat_ws_WithNullArray "select concat_ws('-',['a'],null,['b','c'])"
+    qt_concat_ws_SingleArray "select concat_ws(',',['x','y','z'])"
+    qt_concat_ws_ArrayAllNull "select concat_ws('-',['a'],[null,null],['b'])"
+    qt_concat_ws_MixedTypeElement "select concat_ws('|',['a','123'],['456',null,'b'])"
+    qt_concat_ws_chinese "select concat_ws('，',['你好','世界'],['Doris',null,'Nereids'],['测试'])"
+
+    sql "DROP TABLE IF EXISTS test_concat_ws_1"
+    sql "CREATE TABLE test_concat_ws_1 (id INT, a ARRAY<VARCHAR>, b ARRAY<VARCHAR>) ENGINE=OLAP DISTRIBUTED BY HASH(id) BUCKETS 1 PROPERTIES ('replication_num' = '1')"
+    sql "INSERT INTO test_concat_ws_1 VALUES (1, ['a','b'], ['css',null,'d']), (2, ['x',null], ['y','z']),(3,['你好','世界'],['Doris',null,'Nereids'])"
+    qt_concat_ws_insert_1 "SELECT concat_ws('-', a, b) FROM test_concat_ws_1 ORDER BY id"
+
+
+    qt_log_function "SELECT log(10, 100), log(2, 8), log(3, 27), log(5, 125), log(10, 1000)"
+    qt_log_function_with_null "SELECT log(10, NULL), log(NULL, 100), log(NULL, NULL), log(10, 0), log(0, 10)"
+    qt_log_function_wiht_one_argument "SELECT log(100), log(8), log(27), log(125), log(1000)"
+    qt_log_function_with_null_and_one_argument "SELECT log(NULL), log(0), log(1), log(10)"
+}