chang order_push_down and push_down_top_n_through_union test

xiedeyantu · Jun 27, 2024 · 3ed1e08 · 3ed1e08
1 parent e867332
commit 3ed1e08
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 85 deletions.
diff --git a/regression-test/data/nereids_rules_p0/limit_push_down/order_push_down.out b/regression-test/data/nereids_rules_p0/limit_push_down/order_push_down.out
@@ -75,13 +75,12 @@ PhysicalResultSink
 
 -- !cross_join_order --
 PhysicalResultSink
---PhysicalTopN[MERGE_SORT]
-----PhysicalTopN[LOCAL_SORT]
-------NestedLoopJoin[CROSS_JOIN]
---------PhysicalTopN[MERGE_SORT]
-----------PhysicalTopN[LOCAL_SORT]
-------------PhysicalOlapScan[t1]
---------PhysicalOlapScan[t2]
+--PhysicalTopN[GATHER_SORT]
+----NestedLoopJoin[CROSS_JOIN]
+------PhysicalTopN[MERGE_SORT]
+--------PhysicalTopN[LOCAL_SORT]
+----------PhysicalOlapScan[t1]
+------PhysicalOlapScan[t2]
 
 -- !limit_offset_sort_join --
 PhysicalResultSink
@@ -172,12 +171,11 @@ PhysicalResultSink
 
 -- !limit_sort_window --
 PhysicalResultSink
---PhysicalTopN[MERGE_SORT]
-----PhysicalTopN[LOCAL_SORT]
-------PhysicalWindow
---------PhysicalQuickSort[MERGE_SORT]
-----------PhysicalQuickSort[LOCAL_SORT]
-------------PhysicalOlapScan[t1]
+--PhysicalTopN[GATHER_SORT]
+----PhysicalWindow
+------PhysicalQuickSort[MERGE_SORT]
+--------PhysicalQuickSort[LOCAL_SORT]
+----------PhysicalOlapScan[t1]
 
 -- !limit_offset_window --
 PhysicalResultSink
@@ -191,12 +189,11 @@ PhysicalResultSink
 
 -- !limit_offset_sort_window --
 PhysicalResultSink
---PhysicalTopN[MERGE_SORT]
-----PhysicalTopN[LOCAL_SORT]
-------PhysicalWindow
---------PhysicalQuickSort[MERGE_SORT]
-----------PhysicalQuickSort[LOCAL_SORT]
-------------PhysicalOlapScan[t1]
+--PhysicalTopN[GATHER_SORT]
+----PhysicalWindow
+------PhysicalQuickSort[MERGE_SORT]
+--------PhysicalQuickSort[LOCAL_SORT]
+----------PhysicalOlapScan[t1]
 
 -- !limit_sort_filter --
 PhysicalResultSink
@@ -264,21 +261,19 @@ PhysicalResultSink
 
 -- !limit_window --
 PhysicalResultSink
---PhysicalTopN[MERGE_SORT]
-----PhysicalTopN[LOCAL_SORT]
-------PhysicalWindow
---------PhysicalQuickSort[MERGE_SORT]
-----------PhysicalQuickSort[LOCAL_SORT]
-------------PhysicalOlapScan[t1]
+--PhysicalTopN[GATHER_SORT]
+----PhysicalWindow
+------PhysicalQuickSort[MERGE_SORT]
+--------PhysicalQuickSort[LOCAL_SORT]
+----------PhysicalOlapScan[t1]
 
 -- !limit_offset_window --
 PhysicalResultSink
---PhysicalTopN[MERGE_SORT]
-----PhysicalTopN[LOCAL_SORT]
-------PhysicalWindow
---------PhysicalQuickSort[MERGE_SORT]
-----------PhysicalQuickSort[LOCAL_SORT]
-------------PhysicalOlapScan[t1]
+--PhysicalTopN[GATHER_SORT]
+----PhysicalWindow
+------PhysicalQuickSort[MERGE_SORT]
+--------PhysicalQuickSort[LOCAL_SORT]
+----------PhysicalOlapScan[t1]
 
 -- !limit_filter --
 PhysicalResultSink
@@ -334,12 +329,11 @@ PhysicalResultSink
 
 -- !limit_subquery_window --
 PhysicalResultSink
---PhysicalTopN[MERGE_SORT]
-----PhysicalTopN[LOCAL_SORT]
-------PhysicalWindow
---------PhysicalQuickSort[MERGE_SORT]
-----------PhysicalQuickSort[LOCAL_SORT]
-------------PhysicalOlapScan[t1]
+--PhysicalTopN[GATHER_SORT]
+----PhysicalWindow
+------PhysicalQuickSort[MERGE_SORT]
+--------PhysicalQuickSort[LOCAL_SORT]
+----------PhysicalOlapScan[t1]
 
 -- !limit_nested_subquery --
 PhysicalResultSink
@@ -384,18 +378,16 @@ PhysicalResultSink
 --PhysicalTopN[MERGE_SORT]
 ----PhysicalTopN[LOCAL_SORT]
 ------PhysicalUnion
