diff --git a/regression-test/data/shape_check/tpch_sf1000/hint/q14.out b/regression-test/data/shape_check/tpch_sf1000/hint/q14.out
index 3633709f96fa8a..d92539ff58dce4 100644
--- a/regression-test/data/shape_check/tpch_sf1000/hint/q14.out
+++ b/regression-test/data/shape_check/tpch_sf1000/hint/q14.out
@@ -6,7 +6,7 @@ PhysicalResultSink
 ------PhysicalDistribute[DistributionSpecGather]
 --------hashAgg[LOCAL]
 ----------PhysicalProject
-------------hashJoin[INNER_JOIN broadcast] hashCondition=((lineitem.l_partkey = part.p_partkey)) otherCondition=()
+------------hashJoin[INNER_JOIN bucketShuffle] hashCondition=((lineitem.l_partkey = part.p_partkey)) otherCondition=()
 --------------PhysicalProject
 ----------------PhysicalOlapScan[part]
 --------------PhysicalProject
diff --git a/regression-test/data/shape_check/tpch_sf1000/hint/q15.out b/regression-test/data/shape_check/tpch_sf1000/hint/q15.out
index a88c5e699bd99d..4e525326a19945 100644
--- a/regression-test/data/shape_check/tpch_sf1000/hint/q15.out
+++ b/regression-test/data/shape_check/tpch_sf1000/hint/q15.out
@@ -7,7 +7,7 @@ PhysicalResultSink
 --------PhysicalProject
 ----------hashJoin[INNER_JOIN broadcast] hashCondition=((revenue0.total_revenue = max(total_revenue))) otherCondition=()
 ------------PhysicalProject
---------------hashJoin[INNER_JOIN broadcast] hashCondition=((supplier.s_suppkey = revenue0.supplier_no)) otherCondition=()
+--------------hashJoin[INNER_JOIN bucketShuffle] hashCondition=((supplier.s_suppkey = revenue0.supplier_no)) otherCondition=()
 ----------------PhysicalProject
 ------------------PhysicalOlapScan[supplier]
 ----------------PhysicalProject
diff --git a/regression-test/data/shape_check/tpch_sf1000/hint/q3.out b/regression-test/data/shape_check/tpch_sf1000/hint/q3.out
index a58bf8720464f4..0e310fdb46e2c0 100644
--- a/regression-test/data/shape_check/tpch_sf1000/hint/q3.out
+++ b/regression-test/data/shape_check/tpch_sf1000/hint/q3.out
@@ -6,7 +6,7 @@ PhysicalResultSink
 ------PhysicalTopN[LOCAL_SORT]
 --------hashAgg[LOCAL]
 ----------PhysicalProject
-------------hashJoin[INNER_JOIN broadcast] hashCondition=((lineitem.l_orderkey = orders.o_orderkey)) otherCondition=()
+------------hashJoin[INNER_JOIN bucketShuffle] hashCondition=((lineitem.l_orderkey = orders.o_orderkey)) otherCondition=()
 --------------PhysicalProject
 ----------------filter((lineitem.l_shipdate > '1995-03-15'))
 ------------------PhysicalOlapScan[lineitem]
diff --git a/regression-test/data/shape_check/tpch_sf1000/hint/q7.out b/regression-test/data/shape_check/tpch_sf1000/hint/q7.out
index d9fb0e0791a203..62b5874d806aed 100644
--- a/regression-test/data/shape_check/tpch_sf1000/hint/q7.out
+++ b/regression-test/data/shape_check/tpch_sf1000/hint/q7.out
@@ -8,7 +8,7 @@ PhysicalResultSink
 ----------PhysicalDistribute[DistributionSpecHash]
 ------------hashAgg[LOCAL]
 --------------PhysicalProject
-----------------hashJoin[INNER_JOIN broadcast] hashCondition=((orders.o_orderkey = lineitem.l_orderkey)) otherCondition=(OR[AND[(n1.n_name = 'FRANCE'),(n2.n_name = 'GERMANY')],AND[(n1.n_name = 'GERMANY'),(n2.n_name = 'FRANCE')]])
+----------------hashJoin[INNER_JOIN bucketShuffle] hashCondition=((orders.o_orderkey = lineitem.l_orderkey)) otherCondition=(OR[AND[(n1.n_name = 'FRANCE'),(n2.n_name = 'GERMANY')],AND[(n1.n_name = 'GERMANY'),(n2.n_name = 'FRANCE')]])
 ------------------PhysicalProject
 --------------------hashJoin[INNER_JOIN broadcast] hashCondition=((supplier.s_suppkey = lineitem.l_suppkey)) otherCondition=()
 ----------------------PhysicalProject
diff --git a/regression-test/data/shape_check/tpch_sf1000/hint/q8.out b/regression-test/data/shape_check/tpch_sf1000/hint/q8.out
index 486e40152fb644..7be8c0af45a719 100644
--- a/regression-test/data/shape_check/tpch_sf1000/hint/q8.out
+++ b/regression-test/data/shape_check/tpch_sf1000/hint/q8.out
@@ -11,11 +11,11 @@ PhysicalResultSink
 ----------------PhysicalProject
 ------------------hashJoin[INNER_JOIN broadcast] hashCondition=((supplier.s_nationkey = n2.n_nationkey)) otherCondition=()
 --------------------PhysicalProject
-----------------------hashJoin[INNER_JOIN broadcast] hashCondition=((supplier.s_suppkey = lineitem.l_suppkey)) otherCondition=()
+----------------------hashJoin[INNER_JOIN bucketShuffle] hashCondition=((supplier.s_suppkey = lineitem.l_suppkey)) otherCondition=()
 ------------------------PhysicalProject
 --------------------------PhysicalOlapScan[supplier]
 ------------------------PhysicalProject
---------------------------hashJoin[INNER_JOIN broadcast] hashCondition=((orders.o_custkey = customer.c_custkey)) otherCondition=()
+--------------------------hashJoin[INNER_JOIN shuffle] hashCondition=((orders.o_custkey = customer.c_custkey)) otherCondition=()
 ----------------------------PhysicalProject
 ------------------------------hashJoin[INNER_JOIN colocated] hashCondition=((lineitem.l_orderkey = orders.o_orderkey)) otherCondition=()
 --------------------------------PhysicalProject