This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new b00b298342b branch-4.1: [fix](test) fix unstable test
agg_strategy_variable #62169 (#62257)
b00b298342b is described below
commit b00b298342b07628ea2461efa9ea4f50409fa108
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Apr 10 12:00:33 2026 +0800
branch-4.1: [fix](test) fix unstable test agg_strategy_variable #62169
(#62257)
Cherry-picked from #62169
Co-authored-by: feiniaofeiafei <[email protected]>
---
.../agg_strategy/test_variables.out | 24 ----------------------
.../agg_strategy/test_variables.groovy | 7 +++++--
2 files changed, 5 insertions(+), 26 deletions(-)
diff --git
a/regression-test/data/nereids_rules_p0/agg_strategy/test_variables.out
b/regression-test/data/nereids_rules_p0/agg_strategy/test_variables.out
index 0a009cc77df..8083afa0bfe 100644
--- a/regression-test/data/nereids_rules_p0/agg_strategy/test_variables.out
+++ b/regression-test/data/nereids_rules_p0/agg_strategy/test_variables.out
@@ -228,27 +228,3 @@ PhysicalCteAnchor ( cteId=CTEId#0 )
----------PhysicalDistribute[DistributionSpecHash]
------------PhysicalCteConsumer ( cteId=CTEId#0 )
--- !agg_phase4_and_multi_distinct_strategy2 --
-PhysicalCteAnchor ( cteId=CTEId#0 )
---PhysicalCteProducer ( cteId=CTEId#0 )
-----PhysicalOlapScan[t_gbykey_10_dstkey_10_1000_id_2]
---PhysicalResultSink
-----PhysicalDistribute[DistributionSpecGather]
-------hashJoin[INNER_JOIN colocated] hashCondition=((gby_key <=> .gby_key))
otherCondition=()
---------hashJoin[INNER_JOIN colocated] hashCondition=((gby_key <=> .gby_key))
otherCondition=()
-----------hashAgg[DISTINCT_GLOBAL]
-------------PhysicalDistribute[DistributionSpecHash]
---------------hashAgg[DISTINCT_LOCAL]
-----------------hashAgg[GLOBAL]
-------------------PhysicalDistribute[DistributionSpecHash]
---------------------PhysicalCteConsumer ( cteId=CTEId#0 )
-----------hashAgg[DISTINCT_GLOBAL]
-------------PhysicalDistribute[DistributionSpecHash]
---------------hashAgg[DISTINCT_LOCAL]
-----------------hashAgg[GLOBAL]
-------------------PhysicalDistribute[DistributionSpecHash]
---------------------PhysicalCteConsumer ( cteId=CTEId#0 )
---------hashAgg[GLOBAL]
-----------PhysicalDistribute[DistributionSpecHash]
-------------PhysicalCteConsumer ( cteId=CTEId#0 )
-
diff --git
a/regression-test/suites/nereids_rules_p0/agg_strategy/test_variables.groovy
b/regression-test/suites/nereids_rules_p0/agg_strategy/test_variables.groovy
index 7e475d292a3..6aa3688ccb4 100644
--- a/regression-test/suites/nereids_rules_p0/agg_strategy/test_variables.groovy
+++ b/regression-test/suites/nereids_rules_p0/agg_strategy/test_variables.groovy
@@ -113,8 +113,11 @@ suite("agg_strategy_variable") {
sql "set agg_phase=4;"
sql "set multi_distinct_strategy=2;"
- qt_agg_phase4_and_multi_distinct_strategy2 """explain shape plan
- select count(distinct dst_key2), count(distinct dst_key1),
max(gby_key),min(gby_key),sum(gby_key),sum0(gby_key),count(gby_key) from
t_gbykey_10_dstkey_10_1000_id_2 group by gby_key;"""
+ explain {
+ sql "shape plan select count(distinct dst_key2), count(distinct
dst_key1), max(gby_key),min(gby_key),sum(gby_key),sum0(gby_key),count(gby_key)
from t_gbykey_10_dstkey_10_1000_id_2 group by gby_key;"
+ contains "PhysicalCteAnchor"
+ contains "DISTINCT_GLOBAL"
+ }
sql "set agg_phase=0;"
sql "set multi_distinct_strategy=0;"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
