fixed join order

englefly · Oct 22, 2024 · d91a2dd · d91a2dd
1 parent 6cf54e2
commit d91a2dd
Show file tree

Hide file tree

Showing 18 changed files with 114 additions and 106 deletions.
diff --git a/regression-test/data/nereids_rules_p0/eager_aggregate/basic.out b/regression-test/data/nereids_rules_p0/eager_aggregate/basic.out
@@ -32,8 +32,8 @@ PhysicalResultSink
 --hashAgg[GLOBAL]
 ----hashAgg[LOCAL]
 ------hashJoin[INNER_JOIN] hashCondition=((a.device_id = b.device_id)) otherCondition=()
---------PhysicalOlapScan[shunt_log_com_dd_library]
 --------PhysicalOlapScan[com_dd_library]
+--------PhysicalOlapScan[shunt_log_com_dd_library]
 
 -- !with_hint_1 --
 PhysicalResultSink
@@ -83,8 +83,8 @@ PhysicalResultSink
 --hashAgg[GLOBAL]
 ----hashAgg[LOCAL]
 ------hashJoin[INNER_JOIN] hashCondition=((a.device_id = b.device_id)) otherCondition=()
---------PhysicalOlapScan[shunt_log_com_dd_library]
 --------PhysicalOlapScan[com_dd_library]
+--------PhysicalOlapScan[shunt_log_com_dd_library]
 
 Hint log:
 Used:

diff --git a/regression-test/data/nereids_rules_p0/eager_aggregate/basic_one_side.out b/regression-test/data/nereids_rules_p0/eager_aggregate/basic_one_side.out
@@ -32,8 +32,8 @@ PhysicalResultSink
 --hashAgg[GLOBAL]
 ----hashAgg[LOCAL]
 ------hashJoin[INNER_JOIN] hashCondition=((a.device_id = b.device_id)) otherCondition=()
---------PhysicalOlapScan[shunt_log_com_dd_library_one_side]
 --------PhysicalOlapScan[com_dd_library_one_side]
+--------PhysicalOlapScan[shunt_log_com_dd_library_one_side]
 
 -- !with_hint_1 --
 PhysicalResultSink
@@ -83,8 +83,8 @@ PhysicalResultSink
 --hashAgg[GLOBAL]
 ----hashAgg[LOCAL]
 ------hashJoin[INNER_JOIN] hashCondition=((a.device_id = b.device_id)) otherCondition=()
---------PhysicalOlapScan[shunt_log_com_dd_library_one_side]
 --------PhysicalOlapScan[com_dd_library_one_side]
+--------PhysicalOlapScan[shunt_log_com_dd_library_one_side]
 
 Hint log:
 Used:

diff --git a/regression-test/data/nereids_rules_p0/eager_aggregate/push_down_count_through_join.out b/regression-test/data/nereids_rules_p0/eager_aggregate/push_down_count_through_join.out
@@ -68,9 +68,9 @@ PhysicalResultSink
 --hashAgg[GLOBAL]
 ----hashAgg[LOCAL]
 ------hashJoin[INNER_JOIN] hashCondition=((t1.id = t2.id)) otherCondition=()
---------PhysicalOlapScan[count_t]
 --------filter((count_t.score > 10))
 ----------PhysicalOlapScan[count_t]
+--------PhysicalOlapScan[count_t]
 
 -- !groupby_pushdown_outer_join --
 PhysicalResultSink
@@ -85,9 +85,9 @@ PhysicalResultSink
 --hashAgg[GLOBAL]
 ----hashAgg[LOCAL]
 ------hashJoin[INNER_JOIN] hashCondition=((t1.id = t2.id)) otherCondition=()
---------PhysicalOlapScan[count_t]
 --------filter((count_t.score > 10))
 ----------PhysicalOlapScan[count_t]
+--------PhysicalOlapScan[count_t]
 
 -- !groupby_pushdown_having --
 PhysicalResultSink
@@ -163,9 +163,9 @@ PhysicalResultSink
 --hashAgg[GLOBAL]
 ----hashAgg[LOCAL]
 ------hashJoin[INNER_JOIN] hashCondition=((t1.id = t2.id)) otherCondition=()
---------PhysicalOlapScan[count_t]
 --------filter((t1.score > 50))
 ----------PhysicalOlapScan[count_t]
+--------PhysicalOlapScan[count_t]
 
 -- !groupby_pushdown_varied_aggregates --
 PhysicalResultSink
@@ -214,10 +214,10 @@ PhysicalResultSink
 --hashAgg[GLOBAL]
 ----hashAgg[LOCAL]
 ------hashJoin[INNER_JOIN] hashCondition=((t1.id = t2.id)) otherCondition=()
---------filter((count_t.id < 100))
-----------PhysicalOlapScan[count_t]
 --------filter((count_t.score > 20) and (t1.id < 100))
 ----------PhysicalOlapScan[count_t]
+--------filter((count_t.id < 100))
+----------PhysicalOlapScan[count_t]
 
 -- !groupby_pushdown_basic --
 PhysicalResultSink
@@ -288,9 +288,9 @@ PhysicalResultSink
 --hashAgg[GLOBAL]
 ----hashAgg[LOCAL]
 ------hashJoin[INNER_JOIN] hashCondition=((t1.id = t2.id)) otherCondition=()
---------PhysicalOlapScan[count_t]
 --------filter((count_t.score > 10))
 ----------PhysicalOlapScan[count_t]
+--------PhysicalOlapScan[count_t]
 
 -- !groupby_pushdown_outer_join --
 PhysicalResultSink
