From c6355f38e33e6fa3c362dc374977393632803654 Mon Sep 17 00:00:00 2001 From: BiteTheDDDDt Date: Mon, 14 Jul 2025 18:09:26 +0800 Subject: [PATCH 1/2] test --- .../src/main/java/org/apache/doris/qe/SessionVariable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8e9e433a726095..de9d5f9ad75ce9 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 @@ -1324,7 +1324,7 @@ public enum IgnoreSplitType { public long runtimeFilterMaxBuildRowCount = 64L * 1024L * 1024L; @VariableMgr.VarAttr(name = ENABLE_PARALLEL_RESULT_SINK, needForward = true, fuzzy = true) - private boolean enableParallelResultSink = false; + private boolean enableParallelResultSink = true; @VariableMgr.VarAttr(name = "sort_phase_num", fuzzy = true, needForward = true, description = {"如设置为1，则只生成1阶段sort，设置为2，则只生成2阶段sort，设置其它值，优化器根据代价选择sort类型", From b80f01db0d0104dca0e9a84514fafa345830f769 Mon Sep 17 00:00:00 2001 From: BiteTheDDDDt Date: Mon, 14 Jul 2025 21:27:58 +0800 Subject: [PATCH 2/2] fix --- .../src/main/java/org/apache/doris/qe/SessionVariable.java | 4 ++++ .../doris/nereids/rules/rewrite/SplitMultiDistinctTest.java | 1 + .../nereids_p0/runtime_filter/cte-runtime-filter.groovy | 2 +- .../adjust_nullable/test_subquery_nullable.groovy | 1 + regression-test/suites/shape_check/others/nlj.groovy | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) 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 de9d5f9ad75ce9..0bf2195a01c73b 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 @@ -3876,6 +3876,10 @@ public void setDisableNereidsRules(String disableNereidsRules) { this.disableNereidsRules = disableNereidsRules; } + public void setEnableParallelResultSink(boolean enableParallelResultSink) { + this.enableParallelResultSink = enableParallelResultSink; + } + public void setDisableNereidsExpressionRules(String disableNereidsExpressionRules) { BitSet bitSet = new BitSet(); for (String ruleName : disableNereidsExpressionRules.split(",")) { diff --git a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/SplitMultiDistinctTest.java b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/SplitMultiDistinctTest.java index ebc6331506a5d3..ee2b53e8ba9861 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/SplitMultiDistinctTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/SplitMultiDistinctTest.java @@ -35,6 +35,7 @@ protected void runBeforeAll() throws Exception { + "distributed by hash(a) properties('replication_num'='1');"); connectContext.setDatabase("test"); connectContext.getSessionVariable().setDisableNereidsRules("PRUNE_EMPTY_PARTITION"); + connectContext.getSessionVariable().setEnableParallelResultSink(false); } @Test diff --git a/regression-test/suites/nereids_p0/runtime_filter/cte-runtime-filter.groovy b/regression-test/suites/nereids_p0/runtime_filter/cte-runtime-filter.groovy index b5ce12e0851992..6e9393e05d21b6 100644 --- a/regression-test/suites/nereids_p0/runtime_filter/cte-runtime-filter.groovy +++ b/regression-test/suites/nereids_p0/runtime_filter/cte-runtime-filter.groovy @@ -16,7 +16,7 @@ // under the License. suite('cte-runtime-filter') { - + sql 'set enable_parallel_result_sink=false;' sql ''' drop table if exists cte_runtime_filter_table; CREATE TABLE `cte_runtime_filter_table` ( diff --git a/regression-test/suites/nereids_rules_p0/adjust_nullable/test_subquery_nullable.groovy b/regression-test/suites/nereids_rules_p0/adjust_nullable/test_subquery_nullable.groovy index b30fb67b371bd0..017fa68bde62f9 100644 --- a/regression-test/suites/nereids_rules_p0/adjust_nullable/test_subquery_nullable.groovy +++ b/regression-test/suites/nereids_rules_p0/adjust_nullable/test_subquery_nullable.groovy @@ -16,6 +16,7 @@ // under the License. suite('test_subquery_nullable') { + sql 'set enable_parallel_result_sink=false;' sql 'DROP TABLE IF EXISTS test_subquery_nullable_t1 FORCE' sql 'DROP TABLE IF EXISTS test_subquery_nullable_t2 FORCE' sql "CREATE TABLE test_subquery_nullable_t1(a int not null, b int not null, c int not null) distributed by hash(a) properties('replication_num' = '1')" diff --git a/regression-test/suites/shape_check/others/nlj.groovy b/regression-test/suites/shape_check/others/nlj.groovy index 19a7f25b3e159d..63920380a73114 100644 --- a/regression-test/suites/shape_check/others/nlj.groovy +++ b/regression-test/suites/shape_check/others/nlj.groovy @@ -18,6 +18,7 @@ */ suite("nlj") { + sql 'set enable_parallel_result_sink=false;' sql """ drop table if exists a; create table a (