[WIP](test) remove enable_nereids_planner in regression cases (part 2) (

apache#34490)
ByteYue · May 15, 2024 · 7b5b9a2 · 7b5b9a2
1 parent c05fe31
commit 7b5b9a2
Show file tree

Hide file tree

Showing 63 changed files with 63 additions and 472 deletions.
diff --git a/regression-test/data/bloom_filter_p0/test_bloom_filter_is_not_null.out b/regression-test/data/bloom_filter_p0/test_bloom_filter_is_not_null.out
@@ -9,13 +9,3 @@ b
 -- !select_null --
 \N
 
--- !select_all --
-\N
-b
-
--- !select_not_null --
-b
-
--- !select_null --
-\N
-
diff --git a/regression-test/data/correctness/test_cast_as_decimalv3.out b/regression-test/data/correctness/test_cast_as_decimalv3.out
@@ -18,9 +18,3 @@
 -- !select5 --
 -280.0001
 
--- !select6 --
--280.0000
-
--- !select7 --
--280.0001
-
diff --git a/regression-test/data/correctness/test_from_millisecond_microsecond.out b/regression-test/data/correctness/test_from_millisecond_microsecond.out
@@ -74,15 +74,6 @@
 -- !select15 --
 1700237372000000
 
--- !select16 --
-1700237372
-
--- !select17 --
-1700237372000
-
--- !select18 --
-1700237372000000
-
 -- !select1 --
 2030-11-02T08:35:14.514	2030-11-02T08:35:14.514
 4803-07-17T15:07:14.789	\N

diff --git a/regression-test/data/correctness/test_in_null.out b/regression-test/data/correctness/test_in_null.out
@@ -13,17 +13,3 @@
 2	true
 3	\N
 
--- !select3 --
-\N	\N
-0	\N
-1	\N
-2	\N
-3	\N
-
--- !select4 --
-\N	\N
-0	\N
-1	\N
-2	true
-3	\N
-
diff --git a/regression-test/data/correctness/test_str_to_date.out b/regression-test/data/correctness/test_str_to_date.out
@@ -13,41 +13,15 @@
 -- !select4 --
 2020-12-03T11:45:14
 
--- !short_nereids_1 --
+-- !short_1 --
 2023-01-01
 
--- !short_nereids_2 --
+-- !short_2 --
 2023-12-01
 
--- !short_nereids_3 --
+-- !short_3 --
 2023-01-01
 
--- !short_nereids_4 --
-2020-02-01
-
--- !select5 --
-2019-12-01	yyyy-MM-dd	2019-12-01T00:00
-20201203	yyyyMMdd	2020-12-03T00:00
-2020-12-03 11:45:14	yyyy-MM-dd HH:mm:ss	2020-12-03T11:45:14
-
--- !select6 --
-2019-12-01
-
--- !select7 --
-2020-12-03
-
--- !select8 --
-2020-12-03T11:45:14
-
--- !short_legacy_1 --
-2023-01-01
-
--- !short_legacy_2 --
-2023-12-01
-
--- !short_legacy_3 --
-2023-01-01
-
--- !short_legacy_4 --
+-- !short_4 --
 2020-02-01
 
diff --git a/regression-test/data/correctness/test_time_diff_microseconds.out b/regression-test/data/correctness/test_time_diff_microseconds.out
@@ -11,7 +11,7 @@
 48:00:00.114514
 
 -- !select4 --
-48:00:00.11400
+48:00:00.11500
 
 -- !select5 --
 67:19:00.0000

diff --git a/regression-test/data/correctness/test_time_function.out b/regression-test/data/correctness/test_time_function.out
@@ -47,51 +47,3 @@
 -- !select --
 604800
 
--- !select --
-16:32:18
-
--- !select --
-16:32:18
-
--- !select --
-12:34:56
-
--- !select --
-00:34:56
-
--- !select --
-00:00:56
-
--- !select --
-12:34:56
-
--- !select --
-34:56:00
-
--- !select --
-\N
-
--- !select --
-12:34:56
-
--- !select --
-00:34:56
-
--- !select --
-00:00:56
-
--- !select --
-\N
-
--- !select --
-\N
-
--- !select --
-\N
-
--- !select --
-\N
-
--- !select --
-604800
-
diff --git a/regression-test/data/correctness_p0/test_avg.out b/regression-test/data/correctness_p0/test_avg.out
@@ -107,14 +107,11 @@
 99
 
 -- !avg --
-9.181818181818681E14
+9.18181818181868E14
 
 -- !select2 --
 \N	\N
 
--- !select3 --
-\N	\N
-
 -- !select4 --
 0.0100
 
diff --git a/regression-test/data/correctness_p0/test_cast_null.out b/regression-test/data/correctness_p0/test_cast_null.out
@@ -5,9 +5,6 @@
 -- !sql2 --
 \N
 
--- !sql3 --
-19700506
-
 -- !sql4 --
 \N
 

diff --git a/regression-test/data/correctness_p0/test_constant_having.out b/regression-test/data/correctness_p0/test_constant_having.out
@@ -1,5 +1,3 @@
 -- This file is automatically generated. You should know what you did if you want to edit this
 -- !sql1 --
 
--- !sql2 --
-
diff --git a/regression-test/data/correctness_p0/test_div_decimal_overflow.out b/regression-test/data/correctness_p0/test_div_decimal_overflow.out
@@ -1,7 +1,4 @@
 -- This file is automatically generated. You should know what you did if you want to edit this
 -- !sql1 --
-7166.000000000000000000	3242.500000000000000000	0.45248395199553443
-
--- !sql2 --
-7166.000000000000000000	3242.500000000000000000	0.45248395199553443
+7166.000000000000000000	3242.500000000000000000	0.4524839519
 
diff --git a/regression-test/data/correctness_p0/test_function_conjunct.out b/regression-test/data/correctness_p0/test_function_conjunct.out
@@ -1,5 +1,3 @@
 -- This file is automatically generated. You should know what you did if you want to edit this
 -- !select_default --
 
--- !select_default --
-
diff --git a/regression-test/data/ddl_p0/test_create_view.out b/regression-test/data/ddl_p0/test_create_view.out
@@ -25,5 +25,5 @@
 3	[-1, 20, 0]	[0, 1, 0]
 
 -- !test_view_6 --
-v1	CREATE VIEW `v1` COMMENT 'VIEW' AS SELECT `error_code` AS `error_code`, 1 AS `__literal_1`, 'string' AS `__literal_2`, now() AS `__now_3`, dayofyear(`op_time`) AS `__dayofyear_4`, CAST(`source` AS BIGINT) AS `__cast_expr_5`, min(`timestamp`) OVER (ORDER BY `op_time` DESC NULLS LAST ROWS BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING) AS `__min_6`, (1 > 2) AS `__binary_predicate_7`, (2 + 3) AS `__arithmetic_expr_8`, 1 IN (1, 2, 3, 4) AS `__in_predicate_9`, `remark` LIKE '%like' AS `__like_predicate_10`, CASE WHEN (`remark` = 's') THEN 1 ELSE 2 END AS `__case_expr_11`, (TRUE | FALSE) AS `__arithmetic_expr_12` FROM `regression_test_ddl_p0`.`view_column_name_test`;
+v1	CREATE VIEW `v1` COMMENT 'VIEW' AS SELECT\n      error_code, \n      1, \n      'string', \n      now(), \n      dayofyear(op_time), \n      cast (source AS BIGINT), \n      min(`timestamp`) OVER (\n        ORDER BY \n          op_time DESC ROWS BETWEEN UNBOUNDED PRECEDING\n          AND 1 FOLLOWING\n      ), \n      1 > 2,\n      2 + 3,\n      1 IN (1, 2, 3, 4), \n      remark LIKE '%like', \n      CASE WHEN remark = 's' THEN 1 ELSE 2 END,\n      TRUE | FALSE \n    FROM \n      `internal`.`regression_test_ddl_p0`.`view_column_name_test`;
 
diff --git a/regression-test/data/performance_p0/redundant_conjuncts.out b/regression-test/data/performance_p0/redundant_conjuncts.out
@@ -2,20 +2,37 @@
 -- !redundant_conjuncts --
 PLAN FRAGMENT 0
   OUTPUT EXPRS:
-    `v1`
-  PARTITION: HASH_PARTITIONED: `regression_test_performance_p0`.`redundant_conjuncts`.`k1`
+    v1[#2]
+  PARTITION: UNPARTITIONED
 
   HAS_COLO_PLAN_NODE: false
 
   VRESULT SINK
      MYSQL_PROTOCAL
 
-  0:VOlapScanNode
-     TABLE: regression_test_performance_p0.redundant_conjuncts(redundant_conjuncts), PREAGGREGATION: OFF. Reason: No AggregateInfo
-     PREDICATES: (`k1` = 1)
+  1:VEXCHANGE
+     offset: 0
+     distribute expr lists: 
+
+PLAN FRAGMENT 1
+
+  PARTITION: HASH_PARTITIONED: k1[#0]
+
+  HAS_COLO_PLAN_NODE: false
+
+  STREAM DATA SINK
+    EXCHANGE ID: 01
+    UNPARTITIONED
+
+  0:VOlapScanNode(90)
+     TABLE: regression_test_performance_p0.redundant_conjuncts(redundant_conjuncts), PREAGGREGATION: ON
+     PREDICATES: (k1[#0] = 1)
      partitions=0/1 (), tablets=0/0, tabletList=
-     cardinality=0, avgRowSize=8.0, numNodes=1
+     cardinality=0, avgRowSize=0.0, numNodes=1
      pushAggOp=NONE
+     final projections: v1[#1]
+     final project output tuple id: 1
+planed with unknown column statistics
 
 -- !redundant_conjuncts_gnerated_by_extract_common_filter --
 PLAN FRAGMENT 0

diff --git a/regression-test/suites/bloom_filter_p0/test_bloom_filter_is_not_null.groovy b/regression-test/suites/bloom_filter_p0/test_bloom_filter_is_not_null.groovy
@@ -33,17 +33,7 @@ suite("test_bloom_filter_is_not_null") {
 
     sql """INSERT INTO ${table_name} values (null), ('b')"""
 
-    sql 'set enable_nereids_planner=false'
     qt_select_all """select * from ${table_name} order by a"""
     qt_select_not_null """select * from ${table_name} WHERE a is not null"""
     qt_select_null """select * from ${table_name} WHERE a is null"""
-
-    sql 'set enable_nereids_planner=true'
-    sql 'set enable_fallback_to_original_planner=false'
-    qt_select_all """select * from ${table_name} order by a"""
-    qt_select_not_null """select * from ${table_name} WHERE a is not null"""
-    qt_select_null """select * from ${table_name} WHERE a is null"""
-
-    sql 'set enable_nereids_planner=false'
-    sql 'set enable_fallback_to_original_planner=true'
-}
+}
diff --git a/regression-test/suites/correctness/test_cast_as_decimalv3.groovy b/regression-test/suites/correctness/test_cast_as_decimalv3.groovy
@@ -56,16 +56,4 @@ suite("test_cast_as_decimalv3") {
     qt_select5 """
         select cast(-280.00005000 as decimal(16,4));
     """
-
-    sql """
-        set enable_nereids_planner=false
-    """
-
-
-    qt_select6 """
-        select cast(-280.00000000 as decimal(16,4));
-    """
-    qt_select7 """
-        select cast(-280.00005000 as decimal(16,4));
-    """
-}
+}
diff --git a/regression-test/suites/correctness/test_date_function_const.groovy b/regression-test/suites/correctness/test_date_function_const.groovy
@@ -16,7 +16,6 @@
 // under the License.
 
 suite("test_date_function_const") {
-    sql 'set enable_nereids_planner=false'
     sql 'set enable_fold_constant_by_be = false;'
 
     qt_select1 """
@@ -36,9 +35,7 @@ suite("test_date_function_const") {
         select hours_add(cast('2023-03-30 22:23:45.23452' as datetimev2(6)),8)
     """ 
 
-    sql 'set enable_nereids_planner=true'
     sql 'set enable_fold_constant_by_be = true;'
-	sql 'set enable_fallback_to_original_planner=false'
 
 
     qt_select6 """
@@ -61,4 +58,4 @@ suite("test_date_function_const") {
         sql("""select date_add(CURRENT_DATE(),-2);""")
         notContains("00:00:00")
     }
-}
+}
diff --git a/regression-test/suites/correctness/test_from_millisecond_microsecond.groovy b/regression-test/suites/correctness/test_from_millisecond_microsecond.groovy
@@ -43,9 +43,6 @@ suite("test_from_millisecond_microsecond") {
     sql """
         insert into millimicro values(4,NULL);
     """
-    sql """
-        set enable_nereids_planner=false
-    """
 
     qt_select1 """
         select 
@@ -88,9 +85,10 @@ suite("test_from_millisecond_microsecond") {
         from_microsecond(t), 
         microsecond_timestamp(from_microsecond(t))
         from millimicro order by id;
-    """ 
+    """
+
     sql """
-        set enable_nereids_planner=true,enable_fold_constant_by_be = false,forbid_unknown_col_stats = false
+        set enable_fold_constant_by_be = false
     """
 
     qt_select7 """
@@ -130,13 +128,7 @@ suite("test_from_millisecond_microsecond") {
     """ 
     qt_select13 """select SECOND_TIMESTAMP(cast('2023-11-18 00:09:32' as datetime));""" 
     qt_select14 """select MILLISECOND_TIMESTAMP(cast('2023-11-18 00:09:32' as datetime));""" 
-    qt_select15 """select MICROSECOND_TIMESTAMP(cast('2023-11-18 00:09:32' as datetime));""" 
-    sql """
-        set enable_nereids_planner=false
-    """
-    qt_select16 """select SECOND_TIMESTAMP(cast('2023-11-18 00:09:32' as datetime));""" 
-    qt_select17 """select MILLISECOND_TIMESTAMP(cast('2023-11-18 00:09:32' as datetime));""" 
-    qt_select18 """select MICROSECOND_TIMESTAMP(cast('2023-11-18 00:09:32' as datetime));"""
+    qt_select15 """select MICROSECOND_TIMESTAMP(cast('2023-11-18 00:09:32' as datetime));"""
 
     // not null 
     sql """ DROP TABLE IF EXISTS millimicro """
@@ -167,7 +159,6 @@ suite("test_from_millisecond_microsecond") {
         insert into millimicro values(4,NULL);
     """
 
-
     qt_select1 """
         select 
         from_millisecond(t) as t1 , 
@@ -211,7 +202,7 @@ suite("test_from_millisecond_microsecond") {
         from millimicro order by id;
     """ 
     sql """
-        set enable_nereids_planner=true,enable_fold_constant_by_be = false,forbid_unknown_col_stats = false
+        set enable_fold_constant_by_be = false
     """
 
     qt_select7 """
@@ -325,4 +316,4 @@ suite("test_from_millisecond_microsecond") {
     qt_sql " select from_second(-1) "
     qt_sql " select from_microsecond(253402271999999999) "
     qt_sql " select from_microsecond(253402272000000000) "
-}
+}