@@ -305,9 +305,9 @@ PhysicalResultSink
 --hashAgg[GLOBAL]
 ----hashAgg[LOCAL]
 ------hashJoin[INNER_JOIN] hashCondition=((t1.id = t2.id)) otherCondition=()
---------PhysicalOlapScan[count_t]
 --------filter((count_t.score > 10))
 ----------PhysicalOlapScan[count_t]
+--------PhysicalOlapScan[count_t]
 
 -- !groupby_pushdown_having --
 PhysicalResultSink
@@ -359,9 +359,9 @@ PhysicalResultSink
 --hashAgg[GLOBAL]
 ----hashAgg[LOCAL]
 ------hashJoin[INNER_JOIN] hashCondition=((t1.id = t2.id)) otherCondition=()
---------PhysicalOlapScan[count_t]
 --------filter((t1.score > 50))
 ----------PhysicalOlapScan[count_t]
+--------PhysicalOlapScan[count_t]
 
 -- !groupby_pushdown_varied_aggregates --
 PhysicalResultSink
@@ -394,10 +394,10 @@ PhysicalResultSink
 --hashAgg[GLOBAL]
 ----hashAgg[LOCAL]
 ------hashJoin[INNER_JOIN] hashCondition=((t1.id = t2.id)) otherCondition=()
---------filter((count_t.id < 100))
-----------PhysicalOlapScan[count_t]
 --------filter((count_t.score > 20) and (t1.id < 100))
 ----------PhysicalOlapScan[count_t]
+--------filter((count_t.id < 100))
+----------PhysicalOlapScan[count_t]
 
 -- !with_hint_groupby_pushdown_basic --
 PhysicalResultSink
@@ -508,9 +508,9 @@ PhysicalResultSink
 --hashAgg[GLOBAL]
 ----hashAgg[LOCAL]
 ------hashJoin[INNER_JOIN] hashCondition=((t1.id = t2.id)) otherCondition=()
---------PhysicalOlapScan[count_t]
 --------filter((count_t.score > 10))
 ----------PhysicalOlapScan[count_t]
+--------PhysicalOlapScan[count_t]
 
 Hint log:
 Used:
@@ -535,9 +535,9 @@ PhysicalResultSink
 --hashAgg[GLOBAL]
 ----hashAgg[LOCAL]
 ------hashJoin[INNER_JOIN] hashCondition=((t1.id = t2.id)) otherCondition=()
---------PhysicalOlapScan[count_t]
 --------filter((count_t.score > 10))
 ----------PhysicalOlapScan[count_t]
+--------PhysicalOlapScan[count_t]
 
 Hint log:
 Used:
@@ -658,9 +658,9 @@ PhysicalResultSink
 --hashAgg[GLOBAL]
 ----hashAgg[LOCAL]
 ------hashJoin[INNER_JOIN] hashCondition=((t1.id = t2.id)) otherCondition=()
---------PhysicalOlapScan[count_t]
 --------filter((t1.score > 50))
 ----------PhysicalOlapScan[count_t]
+--------PhysicalOlapScan[count_t]
 
 Hint log:
 Used:
@@ -739,10 +739,10 @@ PhysicalResultSink
 --hashAgg[GLOBAL]
 ----hashAgg[LOCAL]
 ------hashJoin[INNER_JOIN] hashCondition=((t1.id = t2.id)) otherCondition=()
---------filter((count_t.id < 100))
-----------PhysicalOlapScan[count_t]
 --------filter((count_t.score > 20) and (t1.id < 100))
 ----------PhysicalOlapScan[count_t]
+--------filter((count_t.id < 100))
+----------PhysicalOlapScan[count_t]
 
 Hint log:
 Used:
@@ -858,9 +858,9 @@ PhysicalResultSink
 --hashAgg[GLOBAL]
 ----hashAgg[LOCAL]
 ------hashJoin[INNER_JOIN] hashCondition=((t1.id = t2.id)) otherCondition=()
---------PhysicalOlapScan[count_t]
 --------filter((count_t.score > 10))
 ----------PhysicalOlapScan[count_t]
+--------PhysicalOlapScan[count_t]
 
 Hint log:
 Used:
@@ -885,9 +885,9 @@ PhysicalResultSink
 --hashAgg[GLOBAL]
 ----hashAgg[LOCAL]
 ------hashJoin[INNER_JOIN] hashCondition=((t1.id = t2.id)) otherCondition=()
---------PhysicalOlapScan[count_t]
 --------filter((count_t.score > 10))
 ----------PhysicalOlapScan[count_t]
+--------PhysicalOlapScan[count_t]
 
 Hint log:
 Used:
@@ -969,9 +969,9 @@ PhysicalResultSink
 --hashAgg[GLOBAL]
 ----hashAgg[LOCAL]
 ------hashJoin[INNER_JOIN] hashCondition=((t1.id = t2.id)) otherCondition=()
---------PhysicalOlapScan[count_t]
 --------filter((t1.score > 50))
 ----------PhysicalOlapScan[count_t]
+--------PhysicalOlapScan[count_t]
 
 Hint log:
 Used:
@@ -1024,10 +1024,10 @@ PhysicalResultSink
 --hashAgg[GLOBAL]
 ----hashAgg[LOCAL]
 ------hashJoin[INNER_JOIN] hashCondition=((t1.id = t2.id)) otherCondition=()
---------filter((count_t.id < 100))
-----------PhysicalOlapScan[count_t]
 --------filter((count_t.score > 20) and (t1.id < 100))
 ----------PhysicalOlapScan[count_t]
+--------filter((count_t.id < 100))
+----------PhysicalOlapScan[count_t]
 
 Hint log:
 Used: