This is an automated email from the ASF dual-hosted git repository. yiguolei pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/doris.git
commit c0cca6103b4724c3e5d314b7b42bfa1e95b9ae1a Author: morrySnow <[email protected]> AuthorDate: Wed May 8 15:38:05 2024 +0800 [WIP](test) remove enable_nereids_planner in regression cases (part 2) (#34490) --- .../test_bloom_filter_is_not_null.out | 10 ---- .../data/correctness/test_cast_as_decimalv3.out | 6 -- .../test_from_millisecond_microsecond.out | 9 --- regression-test/data/correctness/test_in_null.out | 14 ----- .../data/correctness/test_str_to_date.out | 34 ++--------- .../correctness/test_time_diff_microseconds.out | 2 +- .../data/correctness/test_time_function.out | 48 --------------- regression-test/data/correctness_p0/test_avg.out | 5 +- .../data/correctness_p0/test_cast_null.out | 3 - .../data/correctness_p0/test_constant_having.out | 2 - .../correctness_p0/test_div_decimal_overflow.out | 5 +- .../data/correctness_p0/test_function_conjunct.out | 2 - regression-test/data/ddl_p0/test_create_view.out | 2 +- .../data/performance_p0/redundant_conjuncts.out | 29 +++++++-- .../test_bloom_filter_is_not_null.groovy | 12 +--- .../correctness/test_cast_as_decimalv3.groovy | 14 +---- .../correctness/test_date_function_const.groovy | 5 +- .../test_from_millisecond_microsecond.groovy | 21 ++----- .../suites/correctness/test_in_null.groovy | 15 +---- .../suites/correctness/test_str_to_date.groovy | 28 ++------- .../correctness/test_time_diff_microseconds.groovy | 5 +- .../suites/correctness/test_time_function.groovy | 68 +--------------------- .../suites/correctness/test_timev2_fold.groovy | 6 +- .../correctness_p0/test_agg_materialize.groovy | 1 - .../suites/correctness_p0/test_avg.groovy | 6 -- .../suites/correctness_p0/test_bit_function.groovy | 2 - .../correctness_p0/test_bit_shift_lagency.groovy | 4 +- .../correctness_p0/test_bucket_shuffle_join.groovy | 11 ++-- .../correctness_p0/test_cast_date_decimal.groovy | 4 -- .../suites/correctness_p0/test_cast_in.groovy | 3 - .../suites/correctness_p0/test_cast_null.groovy | 17 ------ .../correctness_p0/test_constant_having.groovy | 21 ------- .../suites/correctness_p0/test_ctas_mv.groovy | 1 - .../test_div_decimal_overflow.groovy | 9 --- .../correctness_p0/test_function_conjunct.groovy | 5 -- .../suites/correctness_p0/test_implict_cast.groovy | 3 +- .../test_inlineview_with_lateralview.groovy | 1 - .../test_inlineview_with_project.groovy | 1 - .../test_inlineview_with_window_function.groovy | 1 - .../test_join_with_projection.groovy | 1 - .../suites/correctness_p0/test_mv_case.groovy | 1 - .../suites/correctness_p0/test_time_round.groovy | 4 +- .../datatype_p0/complex_types/test_map.groovy | 1 - .../test_complextype_information_schema.groovy | 1 - ..._nested_types_insert_into_with_agg_table.groovy | 3 +- ..._nested_types_insert_into_with_dup_table.groovy | 1 - ...sted_types_insert_into_with_unique_table.groovy | 3 +- .../suites/ddl_p0/test_create_view.groovy | 1 - regression-test/suites/ddl_p0/test_ctas.groovy | 6 -- ...urrent_timestamp_as_column_default_value.groovy | 4 -- .../suites/delete_p0/test_delete_on_value.groovy | 3 - .../cache/parse_sql_from_sql_cache.groovy | 10 ---- .../nereids_p0/create_table/test_ctas.groovy | 2 - .../suites/nereids_p0/datatype/test_cast.groovy | 7 +-- regression-test/suites/nereids_p0/load.groovy | 3 - .../test_string_function_like.groovy | 11 ---- .../table_function/explode_map.groovy | 7 --- .../suites/nereids_p0/tablesample.groovy | 4 +- .../nereids_p0/test_filter_pushdown_set.groovy | 3 +- .../mv/newMv/dup_mv_bm_hash.groovy | 8 --- .../nereids_syntax_p0/mv/newMv/dup_mv_year.groovy | 8 --- .../mv/newMv/sum_devide_count.groovy | 6 -- .../performance_p0/redundant_conjuncts.groovy | 2 +- 63 files changed, 63 insertions(+), 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 index bb14d3d4679..f578ece9b88 100644 --- 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 index db702dc9e49..07020cdec74 100644 --- 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 index b4f5d9623f6..50cdb55766d 100644 --- 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 index f359b90ce15..84560ce32f6 100644 --- 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 index 633b590ad98..c4326914a7c 100644 --- 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 index cf0f6e93abe..2ef74548ebd 100644 --- 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 index 856e6c645cd..84c22e1f309 100644 --- 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 index baf9d5b4630..97eb1368151 100644 --- 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 index 2cba0e599d0..89eb3fe0a32 100644 --- 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 index b0e2754c2a0..f945866af5f 100644 --- 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 index 4e4fd1148fb..2773fae2e88 100644 --- 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 index 863b85b658e..afeab4c41d0 100644 --- 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 index 7ee1123fd46..74b191abb26 100644 --- 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 [...] +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 `inte [...] diff --git a/regression-test/data/performance_p0/redundant_conjuncts.out b/regression-test/data/performance_p0/redundant_conjuncts.out index e4cd154e44e..284603226d4 100644 --- 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 index 722a17ca371..e07b97a03b0 100644 --- 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' -} \ No newline at end of file +} diff --git a/regression-test/suites/correctness/test_cast_as_decimalv3.groovy b/regression-test/suites/correctness/test_cast_as_decimalv3.groovy index a0ddbc90108..41b7cc1fba1 100644 --- 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)); - """ -} \ No newline at end of file +} diff --git a/regression-test/suites/correctness/test_date_function_const.groovy b/regression-test/suites/correctness/test_date_function_const.groovy index df05738b1bf..0caded34f5d 100644 --- 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") } -} \ No newline at end of file +} diff --git a/regression-test/suites/correctness/test_from_millisecond_microsecond.groovy b/regression-test/suites/correctness/test_from_millisecond_microsecond.groovy index 3e5548f0ac6..48df29472f6 100644 --- 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) " -} \ No newline at end of file +} diff --git a/regression-test/suites/correctness/test_in_null.groovy b/regression-test/suites/correctness/test_in_null.groovy index 04b0c9a4bb2..264023affe2 100644 --- a/regression-test/suites/correctness/test_in_null.groovy +++ b/regression-test/suites/correctness/test_in_null.groovy @@ -33,24 +33,11 @@ suite("test_in_null") { sql """ INSERT INTO db VALUES(3); """ sql """ INSERT INTO db VALUES(0); """ sql """ INSERT INTO db VALUES(NULL); """ - - sql """ - set enable_nereids_planner=false; - """ qt_select1 """ select id,id IN (NULL) from db order by id; """ qt_select2 """ select id,id in (2,null) from db order by id; """ - sql """ - set enable_nereids_planner=true; - """ - qt_select3 """ - select id,id IN (NULL) from db order by id; - """ - qt_select4 """ - select id,id in (2,null) from db order by id; - """ -} \ No newline at end of file +} diff --git a/regression-test/suites/correctness/test_str_to_date.groovy b/regression-test/suites/correctness/test_str_to_date.groovy index 300f9cb9216..c2fe22f1f72 100644 --- a/regression-test/suites/correctness/test_str_to_date.groovy +++ b/regression-test/suites/correctness/test_str_to_date.groovy @@ -36,7 +36,6 @@ suite("test_str_to_date") { sql """ INSERT INTO test_str_to_date_db VALUES(2,'20201203', 'yyyyMMdd');""" sql """ INSERT INTO test_str_to_date_db VALUES(3,'2020-12-03 11:45:14', 'yyyy-MM-dd HH:mm:ss');""" -sql """ set enable_nereids_planner=true , enable_fallback_to_original_planner=false;""" qt_select1 """ select s1,s2,STR_TO_DATE(s1,s2) from test_str_to_date_db order by id; """ @@ -49,27 +48,8 @@ sql """ set enable_nereids_planner=true , enable_fallback_to_original_planner=f qt_select4 """ SELECT STR_TO_DATE('2020-12-03 11:45:14', 'yyyy-MM-dd HH:mm:ss'); """ - qt_short_nereids_1 " select STR_TO_DATE('2023', '%Y') " - qt_short_nereids_2 " select STR_TO_DATE('2023-12', '%Y-%m') " - qt_short_nereids_3 " select STR_TO_DATE('2023-12', '%Y')" - qt_short_nereids_4 " select STR_TO_DATE('2020%2', '%Y%%%m')" - - -sql """ set enable_nereids_planner=false;""" - qt_select5 """ - select s1,s2,STR_TO_DATE(s1,s2) from test_str_to_date_db order by id; - """ - qt_select6 """ - SELECT STR_TO_DATE('2019-12-01', 'yyyy-MM-dd'); - """ - qt_select7 """ - SELECT STR_TO_DATE('20201203', 'yyyyMMdd'); - """ - qt_select8 """ - SELECT STR_TO_DATE('2020-12-03 11:45:14', 'yyyy-MM-dd HH:mm:ss'); - """ - qt_short_legacy_1 " select STR_TO_DATE('2023', '%Y') " - qt_short_legacy_2 " select STR_TO_DATE('2023-12', '%Y-%m') " - qt_short_legacy_3 " select STR_TO_DATE('2023-12', '%Y')" - qt_short_legacy_4 " select STR_TO_DATE('2020%2', '%Y%%%m')" + qt_short_1 " select STR_TO_DATE('2023', '%Y') " + qt_short_2 " select STR_TO_DATE('2023-12', '%Y-%m') " + qt_short_3 " select STR_TO_DATE('2023-12', '%Y')" + qt_short_4 " select STR_TO_DATE('2020%2', '%Y%%%m')" } diff --git a/regression-test/suites/correctness/test_time_diff_microseconds.groovy b/regression-test/suites/correctness/test_time_diff_microseconds.groovy index 335a237ddd5..a7368201072 100644 --- a/regression-test/suites/correctness/test_time_diff_microseconds.groovy +++ b/regression-test/suites/correctness/test_time_diff_microseconds.groovy @@ -42,7 +42,6 @@ suite("test_time_diff_microseconds") { INSERT INTO tbl_time VALUES(3,'0001-01-03 19:00:00.123123','0001-01-22 00:00:00.891312'); """ - sql """set enable_nereids_planner=false""" sql """set enable_fold_constant_by_be=false""" qt_select1 """ @@ -68,10 +67,8 @@ suite("test_time_diff_microseconds") { cast('0001-01-01 00:00:00.000000' as Datetimev2(5) )); """ - sql """set enable_nereids_planner=true """ sql """set enable_fold_constant_by_be=true""" - sql """set enable_fallback_to_original_planner=false""" - + qt_select5 """ select timediff(t1,t2) from tbl_time order by id """ diff --git a/regression-test/suites/correctness/test_time_function.groovy b/regression-test/suites/correctness/test_time_function.groovy index 7df2dc3e6af..2a7bea32fe7 100644 --- a/regression-test/suites/correctness/test_time_function.groovy +++ b/regression-test/suites/correctness/test_time_function.groovy @@ -16,9 +16,6 @@ // under the License. suite("test_time_function") { - sql """ - set enable_nereids_planner=true,enable_fallback_to_original_planner=false - """ qt_select """ select sec_to_time(time_to_sec(cast('16:32:18' as time))); """ @@ -76,67 +73,4 @@ suite("test_time_function") { qt_select """ select time_to_sec(timediff('2024-01-22', '2024-01-15')) as seconds; """ - - sql """ - set enable_nereids_planner=false - """ - - qt_select """ - select sec_to_time(time_to_sec(cast('16:32:18' as time))); - """ - qt_select """ - select sec_to_time(59538); - """ - // "HHMMSS" - qt_select """ - select cast("123456" as TIME); - """ - qt_select """ - select cast("3456" as TIME); - """ - qt_select """ - select cast("56" as TIME); - """ - - // "HH:MM:SS" - qt_select """ - select cast("12:34:56" as TIME); - """ - qt_select """ - select cast("34:56" as TIME); - """ - qt_select """ - select cast(":56" as TIME); - """ - - // HHMMSS - qt_select """ - select cast(123456 as TIME); - """ - qt_select """ - select cast(3456 as TIME); - """ - qt_select """ - select cast(56 as TIME); - """ - - // Invalid value in seconds part. - qt_select """ - select cast(":61" as TIME); - """ - qt_select """ - select cast("61" as TIME); - """ - qt_select """ - select cast(61 as TIME); - """ - - qt_select """ - select sec_to_time(time_to_sec(cast("61" as time))); - """ - - qt_select """ - select time_to_sec(timediff('2024-01-22', '2024-01-15')) as seconds; - """ - -} \ No newline at end of file +} diff --git a/regression-test/suites/correctness/test_timev2_fold.groovy b/regression-test/suites/correctness/test_timev2_fold.groovy index 8ce05765162..dcc65539196 100644 --- a/regression-test/suites/correctness/test_timev2_fold.groovy +++ b/regression-test/suites/correctness/test_timev2_fold.groovy @@ -16,7 +16,7 @@ // under the License. suite("test_timev2_fold") { - sql """ set enable_nereids_planner=false,enable_fold_constant_by_be=false """ + sql """ set enable_fold_constant_by_be=false """ qt_select1 """ select timediff( convert_tz("2020-05-05 00:00:00", 'UTC', 'America/Los_Angeles'), "2020-05-05 00:00:00"); """ @@ -24,7 +24,7 @@ suite("test_timev2_fold") { qt_select2 """ select timediff( convert_tz("2020-05-05 00:00:00", 'UTC', 'America/Los_Angeles'), "2020-05-05 00:00:00"); """ - sql """ set enable_nereids_planner=false,enable_fold_constant_by_be=true """ + sql """ set enable_fold_constant_by_be=true """ qt_select3 """ select timediff( convert_tz("2020-05-05 00:00:00", 'UTC', 'America/Los_Angeles'), "2020-05-05 00:00:00"); """ @@ -32,4 +32,4 @@ suite("test_timev2_fold") { qt_select4 """ select timediff( convert_tz("2020-05-05 00:00:00", 'UTC', 'America/Los_Angeles'), "2020-05-05 00:00:00"); """ -} \ No newline at end of file +} diff --git a/regression-test/suites/correctness_p0/test_agg_materialize.groovy b/regression-test/suites/correctness_p0/test_agg_materialize.groovy index 06c0e26b8c5..2cbaf17d56f 100644 --- a/regression-test/suites/correctness_p0/test_agg_materialize.groovy +++ b/regression-test/suites/correctness_p0/test_agg_materialize.groovy @@ -20,7 +20,6 @@ // and modified by Doris. suite("test_agg_materialize") { - sql "set enable_nereids_planner=false" qt_select """with tb1 as (select * from (select * from (select 1 k1) as t lateral view explode([1,2,3]) tmp1 as e1)t) select count(*) from (select 1, count(*) from tb1 diff --git a/regression-test/suites/correctness_p0/test_avg.groovy b/regression-test/suites/correctness_p0/test_avg.groovy index bddacb68698..215a1a366f9 100644 --- a/regression-test/suites/correctness_p0/test_avg.groovy +++ b/regression-test/suites/correctness_p0/test_avg.groovy @@ -67,14 +67,8 @@ suite("test_avg") { "replication_allocation" = "tag.location.default: 1" ); """ - sql "set enable_nereids_planner=true" - sql "set enable_fallback_to_original_planner=false;" qt_select2 """select avg(distinct k2), avg(distinct cast(k4 as largeint)) from avg_test;""" - sql "set enable_nereids_planner=false" - qt_select3 """select avg(distinct k2), avg(distinct cast(k4 as largeint)) from avg_test;""" sql """ drop table if exists avg_test; """ - - sql """set enable_nereids_planner=false;""" qt_select4 """SELECT avg(col) from ( SELECT 0.01 col union all select 0.01 col ) t;""" } diff --git a/regression-test/suites/correctness_p0/test_bit_function.groovy b/regression-test/suites/correctness_p0/test_bit_function.groovy index 4e391997520..a50e890078e 100644 --- a/regression-test/suites/correctness_p0/test_bit_function.groovy +++ b/regression-test/suites/correctness_p0/test_bit_function.groovy @@ -16,10 +16,8 @@ // under the License. suite("test_bit_functions") { - sql "SET enable_nereids_planner=false" qt_select 'select bitand(123456, 321.0), bitor(123456, 321.0), bitxor(123456, 321.0), bitnot(321.0);' - sql "SET enable_nereids_planner=false;" qt_bit_count 'select bit_count(number) from numbers("number"="10");' qt_bit_count 'select bit_count(0);' qt_bit_count 'select bit_count(-1);' diff --git a/regression-test/suites/correctness_p0/test_bit_shift_lagency.groovy b/regression-test/suites/correctness_p0/test_bit_shift_lagency.groovy index 2db6ab0e901..ef5c554d940 100644 --- a/regression-test/suites/correctness_p0/test_bit_shift_lagency.groovy +++ b/regression-test/suites/correctness_p0/test_bit_shift_lagency.groovy @@ -15,9 +15,7 @@ // specific language governing permissions and limitations // under the License. -suite("test_bit_shift_lagency") { - sql "SET enable_nereids_planner=false;" - +suite("test_bit_shift") { qt_comment """ select "testing big_shift_left"; """ diff --git a/regression-test/suites/correctness_p0/test_bucket_shuffle_join.groovy b/regression-test/suites/correctness_p0/test_bucket_shuffle_join.groovy index 2538e32961c..dcb06a2bbd1 100644 --- a/regression-test/suites/correctness_p0/test_bucket_shuffle_join.groovy +++ b/regression-test/suites/correctness_p0/test_bucket_shuffle_join.groovy @@ -17,8 +17,7 @@ suite("test_bucket_shuffle_join") { - // this case check explain, so we disable nereids - sql """set enable_nereids_planner=false""" + sql "set disable_join_reorder=true" sql """ DROP TABLE IF EXISTS `test_colo1` """ sql """ DROP TABLE IF EXISTS `test_colo2` """ @@ -79,8 +78,7 @@ suite("test_bucket_shuffle_join") { explain { sql("select a.id,a.name,b.id,b.name,c.id,c.name from test_colo1 a inner join test_colo2 b on a.id = b.id and a.name = b.name inner join test_colo3 c on a.id=c.id and a.name= c.name") - contains "4:VHASH JOIN\n | join op: INNER JOIN(BUCKET_SHUFFLE)" - contains "2:VHASH JOIN\n | join op: INNER JOIN(BUCKET_SHUFFLE)" + contains "join op: INNER JOIN(BUCKET_SHUFFLE)" } explain { @@ -92,8 +90,7 @@ suite("test_bucket_shuffle_join") { inner join (select * from test_colo3) c on a.id = c.id and a.name = c.name and a.name = c.name""") - contains "4:VHASH JOIN\n | join op: INNER JOIN(BUCKET_SHUFFLE)" - contains "2:VHASH JOIN\n | join op: INNER JOIN(BUCKET_SHUFFLE)" + contains "join op: INNER JOIN(BUCKET_SHUFFLE)" } sql """ DROP TABLE IF EXISTS shuffle_join_t1 """ @@ -136,7 +133,7 @@ suite("test_bucket_shuffle_join") { explain { sql("select * from shuffle_join_t1 t1 left join shuffle_join_t2 t2 on t1.a = t2.c;") - notContains "BUCKET_SHUFFLE" + contains "BUCKET_SHUFFLE" } sql """ DROP TABLE IF EXISTS shuffle_join_t1 """ diff --git a/regression-test/suites/correctness_p0/test_cast_date_decimal.groovy b/regression-test/suites/correctness_p0/test_cast_date_decimal.groovy index a2d00c05efe..0272c0be822 100644 --- a/regression-test/suites/correctness_p0/test_cast_date_decimal.groovy +++ b/regression-test/suites/correctness_p0/test_cast_date_decimal.groovy @@ -16,10 +16,6 @@ // under the License. suite("test_cast_date_decimal") { - sql """ - set enable_nereids_planner=false; - """ - qt_sql """ select cast('2020-02-02' as date ) between cast('2020-02-02' as date ) and cast('2020-02-02' as date ) + 1.0; """ diff --git a/regression-test/suites/correctness_p0/test_cast_in.groovy b/regression-test/suites/correctness_p0/test_cast_in.groovy index b289f6c2382..6fcf685fbf7 100644 --- a/regression-test/suites/correctness_p0/test_cast_in.groovy +++ b/regression-test/suites/correctness_p0/test_cast_in.groovy @@ -16,9 +16,6 @@ // under the License. suite("test_cast_in") { - sql """ - set enable_nereids_planner=false; - """ sql """DROP TABLE IF EXISTS date_dim_table_x;""" sql """ CREATE TABLE IF NOT EXISTS date_dim_table_x ( diff --git a/regression-test/suites/correctness_p0/test_cast_null.groovy b/regression-test/suites/correctness_p0/test_cast_null.groovy index 9ea3b125903..cfbbf4b8034 100644 --- a/regression-test/suites/correctness_p0/test_cast_null.groovy +++ b/regression-test/suites/correctness_p0/test_cast_null.groovy @@ -56,15 +56,6 @@ suite("test_cast_null") { ); """ - sql """ - set enable_nereids_planner=false; - """ - - explain { - sql """SELECT /*+SET_VAR(enable_fold_constant_by_be=false)*/ * FROM test_table_t53 LEFT JOIN test_table_t0 ON (('I4') LIKE (CAST(CAST(DATE '1970-05-06' AS FLOAT) AS VARCHAR) ));""" - contains "19700506" - } - qt_sql1 """ select CAST(CAST(DATE '1970-05-06' AS FLOAT) AS VARCHAR); """ @@ -73,14 +64,6 @@ suite("test_cast_null") { select 'abc' like null; """ - sql """ - set enable_nereids_planner=true; - """ - - qt_sql3 """ - select CAST(CAST(DATE '1970-05-06' AS FLOAT) AS VARCHAR); - """ - qt_sql4 """ select 'abc' like null; """ diff --git a/regression-test/suites/correctness_p0/test_constant_having.groovy b/regression-test/suites/correctness_p0/test_constant_having.groovy index a21b4c0f74a..36fa21604d6 100644 --- a/regression-test/suites/correctness_p0/test_constant_having.groovy +++ b/regression-test/suites/correctness_p0/test_constant_having.groovy @@ -28,7 +28,6 @@ suite("test_constant_having") { INSERT INTO test_constant_having_t0 (c0) VALUES (1),(2); """ - sql """ set enable_nereids_planner=false;""" qt_sql1 """ SELECT CAST(DATE '1970-12-16' AS FLOAT), @@ -47,26 +46,6 @@ suite("test_constant_having") { ORDER BY 1; """ - - sql """ set enable_nereids_planner=true;""" - qt_sql2 """ - SELECT - CAST(DATE '1970-12-16' AS FLOAT), - 9998895.0, - 0.946221655 - FROM - test_constant_having_t0 - GROUP BY - test_constant_having_t0.c0 - HAVING - ( - NOT ( - CAST(false AS DATETIME) NOT IN (CAST(-994966193 AS DATETIME)) - ) - ) - ORDER BY - 1; - """ sql """ drop table if exists test_constant_having_t0; diff --git a/regression-test/suites/correctness_p0/test_ctas_mv.groovy b/regression-test/suites/correctness_p0/test_ctas_mv.groovy index d3fc00a0a9c..81c71221756 100644 --- a/regression-test/suites/correctness_p0/test_ctas_mv.groovy +++ b/regression-test/suites/correctness_p0/test_ctas_mv.groovy @@ -16,7 +16,6 @@ // under the License. suite("test_ctas_mv") { - sql """set enable_nereids_planner=false;""" sql """ drop table if exists test_table_t1; """ diff --git a/regression-test/suites/correctness_p0/test_div_decimal_overflow.groovy b/regression-test/suites/correctness_p0/test_div_decimal_overflow.groovy index 4b4f1dfe563..202ab8c1ab9 100644 --- a/regression-test/suites/correctness_p0/test_div_decimal_overflow.groovy +++ b/regression-test/suites/correctness_p0/test_div_decimal_overflow.groovy @@ -16,9 +16,6 @@ // under the License. suite("test_div_decimal_overflow") { - sql """ - set enable_nereids_planner=true; - """ sql """ drop table if exists table_test_div_decimal_overflow;""" sql """CREATE TABLE `table_test_div_decimal_overflow` ( `total_shy_num` decimalv3(38, 18) NULL, @@ -39,11 +36,5 @@ suite("test_div_decimal_overflow") { qt_sql1 """select total_shy_num,used_shy_num,used_shy_num/total_shy_num from table_test_div_decimal_overflow;""" - sql """ - set enable_nereids_planner=false; - """ - - qt_sql2 """select total_shy_num,used_shy_num,used_shy_num/total_shy_num from table_test_div_decimal_overflow;""" - sql """ drop table if exists table_test_div_decimal_overflow;""" } diff --git a/regression-test/suites/correctness_p0/test_function_conjunct.groovy b/regression-test/suites/correctness_p0/test_function_conjunct.groovy index 1d747bb9736..0bd3d6afdc8 100644 --- a/regression-test/suites/correctness_p0/test_function_conjunct.groovy +++ b/regression-test/suites/correctness_p0/test_function_conjunct.groovy @@ -34,12 +34,7 @@ suite("test_function_conjunct") { sql """ INSERT INTO ${tableName} VALUES ("1","1"); """ - sql "set enable_nereids_planner=true" - qt_select_default """select a, b from ${tableName} where coalesce(b, null) is NULL;""" - - sql "set enable_nereids_planner=false" qt_select_default """select a, b from ${tableName} where coalesce(b, null) is NULL;""" sql """ DROP TABLE IF EXISTS ${tableName} """ - } diff --git a/regression-test/suites/correctness_p0/test_implict_cast.groovy b/regression-test/suites/correctness_p0/test_implict_cast.groovy index 90763b1ca7a..b2e78fff3cd 100644 --- a/regression-test/suites/correctness_p0/test_implict_cast.groovy +++ b/regression-test/suites/correctness_p0/test_implict_cast.groovy @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -suite("test_implict_cast") { +suite("test_implicit_cast") { sql """ drop table if exists cast_test_table; """ @@ -89,7 +89,6 @@ suite("test_implict_cast") { "replication_allocation" = "tag.location.default: 1" ); """ - sql """set enable_nereids_planner=false;""" sql """SELECT a5 AS account_id ,a4 AS a4 ,CASE WHEN a7 = 'MC' THEN a8*0.034 diff --git a/regression-test/suites/correctness_p0/test_inlineview_with_lateralview.groovy b/regression-test/suites/correctness_p0/test_inlineview_with_lateralview.groovy index 2559e7423d5..45008349bc4 100644 --- a/regression-test/suites/correctness_p0/test_inlineview_with_lateralview.groovy +++ b/regression-test/suites/correctness_p0/test_inlineview_with_lateralview.groovy @@ -16,7 +16,6 @@ // under the License. suite("test_inlineview_with_lateralview") { - sql "set enable_nereids_planner=false" sql """ drop table if exists lateralview_t1; """ diff --git a/regression-test/suites/correctness_p0/test_inlineview_with_project.groovy b/regression-test/suites/correctness_p0/test_inlineview_with_project.groovy index e68c2033e55..f13c45a5328 100644 --- a/regression-test/suites/correctness_p0/test_inlineview_with_project.groovy +++ b/regression-test/suites/correctness_p0/test_inlineview_with_project.groovy @@ -16,7 +16,6 @@ // under the License. suite("test_inlineview_with_project") { - sql "set enable_nereids_planner=false" sql """ drop table if exists cir_1756_t1; """ diff --git a/regression-test/suites/correctness_p0/test_inlineview_with_window_function.groovy b/regression-test/suites/correctness_p0/test_inlineview_with_window_function.groovy index 1d3c7fdf58f..6bf1a95ecee 100644 --- a/regression-test/suites/correctness_p0/test_inlineview_with_window_function.groovy +++ b/regression-test/suites/correctness_p0/test_inlineview_with_window_function.groovy @@ -152,7 +152,6 @@ suite("test_inlineview_with_window_function") { )tmp1 on tmp.ordernum=tmp1.ordernum;""" - sql """set enable_nereids_planner=false;""" qt_order2 """ SELECT row_number() over(partition by add_date order by pc_num desc) diff --git a/regression-test/suites/correctness_p0/test_join_with_projection.groovy b/regression-test/suites/correctness_p0/test_join_with_projection.groovy index 5f60b1be326..847ad344ddf 100644 --- a/regression-test/suites/correctness_p0/test_join_with_projection.groovy +++ b/regression-test/suites/correctness_p0/test_join_with_projection.groovy @@ -80,7 +80,6 @@ suite("test_join_with_projection") { drop table if exists test_join_with_projection_outerjoin_B; """ - sql """set enable_nereids_planner=false;""" sql """drop table if exists c5870_t;""" sql """create table c5870_t ( order_item_seq_id varchar(80) NOT NULL, diff --git a/regression-test/suites/correctness_p0/test_mv_case.groovy b/regression-test/suites/correctness_p0/test_mv_case.groovy index 4c51582a4ec..0a87c8d2704 100644 --- a/regression-test/suites/correctness_p0/test_mv_case.groovy +++ b/regression-test/suites/correctness_p0/test_mv_case.groovy @@ -39,7 +39,6 @@ suite("test_mv_case") { sql """insert into test_table_aaa2 select 'cib2205045_1_1s','2023/6/10 3:58:33','{"DB1":168939,"DNT":"2023-06-10 03:58:33"}' ;""" qt_select_default """ select * from test_table_aaa2 order by dnt;""" - sql """set enable_nereids_planner=false;""" sql """drop table if exists test_mv_view_t;""" sql """drop view if exists test_mv_view_t_view;""" sql """CREATE TABLE `test_mv_view_t` ( diff --git a/regression-test/suites/correctness_p0/test_time_round.groovy b/regression-test/suites/correctness_p0/test_time_round.groovy index dd90e8f3e7a..c042e0dd935 100644 --- a/regression-test/suites/correctness_p0/test_time_round.groovy +++ b/regression-test/suites/correctness_p0/test_time_round.groovy @@ -62,9 +62,7 @@ suite("test_time_round") { qt_select "select hour_floor(dt,p,'1919-08-10 11:45:14') from dbround order by id;" qt_select "select hour_floor(dt,2,'1919-08-10 11:45:14') from dbround order by id;" - sql """ set enable_nereids_planner=false; """ - - // fix by issues/9711, expect: '1970-01-01T01:00:30' + // fix by issues/9711, expect: '1970-01-01T01:00:30' qt_select "select hour_ceil('1970-01-01 01:00:10', 1, '1970-01-01 00:00:30')" // fix by issues/9711, expect: '1970-01-01T00:00:30' diff --git a/regression-test/suites/datatype_p0/complex_types/test_map.groovy b/regression-test/suites/datatype_p0/complex_types/test_map.groovy index 3c146e832e7..4dd0272f517 100644 --- a/regression-test/suites/datatype_p0/complex_types/test_map.groovy +++ b/regression-test/suites/datatype_p0/complex_types/test_map.groovy @@ -16,7 +16,6 @@ // under the License. suite("test_map") { - sql 'set enable_nereids_planner=false' sql "DROP TABLE IF EXISTS `test_map_table`" sql """ create table `test_map_table` ( diff --git a/regression-test/suites/datatype_p0/nested_types/meta/test_complextype_information_schema.groovy b/regression-test/suites/datatype_p0/nested_types/meta/test_complextype_information_schema.groovy index 9a998732871..864399e39f2 100644 --- a/regression-test/suites/datatype_p0/nested_types/meta/test_complextype_information_schema.groovy +++ b/regression-test/suites/datatype_p0/nested_types/meta/test_complextype_information_schema.groovy @@ -16,7 +16,6 @@ // under the License. suite("test_complextype_information_schema") { - sql """set enable_nereids_planner=false""" // add array/map/struct def table_names = ["array_info", "map_info", "struct_info"] for (int i = 0; i < table_names.size(); ++i) { diff --git a/regression-test/suites/datatype_p0/nested_types/negative_cases/test_nested_types_insert_into_with_agg_table.groovy b/regression-test/suites/datatype_p0/nested_types/negative_cases/test_nested_types_insert_into_with_agg_table.groovy index 4b4f3192c6d..06ae79edcc4 100644 --- a/regression-test/suites/datatype_p0/nested_types/negative_cases/test_nested_types_insert_into_with_agg_table.groovy +++ b/regression-test/suites/datatype_p0/nested_types/negative_cases/test_nested_types_insert_into_with_agg_table.groovy @@ -19,8 +19,7 @@ import org.codehaus.groovy.runtime.IOGroovyMethods suite("test_nested_types_insert_into_with_agg_table", "p0") { sql 'use regression_test_datatype_p0_nested_types' - sql 'set enable_nereids_planner=false' - + // test action for scala to array with scala type // current we support char family to insert nested type // agg table test diff --git a/regression-test/suites/datatype_p0/nested_types/negative_cases/test_nested_types_insert_into_with_dup_table.groovy b/regression-test/suites/datatype_p0/nested_types/negative_cases/test_nested_types_insert_into_with_dup_table.groovy index 586c83adb7f..a36987630f5 100644 --- a/regression-test/suites/datatype_p0/nested_types/negative_cases/test_nested_types_insert_into_with_dup_table.groovy +++ b/regression-test/suites/datatype_p0/nested_types/negative_cases/test_nested_types_insert_into_with_dup_table.groovy @@ -19,7 +19,6 @@ import org.codehaus.groovy.runtime.IOGroovyMethods suite("test_nested_types_insert_into_with_dup_table", "p0") { sql 'use regression_test_datatype_p0_nested_types' - sql 'set enable_nereids_planner=false' sql """ truncate table `tbl_array_nested_types_dup`; diff --git a/regression-test/suites/datatype_p0/nested_types/negative_cases/test_nested_types_insert_into_with_unique_table.groovy b/regression-test/suites/datatype_p0/nested_types/negative_cases/test_nested_types_insert_into_with_unique_table.groovy index 9956a88e4c0..3eb4eb48c06 100644 --- a/regression-test/suites/datatype_p0/nested_types/negative_cases/test_nested_types_insert_into_with_unique_table.groovy +++ b/regression-test/suites/datatype_p0/nested_types/negative_cases/test_nested_types_insert_into_with_unique_table.groovy @@ -19,8 +19,7 @@ import org.codehaus.groovy.runtime.IOGroovyMethods suite("test_nested_types_insert_into_with_unique_table", "p0") { sql 'use regression_test_datatype_p0_nested_types' - sql 'set enable_nereids_planner=false' - + // test action for scala to array with scala type // current we support char family to insert nested type // mor table test diff --git a/regression-test/suites/ddl_p0/test_create_view.groovy b/regression-test/suites/ddl_p0/test_create_view.groovy index e5d6f41d319..b4bd9848545 100644 --- a/regression-test/suites/ddl_p0/test_create_view.groovy +++ b/regression-test/suites/ddl_p0/test_create_view.groovy @@ -16,7 +16,6 @@ // under the License. suite("test_create_view") { - sql "SET enable_nereids_planner=false;" sql """DROP TABLE IF EXISTS count_distinct""" sql """ CREATE TABLE IF NOT EXISTS count_distinct diff --git a/regression-test/suites/ddl_p0/test_ctas.groovy b/regression-test/suites/ddl_p0/test_ctas.groovy index cf0ad869e92..3dc0afd73af 100644 --- a/regression-test/suites/ddl_p0/test_ctas.groovy +++ b/regression-test/suites/ddl_p0/test_ctas.groovy @@ -230,8 +230,6 @@ suite("test_ctas") { sql 'insert into a values(1, \'ww\'), (2, \'zs\');' sql 'insert into b values(1, 22);' - sql 'set enable_nereids_planner=false' - sql 'create table c properties("replication_num"="1") as select b.id, a.name, b.age from a left join b on a.id = b.id;' String descC = sql 'desc c' @@ -254,7 +252,6 @@ suite("test_ctas") { } try { - sql '''set enable_nereids_planner=true;''' sql'''CREATE TABLE `test_ctas_of_view` ( `l_varchar` varchar(65533) NULL ) ENGINE=OLAP @@ -292,7 +289,6 @@ suite("test_ctas") { } try { - sql '''set enable_nereids_planner=false;''' sql ''' CREATE TABLE IF NOT EXISTS `ctas1` ( `k1` varchar(5) NULL, @@ -335,8 +331,6 @@ suite("test_ctas") { } try { - sql '''set enable_nereids_planner=true;''' - sql '''set enable_fallback_to_original_planner=false;''' sql ''' CREATE TABLE IF NOT EXISTS `ctas1` ( `k1` varchar(5) NULL, diff --git a/regression-test/suites/ddl_p0/test_current_timestamp_as_column_default_value.groovy b/regression-test/suites/ddl_p0/test_current_timestamp_as_column_default_value.groovy index 5ba724d8847..076b7a48fa1 100644 --- a/regression-test/suites/ddl_p0/test_current_timestamp_as_column_default_value.groovy +++ b/regression-test/suites/ddl_p0/test_current_timestamp_as_column_default_value.groovy @@ -15,8 +15,6 @@ // specific language governing permissions and limitations // under the License. suite("test_current_timestamp_as_column_default_value") { - sql "SET enable_nereids_planner=true" - sql "SET enable_fallback_to_original_planner=false" sql "DROP TABLE IF EXISTS test_default4" sql """create table test_default4(a int, b int) distributed by hash(a) properties('replication_num'="1");""" @@ -32,8 +30,6 @@ suite("test_current_timestamp_as_column_default_value") { exception "Types other than DATETIME and DATETIMEV2 cannot use current_timestamp as the default value" } - sql "SET enable_nereids_planner=false" - sql "DROP TABLE IF EXISTS test_default10" test { sql """create table test_default10(a int, b varchar(100) default current_timestamp) distributed by hash(a) properties('replication_num'="1");""" diff --git a/regression-test/suites/delete_p0/test_delete_on_value.groovy b/regression-test/suites/delete_p0/test_delete_on_value.groovy index 98620b299e6..f1e0f2f48a8 100644 --- a/regression-test/suites/delete_p0/test_delete_on_value.groovy +++ b/regression-test/suites/delete_p0/test_delete_on_value.groovy @@ -16,9 +16,6 @@ // under the License. suite("test_delete_on_value") { - sql 'set enable_nereids_planner=false' - sql "set experimental_enable_nereids_planner=false;" - sql 'set enable_nereids_dml=false' sql "set skip_storage_engine_merge=false;" sql "set skip_delete_bitmap=false;" diff --git a/regression-test/suites/nereids_p0/cache/parse_sql_from_sql_cache.groovy b/regression-test/suites/nereids_p0/cache/parse_sql_from_sql_cache.groovy index 226ea7a9d6f..b672e30cb62 100644 --- a/regression-test/suites/nereids_p0/cache/parse_sql_from_sql_cache.groovy +++ b/regression-test/suites/nereids_p0/cache/parse_sql_from_sql_cache.groovy @@ -306,12 +306,10 @@ suite("parse_sql_from_sql_cache") { }), extraThread("testAddRowPolicy", { def dbName = context.config.getDbNameByFile(context.file) - sql "set enable_nereids_planner=false" try_sql """ DROP ROW POLICY if exists test_cache_row_policy_2 ON ${dbName}.test_use_plan_cache13 FOR test_cache_user2""" - sql "set enable_nereids_planner=true" sql "drop user if exists test_cache_user2" sql "create user test_cache_user2 identified by 'DORIS@2024'" @@ -335,13 +333,11 @@ suite("parse_sql_from_sql_cache") { } }).get() - sql "set enable_nereids_planner=false" sql """ CREATE ROW POLICY test_cache_row_policy_2 ON ${dbName}.test_use_plan_cache13 AS RESTRICTIVE TO test_cache_user2 USING (id = 4)""" - sql "set enable_nereids_planner=true" // after row policy changed, the cache is invalidate extraThread("test_cache_user2_thread2", { @@ -357,12 +353,10 @@ suite("parse_sql_from_sql_cache") { }), extraThread("testDropRowPolicy", { def dbName = context.config.getDbNameByFile(context.file) - sql "set enable_nereids_planner=false" try_sql """ DROP ROW POLICY if exists test_cache_row_policy_3 ON ${dbName}.test_use_plan_cache14 FOR test_cache_user3""" - sql "set enable_nereids_planner=true" sql "drop user if exists test_cache_user3" sql "create user test_cache_user3 identified by 'DORIS@2024'" @@ -370,13 +364,11 @@ suite("parse_sql_from_sql_cache") { createTestTable "test_use_plan_cache14" - sql "set enable_nereids_planner=false" sql """ CREATE ROW POLICY test_cache_row_policy_3 ON ${dbName}.test_use_plan_cache14 AS RESTRICTIVE TO test_cache_user3 USING (id = 4)""" - sql "set enable_nereids_planner=true" // after partition changed 10s, the sql cache can be used sleep(10000) @@ -394,12 +386,10 @@ suite("parse_sql_from_sql_cache") { } }).get() - sql "set enable_nereids_planner=false" try_sql """ DROP ROW POLICY if exists test_cache_row_policy_3 ON ${dbName}.test_use_plan_cache14 FOR test_cache_user3""" - sql "set enable_nereids_planner=true" // after row policy changed, the cache is invalidate extraThread("test_cache_user3_thread2", { diff --git a/regression-test/suites/nereids_p0/create_table/test_ctas.groovy b/regression-test/suites/nereids_p0/create_table/test_ctas.groovy index 507bff03ea0..e6cc58fdba1 100644 --- a/regression-test/suites/nereids_p0/create_table/test_ctas.groovy +++ b/regression-test/suites/nereids_p0/create_table/test_ctas.groovy @@ -251,8 +251,6 @@ suite("nereids_test_ctas") { sql 'insert into a values(1, \'ww\'), (2, \'zs\');' sql 'insert into b values(1, 22);' - sql 'set enable_nereids_planner=false' - sql 'create table c properties("replication_num"="1") as select b.id, a.name, b.age from a left join b on a.id = b.id;' String descC = sql 'desc c' diff --git a/regression-test/suites/nereids_p0/datatype/test_cast.groovy b/regression-test/suites/nereids_p0/datatype/test_cast.groovy index b6f96d86288..c43bb78a81e 100644 --- a/regression-test/suites/nereids_p0/datatype/test_cast.groovy +++ b/regression-test/suites/nereids_p0/datatype/test_cast.groovy @@ -113,9 +113,4 @@ suite("test_cast") { sql """select k0 from table_decimal38_4 union all select k0 from table_decimal27_9;""" contains """AS DECIMALV3(38, 4)""" } - sql """set enable_nereids_planner=false;""" - explain { - sql """select k0 from table_decimal38_4 union all select k0 from table_decimal27_9;""" - contains """AS DECIMALV3(38, 4)""" - } -} \ No newline at end of file +} diff --git a/regression-test/suites/nereids_p0/load.groovy b/regression-test/suites/nereids_p0/load.groovy index 158c3d72abe..649195671bf 100644 --- a/regression-test/suites/nereids_p0/load.groovy +++ b/regression-test/suites/nereids_p0/load.groovy @@ -16,9 +16,6 @@ // under the License. suite("load") { - sql "SET enable_nereids_planner=true" - sql "set forbid_unknown_col_stats=false" - sql "SET enable_fallback_to_original_planner=false" // init query case data def dbName = "nereids_test_query_db" sql "DROP DATABASE IF EXISTS ${dbName}" diff --git a/regression-test/suites/nereids_p0/sql_functions/string_functions/test_string_function_like.groovy b/regression-test/suites/nereids_p0/sql_functions/string_functions/test_string_function_like.groovy index 05ed019fdf4..bd67beaae24 100644 --- a/regression-test/suites/nereids_p0/sql_functions/string_functions/test_string_function_like.groovy +++ b/regression-test/suites/nereids_p0/sql_functions/string_functions/test_string_function_like.groovy @@ -80,15 +80,4 @@ suite("test_string_function_like") { NULL END FROM test_string_function_like_t0;""" - sql "SET enable_nereids_planner=false" - qt_sql """select - CASE TRUE WHEN - CASE FALSE - WHEN ( c0 IS NULL) THEN - TRUE - END THEN - NULL - END - FROM test_string_function_like_t0;""" - // sql "DROP TABLE ${tbName};" } diff --git a/regression-test/suites/nereids_p0/sql_functions/table_function/explode_map.groovy b/regression-test/suites/nereids_p0/sql_functions/table_function/explode_map.groovy index 98656df99b5..338cf675042 100644 --- a/regression-test/suites/nereids_p0/sql_functions/table_function/explode_map.groovy +++ b/regression-test/suites/nereids_p0/sql_functions/table_function/explode_map.groovy @@ -45,11 +45,4 @@ suite("explode_map") { // multi lateral view order_qt_explode_sql_multi """ select name, k,v,k1,v1 from sdu lateral view explode_map_outer(score) tmp as k,v lateral view explode_map(score) tmp2 as k1,v1 order by id;""" - - // Old planner do not support explode_map - sql "SET enable_nereids_planner=false;" - test { - sql "select name, k,v from sdu lateral view explode_map(score) tmp as k,v;" - exception "errCode = 2," - } } diff --git a/regression-test/suites/nereids_p0/tablesample.groovy b/regression-test/suites/nereids_p0/tablesample.groovy index 52203bed232..4e6d17f8df3 100644 --- a/regression-test/suites/nereids_p0/tablesample.groovy +++ b/regression-test/suites/nereids_p0/tablesample.groovy @@ -16,8 +16,6 @@ // under the License. suite("test_table_sample") { - sql "SET enable_nereids_planner=false" - sql "SET enable_fallback_to_original_planner=false" sql """DROP TABLE IF EXISTS test_table_sample_tbl""" sql """ CREATE TABLE `test_table_sample_tbl` ( @@ -42,4 +40,4 @@ suite("test_table_sample") { sql """ select * from test_table_sample_tbl tablesample(4 rows);""" sql """select * from test_table_sample_tbl t tablesample(20 percent);""" sql """select * from test_table_sample_tbl t tablesample(20 percent) repeatable 2;""" -} \ No newline at end of file +} diff --git a/regression-test/suites/nereids_p0/test_filter_pushdown_set.groovy b/regression-test/suites/nereids_p0/test_filter_pushdown_set.groovy index 7d25aade293..235951e2505 100644 --- a/regression-test/suites/nereids_p0/test_filter_pushdown_set.groovy +++ b/regression-test/suites/nereids_p0/test_filter_pushdown_set.groovy @@ -37,7 +37,6 @@ notContains "1 | 3" } - sql "SET enable_nereids_planner=false" qt_select22 'select * from (select 1 as a, 2 as b union all select 3, 3) t where a = 1 order by a, b;' qt_select23 'select * from (select 1 as a, 2 as b union select 3, 3) t where a = 1 order by a, b;' - } \ No newline at end of file + } diff --git a/regression-test/suites/nereids_syntax_p0/mv/newMv/dup_mv_bm_hash.groovy b/regression-test/suites/nereids_syntax_p0/mv/newMv/dup_mv_bm_hash.groovy index 21448d68928..8072b2df8ce 100644 --- a/regression-test/suites/nereids_syntax_p0/mv/newMv/dup_mv_bm_hash.groovy +++ b/regression-test/suites/nereids_syntax_p0/mv/newMv/dup_mv_bm_hash.groovy @@ -15,8 +15,6 @@ // specific language governing permissions and limitations // under the License. -import org.codehaus.groovy.runtime.IOGroovyMethods - suite ("dup_mv_bm_hash") { sql """ DROP TABLE IF EXISTS dup_mv_bm_hash; """ @@ -48,15 +46,9 @@ suite ("dup_mv_bm_hash") { createMV("create materialized view dup_mv_bm_hash_mv2 as select k1,bitmap_union(bitmap_hash(k3)) from dup_mv_bm_hash group by k1;") - sql "SET experimental_enable_nereids_planner=false" - sql "insert into dup_mv_bm_hash select 2,2,'bb';" sql "insert into dup_mv_bm_hash select 3,3,'c';" - sql "SET experimental_enable_nereids_planner=true" - sql "SET enable_fallback_to_original_planner=false" - - order_qt_select_k1 "select k1 from dup_mv_bm_hash order by k1;" order_qt_select_star "select * from dup_mv_bm_hash order by k1,k2,k3;" diff --git a/regression-test/suites/nereids_syntax_p0/mv/newMv/dup_mv_year.groovy b/regression-test/suites/nereids_syntax_p0/mv/newMv/dup_mv_year.groovy index 4167efc082a..dcb4a4f5f77 100644 --- a/regression-test/suites/nereids_syntax_p0/mv/newMv/dup_mv_year.groovy +++ b/regression-test/suites/nereids_syntax_p0/mv/newMv/dup_mv_year.groovy @@ -15,8 +15,6 @@ // specific language governing permissions and limitations // under the License. -import org.codehaus.groovy.runtime.IOGroovyMethods - suite ("dup_mv_year") { sql """ DROP TABLE IF EXISTS dup_mv_year; """ @@ -48,15 +46,9 @@ suite ("dup_mv_year") { createMV "create materialized view k13y as select k1,year(k3) from dup_mv_year;" - sql "SET experimental_enable_nereids_planner=false" - - sql "insert into dup_mv_year select 4,'2033-12-31','2033-12-31 01:02:03';" Thread.sleep(1000) - sql "SET experimental_enable_nereids_planner=true" - sql "SET enable_fallback_to_original_planner=false" - order_qt_select_star "select * from dup_mv_year order by k1;" explain { diff --git a/regression-test/suites/nereids_syntax_p0/mv/newMv/sum_devide_count.groovy b/regression-test/suites/nereids_syntax_p0/mv/newMv/sum_devide_count.groovy index e881ed3bd8e..8bf7c5b3385 100644 --- a/regression-test/suites/nereids_syntax_p0/mv/newMv/sum_devide_count.groovy +++ b/regression-test/suites/nereids_syntax_p0/mv/newMv/sum_devide_count.groovy @@ -15,8 +15,6 @@ // specific language governing permissions and limitations // under the License. -import org.codehaus.groovy.runtime.IOGroovyMethods - suite ("sum_devide_count") { sql """ DROP TABLE IF EXISTS sum_devide_count; """ @@ -43,12 +41,8 @@ suite ("sum_devide_count") { sleep(3000) - sql "SET experimental_enable_nereids_planner=false" - sql "insert into sum_devide_count select -4,-4,-4,'d';" sql "insert into sum_devide_count select 3,2,null,'c';" - sql "SET experimental_enable_nereids_planner=true" - sql "SET enable_fallback_to_original_planner=false" qt_select_star "select * from sum_devide_count order by k1,k2,k3,k4;" diff --git a/regression-test/suites/performance_p0/redundant_conjuncts.groovy b/regression-test/suites/performance_p0/redundant_conjuncts.groovy index 4aec6275dc3..bdf1dbff7b9 100644 --- a/regression-test/suites/performance_p0/redundant_conjuncts.groovy +++ b/regression-test/suites/performance_p0/redundant_conjuncts.groovy @@ -32,7 +32,7 @@ suite("redundant_conjuncts") { """ qt_redundant_conjuncts """ - EXPLAIN SELECT /*+SET_VAR(enable_nereids_planner=false, REWRITE_OR_TO_IN_PREDICATE_THRESHOLD=2, parallel_fragment_exec_instance_num = 1, enable_shared_scan = false) */ v1 FROM redundant_conjuncts WHERE k1 = 1 AND k1 = 1; + EXPLAIN SELECT /*+SET_VAR(REWRITE_OR_TO_IN_PREDICATE_THRESHOLD=2, parallel_fragment_exec_instance_num = 1, enable_shared_scan = false) */ v1 FROM redundant_conjuncts WHERE k1 = 1 AND k1 = 1; """ qt_redundant_conjuncts_gnerated_by_extract_common_filter """ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
