diff --git a/be/src/exec/exec_node.cpp b/be/src/exec/exec_node.cpp index e0c85d9816..cf21e7ae91 100644 --- a/be/src/exec/exec_node.cpp +++ b/be/src/exec/exec_node.cpp @@ -403,13 +403,6 @@ Status ExecNode::create_node(RuntimeState* state, ObjectPool* pool, const TPlanN return Status::OK(); case TPlanNodeType::HASH_JOIN_NODE: - if (!tnode.hash_join_node.__isset.vintermediate_tuple_id_list) { - // in progress of upgrading from 1.1-lts to 1.2-lts - error_msg << "In progress of upgrading from 1.1-lts to 1.2-lts, vectorized hash " - "join cannot be executed, you can switch to non-vectorized engine by " - "'set global enable_vectorized_engine = false'"; - return Status::InternalError(error_msg.str()); - } *node = pool->add(new vectorized::HashJoinNode(pool, tnode, descs)); return Status::OK(); diff --git a/be/src/pipeline/pipeline_fragment_context.cpp b/be/src/pipeline/pipeline_fragment_context.cpp index 52fb8d2175..51aac3c7a7 100644 --- a/be/src/pipeline/pipeline_fragment_context.cpp +++ b/be/src/pipeline/pipeline_fragment_context.cpp @@ -166,12 +166,6 @@ Status PipelineFragmentContext::prepare(const doris::TExecPlanFragmentParams& re .tag("backend_num", request.backend_num) .tag("pthread_id", (uintptr_t)pthread_self()); - // Must be vec exec engine - if (!request.query_options.__isset.enable_vectorized_engine || - !request.query_options.enable_vectorized_engine) { - return Status::InternalError("should set enable_vectorized_engine to true"); - } - // 1. init _runtime_state _runtime_state = std::make_unique(params, request.query_options, _query_ctx->query_globals, _exec_env); diff --git a/be/src/vec/exprs/vectorized_fn_call.cpp b/be/src/vec/exprs/vectorized_fn_call.cpp index dc5d0c1eec..465b0e34f1 100644 --- a/be/src/vec/exprs/vectorized_fn_call.cpp +++ b/be/src/vec/exprs/vectorized_fn_call.cpp @@ -38,15 +38,6 @@ VectorizedFnCall::VectorizedFnCall(const doris::TExprNode& node) : VExpr(node) { doris::Status VectorizedFnCall::prepare(doris::RuntimeState* state, const doris::RowDescriptor& desc, VExprContext* context) { - // In 1.2-lts, repeat function return type is changed to always nullable, - // which is not compatible with 1.1-lts - if ("repeat" == _fn.name.function_name and !_data_type->is_nullable()) { - const auto error_msg = - "In progress of upgrading from 1.1-lts to 1.2-lts, vectorized repeat " - "function cannot be executed, you can switch to non-vectorized engine by " - "'set global enable_vectorized_engine = false'"; - return Status::InternalError(error_msg); - } RETURN_IF_ERROR_OR_PREPARED(VExpr::prepare(state, desc, context)); ColumnsWithTypeAndName argument_template; argument_template.reserve(_children.size()); diff --git a/be/test/vec/exec/vbroker_scan_node_test.cpp b/be/test/vec/exec/vbroker_scan_node_test.cpp index 5da2f255f3..dc237c7103 100644 --- a/be/test/vec/exec/vbroker_scan_node_test.cpp +++ b/be/test/vec/exec/vbroker_scan_node_test.cpp @@ -46,7 +46,6 @@ public: VBrokerScanNodeTest() : _runtime_state(TQueryGlobals()) { init(); _runtime_state.init_mem_trackers(); - _runtime_state._query_options.enable_vectorized_engine = true; } void init(); static void SetUpTestCase() { diff --git a/be/test/vec/exec/vbroker_scanner_test.cpp b/be/test/vec/exec/vbroker_scanner_test.cpp index 225eeeb16b..179b54bafb 100644 --- a/be/test/vec/exec/vbroker_scanner_test.cpp +++ b/be/test/vec/exec/vbroker_scanner_test.cpp @@ -44,7 +44,6 @@ public: TUniqueId unique_id; TQueryOptions query_options; - query_options.__set_enable_vectorized_engine(true); TQueryGlobals query_globals; _runtime_state.init(unique_id, query_options, query_globals, nullptr); diff --git a/be/test/vec/exec/vjson_scanner_test.cpp b/be/test/vec/exec/vjson_scanner_test.cpp index a4d7a6c5d5..362a4fb94b 100644 --- a/be/test/vec/exec/vjson_scanner_test.cpp +++ b/be/test/vec/exec/vjson_scanner_test.cpp @@ -49,7 +49,6 @@ public: TUniqueId unique_id; TQueryOptions query_options; - query_options.__set_enable_vectorized_engine(true); TQueryGlobals query_globals; _runtime_state.init(unique_id, query_options, query_globals, nullptr); diff --git a/be/test/vec/exec/vorc_scanner_test.cpp b/be/test/vec/exec/vorc_scanner_test.cpp index d47052efce..9ab5bd2d83 100644 --- a/be/test/vec/exec/vorc_scanner_test.cpp +++ b/be/test/vec/exec/vorc_scanner_test.cpp @@ -45,7 +45,6 @@ public: VOrcScannerTest() : _runtime_state(TQueryGlobals()) { _profile = _runtime_state.runtime_profile(); _runtime_state.init_mem_trackers(); - _runtime_state._query_options.enable_vectorized_engine = true; } ~VOrcScannerTest() {} diff --git a/be/test/vec/exec/vparquet_scanner_test.cpp b/be/test/vec/exec/vparquet_scanner_test.cpp index 49b3ba3c56..b175ec130a 100644 --- a/be/test/vec/exec/vparquet_scanner_test.cpp +++ b/be/test/vec/exec/vparquet_scanner_test.cpp @@ -41,7 +41,6 @@ public: VParquetScannerTest() : _runtime_state(TQueryGlobals()) { init(); _runtime_state.init_mem_trackers(); - _runtime_state._query_options.enable_vectorized_engine = true; } ~VParquetScannerTest() {} void init(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java index 01b368b26b..996b79d944 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java @@ -1144,7 +1144,7 @@ public class SessionVariable implements Serializable, Writable { } public boolean enablePipelineEngine() { - return enablePipelineEngine && enableVectorizedEngine; + return enablePipelineEngine; } public void setEnablePipelineEngine(boolean enablePipelineEngine) { @@ -1279,7 +1279,7 @@ public class SessionVariable implements Serializable, Writable { * @return true if both nereids and vectorized engine are enabled */ public boolean isEnableNereidsPlanner() { - return enableNereidsPlanner && enableVectorizedEngine; + return enableNereidsPlanner; } public void setEnableNereidsPlanner(boolean enableNereidsPlanner) { @@ -1365,7 +1365,6 @@ public class SessionVariable implements Serializable, Writable { tResult.setQueryTimeout(queryTimeoutS); tResult.setIsReportSuccess(enableProfile); tResult.setCodegenLevel(codegenLevel); - tResult.setEnableVectorizedEngine(enableVectorizedEngine); tResult.setBeExecVersion(Config.be_exec_version); tResult.setEnablePipelineEngine(enablePipelineEngine); tResult.setReturnObjectDataAsBinary(returnObjectDataAsBinary); diff --git a/regression-test/suites/datatype_p0/date/test_from_unixtime.groovy b/regression-test/suites/datatype_p0/date/test_from_unixtime.groovy index 8798749b1b..5cdbcf85af 100644 --- a/regression-test/suites/datatype_p0/date/test_from_unixtime.groovy +++ b/regression-test/suites/datatype_p0/date/test_from_unixtime.groovy @@ -17,7 +17,6 @@ // under the License. suite("test_from_unixtime") { - sql "set enable_vectorized_engine=true" sql "set enable_fold_constant_by_be=true" qt_sql1 "select from_unixtime(1553152255)" diff --git a/regression-test/suites/load/insert/test_array_insert.groovy b/regression-test/suites/load/insert/test_array_insert.groovy index 17372344c9..95d5a1387b 100644 --- a/regression-test/suites/load/insert/test_array_insert.groovy +++ b/regression-test/suites/load/insert/test_array_insert.groovy @@ -133,7 +133,6 @@ suite("test_array_insert", "load") { assertTrue(result2[0][0] == 1, "Insert should update 1 rows") } - // case2: enable_vectorized_flag = true try { sql "DROP TABLE IF EXISTS ${testTable}" diff --git a/regression-test/suites/nereids_syntax_p0/aggregate_strategies.groovy b/regression-test/suites/nereids_syntax_p0/aggregate_strategies.groovy index 65aa1fe838..848a0df3f1 100644 --- a/regression-test/suites/nereids_syntax_p0/aggregate_strategies.groovy +++ b/regression-test/suites/nereids_syntax_p0/aggregate_strategies.groovy @@ -41,7 +41,6 @@ suite("aggregate_strategies") { sql "insert into $tableName select number, concat('name_', number) from numbers('number'='5')" - sql "SET enable_vectorized_engine=true" sql "SET enable_nereids_planner=true" sql "SET enable_fallback_to_original_planner=false" diff --git a/regression-test/suites/nereids_syntax_p0/array_function.groovy b/regression-test/suites/nereids_syntax_p0/array_function.groovy index 3c06ef48a5..915ce8af4d 100644 --- a/regression-test/suites/nereids_syntax_p0/array_function.groovy +++ b/regression-test/suites/nereids_syntax_p0/array_function.groovy @@ -17,7 +17,6 @@ suite("array_function") { sql "SET enable_nereids_planner=true" - sql "SET enable_vectorized_engine=true" sql "SET enable_fallback_to_original_planner=false" test { diff --git a/regression-test/suites/nereids_syntax_p0/group_bit.groovy b/regression-test/suites/nereids_syntax_p0/group_bit.groovy index 415d71bdef..b0a96f80dd 100644 --- a/regression-test/suites/nereids_syntax_p0/group_bit.groovy +++ b/regression-test/suites/nereids_syntax_p0/group_bit.groovy @@ -16,7 +16,6 @@ // under the License. suite("group_bit") { - sql "SET enable_vectorized_engine=true" sql "SET enable_nereids_planner=true" sql "SET enable_fallback_to_original_planner=false" table = "group_bit_and_or_xor" diff --git a/regression-test/suites/nereids_syntax_p0/group_concat.groovy b/regression-test/suites/nereids_syntax_p0/group_concat.groovy index 0f16089cbd..b046b1a5d4 100644 --- a/regression-test/suites/nereids_syntax_p0/group_concat.groovy +++ b/regression-test/suites/nereids_syntax_p0/group_concat.groovy @@ -17,7 +17,6 @@ suite("group_concat") { sql "SET enable_nereids_planner=true" - sql "set enable_vectorized_engine=true" sql "SET enable_fallback_to_original_planner=false" diff --git a/regression-test/suites/nereids_syntax_p0/lateral_view.groovy b/regression-test/suites/nereids_syntax_p0/lateral_view.groovy index a959fae7f8..cef1dafaae 100644 --- a/regression-test/suites/nereids_syntax_p0/lateral_view.groovy +++ b/regression-test/suites/nereids_syntax_p0/lateral_view.groovy @@ -18,7 +18,6 @@ suite("nereids_lateral_view") { sql "SET enable_fallback_to_original_planner=false" sql "SET enable_nereids_planner=true" - sql "SET enable_vectorized_engine=true" sql """DROP TABLE IF EXISTS nlv_test""" diff --git a/regression-test/suites/nereids_syntax_p0/mask_function.groovy b/regression-test/suites/nereids_syntax_p0/mask_function.groovy index 41e2b6827c..94aaa913f9 100644 --- a/regression-test/suites/nereids_syntax_p0/mask_function.groovy +++ b/regression-test/suites/nereids_syntax_p0/mask_function.groovy @@ -22,8 +22,7 @@ suite("test_mask_function") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' - sql 'set enable_vectorized_engine=true' - + sql """ create table table_mask_test ( id int not null, diff --git a/regression-test/suites/nereids_syntax_p0/null_aware_left_anti_join.groovy b/regression-test/suites/nereids_syntax_p0/null_aware_left_anti_join.groovy index e6a15f6ca9..0a70404b90 100644 --- a/regression-test/suites/nereids_syntax_p0/null_aware_left_anti_join.groovy +++ b/regression-test/suites/nereids_syntax_p0/null_aware_left_anti_join.groovy @@ -42,7 +42,6 @@ suite("test_nereids_null_aware_left_anti_join") { insert into ${tableName2} values (1), (2); """ sql "SET enable_nereids_planner=true" - sql "SET enable_vectorized_engine=true" sql "SET enable_fallback_to_original_planner=false" qt_select """ select ${tableName2}.k1 from ${tableName2} where k1 not in (select ${tableName1}.k1 from ${tableName1}) order by ${tableName2}.k1; """ diff --git a/regression-test/suites/nereids_syntax_p0/select_partition.groovy b/regression-test/suites/nereids_syntax_p0/select_partition.groovy index 9caa21c96b..4a61471d2b 100644 --- a/regression-test/suites/nereids_syntax_p0/select_partition.groovy +++ b/regression-test/suites/nereids_syntax_p0/select_partition.groovy @@ -16,7 +16,6 @@ // under the License. suite("query_on_specific_partition") { - sql "SET enable_vectorized_engine=true" sql "SET enable_nereids_planner=true" sql """ diff --git a/regression-test/suites/nereids_syntax_p0/set_operation.groovy b/regression-test/suites/nereids_syntax_p0/set_operation.groovy index bc2e86db2f..2e06f2aa78 100644 --- a/regression-test/suites/nereids_syntax_p0/set_operation.groovy +++ b/regression-test/suites/nereids_syntax_p0/set_operation.groovy @@ -18,7 +18,6 @@ suite("test_nereids_set_operation") { sql "SET enable_nereids_planner=true" - sql "SET enable_vectorized_engine=true" sql "DROP TABLE IF EXISTS setOperationTable" sql "DROP TABLE IF EXISTS setOperationTableNotNullable" diff --git a/regression-test/suites/nereids_syntax_p0/sub_query_count_with_const.groovy b/regression-test/suites/nereids_syntax_p0/sub_query_count_with_const.groovy index 9ed1624ea7..ffe07644d5 100644 --- a/regression-test/suites/nereids_syntax_p0/sub_query_count_with_const.groovy +++ b/regression-test/suites/nereids_syntax_p0/sub_query_count_with_const.groovy @@ -16,7 +16,6 @@ // under the License. suite("sub_query_count_with_const") { - sql "SET enable_vectorized_engine=true" sql "SET enable_nereids_planner=true" sql "SET enable_fallback_to_original_planner=false" diff --git a/regression-test/suites/nereids_syntax_p0/test_arithmetic_operators.groovy b/regression-test/suites/nereids_syntax_p0/test_arithmetic_operators.groovy index e7fe4a8c4a..53b7721446 100644 --- a/regression-test/suites/nereids_syntax_p0/test_arithmetic_operators.groovy +++ b/regression-test/suites/nereids_syntax_p0/test_arithmetic_operators.groovy @@ -20,7 +20,6 @@ suite("nereids_test_arithmetic_operators", "query,p0") { def tableName = "test" sql "use test_query_db" - sql "SET enable_vectorized_engine=true" sql "SET enable_nereids_planner=true" sql "SET enable_fallback_to_original_planner=false" diff --git a/regression-test/suites/nereids_syntax_p0/test_bitmap_function_nereids.groovy b/regression-test/suites/nereids_syntax_p0/test_bitmap_function_nereids.groovy index cb00d6cd66..caefcd236c 100644 --- a/regression-test/suites/nereids_syntax_p0/test_bitmap_function_nereids.groovy +++ b/regression-test/suites/nereids_syntax_p0/test_bitmap_function_nereids.groovy @@ -16,7 +16,6 @@ // under the License. suite("test_bitmap_function_nereids") { - sql 'set enable_vectorized_engine=true;' sql 'set enable_fallback_to_original_planner=false;' sql 'set enable_nereids_planner=true;' // BITMAP_AND diff --git a/regression-test/suites/nereids_syntax_p0/test_case_function.groovy b/regression-test/suites/nereids_syntax_p0/test_case_function.groovy index 9a0b63a95b..85ae190977 100644 --- a/regression-test/suites/nereids_syntax_p0/test_case_function.groovy +++ b/regression-test/suites/nereids_syntax_p0/test_case_function.groovy @@ -18,7 +18,6 @@ suite("test_nereids_case_function", "query,p0") { sql "use test_query_db" sql "SET enable_nereids_planner=true" - sql "SET enable_vectorized_engine=true" sql "SET enable_fallback_to_original_planner=false" def tableName1 = "test" diff --git a/regression-test/suites/nereids_syntax_p0/test_join3.groovy b/regression-test/suites/nereids_syntax_p0/test_join3.groovy index 17a0ad76c7..cf59e8f79c 100644 --- a/regression-test/suites/nereids_syntax_p0/test_join3.groovy +++ b/regression-test/suites/nereids_syntax_p0/test_join3.groovy @@ -17,7 +17,6 @@ suite("nereids_test_join3", "query,p0") { - sql "SET enable_vectorized_engine=true" sql "SET enable_nereids_planner=true" sql "SET enable_fallback_to_original_planner=false" diff --git a/regression-test/suites/nereids_syntax_p0/test_query_between.groovy b/regression-test/suites/nereids_syntax_p0/test_query_between.groovy index d3b4b18306..4c5971e3cb 100644 --- a/regression-test/suites/nereids_syntax_p0/test_query_between.groovy +++ b/regression-test/suites/nereids_syntax_p0/test_query_between.groovy @@ -18,7 +18,6 @@ suite("nereids_test_query_between", "query,p0") { sql"use test_query_db" - sql "SET enable_vectorized_engine=true" sql "SET enable_nereids_planner=true" sql "SET enable_fallback_to_original_planner=false" diff --git a/regression-test/suites/nereids_syntax_p0/test_time_lut_nereids.groovy b/regression-test/suites/nereids_syntax_p0/test_time_lut_nereids.groovy index 3a7795e17b..95b66e73b6 100644 --- a/regression-test/suites/nereids_syntax_p0/test_time_lut_nereids.groovy +++ b/regression-test/suites/nereids_syntax_p0/test_time_lut_nereids.groovy @@ -16,7 +16,6 @@ // under the License. suite("test_time_lut_nereids") { - sql 'set enable_vectorized_engine=true;' sql 'set enable_fallback_to_original_planner=false;' sql 'set enable_nereids_planner=true;' for (def year = 1980; year < 2030; year++) { diff --git a/regression-test/suites/query_p0/aggregate/aggregate.groovy b/regression-test/suites/query_p0/aggregate/aggregate.groovy index 025606d88e..0053bf05b0 100644 --- a/regression-test/suites/query_p0/aggregate/aggregate.groovy +++ b/regression-test/suites/query_p0/aggregate/aggregate.groovy @@ -292,7 +292,6 @@ suite("aggregate") { sql"""create table tempbaseall PROPERTIES("replication_num" = "1") as select k1, k2 from baseall where k1 is not null;""" qt_aggregate32"select k1, k2 from (select k1, max(k2) as k2 from tempbaseall where k1 > 0 group by k1 order by k1)a where k1 > 0 and k1 < 10 order by k1;" - sql 'set enable_vectorized_engine=true;' sql 'set enable_fallback_to_original_planner=false' sql 'set enable_nereids_planner=true' qt_aggregate """ select avg(distinct c_bigint), avg(distinct c_double) from regression_test_query_p0_aggregate.${tableName} """ diff --git a/regression-test/suites/query_p0/aggregate/aggregate_group_by_metric_type.groovy b/regression-test/suites/query_p0/aggregate/aggregate_group_by_metric_type.groovy index 78b687b7cf..31b8ef9fae 100644 --- a/regression-test/suites/query_p0/aggregate/aggregate_group_by_metric_type.groovy +++ b/regression-test/suites/query_p0/aggregate/aggregate_group_by_metric_type.groovy @@ -46,7 +46,6 @@ suite("aggregate_group_by_metric_type") { exception "${error_msg}" } - sql 'set enable_vectorized_engine=true;' sql 'set enable_fallback_to_original_planner=false' sql 'set enable_nereids_planner=true' diff --git a/regression-test/suites/query_p0/join/test_runtimefilter_on_datev2.groovy b/regression-test/suites/query_p0/join/test_runtimefilter_on_datev2.groovy index 3247f331ef..32435ffd73 100644 --- a/regression-test/suites/query_p0/join/test_runtimefilter_on_datev2.groovy +++ b/regression-test/suites/query_p0/join/test_runtimefilter_on_datev2.groovy @@ -216,7 +216,6 @@ suite("test_runtimefilter_on_datev2", "query_p0") { SELECT * FROM ${dateV2Table} a, ${dateV2Table2} b WHERE a.date = b.date; """ - sql 'set enable_vectorized_engine=true' sql 'set enable_fallback_to_original_planner=false' sql 'set enable_nereids_planner=true' qt_join1 """ diff --git a/regression-test/suites/query_p0/keyword/test_keyword.groovy b/regression-test/suites/query_p0/keyword/test_keyword.groovy index 8ce23e4ee4..dd8f072043 100644 --- a/regression-test/suites/query_p0/keyword/test_keyword.groovy +++ b/regression-test/suites/query_p0/keyword/test_keyword.groovy @@ -110,7 +110,6 @@ suite("test_keyword", "query,p0") { order by k7;" try_sql "select k1 as k7, k2 as k8, k3 as k9 from baseall t where k8 > 0 group by k7, k8, k9 having k7 > 5 order by k7;" - sql 'set enable_vectorized_engine=true' sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' diff --git a/regression-test/suites/query_p0/sql_functions/aggregate_functions/test_aggregate_histogram.groovy b/regression-test/suites/query_p0/sql_functions/aggregate_functions/test_aggregate_histogram.groovy index fc0f993971..a9d3e458a2 100644 --- a/regression-test/suites/query_p0/sql_functions/aggregate_functions/test_aggregate_histogram.groovy +++ b/regression-test/suites/query_p0/sql_functions/aggregate_functions/test_aggregate_histogram.groovy @@ -16,8 +16,6 @@ // under the License. suite("test_aggregate_histogram") { - sql "set enable_vectorized_engine = true" - def tableName = "histogram_test" def tableCTAS1 = "histogram_test_ctas1" def tableCTAS2 = "histogram_test_ctas2" diff --git a/regression-test/suites/query_p0/sql_functions/aggregate_functions/test_approx_count_distinct.groovy b/regression-test/suites/query_p0/sql_functions/aggregate_functions/test_approx_count_distinct.groovy index d966bb042c..9addccccf7 100644 --- a/regression-test/suites/query_p0/sql_functions/aggregate_functions/test_approx_count_distinct.groovy +++ b/regression-test/suites/query_p0/sql_functions/aggregate_functions/test_approx_count_distinct.groovy @@ -17,7 +17,6 @@ suite("test_approx_count_distinct") { qt_select "select approx_count_distinct(k1) from test_query_db.baseall" - sql 'set enable_vectorized_engine=true;' sql 'set enable_fallback_to_original_planner=false' sql 'set enable_nereids_planner=true' qt_select "select approx_count_distinct(k1) from test_query_db.baseall" diff --git a/regression-test/suites/query_p0/sql_functions/conditional_functions/test_conditional_function.groovy b/regression-test/suites/query_p0/sql_functions/conditional_functions/test_conditional_function.groovy index 08863cea7a..ccf0576bfd 100644 --- a/regression-test/suites/query_p0/sql_functions/conditional_functions/test_conditional_function.groovy +++ b/regression-test/suites/query_p0/sql_functions/conditional_functions/test_conditional_function.groovy @@ -92,7 +92,6 @@ suite("test_conditional_function") { qt_if_false_then_nullable """select IF(false, DAYOFWEEK("2022-12-06 17:48:46"), 1) + 1;""" qt_if_false_else_nullable """select IF(false, 1, DAYOFWEEK("2022-12-06 17:48:46")) + 1;""" - sql 'set enable_vectorized_engine=true;' sql 'set enable_fallback_to_original_planner=false' sql 'set enable_nereids_planner=true' diff --git a/regression-test/suites/query_p0/sql_functions/math_functions/test_round.groovy b/regression-test/suites/query_p0/sql_functions/math_functions/test_round.groovy index 9d6892a40e..e0b63b300f 100644 --- a/regression-test/suites/query_p0/sql_functions/math_functions/test_round.groovy +++ b/regression-test/suites/query_p0/sql_functions/math_functions/test_round.groovy @@ -39,7 +39,6 @@ suite("test_round") { sql """ DROP TABLE IF EXISTS `${tableName}` """ sql "SET enable_nereids_planner=true" - sql "SET enable_vectorized_engine=true" sql "SET enable_fallback_to_original_planner=false" qt_nereids_round_arg1 "SELECT round(10.12345)" diff --git a/regression-test/suites/query_p0/sql_functions/width_bucket_fuctions/test_width_bucket_function.groovy b/regression-test/suites/query_p0/sql_functions/width_bucket_fuctions/test_width_bucket_function.groovy index 32d720e691..81be814166 100644 --- a/regression-test/suites/query_p0/sql_functions/width_bucket_fuctions/test_width_bucket_function.groovy +++ b/regression-test/suites/query_p0/sql_functions/width_bucket_fuctions/test_width_bucket_function.groovy @@ -16,8 +16,6 @@ // under the License. suite("test_width_bucket_function") { - sql "set enable_vectorized_engine = true" - qt_sql "select width_bucket(1, 2, 3, 2)" qt_sql "select width_bucket(null, 2, 3, 2)" qt_sql "select width_bucket(6, 2, 6, 4)" diff --git a/regression-test/suites/query_p0/union/test_union.groovy b/regression-test/suites/query_p0/union/test_union.groovy index d859259672..04631d971a 100644 --- a/regression-test/suites/query_p0/union/test_union.groovy +++ b/regression-test/suites/query_p0/union/test_union.groovy @@ -274,7 +274,6 @@ suite("test_union") { } sql"""drop table ${new_union_table}""" - sql 'set enable_vectorized_engine=true;' sql 'set enable_fallback_to_original_planner=false' sql 'set enable_nereids_planner=true' qt_union35 """select cast("2016-07-01" as date) union (select cast("2016-07-02 1:10:0" as date)) order by 1""" diff --git a/regression-test/suites/query_p1/return_binaray/test_return_binaray_hll.groovy b/regression-test/suites/query_p1/return_binaray/test_return_binaray_hll.groovy index d581b6a04e..f998dbbb3d 100644 --- a/regression-test/suites/query_p1/return_binaray/test_return_binaray_hll.groovy +++ b/regression-test/suites/query_p1/return_binaray/test_return_binaray_hll.groovy @@ -38,12 +38,10 @@ suite("test_return_binary_hll") { sql """ insert into ${tableName} values(1,1,hll_hash(1)),(1,1,hll_hash(2)),(1,1,hll_hash(3)),(1,1,hll_hash(23332)); """ - sql "set enable_vectorized_engine=true;" sql "set return_object_data_as_binary=false;" def result1 = sql "select * from ${tableName}" assertTrue(result1[0][2]==null); - sql "set enable_vectorized_engine=true;" sql "set return_object_data_as_binary=true;" def result2 = sql "select * from ${tableName}" assertTrue(result2[0][2]!=null); diff --git a/regression-test/suites/query_p1/return_binaray/test_return_binary_bitmap.groovy b/regression-test/suites/query_p1/return_binaray/test_return_binary_bitmap.groovy index c09d71666d..feff7d4d08 100644 --- a/regression-test/suites/query_p1/return_binaray/test_return_binary_bitmap.groovy +++ b/regression-test/suites/query_p1/return_binaray/test_return_binary_bitmap.groovy @@ -38,12 +38,10 @@ suite("test_return_binary_bitmap") { sql """ insert into ${tableName} values(1,1,to_bitmap(1)),(1,1,to_bitmap(2)),(1,1,to_bitmap(3)),(1,1,to_bitmap(23332)); """ - sql "set enable_vectorized_engine=true;" sql "set return_object_data_as_binary=false;" def result1 = sql "select * from ${tableName}" assertTrue(result1[0][2]==null); - sql "set enable_vectorized_engine=true;" sql "set return_object_data_as_binary=true;" def result2 = sql "select * from ${tableName}" assertTrue(result2[0][2]!=null);