From 8ea69ca11c1b1fe7eed6ec43a18f62a4129743a5 Mon Sep 17 00:00:00 2001 From: minghong Date: Tue, 25 Apr 2023 19:02:12 +0800 Subject: [PATCH] [refactor](nereids) do not use in_filter in pipeline mode (#19028) 1. in pipeline in_or_bloom filter replaced by bloom filter 2. do not set broadcast row limit --- .../nereids/processor/post/RuntimeFilterGenerator.java | 4 ++++ .../org/apache/doris/planner/RuntimeFilterGenerator.java | 6 ------ .../main/java/org/apache/doris/qe/SessionVariable.java | 2 +- .../suites/nereids_tpch_shape_sf1000_p0/shape/q10.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf1000_p0/shape/q11.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf1000_p0/shape/q12.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf1000_p0/shape/q13.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf1000_p0/shape/q14.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf1000_p0/shape/q15.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf1000_p0/shape/q16.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf1000_p0/shape/q17.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf1000_p0/shape/q18.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf1000_p0/shape/q19.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf1000_p0/shape/q2.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf1000_p0/shape/q20.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf1000_p0/shape/q21.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf1000_p0/shape/q22.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf1000_p0/shape/q3.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf1000_p0/shape/q4.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf1000_p0/shape/q5.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf1000_p0/shape/q6.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf1000_p0/shape/q7.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf1000_p0/shape/q8.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf1000_p0/shape/q9.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf1_p0/shape/q10.groovy | 2 +- .../suites/nereids_tpch_shape_sf1_p0/shape/q11.groovy | 2 +- .../suites/nereids_tpch_shape_sf1_p0/shape/q12.groovy | 2 +- .../suites/nereids_tpch_shape_sf1_p0/shape/q13.groovy | 2 +- .../suites/nereids_tpch_shape_sf1_p0/shape/q14.groovy | 2 +- .../suites/nereids_tpch_shape_sf1_p0/shape/q15.groovy | 2 +- .../suites/nereids_tpch_shape_sf1_p0/shape/q16.groovy | 2 +- .../suites/nereids_tpch_shape_sf1_p0/shape/q17.groovy | 2 +- .../suites/nereids_tpch_shape_sf1_p0/shape/q18.groovy | 2 +- .../suites/nereids_tpch_shape_sf1_p0/shape/q19.groovy | 2 +- .../suites/nereids_tpch_shape_sf1_p0/shape/q2.groovy | 2 +- .../suites/nereids_tpch_shape_sf1_p0/shape/q20.groovy | 2 +- .../suites/nereids_tpch_shape_sf1_p0/shape/q21.groovy | 2 +- .../suites/nereids_tpch_shape_sf1_p0/shape/q22.groovy | 2 +- .../suites/nereids_tpch_shape_sf1_p0/shape/q3.groovy | 2 +- .../suites/nereids_tpch_shape_sf1_p0/shape/q4.groovy | 2 +- .../suites/nereids_tpch_shape_sf1_p0/shape/q5.groovy | 2 +- .../suites/nereids_tpch_shape_sf1_p0/shape/q6.groovy | 2 +- .../suites/nereids_tpch_shape_sf1_p0/shape/q7.groovy | 2 +- .../suites/nereids_tpch_shape_sf1_p0/shape/q8.groovy | 2 +- .../suites/nereids_tpch_shape_sf1_p0/shape/q9.groovy | 2 +- .../suites/nereids_tpch_shape_sf500_p0/shape/q10.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf500_p0/shape/q11.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf500_p0/shape/q12.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf500_p0/shape/q13.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf500_p0/shape/q14.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf500_p0/shape/q15.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf500_p0/shape/q16.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf500_p0/shape/q17.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf500_p0/shape/q18.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf500_p0/shape/q19.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf500_p0/shape/q2.groovy | 7 +++---- .../suites/nereids_tpch_shape_sf500_p0/shape/q20.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf500_p0/shape/q21.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf500_p0/shape/q22.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf500_p0/shape/q3.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf500_p0/shape/q4.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf500_p0/shape/q5.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf500_p0/shape/q6.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf500_p0/shape/q7.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf500_p0/shape/q8.groovy | 8 ++++---- .../suites/nereids_tpch_shape_sf500_p0/shape/q9.groovy | 8 ++++---- 66 files changed, 193 insertions(+), 196 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/RuntimeFilterGenerator.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/RuntimeFilterGenerator.java index ba239a2e0d..13d03d0350 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/RuntimeFilterGenerator.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/RuntimeFilterGenerator.java @@ -102,6 +102,10 @@ public class RuntimeFilterGenerator extends PlanPostProcessor { if (type == TRuntimeFilterType.BITMAP) { continue; } + // in-filter is not friendly to pipeline + if (type == TRuntimeFilterType.IN_OR_BLOOM && ctx.getSessionVariable().enablePipelineEngine()) { + type = TRuntimeFilterType.BLOOM; + } // currently, we can ensure children in the two side are corresponding to the equal_to's. // so right maybe an expression and left is a slot Slot unwrappedSlot = checkTargetChild(equalTo.left()); diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/RuntimeFilterGenerator.java b/fe/fe-core/src/main/java/org/apache/doris/planner/RuntimeFilterGenerator.java index a88f5d73bf..7de864f50a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/planner/RuntimeFilterGenerator.java +++ b/fe/fe-core/src/main/java/org/apache/doris/planner/RuntimeFilterGenerator.java @@ -190,12 +190,6 @@ public final class RuntimeFilterGenerator { int numBloomFilters = 0; for (RuntimeFilter filter : filters) { filter.extractTargetsPosition(); - // Number of parallel instances are large for pipeline engine, so we prefer bloom filter. - if (filter.hasRemoteTargets() && filter.getType() == TRuntimeFilterType.IN_OR_BLOOM - && ConnectContext.get() != null - && ConnectContext.get().getSessionVariable().enablePipelineEngine()) { - filter.setType(TRuntimeFilterType.BLOOM); - } if (filter.getType() == TRuntimeFilterType.BLOOM) { if (numBloomFilters >= maxNumBloomFilters) { continue; 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 9fa5dfed4f..777c57c1fd 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 @@ -649,7 +649,7 @@ public class SessionVariable implements Serializable, Writable { private double broadcastRightTableScaleFactor = 10.0; @VariableMgr.VarAttr(name = BROADCAST_ROW_COUNT_LIMIT, needForward = true) - private double broadcastRowCountLimit = 15000000; + private double broadcastRowCountLimit = 30000000; @VariableMgr.VarAttr(name = BROADCAST_HASHTABLE_MEM_LIMIT_PERCENTAGE, needForward = true) private double broadcastHashtableMemLimitPercentage = 0.2; diff --git a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q10.groovy b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q10.groovy index 8b8d1c8a08..e008b2a7d6 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q10.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q10.groovy @@ -23,11 +23,11 @@ suite("q10") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set global exec_mem_limit = 21G' - sql 'set global broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q11.groovy b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q11.groovy index 90921595ec..bf58240e1c 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q11.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q11.groovy @@ -23,11 +23,11 @@ suite("q11") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set global exec_mem_limit = 21G' - sql 'set global broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q12.groovy b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q12.groovy index da84e2ae06..4a3eefb91b 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q12.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q12.groovy @@ -23,11 +23,11 @@ suite("q12") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set global exec_mem_limit = 21G' - sql 'set global broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q13.groovy b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q13.groovy index b576084dad..1da4512526 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q13.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q13.groovy @@ -23,11 +23,11 @@ suite("q13") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set global exec_mem_limit = 21G' - sql 'set global broadcast_row_count_limit = 30000000' + + + qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q14.groovy b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q14.groovy index ddbfb307b7..9c57ba1c67 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q14.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q14.groovy @@ -23,11 +23,11 @@ suite("q14") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set global exec_mem_limit = 21G' - sql 'set global broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q15.groovy b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q15.groovy index 9365f0d2e2..ee4369037f 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q15.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q15.groovy @@ -23,11 +23,11 @@ suite("q15") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set global exec_mem_limit = 21G' - sql 'set global broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q16.groovy b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q16.groovy index e7fc3d6a83..e056ef806f 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q16.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q16.groovy @@ -23,11 +23,11 @@ suite("q16") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set global exec_mem_limit = 21G' - sql 'set global broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q17.groovy b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q17.groovy index ab910f33c1..8c647b3c20 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q17.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q17.groovy @@ -23,11 +23,11 @@ suite("q17") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set global exec_mem_limit = 21G' - sql 'set global broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q18.groovy b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q18.groovy index d7a2e2a142..e3b7aaee8f 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q18.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q18.groovy @@ -23,11 +23,11 @@ suite("q18") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set global exec_mem_limit = 21G' - sql 'set global broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q19.groovy b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q19.groovy index b950ec8fea..89ab74fa9a 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q19.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q19.groovy @@ -24,11 +24,11 @@ suite("q19") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set global exec_mem_limit = 21G' - sql 'set global broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q2.groovy b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q2.groovy index 2e27bfd1f6..bff504bfc3 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q2.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q2.groovy @@ -23,11 +23,11 @@ suite("q2") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set global exec_mem_limit = 21G' - sql 'set global broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q20.groovy b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q20.groovy index 297dd4cf36..49198ed4f3 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q20.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q20.groovy @@ -24,11 +24,11 @@ suite("q20") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set global exec_mem_limit = 21G' - sql 'set global broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q21.groovy b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q21.groovy index 131f2d5a7b..19e0a307bf 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q21.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q21.groovy @@ -23,11 +23,11 @@ suite("q21") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set global exec_mem_limit = 21G' - sql 'set global broadcast_row_count_limit = 30000000' + + + // qt_select """ // explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q22.groovy b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q22.groovy index 9f9f99afe8..0cad1e7bd2 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q22.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q22.groovy @@ -23,11 +23,11 @@ suite("q22") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set global exec_mem_limit = 21G' - sql 'set global broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q3.groovy b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q3.groovy index 6d99ce30d2..34a55f03e8 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q3.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q3.groovy @@ -24,11 +24,11 @@ suite("q3") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set global exec_mem_limit = 21G' - sql 'set global broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q4.groovy b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q4.groovy index c08531db12..bc00e332f3 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q4.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q4.groovy @@ -23,11 +23,11 @@ suite("q4") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set global exec_mem_limit = 21G' - sql 'set global broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q5.groovy b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q5.groovy index 7346489d6f..24b74ada88 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q5.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q5.groovy @@ -23,11 +23,11 @@ suite("q5") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set global exec_mem_limit = 21G' - sql 'set global broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q6.groovy b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q6.groovy index adc3976561..d935874c53 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q6.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q6.groovy @@ -23,11 +23,11 @@ suite("q6") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set global exec_mem_limit = 21G' - sql 'set global broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q7.groovy b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q7.groovy index e21a857f07..bcf8bcbbc5 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q7.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q7.groovy @@ -23,11 +23,11 @@ suite("q7") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set global exec_mem_limit = 21G' - sql 'set global broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q8.groovy b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q8.groovy index 627bc8b03c..d11c6c5778 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q8.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q8.groovy @@ -23,11 +23,11 @@ suite("q8") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set global exec_mem_limit = 21G' - sql 'set global broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q9.groovy b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q9.groovy index efb81269df..9be034c621 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q9.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1000_p0/shape/q9.groovy @@ -23,11 +23,11 @@ suite("q9") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set global exec_mem_limit = 21G' - sql 'set global broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q10.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q10.groovy index e7a0ed87a9..3d1701cf6f 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q10.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q10.groovy @@ -23,7 +23,7 @@ suite("q10") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q11.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q11.groovy index 028c7529aa..d9d95ddb54 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q11.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q11.groovy @@ -23,7 +23,7 @@ suite("q11") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q12.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q12.groovy index 6221ca9c90..1a93bf92d2 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q12.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q12.groovy @@ -23,7 +23,7 @@ suite("q12") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q13.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q13.groovy index 460a316b17..0e3b3d10ee 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q13.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q13.groovy @@ -23,7 +23,7 @@ suite("q13") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q14.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q14.groovy index c8d28ef6ca..23fb926e2b 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q14.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q14.groovy @@ -23,7 +23,7 @@ suite("q14") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q15.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q15.groovy index b6888c2cc8..39d473a629 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q15.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q15.groovy @@ -23,7 +23,7 @@ suite("q15") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q16.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q16.groovy index 565cbc8dd2..b7e466ed3a 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q16.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q16.groovy @@ -23,7 +23,7 @@ suite("q16") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q17.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q17.groovy index bf85f08e54..afad572be2 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q17.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q17.groovy @@ -23,7 +23,7 @@ suite("q17") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q18.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q18.groovy index 79ab60654d..65f22c9dba 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q18.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q18.groovy @@ -23,7 +23,7 @@ suite("q18") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q19.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q19.groovy index 41b078eb40..f6a77f3c6f 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q19.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q19.groovy @@ -24,7 +24,7 @@ suite("q19") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q2.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q2.groovy index 8476049746..16f65d80fe 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q2.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q2.groovy @@ -23,7 +23,7 @@ suite("q2") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q20.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q20.groovy index 37c97ffe2f..812497e8a9 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q20.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q20.groovy @@ -24,7 +24,7 @@ suite("q20") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q21.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q21.groovy index 6a17489bc3..cc6a106cd8 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q21.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q21.groovy @@ -23,7 +23,7 @@ suite("q21") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q22.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q22.groovy index 6b9ed6713b..0dfbe32f12 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q22.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q22.groovy @@ -23,7 +23,7 @@ suite("q22") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q3.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q3.groovy index 4fd26f615f..38d34abdbe 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q3.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q3.groovy @@ -24,7 +24,7 @@ suite("q3") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q4.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q4.groovy index 67e98d6d66..9d377d4e82 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q4.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q4.groovy @@ -23,7 +23,7 @@ suite("q4") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q5.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q5.groovy index a070bb76fa..f996037305 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q5.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q5.groovy @@ -23,7 +23,7 @@ suite("q5") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q6.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q6.groovy index f846b4016a..08e31ab3b7 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q6.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q6.groovy @@ -23,7 +23,7 @@ suite("q6") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q7.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q7.groovy index 54e6eaf404..ff80059519 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q7.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q7.groovy @@ -23,7 +23,7 @@ suite("q7") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q8.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q8.groovy index 73fbca0524..c32bcf4b72 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q8.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q8.groovy @@ -23,7 +23,7 @@ suite("q8") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q9.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q9.groovy index 0e38b7bb7b..81f8a31013 100644 --- a/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q9.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q9.groovy @@ -23,7 +23,7 @@ suite("q9") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q10.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q10.groovy index 80bec0f347..e008b2a7d6 100644 --- a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q10.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q10.groovy @@ -23,11 +23,11 @@ suite("q10") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set exec_mem_limit = 21G' - sql 'set broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q11.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q11.groovy index 512b5ec8d8..bf58240e1c 100644 --- a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q11.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q11.groovy @@ -23,11 +23,11 @@ suite("q11") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set exec_mem_limit = 21G' - sql 'set broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q12.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q12.groovy index 15b179e353..4a3eefb91b 100644 --- a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q12.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q12.groovy @@ -23,11 +23,11 @@ suite("q12") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set exec_mem_limit = 21G' - sql 'set broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q13.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q13.groovy index 2ea990ca56..1da4512526 100644 --- a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q13.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q13.groovy @@ -23,11 +23,11 @@ suite("q13") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set exec_mem_limit = 21G' - sql 'set broadcast_row_count_limit = 30000000' + + + qt_select """ diff --git a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q14.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q14.groovy index ce76f74348..9c57ba1c67 100644 --- a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q14.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q14.groovy @@ -23,11 +23,11 @@ suite("q14") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set exec_mem_limit = 21G' - sql 'set broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q15.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q15.groovy index c6ef00b169..ee4369037f 100644 --- a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q15.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q15.groovy @@ -23,11 +23,11 @@ suite("q15") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set exec_mem_limit = 21G' - sql 'set broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q16.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q16.groovy index 6b179e3f09..e056ef806f 100644 --- a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q16.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q16.groovy @@ -23,11 +23,11 @@ suite("q16") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set exec_mem_limit = 21G' - sql 'set broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q17.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q17.groovy index 4e7e01848c..8c647b3c20 100644 --- a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q17.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q17.groovy @@ -23,11 +23,11 @@ suite("q17") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set exec_mem_limit = 21G' - sql 'set broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q18.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q18.groovy index 59343b337b..e3b7aaee8f 100644 --- a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q18.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q18.groovy @@ -23,11 +23,11 @@ suite("q18") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set exec_mem_limit = 21G' - sql 'set broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q19.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q19.groovy index cea79468ef..89ab74fa9a 100644 --- a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q19.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q19.groovy @@ -24,11 +24,11 @@ suite("q19") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set exec_mem_limit = 21G' - sql 'set broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q2.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q2.groovy index 57fb2c140e..c6b22ec021 100644 --- a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q2.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q2.groovy @@ -23,11 +23,10 @@ suite("q2") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set exec_mem_limit = 21G' - sql 'set broadcast_row_count_limit = 30000000' + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q20.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q20.groovy index 0c76d9c6dd..49198ed4f3 100644 --- a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q20.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q20.groovy @@ -24,11 +24,11 @@ suite("q20") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set exec_mem_limit = 21G' - sql 'set broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q21.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q21.groovy index 5b4fea0fb3..b948c4b012 100644 --- a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q21.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q21.groovy @@ -23,11 +23,11 @@ suite("q21") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set exec_mem_limit = 21G' - sql 'set broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q22.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q22.groovy index b36e48591f..0cad1e7bd2 100644 --- a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q22.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q22.groovy @@ -23,11 +23,11 @@ suite("q22") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set exec_mem_limit = 21G' - sql 'set broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q3.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q3.groovy index c0621f8878..34a55f03e8 100644 --- a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q3.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q3.groovy @@ -24,11 +24,11 @@ suite("q3") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set exec_mem_limit = 21G' - sql 'set broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q4.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q4.groovy index a435b7ee83..bc00e332f3 100644 --- a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q4.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q4.groovy @@ -23,11 +23,11 @@ suite("q4") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set exec_mem_limit = 21G' - sql 'set broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q5.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q5.groovy index 94b390cd69..24b74ada88 100644 --- a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q5.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q5.groovy @@ -23,11 +23,11 @@ suite("q5") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set exec_mem_limit = 21G' - sql 'set broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q6.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q6.groovy index d25429d017..d935874c53 100644 --- a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q6.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q6.groovy @@ -23,11 +23,11 @@ suite("q6") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set exec_mem_limit = 21G' - sql 'set broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q7.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q7.groovy index be703b8f34..bcf8bcbbc5 100644 --- a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q7.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q7.groovy @@ -23,11 +23,11 @@ suite("q7") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set exec_mem_limit = 21G' - sql 'set broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q8.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q8.groovy index 97e6109e76..d11c6c5778 100644 --- a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q8.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q8.groovy @@ -23,11 +23,11 @@ suite("q8") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set exec_mem_limit = 21G' - sql 'set broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan diff --git a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q9.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q9.groovy index dc1d75afa8..9be034c621 100644 --- a/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q9.groovy +++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q9.groovy @@ -23,11 +23,11 @@ suite("q9") { sql 'set enable_nereids_planner=true' sql 'set enable_fallback_to_original_planner=false' sql "set runtime_filter_mode='GLOBAL'" - sql "set enable_runtime_filter_prune=true" + sql 'set exec_mem_limit=21G' - sql 'set enable_new_cost_model=false' - sql 'set exec_mem_limit = 21G' - sql 'set broadcast_row_count_limit = 30000000' + + + qt_select """ explain shape plan