From 3cf8787f999dbf490eae8b2c9597940db1a2683b Mon Sep 17 00:00:00 2001 From: Gabriel Date: Wed, 5 Feb 2025 10:40:43 +0800 Subject: [PATCH 1/4] [fix](local shuffle) Set serial execution for schema scan operator --- be/src/pipeline/exec/schema_scan_operator.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/be/src/pipeline/exec/schema_scan_operator.cpp b/be/src/pipeline/exec/schema_scan_operator.cpp index ea6f122df95616..cac44c9e3a5f4a 100644 --- a/be/src/pipeline/exec/schema_scan_operator.cpp +++ b/be/src/pipeline/exec/schema_scan_operator.cpp @@ -71,7 +71,9 @@ SchemaScanOperatorX::SchemaScanOperatorX(ObjectPool* pool, const TPlanNode& tnod _common_scanner_param(new SchemaScannerCommonParam()), _tuple_id(tnode.schema_scan_node.tuple_id), _tuple_idx(0), - _slot_num(0) {} + _slot_num(0) { + Base::_is_serial_operator = tnode.__isset.is_serial_operator && tnode.is_serial_operator; +} Status SchemaScanOperatorX::init(const TPlanNode& tnode, RuntimeState* state) { RETURN_IF_ERROR(Base::init(tnode, state)); From c8671ec6b00eb4fb3b5027b52d8aae1a30eb201b Mon Sep 17 00:00:00 2001 From: Gabriel Date: Wed, 5 Feb 2025 15:23:48 +0800 Subject: [PATCH 2/4] update --- regression-test/data/query_p0/system/test_query_sys.out | 4 ++++ regression-test/suites/query_p0/system/test_query_sys.groovy | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 regression-test/data/query_p0/system/test_query_sys.out diff --git a/regression-test/data/query_p0/system/test_query_sys.out b/regression-test/data/query_p0/system/test_query_sys.out new file mode 100644 index 00000000000000..8f67d3a35c418f --- /dev/null +++ b/regression-test/data/query_p0/system/test_query_sys.out @@ -0,0 +1,4 @@ +-- This file is automatically generated. You should know what you did if you want to edit this +-- !select -- +2 + diff --git a/regression-test/suites/query_p0/system/test_query_sys.groovy b/regression-test/suites/query_p0/system/test_query_sys.groovy index 7b6ca1027b479c..79e18c61717c73 100644 --- a/regression-test/suites/query_p0/system/test_query_sys.groovy +++ b/regression-test/suites/query_p0/system/test_query_sys.groovy @@ -54,4 +54,8 @@ suite("test_query_sys", "query,p0") { sql "select * from http_stream('format'='csv');" exception "No Alive backends" } + + // `workload_group_resource_usage` will be refresh 30s after BE startup so sleep 30s to get a stable result + sleep(30000) + qt_select """ select count(*) from information_schema.workload_group_resource_usage; """ } From c2e506b4f2a79f21d322a4e4924acbdb12aab32e Mon Sep 17 00:00:00 2001 From: Gabriel Date: Wed, 5 Feb 2025 15:34:56 +0800 Subject: [PATCH 3/4] update --- regression-test/data/query_p0/system/test_query_sys.out | 4 ---- regression-test/suites/query_p0/system/test_query_sys.groovy | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 regression-test/data/query_p0/system/test_query_sys.out diff --git a/regression-test/data/query_p0/system/test_query_sys.out b/regression-test/data/query_p0/system/test_query_sys.out deleted file mode 100644 index 8f67d3a35c418f..00000000000000 --- a/regression-test/data/query_p0/system/test_query_sys.out +++ /dev/null @@ -1,4 +0,0 @@ --- This file is automatically generated. You should know what you did if you want to edit this --- !select -- -2 - diff --git a/regression-test/suites/query_p0/system/test_query_sys.groovy b/regression-test/suites/query_p0/system/test_query_sys.groovy index 79e18c61717c73..4926c59c4516e7 100644 --- a/regression-test/suites/query_p0/system/test_query_sys.groovy +++ b/regression-test/suites/query_p0/system/test_query_sys.groovy @@ -57,5 +57,7 @@ suite("test_query_sys", "query,p0") { // `workload_group_resource_usage` will be refresh 30s after BE startup so sleep 30s to get a stable result sleep(30000) - qt_select """ select count(*) from information_schema.workload_group_resource_usage; """ + def rows1 = sql """ select count(*) from information_schema.workload_group_resource_usage; """ + def rows2 = sql """ select count(*) from information_schema.workload_group_resource_usage; """ + assertEquals(rows1, rows2) } From c7fcdea58f109cfe9568c9ed78e4efc984c02e8b Mon Sep 17 00:00:00 2001 From: Gabriel Date: Wed, 5 Feb 2025 17:23:35 +0800 Subject: [PATCH 4/4] update --- regression-test/suites/query_p0/system/test_query_sys.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/regression-test/suites/query_p0/system/test_query_sys.groovy b/regression-test/suites/query_p0/system/test_query_sys.groovy index 4926c59c4516e7..b192a87ca30b00 100644 --- a/regression-test/suites/query_p0/system/test_query_sys.groovy +++ b/regression-test/suites/query_p0/system/test_query_sys.groovy @@ -57,7 +57,9 @@ suite("test_query_sys", "query,p0") { // `workload_group_resource_usage` will be refresh 30s after BE startup so sleep 30s to get a stable result sleep(30000) + sql """set parallel_pipeline_task_num=8""" def rows1 = sql """ select count(*) from information_schema.workload_group_resource_usage; """ + sql """set parallel_pipeline_task_num=1""" def rows2 = sql """ select count(*) from information_schema.workload_group_resource_usage; """ assertEquals(rows1, rows2) }