fix

englefly · Aug 8, 2024 · fa2413f · fa2413f
1 parent 4e9b443
commit fa2413f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 15 deletions.
diff --git a/regression-test/data/nereids_rules_p0/eager_aggregate/push_down_max_through_join.out b/regression-test/data/nereids_rules_p0/eager_aggregate/push_down_max_through_join.out
@@ -108,12 +108,13 @@ PhysicalResultSink
 
 -- !groupby_pushdown_multi_table_join --
 PhysicalResultSink
---hashAgg[LOCAL]
-----hashJoin[INNER_JOIN] hashCondition=((t1.name = t3.name)) otherCondition=()
-------hashJoin[INNER_JOIN] hashCondition=((t1.id = t2.id)) otherCondition=()
---------PhysicalOlapScan[max_t]
+--hashAgg[GLOBAL]
+----hashAgg[LOCAL]
+------hashJoin[INNER_JOIN] hashCondition=((t1.name = t3.name)) otherCondition=()
+--------hashJoin[INNER_JOIN] hashCondition=((t1.id = t2.id)) otherCondition=()
+----------PhysicalOlapScan[max_t]
+----------PhysicalOlapScan[max_t]
 --------PhysicalOlapScan[max_t]
-------PhysicalOlapScan[max_t]
 
 -- !groupby_pushdown_with_order_by --
 PhysicalResultSink
@@ -392,12 +393,13 @@ SyntaxError:
 
 -- !with_hint_groupby_pushdown_multi_table_join --
 PhysicalResultSink
---hashAgg[LOCAL]
-----hashJoin[INNER_JOIN] hashCondition=((t1.name = t3.name)) otherCondition=()
-------hashJoin[INNER_JOIN] hashCondition=((t1.id = t2.id)) otherCondition=()
---------PhysicalOlapScan[max_t]
+--hashAgg[GLOBAL]
+----hashAgg[LOCAL]
+------hashJoin[INNER_JOIN] hashCondition=((t1.name = t3.name)) otherCondition=()
+--------hashJoin[INNER_JOIN] hashCondition=((t1.id = t2.id)) otherCondition=()
+----------PhysicalOlapScan[max_t]
+----------PhysicalOlapScan[max_t]
 --------PhysicalOlapScan[max_t]
-------PhysicalOlapScan[max_t]
 
 Hint log:
 Used:

diff --git a/regression-test/suites/nereids_rules_p0/eager_aggregate/push_down_count_through_join.groovy b/regression-test/suites/nereids_rules_p0/eager_aggregate/push_down_count_through_join.groovy
@@ -47,7 +47,7 @@ suite("push_down_count_through_join") {
     sql "insert into count_t values (8, null, 'c')"
     sql "insert into count_t values (9, 3, null)"
     sql "insert into count_t values (10, null, null)"
-    sql "analyze table max_t with sync;"
+    sql "analyze table count_t with sync;"
     qt_groupby_pushdown_basic """
         explain shape plan select count(t1.score) from count_t t1, count_t t2 where t1.id = t2.id group by t1.name;
     """

diff --git a/...test/suites/nereids_rules_p0/eager_aggregate/push_down_count_through_join_one_side.groovy b/...test/suites/nereids_rules_p0/eager_aggregate/push_down_count_through_join_one_side.groovy
@@ -48,7 +48,7 @@ suite("push_down_count_through_join_one_side") {
     sql "insert into count_t_one_side values (8, null, 'c')"
     sql "insert into count_t_one_side values (9, 3, null)"
     sql "insert into count_t_one_side values (10, null, null)"
-    sql "analyze table max_t with sync;"
+    sql "analyze table count_t_one_side with sync;"
     qt_groupby_pushdown_basic """
         explain shape plan select count(t1.score) from count_t_one_side t1, count_t_one_side t2 where t1.id = t2.id group by t1.name;
     """

diff --git a/regression-test/suites/nereids_rules_p0/eager_aggregate/push_down_min_through_join.groovy b/regression-test/suites/nereids_rules_p0/eager_aggregate/push_down_min_through_join.groovy
@@ -47,7 +47,7 @@ suite("push_down_min_through_join") {
     sql "insert into min_t values (8, null, 'c')"
     sql "insert into min_t values (9, 3, null)"
     sql "insert into min_t values (10, null, null)"
-    sql "analyze table max_t with sync;"
+    sql "analyze table min_t with sync;"
     qt_groupby_pushdown_basic """
         explain shape plan select min(t1.score) from min_t t1, min_t t2 where t1.id = t2.id group by t1.name;
     """

diff --git a/regression-test/suites/nereids_rules_p0/eager_aggregate/push_down_sum_through_join.groovy b/regression-test/suites/nereids_rules_p0/eager_aggregate/push_down_sum_through_join.groovy
@@ -47,7 +47,7 @@ suite("push_down_sum_through_join") {
     sql "insert into sum_t values (8, null, 'c')"
     sql "insert into sum_t values (9, 3, null)"
     sql "insert into sum_t values (10, null, null)"
-    sql "analyze table max_t with sync;"
+    sql "analyze table sum_t with sync;"
     qt_groupby_pushdown_basic """
         explain shape plan select sum(t1.score) from sum_t t1, sum_t t2 where t1.id = t2.id group by t1.name;
     """

diff --git a/...n-test/suites/nereids_rules_p0/eager_aggregate/push_down_sum_through_join_one_side.groovy b/...n-test/suites/nereids_rules_p0/eager_aggregate/push_down_sum_through_join_one_side.groovy
@@ -47,7 +47,7 @@ suite("push_down_sum_through_join_one_side") {
     sql "insert into sum_t_one_side values (8, null, 'c')"
     sql "insert into sum_t_one_side values (9, 3, null)"
     sql "insert into sum_t_one_side values (10, null, null)"
-    sql "analyze table max_t with sync;"
+    sql "analyze table sum_t_one_side with sync;"
     qt_groupby_pushdown_basic """
         explain shape plan select sum(t1.score) from sum_t_one_side t1, sum_t_one_side t2 where t1.id = t2.id group by t1.name;
     """