This is an automated email from the ASF dual-hosted git repository.
starocean999 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 98b101c2336 [fix](Nereids): add be test number in some tests (#35500)
98b101c2336 is described below
commit 98b101c2336394478adcf5367250c39f5549f2d1
Author: 谢健 <jianx...@gmail.com>
AuthorDate: Thu Jun 6 20:19:26 2024 +0800
[fix](Nereids): add be test number in some tests (#35500)
---
.../push_down_count_through_join_one_side.out | 11 +++++-----
.../eliminate_outer_join/eliminate_outer_join.out | 25 ++++++++++++----------
.../push_down_top_n_distinct_through_join.out | 15 ++++++-------
.../suites/nereids_p0/hint/test_distribute.groovy | 3 ++-
.../push_down_count_through_join_one_side.groovy | 1 +
.../eliminate_gby_key/eliminate_gby_key.groovy | 12 +++++------
.../eliminate_outer_join.groovy | 2 +-
.../push_down_alias_through_join.groovy | 1 +
.../push_down_top_n_distinct_through_join.groovy | 1 +
.../performance_p0/redundant_conjuncts.groovy | 1 +
.../suites/query_p0/join/test_join.groovy | 2 +-
11 files changed, 40 insertions(+), 34 deletions(-)
diff --git
a/regression-test/data/nereids_rules_p0/eager_aggregate/push_down_count_through_join_one_side.out
b/regression-test/data/nereids_rules_p0/eager_aggregate/push_down_count_through_join_one_side.out
index eb7e77a7544..c3132e18112 100644
---
a/regression-test/data/nereids_rules_p0/eager_aggregate/push_down_count_through_join_one_side.out
+++
b/regression-test/data/nereids_rules_p0/eager_aggregate/push_down_count_through_join_one_side.out
@@ -338,13 +338,12 @@ PhysicalResultSink
-- !groupby_pushdown_multi_table_join --
PhysicalResultSink
---hashAgg[GLOBAL]
-----hashAgg[LOCAL]
-------hashJoin[INNER_JOIN] hashCondition=((t1.name = t3.name))
otherCondition=()
---------hashJoin[INNER_JOIN] hashCondition=((t1.id = t2.id)) otherCondition=()
-----------PhysicalOlapScan[count_t_one_side]
-----------PhysicalOlapScan[count_t_one_side]
+--hashAgg[LOCAL]
+----hashJoin[INNER_JOIN] hashCondition=((t1.name = t3.name)) otherCondition=()
+------hashJoin[INNER_JOIN] hashCondition=((t1.id = t2.id)) otherCondition=()
--------PhysicalOlapScan[count_t_one_side]
+--------PhysicalOlapScan[count_t_one_side]
+------PhysicalOlapScan[count_t_one_side]
-- !groupby_pushdown_with_order_by --
PhysicalResultSink
diff --git
a/regression-test/data/nereids_rules_p0/eliminate_outer_join/eliminate_outer_join.out
b/regression-test/data/nereids_rules_p0/eliminate_outer_join/eliminate_outer_join.out
index a0119589c46..c08e68d3c72 100644
---
a/regression-test/data/nereids_rules_p0/eliminate_outer_join/eliminate_outer_join.out
+++
b/regression-test/data/nereids_rules_p0/eliminate_outer_join/eliminate_outer_join.out
@@ -103,11 +103,12 @@ PhysicalResultSink
PhysicalResultSink
--PhysicalDistribute[DistributionSpecGather]
----hashJoin[LEFT_OUTER_JOIN] hashCondition=((t1.id = t3.id)) otherCondition=()
-------hashJoin[RIGHT_OUTER_JOIN] hashCondition=((t1.id = t2.id))
otherCondition=()
---------PhysicalOlapScan[t]
---------filter((t2.score > 10))
+------PhysicalDistribute[DistributionSpecHash]
+--------hashJoin[RIGHT_OUTER_JOIN] hashCondition=((t1.id = t2.id))
otherCondition=()
----------PhysicalOlapScan[t]
-------PhysicalDistribute[DistributionSpecReplicated]
+----------filter((t2.score > 10))
+------------PhysicalOlapScan[t]
+------PhysicalDistribute[DistributionSpecHash]
--------PhysicalOlapScan[t]
-- !left_outer_join_non_null_assertion --
@@ -150,10 +151,11 @@ PhysicalResultSink
--PhysicalDistribute[DistributionSpecGather]
----PhysicalProject
------hashJoin[LEFT_OUTER_JOIN] hashCondition=((expr_cast(score as BIGINT) =
expr_(score + 10))) otherCondition=()
---------PhysicalProject
-----------filter(( not id IS NULL))
-------------PhysicalOlapScan[t]
---------PhysicalDistribute[DistributionSpecReplicated]
+--------PhysicalDistribute[DistributionSpecHash]
+----------PhysicalProject
+------------filter(( not id IS NULL))
+--------------PhysicalOlapScan[t]
+--------PhysicalDistribute[DistributionSpecHash]
----------PhysicalProject
------------PhysicalOlapScan[t]
@@ -251,9 +253,10 @@ PhysicalResultSink
--PhysicalDistribute[DistributionSpecGather]
----PhysicalProject
------hashJoin[INNER_JOIN] hashCondition=((expr_cast(score as BIGINT) =
expr_(score * 2))) otherCondition=((t1.id < t2.id))
---------PhysicalProject
-----------PhysicalOlapScan[t]
---------PhysicalDistribute[DistributionSpecReplicated]
+--------PhysicalDistribute[DistributionSpecHash]
+----------PhysicalProject
+------------PhysicalOlapScan[t]
+--------PhysicalDistribute[DistributionSpecHash]
----------PhysicalProject
------------PhysicalOlapScan[t]
diff --git
a/regression-test/data/nereids_rules_p0/push_down_top_n/push_down_top_n_distinct_through_join.out
b/regression-test/data/nereids_rules_p0/push_down_top_n/push_down_top_n_distinct_through_join.out
index 5c3ec397a99..c71ad908a90 100644
---
a/regression-test/data/nereids_rules_p0/push_down_top_n/push_down_top_n_distinct_through_join.out
+++
b/regression-test/data/nereids_rules_p0/push_down_top_n/push_down_top_n_distinct_through_join.out
@@ -3,14 +3,13 @@
PhysicalResultSink
--PhysicalTopN[MERGE_SORT]
----PhysicalTopN[LOCAL_SORT]
-------hashAgg[GLOBAL]
---------hashAgg[LOCAL]
-----------hashJoin[LEFT_OUTER_JOIN] hashCondition=((t1.id = t2.id))
otherCondition=()
-------------PhysicalTopN[MERGE_SORT]
---------------PhysicalTopN[LOCAL_SORT]
-----------------hashAgg[LOCAL]
-------------------PhysicalOlapScan[table_join]
-------------PhysicalOlapScan[table_join]
+------hashAgg[LOCAL]
+--------hashJoin[LEFT_OUTER_JOIN] hashCondition=((t1.id = t2.id))
otherCondition=()
+----------PhysicalTopN[MERGE_SORT]
+------------PhysicalTopN[LOCAL_SORT]
+--------------hashAgg[LOCAL]
+----------------PhysicalOlapScan[table_join]
+----------PhysicalOlapScan[table_join]
-- !push_down_topn_through_join_data --
0
diff --git a/regression-test/suites/nereids_p0/hint/test_distribute.groovy
b/regression-test/suites/nereids_p0/hint/test_distribute.groovy
index 6ac7faa1ec0..db53a3b4ffd 100644
--- a/regression-test/suites/nereids_p0/hint/test_distribute.groovy
+++ b/regression-test/suites/nereids_p0/hint/test_distribute.groovy
@@ -27,7 +27,8 @@ suite("test_distribute") {
sql 'set enable_nereids_planner=true'
sql 'set enable_fallback_to_original_planner=false'
sql 'set runtime_filter_mode=OFF'
-
+ sql 'set be_number_for_test=1'
+
// create tables
sql """drop table if exists t1;"""
sql """drop table if exists t2;"""
diff --git
a/regression-test/suites/nereids_rules_p0/eager_aggregate/push_down_count_through_join_one_side.groovy
b/regression-test/suites/nereids_rules_p0/eager_aggregate/push_down_count_through_join_one_side.groovy
index 88862874362..aa867cd9118 100644
---
a/regression-test/suites/nereids_rules_p0/eager_aggregate/push_down_count_through_join_one_side.groovy
+++
b/regression-test/suites/nereids_rules_p0/eager_aggregate/push_down_count_through_join_one_side.groovy
@@ -18,6 +18,7 @@
suite("push_down_count_through_join_one_side") {
sql "SET enable_nereids_planner=true"
sql "set runtime_filter_mode=OFF"
+ sql 'set be_number_for_test=3'
sql "SET enable_fallback_to_original_planner=false"
sql "SET ignore_shape_nodes='PhysicalDistribute,PhysicalProject'"
diff --git
a/regression-test/suites/nereids_rules_p0/eliminate_gby_key/eliminate_gby_key.groovy
b/regression-test/suites/nereids_rules_p0/eliminate_gby_key/eliminate_gby_key.groovy
index 0c79a5b6746..9139fea3c9d 100644
---
a/regression-test/suites/nereids_rules_p0/eliminate_gby_key/eliminate_gby_key.groovy
+++
b/regression-test/suites/nereids_rules_p0/eliminate_gby_key/eliminate_gby_key.groovy
@@ -18,7 +18,7 @@
suite("eliminate_gby_key") {
sql "SET ignore_shape_nodes='PhysicalDistribute,PhysicalProject'"
sql "set disable_nereids_rules=PRUNE_EMPTY_PARTITION"
-
+ sql 'set be_number_for_test=3'
sql """DROP TABLE IF EXISTS t1;"""
sql """DROP TABLE IF EXISTS t2;"""
@@ -124,7 +124,7 @@ suite("eliminate_gby_key") {
select cnt
from temp;
""")
- contains("groupByExpr=[c1#13, c3#18], outputExpr=[c1#13, c3#18,
count(*) AS `cnt`#20]")
+ contains("groupByExpr=[c1#13, c3#18], outputExpr=[c1#13, c3#18")
}
explain {
@@ -204,7 +204,7 @@ suite("eliminate_gby_key") {
select t2_c1, cnt
from temp;
""")
- contains("groupByExpr=[c1#13, c3#18], outputExpr=[c1#13, c3#18,
count(*) AS `cnt`#20]")
+ contains("groupByExpr=[c1#13, c3#18], outputExpr=[c1#13, c3#18")
}
explain {
@@ -224,7 +224,7 @@ suite("eliminate_gby_key") {
select c3, cnt
from temp;
""")
- contains("groupByExpr=[c1#13, c3#18], outputExpr=[c1#13, c3#18,
count(*) AS `cnt`#20]")
+ contains("groupByExpr=[c1#13, c3#18], outputExpr=[c1#13, c3#18")
}
explain {
@@ -244,7 +244,7 @@ suite("eliminate_gby_key") {
select t2_c1, c3, cnt
from temp;
""")
- contains("groupByExpr=[c1#13, c3#18], outputExpr=[c1#13, c3#18,
count(*) AS `cnt`#20]")
+ contains("groupByExpr=[c1#13, c3#18], outputExpr=[c1#13, c3#18")
}
explain {
@@ -284,6 +284,6 @@ suite("eliminate_gby_key") {
select t2_c2, c3, t2_c1, cnt
from temp;
""")
- contains("groupByExpr=[t2_c2#19, c1#13, c3#18], outputExpr=[t2_c2#19,
c1#13, c3#18, count(*) AS `cnt`#20]")
+ contains("groupByExpr=[t2_c2#19, c1#13, c3#18], outputExpr=[t2_c2#19,
c1#13, c3#18,")
}
}
diff --git
a/regression-test/suites/nereids_rules_p0/eliminate_outer_join/eliminate_outer_join.groovy
b/regression-test/suites/nereids_rules_p0/eliminate_outer_join/eliminate_outer_join.groovy
index e32c7b7d00e..81492dd7d48 100644
---
a/regression-test/suites/nereids_rules_p0/eliminate_outer_join/eliminate_outer_join.groovy
+++
b/regression-test/suites/nereids_rules_p0/eliminate_outer_join/eliminate_outer_join.groovy
@@ -20,7 +20,7 @@ suite("eliminate_outer_join") {
sql "set runtime_filter_mode=OFF"
sql "SET enable_fallback_to_original_planner=false"
sql "set disable_nereids_rules=PRUNE_EMPTY_PARTITION"
-
+ sql 'set be_number_for_test=3'
sql """
DROP TABLE IF EXISTS t
diff --git
a/regression-test/suites/nereids_rules_p0/filter_push_down/push_down_alias_through_join.groovy
b/regression-test/suites/nereids_rules_p0/filter_push_down/push_down_alias_through_join.groovy
index 9e34c5590b5..021d6056951 100644
---
a/regression-test/suites/nereids_rules_p0/filter_push_down/push_down_alias_through_join.groovy
+++
b/regression-test/suites/nereids_rules_p0/filter_push_down/push_down_alias_through_join.groovy
@@ -18,6 +18,7 @@
suite("push_down_alias_through_join") {
sql "SET enable_nereids_planner=true"
sql "set runtime_filter_mode=OFF"
+ sql 'set be_number_for_test=3'
sql "SET enable_fallback_to_original_planner=false"
sql "use regression_test_nereids_rules_p0"
sql "set disable_join_reorder=true"
diff --git
a/regression-test/suites/nereids_rules_p0/push_down_top_n/push_down_top_n_distinct_through_join.groovy
b/regression-test/suites/nereids_rules_p0/push_down_top_n/push_down_top_n_distinct_through_join.groovy
index 3ee3a916e7b..933fe3400cf 100644
---
a/regression-test/suites/nereids_rules_p0/push_down_top_n/push_down_top_n_distinct_through_join.groovy
+++
b/regression-test/suites/nereids_rules_p0/push_down_top_n/push_down_top_n_distinct_through_join.groovy
@@ -18,6 +18,7 @@
suite("push_down_top_n_distinct_through_join") {
sql "SET enable_nereids_planner=true"
sql "set runtime_filter_mode=OFF"
+ sql 'set be_number_for_test=3'
sql "SET enable_fallback_to_original_planner=false"
sql "SET ignore_shape_nodes='PhysicalDistribute,PhysicalProject'"
sql "SET disable_join_reorder=true"
diff --git a/regression-test/suites/performance_p0/redundant_conjuncts.groovy
b/regression-test/suites/performance_p0/redundant_conjuncts.groovy
index 37093a8c7bd..6f9e223a5f2 100644
--- a/regression-test/suites/performance_p0/redundant_conjuncts.groovy
+++ b/regression-test/suites/performance_p0/redundant_conjuncts.groovy
@@ -17,6 +17,7 @@
suite("redundant_conjuncts") {
sql "set disable_nereids_rules=PRUNE_EMPTY_PARTITION"
+ sql 'set be_number_for_test=1'
sql """
DROP TABLE IF EXISTS redundant_conjuncts;
"""
diff --git a/regression-test/suites/query_p0/join/test_join.groovy
b/regression-test/suites/query_p0/join/test_join.groovy
index cb29ee1933c..e75878cb032 100644
--- a/regression-test/suites/query_p0/join/test_join.groovy
+++ b/regression-test/suites/query_p0/join/test_join.groovy
@@ -17,7 +17,7 @@
suite("test_join", "query,p0") {
sql "set disable_nereids_rules=PRUNE_EMPTY_PARTITION"
-
+ sql 'set be_number_for_test=1'
sql"use test_query_db"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
