database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[refactor](vectorized) remove unnecessary vectorization check (#15984)

Browse Source
This commit is contained in:
Gabriel
2023-01-17 12:21:46 +08:00
committed by GitHub
parent 7d34512501
commit d062ca2944
39 changed files with 3 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
be/src/exec/exec_node.cpp
View File

@ -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();

6
be/src/pipeline/pipeline_fragment_context.cpp
View File

@ -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<RuntimeState>(params, request.query_options,
_query_ctx->query_globals, _exec_env);

9
be/src/vec/exprs/vectorized_fn_call.cpp
View File

@ -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());

1
be/test/vec/exec/vbroker_scan_node_test.cpp
View File

@ -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() {

1
be/test/vec/exec/vbroker_scanner_test.cpp
View File

@ -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);

1
be/test/vec/exec/vjson_scanner_test.cpp
View File

@ -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);

1
be/test/vec/exec/vorc_scanner_test.cpp
View File

@ -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() {}

1
be/test/vec/exec/vparquet_scanner_test.cpp
View File

@ -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();

5
fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
View File

@ -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);

1
regression-test/suites/datatype_p0/date/test_from_unixtime.groovy
View File

@ -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)"

1
regression-test/suites/load/insert/test_array_insert.groovy
View File

@ -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}"

1
regression-test/suites/nereids_syntax_p0/aggregate_strategies.groovy
View File

@ -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"

1
regression-test/suites/nereids_syntax_p0/array_function.groovy
View File

@ -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 {

1
regression-test/suites/nereids_syntax_p0/group_bit.groovy
View File

@ -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"

1
regression-test/suites/nereids_syntax_p0/group_concat.groovy
View File

@ -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"

1
regression-test/suites/nereids_syntax_p0/lateral_view.groovy
View File

@ -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"""

3
regression-test/suites/nereids_syntax_p0/mask_function.groovy
View File

@ -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,

1
regression-test/suites/nereids_syntax_p0/null_aware_left_anti_join.groovy
View File

@ -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; """

1
regression-test/suites/nereids_syntax_p0/select_partition.groovy
View File

@ -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 """

1
regression-test/suites/nereids_syntax_p0/set_operation.groovy
View File

@ -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"

1
regression-test/suites/nereids_syntax_p0/sub_query_count_with_const.groovy
View File

@ -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"

1
regression-test/suites/nereids_syntax_p0/test_arithmetic_operators.groovy
View File

@ -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"

1
regression-test/suites/nereids_syntax_p0/test_bitmap_function_nereids.groovy
View File

@ -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

1
regression-test/suites/nereids_syntax_p0/test_case_function.groovy
View File

@ -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"

1
regression-test/suites/nereids_syntax_p0/test_join3.groovy
View File

@ -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"

1
regression-test/suites/nereids_syntax_p0/test_query_between.groovy
View File

@ -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"

1
regression-test/suites/nereids_syntax_p0/test_time_lut_nereids.groovy
View File

@ -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++) {

1
regression-test/suites/query_p0/aggregate/aggregate.groovy
View File

@ -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} """

1
regression-test/suites/query_p0/aggregate/aggregate_group_by_metric_type.groovy
View File

@ -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'

1
regression-test/suites/query_p0/join/test_runtimefilter_on_datev2.groovy
View File

@ -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 """

1
regression-test/suites/query_p0/keyword/test_keyword.groovy
View File

@ -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'

2
regression-test/suites/query_p0/sql_functions/aggregate_functions/test_aggregate_histogram.groovy
View File

@ -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"

1
regression-test/suites/query_p0/sql_functions/aggregate_functions/test_approx_count_distinct.groovy
View File

@ -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"

1
regression-test/suites/query_p0/sql_functions/conditional_functions/test_conditional_function.groovy
View File

@ -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'

1
regression-test/suites/query_p0/sql_functions/math_functions/test_round.groovy
View File

@ -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)"

2
regression-test/suites/query_p0/sql_functions/width_bucket_fuctions/test_width_bucket_function.groovy
View File

@ -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)"

1
regression-test/suites/query_p0/union/test_union.groovy
View File

@ -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"""

2
regression-test/suites/query_p1/return_binaray/test_return_binaray_hll.groovy
View File

@ -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);

2
regression-test/suites/query_p1/return_binaray/test_return_binary_bitmap.groovy
View File

@ -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);