You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by en...@apache.org on 2023/04/16 03:37:40 UTC

[doris] branch master updated: [tpch](nereids) add regression test for tpch_sf500 plan shape #18631

This is an automated email from the ASF dual-hosted git repository.

englefly pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/master by this push:
     new 3ec52dc7da [tpch](nereids) add regression test for tpch_sf500 plan shape #18631
3ec52dc7da is described below

commit 3ec52dc7da3fb12401afa468fcc833702d75ee48
Author: minghong <en...@gmail.com>
AuthorDate: Sun Apr 16 11:37:33 2023 +0800

    [tpch](nereids) add regression test for tpch_sf500 plan shape #18631
    
    add regression test to check tpch_sf500 plan shape by explain shape plan.
---
 .../shape/q1.out                                   |   0
 .../shape/q10.out                                  |   0
 .../shape/q11.out                                  |   0
 .../shape/q12.out                                  |   0
 .../shape/q13.out                                  |   0
 .../shape/q14.out                                  |   0
 .../shape/q15.out                                  |   0
 .../shape/q16.out                                  |   0
 .../shape/q17.out                                  |   0
 .../shape/q18.out                                  |   0
 .../shape/q19.out                                  |   0
 .../shape/q2.out                                   |   0
 .../shape/q20.out                                  |   0
 .../shape/q21.out                                  |   0
 .../shape/q22.out                                  |   0
 .../shape/q3.out                                   |   0
 .../shape/q4.out                                   |   0
 .../shape/q5.out                                   |   0
 .../shape/q6.out                                   |   0
 .../shape/q7.out                                   |   0
 .../shape/q8.out                                   |   0
 .../shape/q9.out                                   |   0
 .../shape/q1.out                                   |   0
 .../shape/q10.out                                  |   0
 .../shape/q11.out                                  |   0
 .../shape/q12.out                                  |   0
 .../shape/q13.out                                  |   0
 .../shape/q14.out                                  |   0
 .../shape/q15.out                                  |   0
 .../shape/q16.out                                  |   0
 .../shape/q17.out                                  |   0
 .../shape/q18.out                                  |   0
 .../data/nereids_tpch_shape_sf500_p0/shape/q19.out |  15 +++
 .../shape/q2.out                                   |   0
 .../shape/q20.out                                  |   0
 .../shape/q21.out                                  |   0
 .../shape/q22.out                                  |   0
 .../shape/q3.out                                   |   0
 .../shape/q4.out                                   |   0
 .../data/nereids_tpch_shape_sf500_p0/shape/q5.out  |  35 +++++++
 .../shape/q6.out                                   |   0
 .../shape/q7.out                                   |   0
 .../shape/q8.out                                   |   0
 .../data/nereids_tpch_shape_sf500_p0/shape/q9.out  |  35 +++++++
 .../load.groovy                                    |   0
 .../shape/q1.groovy                                |   0
 .../shape/q10.groovy                               |   0
 .../shape/q11.groovy                               |   0
 .../shape/q12.groovy                               |   0
 .../shape/q13.groovy                               |   0
 .../shape/q14.groovy                               |   0
 .../shape/q15.groovy                               |   0
 .../shape/q16.groovy                               |   0
 .../shape/q17.groovy                               |   0
 .../shape/q18.groovy                               |   0
 .../shape/q19.groovy                               |   0
 .../shape/q2.groovy                                |   0
 .../shape/q20.groovy                               |   0
 .../shape/q21.groovy                               |   0
 .../shape/q22.groovy                               |   0
 .../shape/q3.groovy                                |   0
 .../shape/q4.groovy                                |   0
 .../shape/q5.groovy                                |   0
 .../shape/q6.groovy                                |   0
 .../shape/q7.groovy                                |   0
 .../shape/q8.groovy                                |   0
 .../shape/q9.groovy                                |   0
 .../load.groovy                                    | 108 ++++++++++-----------
 .../shape/q1.groovy                                |   0
 .../shape/q10.groovy                               |   5 +-
 .../shape/q11.groovy                               |   5 +-
 .../shape/q12.groovy                               |   5 +-
 .../shape/q13.groovy                               |   4 +
 .../shape/q14.groovy                               |   5 +-
 .../shape/q15.groovy                               |   5 +-
 .../shape/q16.groovy                               |   5 +-
 .../shape/q17.groovy                               |   5 +-
 .../shape/q18.groovy                               |   5 +-
 .../shape/q19.groovy                               |   5 +-
 .../shape/q2.groovy                                |   3 +
 .../shape/q20.groovy                               |   5 +-
 .../shape/q21.groovy                               |   5 +-
 .../shape/q22.groovy                               |   5 +-
 .../shape/q3.groovy                                |   5 +-
 .../shape/q4.groovy                                |   5 +-
 .../shape/q5.groovy                                |   5 +-
 .../shape/q6.groovy                                |   5 +-
 .../shape/q7.groovy                                |   5 +-
 .../shape/q8.groovy                                |   5 +-
 .../shape/q9.groovy                                |   3 +
 90 files changed, 221 insertions(+), 72 deletions(-)

diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q1.out b/regression-test/data/nereids_tpch_shape_sf1_p0/shape/q1.out
similarity index 100%
copy from regression-test/data/nereids_tpchPlanShape_p0/shape/q1.out
copy to regression-test/data/nereids_tpch_shape_sf1_p0/shape/q1.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q10.out b/regression-test/data/nereids_tpch_shape_sf1_p0/shape/q10.out
similarity index 100%
copy from regression-test/data/nereids_tpchPlanShape_p0/shape/q10.out
copy to regression-test/data/nereids_tpch_shape_sf1_p0/shape/q10.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q11.out b/regression-test/data/nereids_tpch_shape_sf1_p0/shape/q11.out
similarity index 100%
copy from regression-test/data/nereids_tpchPlanShape_p0/shape/q11.out
copy to regression-test/data/nereids_tpch_shape_sf1_p0/shape/q11.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q12.out b/regression-test/data/nereids_tpch_shape_sf1_p0/shape/q12.out
similarity index 100%
copy from regression-test/data/nereids_tpchPlanShape_p0/shape/q12.out
copy to regression-test/data/nereids_tpch_shape_sf1_p0/shape/q12.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q13.out b/regression-test/data/nereids_tpch_shape_sf1_p0/shape/q13.out
similarity index 100%
copy from regression-test/data/nereids_tpchPlanShape_p0/shape/q13.out
copy to regression-test/data/nereids_tpch_shape_sf1_p0/shape/q13.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q14.out b/regression-test/data/nereids_tpch_shape_sf1_p0/shape/q14.out
similarity index 100%
copy from regression-test/data/nereids_tpchPlanShape_p0/shape/q14.out
copy to regression-test/data/nereids_tpch_shape_sf1_p0/shape/q14.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q15.out b/regression-test/data/nereids_tpch_shape_sf1_p0/shape/q15.out
similarity index 100%
copy from regression-test/data/nereids_tpchPlanShape_p0/shape/q15.out
copy to regression-test/data/nereids_tpch_shape_sf1_p0/shape/q15.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q16.out b/regression-test/data/nereids_tpch_shape_sf1_p0/shape/q16.out
similarity index 100%
copy from regression-test/data/nereids_tpchPlanShape_p0/shape/q16.out
copy to regression-test/data/nereids_tpch_shape_sf1_p0/shape/q16.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q17.out b/regression-test/data/nereids_tpch_shape_sf1_p0/shape/q17.out
similarity index 100%
copy from regression-test/data/nereids_tpchPlanShape_p0/shape/q17.out
copy to regression-test/data/nereids_tpch_shape_sf1_p0/shape/q17.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q18.out b/regression-test/data/nereids_tpch_shape_sf1_p0/shape/q18.out
similarity index 100%
copy from regression-test/data/nereids_tpchPlanShape_p0/shape/q18.out
copy to regression-test/data/nereids_tpch_shape_sf1_p0/shape/q18.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q19.out b/regression-test/data/nereids_tpch_shape_sf1_p0/shape/q19.out
similarity index 100%
rename from regression-test/data/nereids_tpchPlanShape_p0/shape/q19.out
rename to regression-test/data/nereids_tpch_shape_sf1_p0/shape/q19.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q2.out b/regression-test/data/nereids_tpch_shape_sf1_p0/shape/q2.out
similarity index 100%
copy from regression-test/data/nereids_tpchPlanShape_p0/shape/q2.out
copy to regression-test/data/nereids_tpch_shape_sf1_p0/shape/q2.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q20.out b/regression-test/data/nereids_tpch_shape_sf1_p0/shape/q20.out
similarity index 100%
copy from regression-test/data/nereids_tpchPlanShape_p0/shape/q20.out
copy to regression-test/data/nereids_tpch_shape_sf1_p0/shape/q20.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q21.out b/regression-test/data/nereids_tpch_shape_sf1_p0/shape/q21.out
similarity index 100%
copy from regression-test/data/nereids_tpchPlanShape_p0/shape/q21.out
copy to regression-test/data/nereids_tpch_shape_sf1_p0/shape/q21.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q22.out b/regression-test/data/nereids_tpch_shape_sf1_p0/shape/q22.out
similarity index 100%
copy from regression-test/data/nereids_tpchPlanShape_p0/shape/q22.out
copy to regression-test/data/nereids_tpch_shape_sf1_p0/shape/q22.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q3.out b/regression-test/data/nereids_tpch_shape_sf1_p0/shape/q3.out
similarity index 100%
copy from regression-test/data/nereids_tpchPlanShape_p0/shape/q3.out
copy to regression-test/data/nereids_tpch_shape_sf1_p0/shape/q3.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q4.out b/regression-test/data/nereids_tpch_shape_sf1_p0/shape/q4.out
similarity index 100%
copy from regression-test/data/nereids_tpchPlanShape_p0/shape/q4.out
copy to regression-test/data/nereids_tpch_shape_sf1_p0/shape/q4.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q5.out b/regression-test/data/nereids_tpch_shape_sf1_p0/shape/q5.out
similarity index 100%
rename from regression-test/data/nereids_tpchPlanShape_p0/shape/q5.out
rename to regression-test/data/nereids_tpch_shape_sf1_p0/shape/q5.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q6.out b/regression-test/data/nereids_tpch_shape_sf1_p0/shape/q6.out
similarity index 100%
copy from regression-test/data/nereids_tpchPlanShape_p0/shape/q6.out
copy to regression-test/data/nereids_tpch_shape_sf1_p0/shape/q6.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q7.out b/regression-test/data/nereids_tpch_shape_sf1_p0/shape/q7.out
similarity index 100%
copy from regression-test/data/nereids_tpchPlanShape_p0/shape/q7.out
copy to regression-test/data/nereids_tpch_shape_sf1_p0/shape/q7.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q8.out b/regression-test/data/nereids_tpch_shape_sf1_p0/shape/q8.out
similarity index 100%
copy from regression-test/data/nereids_tpchPlanShape_p0/shape/q8.out
copy to regression-test/data/nereids_tpch_shape_sf1_p0/shape/q8.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q9.out b/regression-test/data/nereids_tpch_shape_sf1_p0/shape/q9.out
similarity index 100%
rename from regression-test/data/nereids_tpchPlanShape_p0/shape/q9.out
rename to regression-test/data/nereids_tpch_shape_sf1_p0/shape/q9.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q1.out b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q1.out
similarity index 100%
rename from regression-test/data/nereids_tpchPlanShape_p0/shape/q1.out
rename to regression-test/data/nereids_tpch_shape_sf500_p0/shape/q1.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q10.out b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q10.out
similarity index 100%
rename from regression-test/data/nereids_tpchPlanShape_p0/shape/q10.out
rename to regression-test/data/nereids_tpch_shape_sf500_p0/shape/q10.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q11.out b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q11.out
similarity index 100%
rename from regression-test/data/nereids_tpchPlanShape_p0/shape/q11.out
rename to regression-test/data/nereids_tpch_shape_sf500_p0/shape/q11.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q12.out b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q12.out
similarity index 100%
rename from regression-test/data/nereids_tpchPlanShape_p0/shape/q12.out
rename to regression-test/data/nereids_tpch_shape_sf500_p0/shape/q12.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q13.out b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q13.out
similarity index 100%
rename from regression-test/data/nereids_tpchPlanShape_p0/shape/q13.out
rename to regression-test/data/nereids_tpch_shape_sf500_p0/shape/q13.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q14.out b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q14.out
similarity index 100%
rename from regression-test/data/nereids_tpchPlanShape_p0/shape/q14.out
rename to regression-test/data/nereids_tpch_shape_sf500_p0/shape/q14.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q15.out b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q15.out
similarity index 100%
rename from regression-test/data/nereids_tpchPlanShape_p0/shape/q15.out
rename to regression-test/data/nereids_tpch_shape_sf500_p0/shape/q15.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q16.out b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q16.out
similarity index 100%
rename from regression-test/data/nereids_tpchPlanShape_p0/shape/q16.out
rename to regression-test/data/nereids_tpch_shape_sf500_p0/shape/q16.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q17.out b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q17.out
similarity index 100%
rename from regression-test/data/nereids_tpchPlanShape_p0/shape/q17.out
rename to regression-test/data/nereids_tpch_shape_sf500_p0/shape/q17.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q18.out b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q18.out
similarity index 100%
rename from regression-test/data/nereids_tpchPlanShape_p0/shape/q18.out
rename to regression-test/data/nereids_tpch_shape_sf500_p0/shape/q18.out
diff --git a/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q19.out b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q19.out
new file mode 100644
index 0000000000..1b877ad328
--- /dev/null
+++ b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q19.out
@@ -0,0 +1,15 @@
+-- This file is automatically generated. You should know what you did if you want to edit this
+-- !select --
+hashAgg[GLOBAL]
+--PhysicalDistribute
+----hashAgg[LOCAL]
+------PhysicalProject
+--------hashJoin[INNER_JOIN](part.p_partkey = lineitem.l_partkey)((((((part.p_brand = 'Brand#12') AND p_container IN ('SM CASE', 'SM BOX', 'SM PACK', 'SM PKG')) AND ((lineitem.l_quantity >= 1.00) AND (lineitem.l_quantity <= 11.00))) AND (part.p_size <= 5)) OR ((((part.p_brand = 'Brand#23') AND p_container IN ('MED BAG', 'MED BOX', 'MED PKG', 'MED PACK')) AND ((lineitem.l_quantity >= 10.00) AND (lineitem.l_quantity <= 20.00))) AND (part.p_size <= 10))) OR ((((part.p_brand = 'Brand#34') AN [...]
+----------PhysicalProject
+------------filter((lineitem.l_shipinstruct = 'DELIVER IN PERSON')((((lineitem.l_quantity >= 1.00) AND (lineitem.l_quantity <= 11.00)) OR ((lineitem.l_quantity >= 10.00) AND (lineitem.l_quantity <= 20.00))) OR ((lineitem.l_quantity >= 20.00) AND (lineitem.l_quantity <= 30.00)))((lineitem.l_shipmode = 'AIR') OR (lineitem.l_shipmode = 'AIR REG')))
+--------------PhysicalOlapScan[lineitem]
+----------PhysicalDistribute
+------------PhysicalProject
+--------------filter((((((part.p_brand = 'Brand#12') AND p_container IN ('SM CASE', 'SM BOX', 'SM PACK', 'SM PKG')) AND (part.p_size <= 5)) OR (((part.p_brand = 'Brand#23') AND p_container IN ('MED BAG', 'MED BOX', 'MED PKG', 'MED PACK')) AND (part.p_size <= 10))) OR (((part.p_brand = 'Brand#34') AND p_container IN ('LG CASE', 'LG BOX', 'LG PACK', 'LG PKG')) AND (part.p_size <= 15)))(part.p_size >= 1))
+----------------PhysicalOlapScan[part]
+
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q2.out b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q2.out
similarity index 100%
rename from regression-test/data/nereids_tpchPlanShape_p0/shape/q2.out
rename to regression-test/data/nereids_tpch_shape_sf500_p0/shape/q2.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q20.out b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q20.out
similarity index 100%
rename from regression-test/data/nereids_tpchPlanShape_p0/shape/q20.out
rename to regression-test/data/nereids_tpch_shape_sf500_p0/shape/q20.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q21.out b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q21.out
similarity index 100%
rename from regression-test/data/nereids_tpchPlanShape_p0/shape/q21.out
rename to regression-test/data/nereids_tpch_shape_sf500_p0/shape/q21.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q22.out b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q22.out
similarity index 100%
rename from regression-test/data/nereids_tpchPlanShape_p0/shape/q22.out
rename to regression-test/data/nereids_tpch_shape_sf500_p0/shape/q22.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q3.out b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q3.out
similarity index 100%
rename from regression-test/data/nereids_tpchPlanShape_p0/shape/q3.out
rename to regression-test/data/nereids_tpch_shape_sf500_p0/shape/q3.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q4.out b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q4.out
similarity index 100%
rename from regression-test/data/nereids_tpchPlanShape_p0/shape/q4.out
rename to regression-test/data/nereids_tpch_shape_sf500_p0/shape/q4.out
diff --git a/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q5.out b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q5.out
new file mode 100644
index 0000000000..e7bd14a143
--- /dev/null
+++ b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q5.out
@@ -0,0 +1,35 @@
+-- This file is automatically generated. You should know what you did if you want to edit this
+-- !select --
+PhysicalQuickSort
+--PhysicalDistribute
+----PhysicalQuickSort
+------hashAgg[GLOBAL]
+--------PhysicalDistribute
+----------hashAgg[LOCAL]
+------------PhysicalProject
+--------------hashJoin[INNER_JOIN](customer.c_nationkey = supplier.s_nationkey)(customer.c_custkey = orders.o_custkey)
+----------------PhysicalDistribute
+------------------PhysicalProject
+--------------------hashJoin[INNER_JOIN](lineitem.l_suppkey = supplier.s_suppkey)
+----------------------hashJoin[INNER_JOIN](lineitem.l_orderkey = orders.o_orderkey)
+------------------------PhysicalProject
+--------------------------PhysicalOlapScan[lineitem]
+------------------------PhysicalProject
+--------------------------filter((orders.o_orderdate < 1995-01-01)(orders.o_orderdate >= 1994-01-01))
+----------------------------PhysicalOlapScan[orders]
+----------------------PhysicalDistribute
+------------------------PhysicalProject
+--------------------------hashJoin[INNER_JOIN](supplier.s_nationkey = nation.n_nationkey)
+----------------------------PhysicalProject
+------------------------------PhysicalOlapScan[supplier]
+----------------------------PhysicalDistribute
+------------------------------hashJoin[INNER_JOIN](nation.n_regionkey = region.r_regionkey)
+--------------------------------PhysicalProject
+----------------------------------PhysicalOlapScan[nation]
+--------------------------------PhysicalDistribute
+----------------------------------PhysicalProject
+------------------------------------filter((region.r_name = 'ASIA'))
+--------------------------------------PhysicalOlapScan[region]
+----------------PhysicalProject
+------------------PhysicalOlapScan[customer]
+
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q6.out b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q6.out
similarity index 100%
rename from regression-test/data/nereids_tpchPlanShape_p0/shape/q6.out
rename to regression-test/data/nereids_tpch_shape_sf500_p0/shape/q6.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q7.out b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q7.out
similarity index 100%
rename from regression-test/data/nereids_tpchPlanShape_p0/shape/q7.out
rename to regression-test/data/nereids_tpch_shape_sf500_p0/shape/q7.out
diff --git a/regression-test/data/nereids_tpchPlanShape_p0/shape/q8.out b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q8.out
similarity index 100%
rename from regression-test/data/nereids_tpchPlanShape_p0/shape/q8.out
rename to regression-test/data/nereids_tpch_shape_sf500_p0/shape/q8.out
diff --git a/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q9.out b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q9.out
new file mode 100644
index 0000000000..1df33d14e3
--- /dev/null
+++ b/regression-test/data/nereids_tpch_shape_sf500_p0/shape/q9.out
@@ -0,0 +1,35 @@
+-- This file is automatically generated. You should know what you did if you want to edit this
+-- !select --
+PhysicalQuickSort
+--PhysicalDistribute
+----PhysicalQuickSort
+------hashAgg[GLOBAL]
+--------PhysicalDistribute
+----------hashAgg[LOCAL]
+------------PhysicalProject
+--------------hashJoin[INNER_JOIN](partsupp.ps_suppkey = lineitem.l_suppkey)(partsupp.ps_partkey = lineitem.l_partkey)
+----------------PhysicalDistribute
+------------------PhysicalProject
+--------------------hashJoin[INNER_JOIN](orders.o_orderkey = lineitem.l_orderkey)
+----------------------PhysicalProject
+------------------------PhysicalOlapScan[orders]
+----------------------PhysicalProject
+------------------------hashJoin[INNER_JOIN](supplier.s_suppkey = lineitem.l_suppkey)
+--------------------------PhysicalProject
+----------------------------hashJoin[INNER_JOIN](part.p_partkey = lineitem.l_partkey)
+------------------------------PhysicalProject
+--------------------------------PhysicalOlapScan[lineitem]
+------------------------------PhysicalDistribute
+--------------------------------PhysicalProject
+----------------------------------filter((p_name like '%green%'))
+------------------------------------PhysicalOlapScan[part]
+--------------------------PhysicalDistribute
+----------------------------hashJoin[INNER_JOIN](supplier.s_nationkey = nation.n_nationkey)
+------------------------------PhysicalProject
+--------------------------------PhysicalOlapScan[supplier]
+------------------------------PhysicalDistribute
+--------------------------------PhysicalProject
+----------------------------------PhysicalOlapScan[nation]
+----------------PhysicalProject
+------------------PhysicalOlapScan[partsupp]
+
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/load.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/load.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/load.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/load.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q1.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q1.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/shape/q1.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q1.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q10.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q10.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/shape/q10.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q10.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q11.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q11.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/shape/q11.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q11.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q12.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q12.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/shape/q12.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q12.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q13.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q13.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/shape/q13.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q13.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q14.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q14.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/shape/q14.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q14.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q15.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q15.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/shape/q15.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q15.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q16.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q16.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/shape/q16.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q16.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q17.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q17.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/shape/q17.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q17.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q18.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q18.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/shape/q18.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q18.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q19.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q19.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/shape/q19.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q19.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q2.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q2.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/shape/q2.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q2.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q20.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q20.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/shape/q20.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q20.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q21.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q21.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/shape/q21.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q21.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q22.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q22.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/shape/q22.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q22.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q3.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q3.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/shape/q3.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q3.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q4.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q4.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/shape/q4.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q4.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q5.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q5.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/shape/q5.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q5.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q6.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q6.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/shape/q6.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q6.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q7.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q7.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/shape/q7.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q7.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q8.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q8.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/shape/q8.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q8.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q9.groovy b/regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q9.groovy
similarity index 100%
copy from regression-test/suites/nereids_tpchPlanShape_p0/shape/q9.groovy
copy to regression-test/suites/nereids_tpch_shape_sf1_p0/shape/q9.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/load.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/load.groovy
similarity index 70%
rename from regression-test/suites/nereids_tpchPlanShape_p0/load.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/load.groovy
index 1ddd23a60c..7018c40037 100644
--- a/regression-test/suites/nereids_tpchPlanShape_p0/load.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/load.groovy
@@ -222,151 +222,151 @@ suite("load") {
     '''
     
     sql '''
-    alter table lineitem modify column l_receiptdate set stats ('ndv'='2567', 'avg_size'='16', 'max_size'='16', 'num_nulls'='0', 'min_value'='1992-01-04', 'max_value'='1998-12-31', 'row_count'='6001215')
+    alter table lineitem modify column l_receiptdate set stats ('ndv'='2587', 'avg_size'='16', 'max_size'='16', 'num_nulls'='0', 'min_value'='1992-01-03', 'max_value'='1998-12-31', 'row_count'='3000028242')
     '''
     
     sql '''
-    alter table lineitem modify column l_returnflag set stats ('ndv'='3', 'avg_size'='1', 'max_size'='1', 'num_nulls'='0', 'min_value'='A', 'max_value'='R', 'row_count'='6001215');
+    alter table lineitem modify column l_returnflag set stats ('ndv'='3', 'avg_size'='1', 'max_size'='1', 'num_nulls'='0', 'min_value'='A', 'max_value'='R', 'row_count'='3000028242');
     '''
     
     sql '''
-    alter table lineitem modify column l_tax set stats ('ndv'='9', 'avg_size'='16', 'max_size'='16', 'num_nulls'='0', 'min_value'='0', 'max_value'='0.08', 'row_count'='6001215');
+    alter table lineitem modify column l_tax set stats ('ndv'='9', 'avg_size'='16', 'max_size'='16', 'num_nulls'='0', 'min_value'='0', 'max_value'='0.08', 'row_count'='3000028242');
     '''
     
     sql '''
-    alter table lineitem modify column l_shipmode set stats ('ndv'='7', 'avg_size'='4', 'max_size'='7', 'num_nulls'='0', 'min_value'='AIR', 'max_value'='TRUCK', 'row_count'='6001215');
+    alter table lineitem modify column l_shipmode set stats ('ndv'='7', 'avg_size'='4', 'max_size'='7', 'num_nulls'='0', 'min_value'='AIR', 'max_value'='TRUCK', 'row_count'='3000028242');
     '''
     
     sql '''
-    alter table lineitem modify column l_suppkey set stats ('ndv'='9990', 'avg_size'='4', 'max_size'='4', 'num_nulls'='0', 'min_value'='1', 'max_value'='10000', 'row_count'='6001215');
+    alter table lineitem modify column l_suppkey set stats ('ndv'='4995648', 'avg_size'='4', 'max_size'='4', 'num_nulls'='0', 'min_value'='1', 'max_value'='5000000', 'row_count'='3000028242');
     '''
     
     sql '''
-    alter table lineitem modify column l_shipdate set stats ('ndv'='2549', 'avg_size'='16', 'max_size'='16', 'num_nulls'='0', 'min_value'='1992-01-02', 'max_value'='1998-12-01', 'row_count'='6001215');
+    alter table lineitem modify column l_shipdate set stats ('ndv'='2549', 'avg_size'='16', 'max_size'='16', 'num_nulls'='0', 'min_value'='1992-01-02', 'max_value'='1998-12-01', 'row_count'='3000028242');
     '''
     
     sql '''
-    alter table lineitem modify column l_commitdate set stats ('ndv'='2485', 'avg_size'='16', 'max_size'='16', 'num_nulls'='0', 'min_value'='1992-01-31', 'max_value'='1998-10-31', 'row_count'='6001215');
+    alter table lineitem modify column l_commitdate set stats ('ndv'='2485', 'avg_size'='16', 'max_size'='16', 'num_nulls'='0', 'min_value'='1992-01-31', 'max_value'='1998-10-31', 'row_count'='3000028242');
     '''
     
     sql '''
-    alter table lineitem modify column l_partkey set stats ('ndv'='196099', 'avg_size'='4', 'max_size'='4', 'num_nulls'='0', 'min_value'='1', 'max_value'='10000', 'row_count'='6001215');
+    alter table lineitem modify column l_partkey set stats ('ndv'='101686464', 'avg_size'='4', 'max_size'='4', 'num_nulls'='0', 'min_value'='1', 'max_value'='100000000', 'row_count'='3000028242');
     '''
 
     sql '''
-    alter table lineitem modify column l_orderkey set stats ('ndv'='1500000', 'avg_size'='8', 'max_size'='8', 'num_nulls'='0', 'min_value'='1', 'max_value'='10000', 'row_count'='6001215');
+    alter table lineitem modify column l_orderkey set stats ('ndv'='756756416', 'avg_size'='8', 'max_size'='8', 'num_nulls'='0', 'min_value'='1', 'max_value'='3000000000', 'row_count'='3000028242');
     '''
     
     sql '''
-    alter table lineitem modify column l_quantity set stats ('ndv'='50', 'avg_size'='16', 'max_size'='16', 'num_nulls'='0', 'min_value'='1', 'max_value'='10000', 'row_count'='6001215');
+    alter table lineitem modify column l_quantity set stats ('ndv'='50', 'avg_size'='16', 'max_size'='16', 'num_nulls'='0', 'min_value'='1', 'max_value'='50', 'row_count'='3000028242');
     '''
     
     sql '''
-    alter table lineitem modify column l_linestatus set stats ('ndv'='2', 'avg_size'='1', 'max_size'='1', 'num_nulls'='0', 'min_value'='F', 'max_value'='o', 'row_count'='6001215');
+    alter table lineitem modify column l_linestatus set stats ('ndv'='2', 'avg_size'='1', 'max_size'='1', 'num_nulls'='0', 'min_value'='F', 'max_value'='o', 'row_count'='3000028242');
     '''
     
     sql '''
-    alter table lineitem modify column l_comment set stats ('ndv'='4619207', 'avg_size'='26', 'max_size'='43', 'num_nulls'='0', 'min_value'='1', 'max_value'='10000', 'row_count'='6001215');
+    alter table lineitem modify column l_comment set stats ('ndv'='154387840', 'avg_size'='26', 'max_size'='43', 'num_nulls'='0', 'min_value'='1', 'max_value'='10000', 'row_count'='3000028242');
     '''
     
     sql '''
-    alter table lineitem modify column l_extendedprice set stats ('ndv'='929697', 'avg_size'='16', 'max_size'='16', 'num_nulls'='0', 'min_value'='1', 'max_value'='10000', 'row_count'='6001215');
+    alter table lineitem modify column l_extendedprice set stats ('ndv'='3805461', 'avg_size'='16', 'max_size'='16', 'num_nulls'='0', 'min_value'='900', 'max_value'='104949', 'row_count'='3000028242');
     '''
     
     sql '''
-    alter table lineitem modify column l_linenumber set stats ('ndv'='7', 'avg_size'='4', 'max_size'='4', 'num_nulls'='0', 'min_value'='1', 'max_value'='7', 'row_count'='6001215');
+    alter table lineitem modify column l_linenumber set stats ('ndv'='7', 'avg_size'='4', 'max_size'='4', 'num_nulls'='0', 'min_value'='1', 'max_value'='7', 'row_count'='3000028242');
     '''
     
     sql '''
-    alter table lineitem modify column l_discount set stats ('ndv'='11', 'avg_size'='16', 'max_size'='16', 'num_nulls'='0', 'min_value'='0', 'max_value'='0.1', 'row_count'='6001215');
+    alter table lineitem modify column l_discount set stats ('ndv'='11', 'avg_size'='16', 'max_size'='16', 'num_nulls'='0', 'min_value'='0', 'max_value'='0.1', 'row_count'='3000028242');
     '''
     
     sql '''
-    alter table lineitem modify column l_shipinstruct set stats ('ndv'='4', 'avg_size'='12', 'max_size'='17', 'num_nulls'='0', 'min_value'='COLLECT COD', 'max_value'='TAKE BACK RETURN', 'row_count'='6001215');
+    alter table lineitem modify column l_shipinstruct set stats ('ndv'='4', 'avg_size'='12', 'max_size'='17', 'num_nulls'='0', 'min_value'='COLLECT COD', 'max_value'='TAKE BACK RETURN', 'row_count'='3000028242');
     '''
     
     sql '''
-    alter table partsupp modify column ps_suppkey set stats ('ndv'='10009', 'avg_size'='4.0', 'max_size'='4', 'num_nulls'='0', 'min_value'='1', 'max_value'='10000', 'row_count'='800000');
+    alter table partsupp modify column ps_suppkey set stats ('ndv'='4995648', 'avg_size'='4.0', 'max_size'='4', 'num_nulls'='0', 'min_value'='1', 'max_value'='5000000', 'row_count'='400000000');
     '''
     
     sql '''
-    alter table partsupp modify column ps_availqty set stats ('ndv'='10008', 'avg_size'='4.0', 'max_size'='4', 'num_nulls'='0', 'min_value'='1', 'max_value'='9999', 'row_count'='800000');
+    alter table partsupp modify column ps_availqty set stats ('ndv'='10008', 'avg_size'='4.0', 'max_size'='4', 'num_nulls'='0', 'min_value'='1', 'max_value'='9999', 'row_count'='400000000');
     '''
     
     sql '''
-    alter table partsupp modify column ps_comment set stats ('ndv'='794782', 'avg_size'='123.6', 'max_size'='198', 'num_nulls'='0', 'min_value'='Tiresias according to the quiet courts sleep against the ironic', 'max_value'='zzle. unusual decoys detec', 'row_count'='800000');
+    alter table partsupp modify column ps_comment set stats ('ndv'='238546544', 'avg_size'='123.6', 'max_size'='198', 'num_nulls'='0', 'min_value'='Tiresias according to the quiet courts sleep against the ironic', 'max_value'='zzle. unusual decoys detec', 'row_count'='400000000');
     '''
     
     sql '''
-    alter table partsupp modify column ps_partkey set stats ('ndv'='196099', 'avg_size'='4.0', 'max_size'='4', 'num_nulls'='0', 'min_value'='1', 'max_value'='200000', 'row_count'='800000');
+    alter table partsupp modify column ps_partkey set stats ('ndv'='101686464', 'avg_size'='4.0', 'max_size'='4', 'num_nulls'='0', 'min_value'='1', 'max_value'='100000000', 'row_count'='400000000');
     '''
     
     sql '''
-    alter table partsupp modify column ps_supplycost set stats ('ndv'='100274', 'avg_size'='16.0', 'max_size'='16', 'num_nulls'='0', 'min_value'='1', 'max_value'='1000', 'row_count'='800000');
+    alter table partsupp modify column ps_supplycost set stats ('ndv'='100279', 'avg_size'='16.0', 'max_size'='16', 'num_nulls'='0', 'min_value'='1', 'max_value'='1000', 'row_count'='400000000');
     '''
     
     sql '''
-    alter table supplier modify column s_comment set stats ('ndv'='10039', 'avg_size'='62.56950', 'max_size'='100', 'num_nulls'='0', 'min_value'='about the blithely express foxes. bli', 'max_value'='zzle furiously. bold accounts haggle fu', 'row_count'='10000');
+    alter table supplier modify column s_comment set stats ('ndv'='4942827', 'avg_size'='62.56950', 'max_size'='100', 'num_nulls'='0', 'min_value'='about the blithely express foxes. bli', 'max_value'='zzle furiously. bold accounts haggle fu', 'row_count'='5000000');
     '''
     
     sql '''
-    alter table supplier modify column s_phone set stats ('ndv'='10021', 'avg_size'='15.0', 'max_size'='15', 'num_nulls'='0', 'min_value'='10-102-116-6785', 'max_value'='34-998-900-4911', 'row_count'='10000');
+    alter table supplier modify column s_phone set stats ('ndv'='5070193', 'avg_size'='15.0', 'max_size'='15', 'num_nulls'='0', 'min_value'='10-102-116-6785', 'max_value'='34-998-900-4911', 'row_count'='5000000');
     '''
     
     sql '''
-    alter table supplier modify column s_nationkey set stats ('ndv'='25', 'avg_size'='4.0', 'max_size'='4', 'num_nulls'='0', 'min_value'='0', 'max_value'='24', 'row_count'='10000');
+    alter table supplier modify column s_nationkey set stats ('ndv'='25', 'avg_size'='4.0', 'max_size'='4', 'num_nulls'='0', 'min_value'='0', 'max_value'='24', 'row_count'='5000000');
     '''
     
     sql '''
-    alter table supplier modify column s_name set stats ('ndv'='10002', 'avg_size'='18.0', 'max_size'='18', 'num_nulls'='0', 'min_value'='Supplier#000000001', 'max_value'='Supplier#000010000', 'row_count'='10000');
+    alter table supplier modify column s_name set stats ('ndv'='4930031', 'avg_size'='18.0', 'max_size'='18', 'num_nulls'='0', 'min_value'='Supplier#000000001', 'max_value'='Supplier#005000000', 'row_count'='5000000');
     '''
     
     sql '''
-    alter table supplier modify column s_acctbal set stats ('ndv'='9954', 'avg_size'='16.0', 'max_size'='16', 'num_nulls'='0', 'min_value'='-998.22', 'max_value'='9999.72', 'row_count'='10000');
+    alter table supplier modify column s_acctbal set stats ('ndv'='1099069', 'avg_size'='16.0', 'max_size'='16', 'num_nulls'='0', 'min_value'='-998.22', 'max_value'='9999.72', 'row_count'='5000000');
     '''
     
     sql '''
-    alter table supplier modify column s_address set stats ('ndv'='9888', 'avg_size'='24.9771', 'max_size'='40', 'num_nulls'='0', 'min_value'='   9aW1wwnBJJPnCx,n', 'max_value'='zzfDhdtZcvmVzA8rNFU,Yctj1zBN', 'row_count'='10000');
+    alter table supplier modify column s_address set stats ('ndv'='5000000', 'avg_size'='24.9771', 'max_size'='40', 'num_nulls'='0', 'min_value'='   9aW1wwnBJJPnCx,n', 'max_value'='zzfDhdtZcvmVzA8rNFU,Yctj1zBN', 'row_count'='5000000');
     '''
     
     sql '''
-    alter table supplier modify column s_suppkey set stats ('ndv'='10000', 'avg_size'='4.0', 'max_size'='4', 'num_nulls'='0', 'min_value'='1', 'max_value'='10000', 'row_count'='10000');
+    alter table supplier modify column s_suppkey set stats ('ndv'='5000000', 'avg_size'='4.0', 'max_size'='4', 'num_nulls'='0', 'min_value'='1', 'max_value'='5000000', 'row_count'='5000000');
     '''
     
     sql '''
-    alter table part modify column p_partkey set stats ('ndv'='200000', 'avg_size'='4.0', 'max_size'='4', 'num_nulls'='0', 'min_value'='1', 'max_value'='200000', 'row_count'='200000');
+    alter table part modify column p_partkey set stats ('ndv'='101686464', 'avg_size'='4.0', 'max_size'='4', 'num_nulls'='0', 'min_value'='1', 'max_value'='100000000', 'row_count'='100000000');
     '''
     
     sql '''
-    alter table part modify column p_container set stats ('ndv'='40', 'avg_size'='7.57', 'max_size'='10', 'num_nulls'='0', 'min_value'='JUMBO BAG', 'max_value'='WRAP PKG', 'row_count'='200000');
+    alter table part modify column p_container set stats ('ndv'='40', 'avg_size'='7.57', 'max_size'='10', 'num_nulls'='0', 'min_value'='JUMBO BAG', 'max_value'='WRAP PKG', 'row_count'='100000000');
     '''
     
     sql '''
-    alter table part modify column p_name set stats ('ndv'='200000', 'avg_size'='32.0', 'max_size'='50', 'num_nulls'='0', 'min_value'='almond antique blue royal burnished', 'max_value'='yellow white seashell lavender black', 'row_count'='200000');
+    alter table part modify column p_name set stats ('ndv'='98622912', 'avg_size'='32.0', 'max_size'='50', 'num_nulls'='0', 'min_value'='almond antique blue royal burnished', 'max_value'='yellow white seashell lavender black', 'row_count'='100000000');
     '''
     
     sql '''
-    alter table part modify column p_comment set stats ('ndv'='133106', 'avg_size'='13', 'max_size'='22', 'num_nulls'='0', 'min_value'='Tire', 'max_value'='zzle. quickly si', 'row_count'='200000');
+    alter table part modify column p_comment set stats ('ndv'='10190453', 'avg_size'='13', 'max_size'='22', 'num_nulls'='0', 'min_value'='Tire', 'max_value'='zzle. quickly si', 'row_count'='100000000');
     '''
     
     sql '''
-    alter table part modify column p_brand set stats ('ndv'='25', 'avg_size'='22', 'max_size'='22', 'num_nulls'='0', 'min_value'='Brand#11', 'max_value'='Brand#55', 'row_count'='200000');
+    alter table part modify column p_brand set stats ('ndv'='25', 'avg_size'='22', 'max_size'='22', 'num_nulls'='0', 'min_value'='Brand#11', 'max_value'='Brand#55', 'row_count'='100000000');
     '''
     
     sql '''
-    alter table part modify column p_retailprice set stats ('ndv'='21096', 'avg_size'='16.0', 'max_size'='16', 'num_nulls'='0', 'min_value'='901', 'max_value'='2098.99', 'row_count'='200000');
+    alter table part modify column p_retailprice set stats ('ndv'='120904', 'avg_size'='16.0', 'max_size'='16', 'num_nulls'='0', 'min_value'='901', 'max_value'='2098.99', 'row_count'='100000000');
     '''
     
     sql '''
-    alter table part modify column p_type set stats ('ndv'='150', 'avg_size'='20', 'max_size'='25', 'num_nulls'='0', 'min_value'='ECONOMY ANODIZED BRASSe', 'max_value'='STANDARD POLISHED TIN ', 'row_count'='200000');
+    alter table part modify column p_type set stats ('ndv'='150', 'avg_size'='20', 'max_size'='25', 'num_nulls'='0', 'min_value'='ECONOMY ANODIZED BRASSe', 'max_value'='STANDARD POLISHED TIN ', 'row_count'='100000000');
     '''
     
     sql '''
-    alter table part modify column p_size set stats ('ndv'='50', 'avg_size'='4', 'max_size'='4', 'num_nulls'='0', 'min_value'='1', 'max_value'='50', 'row_count'='200000');
+    alter table part modify column p_size set stats ('ndv'='50', 'avg_size'='4', 'max_size'='4', 'num_nulls'='0', 'min_value'='1', 'max_value'='50', 'row_count'='100000000');
     '''
     
     sql '''
-    alter table part modify column p_mfgr set stats ('ndv'='5', 'avg_size'='14', 'max_size'='14', 'num_nulls'='0', 'min_value'='Manufacturer#1', 'max_value'='Manufacturer#5', 'row_count'='200000');
+    alter table part modify column p_mfgr set stats ('ndv'='5', 'avg_size'='14', 'max_size'='14', 'num_nulls'='0', 'min_value'='Manufacturer#1', 'max_value'='Manufacturer#5', 'row_count'='100000000');
     '''
     
     sql '''
@@ -398,70 +398,70 @@ suite("load") {
     '''
     
     sql '''
-    alter table customer modify column c_custkey set stats ('ndv'='150000', 'avg_size'='4', 'max_size'='4', 'num_nulls'='0', 'min_value'='1', 'max_value'='150000', 'row_count'='150000');
+    alter table customer modify column c_custkey set stats ('ndv'='76285424', 'avg_size'='4', 'max_size'='4', 'num_nulls'='0', 'min_value'='1', 'max_value'='75000000', 'row_count'='75000000');
     '''
     
     sql '''
-    alter table customer modify column c_acctbal set stats ('ndv'='142496', 'avg_size'='16', 'max_size'='16', 'num_nulls'='0', 'min_value'='-999.99', 'max_value'='9999.99', 'row_count'='150000');
+    alter table customer modify column c_acctbal set stats ('ndv'='1109296', 'avg_size'='16', 'max_size'='16', 'num_nulls'='0', 'min_value'='-999.99', 'max_value'='9999.99', 'row_count'='75000000');
     '''
     
     sql '''
-    alter table customer modify column c_phone set stats ('ndv'='150000', 'avg_size'='15', 'max_size'='15', 'num_nulls'='0', 'min_value'='10-100-106-1617', 'max_value'='34-999-618-6881', 'row_count'='150000');
+    alter table customer modify column c_phone set stats ('ndv'='75783176', 'avg_size'='15', 'max_size'='15', 'num_nulls'='0', 'min_value'='10-100-106-1617', 'max_value'='34-999-618-6881', 'row_count'='75000000');
     '''
     
     sql '''
-    alter table customer modify column c_mktsegment set stats ('ndv'='5', 'avg_size'='8.9', 'max_size'='10', 'num_nulls'='0', 'min_value'='AUTOMOBILE', 'max_value'='MACHINERY', 'row_count'='150000');
+    alter table customer modify column c_mktsegment set stats ('ndv'='5', 'avg_size'='8.9', 'max_size'='10', 'num_nulls'='0', 'min_value'='AUTOMOBILE', 'max_value'='MACHINERY', 'row_count'='75000000');
     '''
     
     sql '''
-    alter table customer modify column c_address set stats ('ndv'='150000', 'avg_size'='25', 'max_size'='40', 'num_nulls'='0', 'min_value'='   2uZwVhQvwA', 'max_value'='zzxGktzXTMKS1BxZlgQ9nqQ', 'row_count'='150000');
+    alter table customer modify column c_address set stats ('ndv'='75000000', 'avg_size'='25', 'max_size'='40', 'num_nulls'='0', 'min_value'='   2uZwVhQvwA', 'max_value'='zzxGktzXTMKS1BxZlgQ9nqQ', 'row_count'='75000000');
     '''
     
     sql '''
-    alter table customer modify column c_nationkey set stats ('ndv'='25', 'avg_size'='4', 'max_size'='4', 'num_nulls'='0', 'min_value'='0', 'max_value'='24', 'row_count'='150000');
+    alter table customer modify column c_nationkey set stats ('ndv'='25', 'avg_size'='4', 'max_size'='4', 'num_nulls'='0', 'min_value'='0', 'max_value'='24', 'row_count'='75000000');
     '''
     
     sql '''
-    alter table customer modify column c_name set stats ('ndv'='150000', 'avg_size'='25', 'max_size'='25', 'num_nulls'='0', 'min_value'='Customer#000000001', 'max_value'='Customer#000150000', 'row_count'='150000');
+    alter table customer modify column c_name set stats ('ndv'='75889840', 'avg_size'='25', 'max_size'='25', 'num_nulls'='0', 'min_value'='Customer#000000001', 'max_value'='Customer#075000000', 'row_count'='75000000');
     '''
     
     sql '''
-    alter table customer modify column c_comment set stats ('ndv'='150000', 'avg_size'='72', 'max_size'='116', 'num_nulls'='0', 'min_value'=' Tiresias according to the sly', 'max_value'='zzle. blithely regu0', 'row_count'='150000');
+    alter table customer modify column c_comment set stats ('ndv'='66629836', 'avg_size'='72', 'max_size'='116', 'num_nulls'='0', 'min_value'=' Tiresias according to the sly', 'max_value'='zzle. blithely regu0', 'row_count'='75000000');
     '''
     
     sql '''
-    alter table orders modify column o_orderstatus set stats ('ndv'='3', 'avg_size'='1.0', 'max_size'='1', 'num_nulls'='0', 'min_value'='F', 'max_value'='P', 'row_count'='1500000');
+    alter table orders modify column o_orderstatus set stats ('ndv'='3', 'avg_size'='1.0', 'max_size'='1', 'num_nulls'='0', 'min_value'='F', 'max_value'='P', 'row_count'='750000000');
     '''
     
     sql '''
-    alter table orders modify column o_clerk set stats ('ndv'='988', 'avg_size'='15.0', 'max_size'='15', 'num_nulls'='0', 'min_value'='Clerk#000000001', 'max_value'='Clerk#000001000', 'row_count'='1500000');
+    alter table orders modify column o_clerk set stats ('ndv'='508347', 'avg_size'='15.0', 'max_size'='15', 'num_nulls'='0', 'min_value'='Clerk#000000001', 'max_value'='Clerk#000500000', 'row_count'='750000000');
     '''
     
     sql '''
-    alter table orders modify column o_orderdate set stats ('ndv'='2417', 'avg_size'='16.0', 'max_size'='16', 'num_nulls'='0', 'min_value'='1992-01-01', 'max_value'='1998-08-02', 'row_count'='1500000');
+    alter table orders modify column o_orderdate set stats ('ndv'='2428', 'avg_size'='16.0', 'max_size'='16', 'num_nulls'='0', 'min_value'='1992-01-01', 'max_value'='1998-08-02', 'row_count'='750000000');
     '''
     
     sql '''
-    alter table orders modify column o_shippriority set stats ('ndv'='1', 'avg_size'='4.0', 'max_size'='4', 'num_nulls'='0', 'min_value'='0', 'max_value'='0', 'row_count'='1500000');
+    alter table orders modify column o_shippriority set stats ('ndv'='1', 'avg_size'='4.0', 'max_size'='4', 'num_nulls'='0', 'min_value'='0', 'max_value'='0', 'row_count'='750000000');
     '''
     
     sql '''
-    alter table orders modify column o_custkey set stats ('ndv'='99149', 'avg_size'='4.0', 'max_size'='4', 'num_nulls'='0', 'min_value'='1', 'max_value'='149999', 'row_count'='1500000');
+    alter table orders modify column o_custkey set stats ('ndv'='50471848', 'avg_size'='4.0', 'max_size'='4', 'num_nulls'='0', 'min_value'='1', 'max_value'='74999999', 'row_count'='750000000');
     '''
     
     sql '''
-    alter table orders modify column o_totalprice set stats ('ndv'='1462416', 'avg_size'='16.0', 'max_size'='16', 'num_nulls'='0', 'min_value'='857.71', 'max_value'='555285.16', 'row_count'='1500000');
+    alter table orders modify column o_totalprice set stats ('ndv'='1462416', 'avg_size'='16.0', 'max_size'='16', 'num_nulls'='0', 'min_value'='857.71', 'max_value'='555285.16', 'row_count'='750000000');
     '''
     
     sql '''
-    alter table orders modify column o_orderkey set stats ('ndv'='1500000', 'avg_size'='8.0', 'max_size'='8', 'num_nulls'='0', 'min_value'='1', 'max_value'='6000000', 'row_count'='1500000');
+    alter table orders modify column o_orderkey set stats ('ndv'='750000000', 'avg_size'='8.0', 'max_size'='8', 'num_nulls'='0', 'min_value'='1', 'max_value'='3000000000', 'row_count'='750000000');
     '''
     
     sql '''
-    alter table orders modify column o_comment set stats ('ndv'='1465415', 'avg_size'='48.51387', 'max_size'='78', 'num_nulls'='0', 'min_value'='Tiresias about the blithely ironic a', 'max_value'='zzle? furiously ironic instructions among the unusual t ', 'row_count'='1500000');
+    alter table orders modify column o_comment set stats ('ndv'='260882608', 'avg_size'='48.51387', 'max_size'='78', 'num_nulls'='0', 'min_value'='Tiresias about the blithely ironic a', 'max_value'='zzle? furiously ironic instructions among the unusual t ', 'row_count'='750000000');
     '''
     
     sql '''
-    alter table orders modify column o_orderpriority set stats ('ndv'='5', 'avg_size'='8.4', 'max_size'='15', 'num_nulls'='0', 'min_value'='1-URGENT', 'max_value'='5-LOW', 'row_count'='1500000');
+    alter table orders modify column o_orderpriority set stats ('ndv'='5', 'avg_size'='8.4', 'max_size'='15', 'num_nulls'='0', 'min_value'='1-URGENT', 'max_value'='5-LOW', 'row_count'='750000000');
     '''
 }
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q1.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q1.groovy
similarity index 100%
rename from regression-test/suites/nereids_tpchPlanShape_p0/shape/q1.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q1.groovy
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q10.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q10.groovy
similarity index 89%
rename from regression-test/suites/nereids_tpchPlanShape_p0/shape/q10.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q10.groovy
index e7a0ed87a9..8b8d1c8a08 100644
--- a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q10.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q10.groovy
@@ -25,7 +25,10 @@ suite("q10") {
     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
     select 
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q11.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q11.groovy
similarity index 90%
rename from regression-test/suites/nereids_tpchPlanShape_p0/shape/q11.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q11.groovy
index 028c7529aa..90921595ec 100644
--- a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q11.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q11.groovy
@@ -25,7 +25,10 @@ suite("q11") {
     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
     select  
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q12.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q12.groovy
similarity index 90%
rename from regression-test/suites/nereids_tpchPlanShape_p0/shape/q12.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q12.groovy
index 6221ca9c90..da84e2ae06 100644
--- a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q12.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q12.groovy
@@ -25,7 +25,10 @@ suite("q12") {
     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
     select 
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q13.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q13.groovy
similarity index 89%
rename from regression-test/suites/nereids_tpchPlanShape_p0/shape/q13.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q13.groovy
index 460a316b17..b576084dad 100644
--- a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q13.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q13.groovy
@@ -25,7 +25,11 @@ suite("q13") {
     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
     select 
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q14.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q14.groovy
similarity index 89%
rename from regression-test/suites/nereids_tpchPlanShape_p0/shape/q14.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q14.groovy
index c8d28ef6ca..ddbfb307b7 100644
--- a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q14.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q14.groovy
@@ -25,7 +25,10 @@ suite("q14") {
     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
     select 
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q15.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q15.groovy
similarity index 88%
rename from regression-test/suites/nereids_tpchPlanShape_p0/shape/q15.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q15.groovy
index b6888c2cc8..9365f0d2e2 100644
--- a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q15.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q15.groovy
@@ -25,7 +25,10 @@ suite("q15") {
     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
     select 
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q16.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q16.groovy
similarity index 89%
rename from regression-test/suites/nereids_tpchPlanShape_p0/shape/q16.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q16.groovy
index 565cbc8dd2..e7fc3d6a83 100644
--- a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q16.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q16.groovy
@@ -25,7 +25,10 @@ suite("q16") {
     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
     select 
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q17.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q17.groovy
similarity index 88%
rename from regression-test/suites/nereids_tpchPlanShape_p0/shape/q17.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q17.groovy
index bf85f08e54..ab910f33c1 100644
--- a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q17.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q17.groovy
@@ -25,7 +25,10 @@ suite("q17") {
     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
     select
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q18.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q18.groovy
similarity index 90%
rename from regression-test/suites/nereids_tpchPlanShape_p0/shape/q18.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q18.groovy
index 79ab60654d..d7a2e2a142 100644
--- a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q18.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q18.groovy
@@ -25,7 +25,10 @@ suite("q18") {
     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
     select 
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q19.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q19.groovy
similarity index 92%
rename from regression-test/suites/nereids_tpchPlanShape_p0/shape/q19.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q19.groovy
index 41b078eb40..b950ec8fea 100644
--- a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q19.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q19.groovy
@@ -26,7 +26,10 @@ suite("q19") {
     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
         select
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q2.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q2.groovy
similarity index 93%
rename from regression-test/suites/nereids_tpchPlanShape_p0/shape/q2.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q2.groovy
index 8476049746..2e27bfd1f6 100644
--- a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q2.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q2.groovy
@@ -25,6 +25,9 @@ suite("q2") {
     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_tpchPlanShape_p0/shape/q20.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q20.groovy
similarity index 91%
rename from regression-test/suites/nereids_tpchPlanShape_p0/shape/q20.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q20.groovy
index 37c97ffe2f..297dd4cf36 100644
--- a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q20.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q20.groovy
@@ -26,7 +26,10 @@ suite("q20") {
     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
         select 
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q21.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q21.groovy
similarity index 91%
rename from regression-test/suites/nereids_tpchPlanShape_p0/shape/q21.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q21.groovy
index 6a17489bc3..78d0817533 100644
--- a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q21.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q21.groovy
@@ -25,7 +25,10 @@ suite("q21") {
     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
         select
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q22.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q22.groovy
similarity index 91%
rename from regression-test/suites/nereids_tpchPlanShape_p0/shape/q22.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q22.groovy
index 6b9ed6713b..9f9f99afe8 100644
--- a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q22.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q22.groovy
@@ -25,7 +25,10 @@ suite("q22") {
     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
         select 
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q3.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q3.groovy
similarity index 89%
rename from regression-test/suites/nereids_tpchPlanShape_p0/shape/q3.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q3.groovy
index 4fd26f615f..6d99ce30d2 100644
--- a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q3.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q3.groovy
@@ -26,7 +26,10 @@ suite("q3") {
     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
     select  
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q4.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q4.groovy
similarity index 89%
rename from regression-test/suites/nereids_tpchPlanShape_p0/shape/q4.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q4.groovy
index 67e98d6d66..c08531db12 100644
--- a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q4.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q4.groovy
@@ -25,7 +25,10 @@ suite("q4") {
     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
     select  
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q5.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q5.groovy
similarity index 89%
rename from regression-test/suites/nereids_tpchPlanShape_p0/shape/q5.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q5.groovy
index a070bb76fa..7346489d6f 100644
--- a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q5.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q5.groovy
@@ -25,7 +25,10 @@ suite("q5") {
     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
     select 
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q6.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q6.groovy
similarity index 88%
rename from regression-test/suites/nereids_tpchPlanShape_p0/shape/q6.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q6.groovy
index f846b4016a..adc3976561 100644
--- a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q6.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q6.groovy
@@ -25,7 +25,10 @@ suite("q6") {
     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
     select 
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q7.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q7.groovy
similarity index 91%
rename from regression-test/suites/nereids_tpchPlanShape_p0/shape/q7.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q7.groovy
index 54e6eaf404..e21a857f07 100644
--- a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q7.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q7.groovy
@@ -25,7 +25,10 @@ suite("q7") {
     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
     select 
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q8.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q8.groovy
similarity index 91%
rename from regression-test/suites/nereids_tpchPlanShape_p0/shape/q8.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q8.groovy
index 73fbca0524..627bc8b03c 100644
--- a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q8.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q8.groovy
@@ -25,7 +25,10 @@ suite("q8") {
     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
     select 
diff --git a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q9.groovy b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q9.groovy
similarity index 90%
rename from regression-test/suites/nereids_tpchPlanShape_p0/shape/q9.groovy
rename to regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q9.groovy
index 0e38b7bb7b..efb81269df 100644
--- a/regression-test/suites/nereids_tpchPlanShape_p0/shape/q9.groovy
+++ b/regression-test/suites/nereids_tpch_shape_sf500_p0/shape/q9.groovy
@@ -25,6 +25,9 @@ suite("q9") {
     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


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org