diff --git a/regression-test/data/nereids_tpch_shape_sf1000_p0/shape/q21.out b/regression-test/data/nereids_tpch_shape_sf1000_p0/shape/q21.out
index 1e26a0f353..1ebbb4a839 100644
--- a/regression-test/data/nereids_tpch_shape_sf1000_p0/shape/q21.out
+++ b/regression-test/data/nereids_tpch_shape_sf1000_p0/shape/q21.out
@@ -3,30 +3,31 @@
 PhysicalTopN
 --PhysicalDistribute
 ----PhysicalTopN
-------hashAgg[LOCAL]
+------hashAgg[GLOBAL]
 --------PhysicalDistribute
-----------PhysicalProject
-------------hashJoin[RIGHT_SEMI_JOIN](l2.l_orderkey = l1.l_orderkey)( not (l_suppkey = l_suppkey))
---------------PhysicalProject
-----------------PhysicalOlapScan[lineitem]
---------------hashJoin[INNER_JOIN](orders.o_orderkey = l1.l_orderkey)
+----------hashAgg[LOCAL]
+------------PhysicalProject
+--------------hashJoin[RIGHT_SEMI_JOIN](l2.l_orderkey = l1.l_orderkey)( not (l_suppkey = l_suppkey))
 ----------------PhysicalProject
-------------------filter((orders.o_orderstatus = 'F'))
---------------------PhysicalOlapScan[orders]
-----------------hashJoin[RIGHT_ANTI_JOIN](l3.l_orderkey = l1.l_orderkey)( not (l_suppkey = l_suppkey))
+------------------PhysicalOlapScan[lineitem]
+----------------hashJoin[INNER_JOIN](orders.o_orderkey = l1.l_orderkey)
 ------------------PhysicalProject
---------------------filter((l3.l_receiptdate > l3.l_commitdate))
-----------------------PhysicalOlapScan[lineitem]
-------------------hashJoin[INNER_JOIN](supplier.s_suppkey = l1.l_suppkey)
+--------------------filter((orders.o_orderstatus = 'F'))
+----------------------PhysicalOlapScan[orders]
+------------------hashJoin[RIGHT_ANTI_JOIN](l3.l_orderkey = l1.l_orderkey)( not (l_suppkey = l_suppkey))
 --------------------PhysicalProject
-----------------------filter((l1.l_receiptdate > l1.l_commitdate))
+----------------------filter((l3.l_receiptdate > l3.l_commitdate))
 ------------------------PhysicalOlapScan[lineitem]
---------------------PhysicalDistribute
-----------------------hashJoin[INNER_JOIN](supplier.s_nationkey = nation.n_nationkey)
-------------------------PhysicalProject
---------------------------PhysicalOlapScan[supplier]
-------------------------PhysicalDistribute
+--------------------hashJoin[INNER_JOIN](supplier.s_suppkey = l1.l_suppkey)
+----------------------PhysicalProject
+------------------------filter((l1.l_receiptdate > l1.l_commitdate))
+--------------------------PhysicalOlapScan[lineitem]
+----------------------PhysicalDistribute
+------------------------hashJoin[INNER_JOIN](supplier.s_nationkey = nation.n_nationkey)
 --------------------------PhysicalProject
-----------------------------filter((nation.n_name = 'SAUDI ARABIA'))
-------------------------------PhysicalOlapScan[nation]
+----------------------------PhysicalOlapScan[supplier]
+--------------------------PhysicalDistribute
+----------------------------PhysicalProject
+------------------------------filter((nation.n_name = 'SAUDI ARABIA'))
+--------------------------------PhysicalOlapScan[nation]
 
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 808fdf8a4a..7cf680cd33 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
@@ -78,47 +78,4 @@ suite("q21") {
         s_name
         limit 100;
     """
-    // qt_select """
-    // explain shape plan
-    //     select
-    //             s_name,
-    //             count(*) as numwait
-    //     from
-    //             supplier,
-    //             lineitem l1,
-    //             orders,
-    //             nation
-    //     where
-    //     s_suppkey = l1.l_suppkey
-    //     and o_orderkey = l1.l_orderkey
-    //     and o_orderstatus = 'F'
-    //     and l1.l_receiptdate > l1.l_commitdate
-    //     and exists (
-    //             select
-    //             *
-    //             from
-    //             lineitem l2
-    //             where
-    //             l2.l_orderkey = l1.l_orderkey
-    //             and l2.l_suppkey <> l1.l_suppkey
-    //     )
-    //     and not exists (
-    //             select
-    //             *
-    //             from
-    //             lineitem l3
-    //             where
-    //             l3.l_orderkey = l1.l_orderkey
-    //             and l3.l_suppkey <> l1.l_suppkey
-    //             and l3.l_receiptdate > l3.l_commitdate
-    //     )
-    //     and s_nationkey = n_nationkey
-    //     and n_name = 'SAUDI ARABIA'
-    //     group by
-    //     s_name
-    //     order by
-    //     numwait desc,
-    //     s_name
-    //     limit 100;
-    // """
 }