---------PhysicalTopN[MERGE_SORT]
-----------PhysicalTopN[LOCAL_SORT]
-------------PhysicalWindow
---------------PhysicalQuickSort[MERGE_SORT]
-----------------PhysicalQuickSort[LOCAL_SORT]
-------------------PhysicalOlapScan[t1]
---------PhysicalTopN[MERGE_SORT]
-----------PhysicalTopN[LOCAL_SORT]
-------------PhysicalWindow
---------------PhysicalQuickSort[MERGE_SORT]
-----------------PhysicalQuickSort[LOCAL_SORT]
-------------------PhysicalOlapScan[t2]
+--------PhysicalTopN[GATHER_SORT]
+----------PhysicalWindow
+------------PhysicalQuickSort[MERGE_SORT]
+--------------PhysicalQuickSort[LOCAL_SORT]
+----------------PhysicalOlapScan[t1]
+--------PhysicalTopN[GATHER_SORT]
+----------PhysicalWindow
+------------PhysicalQuickSort[MERGE_SORT]
+--------------PhysicalQuickSort[LOCAL_SORT]
+----------------PhysicalOlapScan[t2]
 
 -- !limit_subquery_join_filter --
 PhysicalResultSink
@@ -533,12 +525,11 @@ PhysicalCteAnchor ( cteId=CTEId#0 )
 ----filter((t1.id < 10))
 ------PhysicalOlapScan[t1]
 --PhysicalResultSink
-----PhysicalTopN[MERGE_SORT]
-------PhysicalTopN[LOCAL_SORT]
---------PhysicalWindow
-----------PhysicalQuickSort[MERGE_SORT]
-------------PhysicalQuickSort[LOCAL_SORT]
---------------PhysicalCteConsumer ( cteId=CTEId#0 )
+----PhysicalTopN[GATHER_SORT]
+------PhysicalWindow
+--------PhysicalQuickSort[MERGE_SORT]
+----------PhysicalQuickSort[LOCAL_SORT]
+------------PhysicalCteConsumer ( cteId=CTEId#0 )
 
 -- !limit_project_filter --
 PhysicalResultSink
@@ -567,12 +558,11 @@ PhysicalResultSink
 
 -- !limit_subquery_window --
 PhysicalResultSink
---PhysicalTopN[MERGE_SORT]
-----PhysicalTopN[LOCAL_SORT]
-------PhysicalWindow
---------PhysicalQuickSort[MERGE_SORT]
-----------PhysicalQuickSort[LOCAL_SORT]
-------------PhysicalOlapScan[t1]
+--PhysicalTopN[GATHER_SORT]
+----PhysicalWindow
+------PhysicalQuickSort[MERGE_SORT]
+--------PhysicalQuickSort[LOCAL_SORT]
+----------PhysicalOlapScan[t1]
 
 -- !limit_nested_subquery --
 PhysicalResultSink
@@ -589,13 +579,12 @@ PhysicalResultSink
 
 -- !limit_cross_join --
 PhysicalResultSink
---PhysicalTopN[MERGE_SORT]
-----PhysicalTopN[LOCAL_SORT]
-------NestedLoopJoin[CROSS_JOIN]
---------PhysicalTopN[MERGE_SORT]
-----------PhysicalTopN[LOCAL_SORT]
-------------PhysicalOlapScan[t1]
---------PhysicalOlapScan[t2]
+--PhysicalTopN[GATHER_SORT]
+----NestedLoopJoin[CROSS_JOIN]
+------PhysicalTopN[MERGE_SORT]
+--------PhysicalTopN[LOCAL_SORT]
+----------PhysicalOlapScan[t1]
+------PhysicalOlapScan[t2]
 
 -- !limit_multiple_left_outer_join --
 PhysicalResultSink
@@ -633,13 +622,12 @@ PhysicalResultSink
 
 -- !limit_subquery_cross_join --
 PhysicalResultSink
---PhysicalTopN[MERGE_SORT]
-----PhysicalTopN[LOCAL_SORT]
-------NestedLoopJoin[CROSS_JOIN]
---------PhysicalTopN[MERGE_SORT]
-----------PhysicalTopN[LOCAL_SORT]
-------------PhysicalOlapScan[t1]
---------PhysicalOlapScan[t2]
+--PhysicalTopN[GATHER_SORT]
+----NestedLoopJoin[CROSS_JOIN]
+------PhysicalTopN[MERGE_SORT]
+--------PhysicalTopN[LOCAL_SORT]
+----------PhysicalOlapScan[t1]
+------PhysicalOlapScan[t2]
 
 -- !limit_subquery_multiple_join --
 PhysicalResultSink

diff --git a/regression-test/data/nereids_rules_p0/push_down_top_n/push_down_top_n_through_union.out b/regression-test/data/nereids_rules_p0/push_down_top_n/push_down_top_n_through_union.out
@@ -106,16 +106,14 @@ PhysicalResultSink
 --PhysicalTopN[MERGE_SORT]
 ----PhysicalTopN[LOCAL_SORT]
 ------PhysicalUnion
---------PhysicalTopN[MERGE_SORT]
-----------PhysicalTopN[LOCAL_SORT]
-------------PhysicalLimit[GLOBAL]
---------------PhysicalLimit[LOCAL]
-----------------PhysicalOlapScan[table1]
---------PhysicalTopN[MERGE_SORT]
-----------PhysicalTopN[LOCAL_SORT]
-------------PhysicalLimit[GLOBAL]
---------------PhysicalLimit[LOCAL]
-----------------PhysicalOlapScan[table1]
+--------PhysicalTopN[GATHER_SORT]
+----------PhysicalLimit[GLOBAL]
+------------PhysicalLimit[LOCAL]
+--------------PhysicalOlapScan[table1]
+--------PhysicalTopN[GATHER_SORT]
+----------PhysicalLimit[GLOBAL]
+------------PhysicalLimit[LOCAL]
+--------------PhysicalOlapScan[table1]
 
 -- !push_down_topn_union_complex_conditions --
 PhysicalResultSink