This is an automated email from the ASF dual-hosted git repository.
dataroaring 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 f8a308fd138 [Fix](Nereids) fix leading with different be instance
number (#36613)
f8a308fd138 is described below
commit f8a308fd138db7dee87540320ae4e87b0ead6f5e
Author: LiBinfeng <46676950+libinfeng...@users.noreply.github.com>
AuthorDate: Fri Jun 21 13:22:27 2024 +0800
[Fix](Nereids) fix leading with different be instance number (#36613)
Problem:
When use different be number to test leading explain shape plan,
physical distribute plan would differ due to different be numbers
Solved:
Disable physical distribute node showing in fix leading cases
---
.../data/nereids_p0/hint/fix_leading.out | 63 +++++++++-------------
.../suites/nereids_p0/hint/fix_leading.groovy | 2 +-
2 files changed, 26 insertions(+), 39 deletions(-)
diff --git a/regression-test/data/nereids_p0/hint/fix_leading.out
b/regression-test/data/nereids_p0/hint/fix_leading.out
index 7acd1523337..372ffad30a3 100644
--- a/regression-test/data/nereids_p0/hint/fix_leading.out
+++ b/regression-test/data/nereids_p0/hint/fix_leading.out
@@ -1,18 +1,14 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
-- !select1 --
PhysicalResultSink
---PhysicalDistribute[DistributionSpecGather]
-----hashJoin[INNER_JOIN] hashCondition=((t1.c1 = t3.c3) and (t1.c1 = t4.c4))
otherCondition=()
-------NestedLoopJoin[CROSS_JOIN]
---------PhysicalOlapScan[t1]
---------PhysicalDistribute[DistributionSpecReplicated]
-----------filter((t2.c2 = t2.c2))
-------------PhysicalOlapScan[t2]
-------PhysicalDistribute[DistributionSpecHash]
---------hashJoin[INNER_JOIN] hashCondition=((t3.c3 = t4.c4)) otherCondition=()
-----------PhysicalOlapScan[t3]
-----------PhysicalDistribute[DistributionSpecHash]
-------------PhysicalOlapScan[t4]
+--hashJoin[INNER_JOIN] hashCondition=((t1.c1 = t3.c3) and (t1.c1 = t4.c4))
otherCondition=()
+----NestedLoopJoin[CROSS_JOIN]
+------PhysicalOlapScan[t1]
+------filter((t2.c2 = t2.c2))
+--------PhysicalOlapScan[t2]
+----hashJoin[INNER_JOIN] hashCondition=((t3.c3 = t4.c4)) otherCondition=()
+------PhysicalOlapScan[t3]
+------PhysicalOlapScan[t4]
Hint log:
Used: leading({ t1 t2 } { t3 t4 } )
@@ -237,14 +233,11 @@ PhysicalResultSink
--hashAgg[GLOBAL]
----hashAgg[LOCAL]
------NestedLoopJoin[RIGHT_OUTER_JOIN](c3 > 500)
---------PhysicalDistribute[DistributionSpecGather]
-----------NestedLoopJoin[LEFT_OUTER_JOIN](c1 < 200)(c1 > 500)
-------------PhysicalOlapScan[t1]
-------------PhysicalDistribute[DistributionSpecReplicated]
---------------filter((t2.c2 > 500))
-----------------PhysicalOlapScan[t2]
---------PhysicalDistribute[DistributionSpecGather]
-----------PhysicalOlapScan[t3]
+--------NestedLoopJoin[LEFT_OUTER_JOIN](c1 < 200)(c1 > 500)
+----------PhysicalOlapScan[t1]
+----------filter((t2.c2 > 500))
+------------PhysicalOlapScan[t2]
+--------PhysicalOlapScan[t3]
Hint log:
Used: leading(t1 t2 t3 )
@@ -254,24 +247,18 @@ SyntaxError:
-- !select6_1 --
PhysicalResultSink
--hashAgg[GLOBAL]
-----PhysicalDistribute[DistributionSpecGather]
-------hashAgg[LOCAL]
---------hashJoin[INNER_JOIN] hashCondition=((t1.c1 = t6.c6)) otherCondition=()
-----------hashJoin[INNER_JOIN] hashCondition=((t1.c1 = t2.c2) and (t1.c1 =
t3.c3) and (t1.c1 = t4.c4) and (t1.c1 = t5.c5)) otherCondition=()
-------------PhysicalOlapScan[t1]
-------------PhysicalDistribute[DistributionSpecHash]
---------------hashJoin[INNER_JOIN] hashCondition=((t2.c2 = t4.c4) and (t2.c2 =
t5.c5) and (t3.c3 = t4.c4) and (t3.c3 = t5.c5)) otherCondition=()
-----------------hashJoin[INNER_JOIN] hashCondition=((t2.c2 = t3.c3))
otherCondition=()
-------------------PhysicalOlapScan[t2]
-------------------PhysicalDistribute[DistributionSpecHash]
---------------------PhysicalOlapScan[t3]
-----------------PhysicalDistribute[DistributionSpecHash]
-------------------hashJoin[INNER_JOIN] hashCondition=((t4.c4 = t5.c5))
otherCondition=()
---------------------PhysicalOlapScan[t4]
---------------------PhysicalDistribute[DistributionSpecHash]
-----------------------PhysicalOlapScan[t5]
-----------PhysicalDistribute[DistributionSpecHash]
-------------PhysicalOlapScan[t6]
+----hashAgg[LOCAL]
+------hashJoin[INNER_JOIN] hashCondition=((t1.c1 = t6.c6)) otherCondition=()
+--------hashJoin[INNER_JOIN] hashCondition=((t1.c1 = t2.c2) and (t1.c1 =
t3.c3) and (t1.c1 = t4.c4) and (t1.c1 = t5.c5)) otherCondition=()
+----------PhysicalOlapScan[t1]
+----------hashJoin[INNER_JOIN] hashCondition=((t2.c2 = t4.c4) and (t2.c2 =
t5.c5) and (t3.c3 = t4.c4) and (t3.c3 = t5.c5)) otherCondition=()
+------------hashJoin[INNER_JOIN] hashCondition=((t2.c2 = t3.c3))
otherCondition=()
+--------------PhysicalOlapScan[t2]
+--------------PhysicalOlapScan[t3]
+------------hashJoin[INNER_JOIN] hashCondition=((t4.c4 = t5.c5))
otherCondition=()
+--------------PhysicalOlapScan[t4]
+--------------PhysicalOlapScan[t5]
+--------PhysicalOlapScan[t6]
Hint log:
Used: leading(t1 { { t2 t3 } { t4 t5 } } t6 )
diff --git a/regression-test/suites/nereids_p0/hint/fix_leading.groovy
b/regression-test/suites/nereids_p0/hint/fix_leading.groovy
index 9229e44a466..7701f49fe6d 100644
--- a/regression-test/suites/nereids_p0/hint/fix_leading.groovy
+++ b/regression-test/suites/nereids_p0/hint/fix_leading.groovy
@@ -30,7 +30,7 @@ suite("fix_leading") {
sql 'set enable_nereids_planner=true'
sql 'set enable_fallback_to_original_planner=false'
sql 'set runtime_filter_mode=OFF'
- sql "set ignore_shape_nodes='PhysicalProject'"
+ sql "set ignore_shape_nodes='PhysicalProject, PhysicalDistribute'"
// create tables
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
