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 c2f90e932b2 [fix](test)delete unstable case in agg_strategy (#64023)
c2f90e932b2 is described below

commit c2f90e932b26a5add5beab5cfe885f4a6b83d1c5
Author: feiniaofeiafei <[email protected]>
AuthorDate: Wed Jun 3 11:20:09 2026 +0800

    [fix](test)delete unstable case in agg_strategy (#64023)
    
    ### What problem does this PR solve?
    
    Issue Number: close #xxx
    
    Related PR: #xxx
    
    Problem Summary:
    
    ### Release note
    
    None
    
    ### Check List (For Author)
    
    - Test <!-- At least one of them must be included. -->
        - [ ] Regression test
        - [ ] Unit Test
        - [ ] Manual test (add detailed scripts or steps below)
        - [ ] No need to test or manual test. Explain why:
    - [ ] This is a refactor/code format and no logic has been changed.
            - [ ] Previous test can cover this change.
            - [ ] No code files have been changed.
            - [ ] Other reason <!-- Add your reason?  -->
    
    - Behavior changed:
        - [ ] No.
        - [ ] Yes. <!-- Explain the behavior change -->
    
    - Does this need documentation?
        - [ ] No.
    - [ ] Yes. <!-- Add document PR link here. eg:
    https://github.com/apache/doris-website/pull/1214 -->
    
    ### Check List (For Reviewer who merge this PR)
    
    - [ ] Confirm the release note
    - [ ] Confirm test cases
    - [ ] Confirm document
    - [ ] Add branch pick label <!-- Add branch pick label that this PR
    should merge into -->
---
 .../nereids_rules_p0/agg_strategy/agg_strategy.out | 200 ++++++++-------------
 .../agg_strategy/agg_strategy.groovy               |   2 -
 2 files changed, 78 insertions(+), 124 deletions(-)

diff --git 
a/regression-test/data/nereids_rules_p0/agg_strategy/agg_strategy.out 
b/regression-test/data/nereids_rules_p0/agg_strategy/agg_strategy.out
index 3deb2ff71d4..8115545a6e7 100644
--- a/regression-test/data/nereids_rules_p0/agg_strategy/agg_strategy.out
+++ b/regression-test/data/nereids_rules_p0/agg_strategy/agg_strategy.out
@@ -60,40 +60,40 @@
 1
 
 -- !agg_distinct_with_gby_key_with_other_func --
-1      1       27      27.0
-1      2       76      76.0
-1      3       42      42.0
-1      4       64      64.0
-1      5       18      18.0
-1      6       91      91.0
-1      7       13      13.0
-1      8       33      33.0
-1      9       55      55.0
-1      10      100     100.0
+1      1       27      27
+1      2       76      76
+1      3       42      42
+1      4       64      64
+1      5       18      18
+1      6       91      91
+1      7       13      13
+1      8       33      33
+1      9       55      55
+1      10      100     100
 
 -- !agg_distinct_satisfy_gby_key_with_other_func --
-1      1       42      42.0
-1      2       18      18.0
-1      3       76      76.0
-1      4       33      33.0
-1      5       91      91.0
-1      6       27      27.0
-1      7       64      64.0
-1      8       55      55.0
-1      9       13      13.0
-1      10      100     100.0
+1      1       42      42
+1      2       18      18
+1      3       76      76
+1      4       33      33
+1      5       91      91
+1      6       27      27
+1      7       64      64
+1      8       55      55
+1      9       13      13
+1      10      100     100
 
 -- !agg_distinct_satisfy_dst_key_with_other_func --
-1      13      13.0
-1      18      18.0
-1      27      27.0
-1      33      33.0
-1      42      42.0
-1      55      55.0
-1      64      64.0
-1      76      76.0
-1      91      91.0
-1      100     100.0
+1      13      13
+1      18      18
+1      27      27
+1      33      33
+1      42      42
+1      55      55
+1      64      64
+1      76      76
+1      91      91
+1      100     100
 
 -- !agg_distinct_without_gby_key --
 10
@@ -174,17 +174,6 @@ PhysicalResultSink
 --------hashAgg[GLOBAL]
 ----------PhysicalOlapScan[t_gbykey_10_dstkey_10_1000_id]
 
--- !agg_distinct_satisfy_dst_key_with_other_func --
-PhysicalResultSink
---PhysicalQuickSort[MERGE_SORT]
-----PhysicalDistribute[DistributionSpecGather]
-------PhysicalQuickSort[LOCAL_SORT]
---------hashAgg[DISTINCT_GLOBAL]
-----------PhysicalDistribute[DistributionSpecHash]
-------------hashAgg[DISTINCT_LOCAL]
---------------hashAgg[GLOBAL]
-----------------PhysicalOlapScan[t_gbykey_10_dstkey_10_1000_id]
-
 -- !agg_distinct_without_gby_key --
 PhysicalResultSink
 --hashAgg[DISTINCT_GLOBAL]
@@ -281,40 +270,40 @@ PhysicalResultSink
 1
 
 -- !agg_distinct_with_gby_key_with_other_func --
-1      1       27      27.0
-1      2       76      76.0
-1      3       42      42.0
-1      4       64      64.0
-1      5       18      18.0
-1      6       91      91.0
-1      7       13      13.0
-1      8       33      33.0
-1      9       55      55.0
-1      10      100     100.0
+1      1       27      27
+1      2       76      76
+1      3       42      42
+1      4       64      64
+1      5       18      18
+1      6       91      91
+1      7       13      13
+1      8       33      33
+1      9       55      55
+1      10      100     100
 
 -- !agg_distinct_satisfy_gby_key_with_other_func --
-1      1       42      42.0
-1      2       18      18.0
-1      3       76      76.0
-1      4       33      33.0
-1      5       91      91.0
-1      6       27      27.0
-1      7       64      64.0
-1      8       55      55.0
-1      9       13      13.0
-1      10      100     100.0
+1      1       42      42
+1      2       18      18
+1      3       76      76
+1      4       33      33
+1      5       91      91
+1      6       27      27
+1      7       64      64
+1      8       55      55
+1      9       13      13
+1      10      100     100
 
 -- !agg_distinct_satisfy_dst_key_with_other_func --
-1      13      13.0
-1      18      18.0
-1      27      27.0
-1      33      33.0
-1      42      42.0
-1      55      55.0
-1      64      64.0
-1      76      76.0
-1      91      91.0
-1      100     100.0
+1      13      13
+1      18      18
+1      27      27
+1      33      33
+1      42      42
+1      55      55
+1      64      64
+1      76      76
+1      91      91
+1      100     100
 
 -- !agg_distinct_without_gby_key --
 10
@@ -403,17 +392,6 @@ PhysicalResultSink
 ----------hashAgg[GLOBAL]
 ------------PhysicalOlapScan[t_gbykey_10_dstkey_10_1000_id]
 
--- !agg_distinct_satisfy_dst_key_with_other_func --
-PhysicalResultSink
---PhysicalQuickSort[MERGE_SORT]
-----PhysicalDistribute[DistributionSpecGather]
-------PhysicalQuickSort[LOCAL_SORT]
---------hashAgg[DISTINCT_GLOBAL]
-----------PhysicalDistribute[DistributionSpecHash]
-------------hashAgg[DISTINCT_LOCAL]
---------------hashAgg[GLOBAL]
-----------------PhysicalOlapScan[t_gbykey_10_dstkey_10_1000_id]
-
 -- !agg_distinct_without_gby_key --
 PhysicalResultSink
 --hashAgg[DISTINCT_GLOBAL]
@@ -494,16 +472,16 @@ PhysicalResultSink
 2
 
 -- !agg_distinct_with_gby_key_with_other_func_low_ndv --
-2      0       60      4.0
-2      1       75      5.0
+2      0       60      4
+2      1       75      5
 
 -- !agg_distinct_satisfy_gby_key_with_other_func_low_ndv --
 2      0       69      4.3125
 2      1       66      4.714285714285714
 
 -- !agg_distinct_satisfy_dst_key_with_other_func_low_ndv --
-2      60      4.0
-2      75      5.0
+2      60      4
+2      75      5
 
 -- !agg_distinct_without_gby_key_low_ndv --
 2
@@ -584,17 +562,6 @@ PhysicalResultSink
 --------hashAgg[GLOBAL]
 ----------PhysicalOlapScan[t_gbykey_2_dstkey_10_30_id]
 
--- !agg_distinct_satisfy_dst_key_with_other_func_low_ndv --
-PhysicalResultSink
---PhysicalQuickSort[MERGE_SORT]
-----PhysicalDistribute[DistributionSpecGather]
-------PhysicalQuickSort[LOCAL_SORT]
---------hashAgg[DISTINCT_GLOBAL]
-----------hashAgg[GLOBAL]
-------------PhysicalDistribute[DistributionSpecHash]
---------------hashAgg[LOCAL]
-----------------PhysicalOlapScan[t_gbykey_2_dstkey_10_30_id]
-
 -- !agg_distinct_without_gby_key_low_ndv --
 PhysicalResultSink
 --hashAgg[DISTINCT_GLOBAL]
@@ -651,16 +618,16 @@ PhysicalResultSink
 2
 
 -- !agg_distinct_with_gby_key_with_other_func_low_ndv --
-2      0       60      4.0
-2      1       75      5.0
+2      0       60      4
+2      1       75      5
 
 -- !agg_distinct_satisfy_gby_key_with_other_func_low_ndv --
 2      0       69      4.3125
 2      1       66      4.714285714285714
 
 -- !agg_distinct_satisfy_dst_key_with_other_func_low_ndv --
-2      60      4.0
-2      75      5.0
+2      60      4
+2      75      5
 
 -- !agg_distinct_without_gby_key_low_ndv --
 2
@@ -749,17 +716,6 @@ PhysicalResultSink
 ----------hashAgg[GLOBAL]
 ------------PhysicalOlapScan[t_gbykey_2_dstkey_10_30_id]
 
--- !agg_distinct_satisfy_dst_key_with_other_func_low_ndv --
-PhysicalResultSink
---PhysicalQuickSort[MERGE_SORT]
-----PhysicalDistribute[DistributionSpecGather]
-------PhysicalQuickSort[LOCAL_SORT]
---------hashAgg[DISTINCT_GLOBAL]
-----------PhysicalDistribute[DistributionSpecHash]
-------------hashAgg[DISTINCT_LOCAL]
---------------hashAgg[GLOBAL]
-----------------PhysicalOlapScan[t_gbykey_2_dstkey_10_30_id]
-
 -- !agg_distinct_without_gby_key_low_ndv --
 PhysicalResultSink
 --hashAgg[DISTINCT_GLOBAL]
@@ -808,16 +764,16 @@ PhysicalResultSink
 1
 
 -- !with_gby_split_in_cascades --
-1      13.0
-1      18.0
-1      27.0
-1      33.0
-1      42.0
-1      55.0
-1      64.0
-1      76.0
-1      91.0
-1      100.0
+1      13
+1      18
+1      27
+1      33
+1      42
+1      55
+1      64
+1      76
+1      91
+1      100
 
 -- !without_gby --
 10
diff --git 
a/regression-test/suites/nereids_rules_p0/agg_strategy/agg_strategy.groovy 
b/regression-test/suites/nereids_rules_p0/agg_strategy/agg_strategy.groovy
index 72ee1b92efb..3d177fd6718 100644
--- a/regression-test/suites/nereids_rules_p0/agg_strategy/agg_strategy.groovy
+++ b/regression-test/suites/nereids_rules_p0/agg_strategy/agg_strategy.groovy
@@ -52,7 +52,6 @@ suite("agg_strategy") {
         qt_agg_distinct_satisfy_dst_key "explain shape plan select 
count(distinct id) from t_gbykey_10_dstkey_10_1000_id group by gby_key order by 
1"
         qt_agg_distinct_with_gby_key_with_other_func "explain shape plan 
select count(distinct dst_key1), gby_key, sum(dst_key2), avg(dst_key2) from 
t_gbykey_10_dstkey_10_1000_id group by gby_key order by 1,2,3,4"
         qt_agg_distinct_satisfy_gby_key_with_other_func "explain shape plan 
select count(distinct dst_key1), id, sum(dst_key2), avg(dst_key2) from 
t_gbykey_10_dstkey_10_1000_id group by id order by 1,2,3,4"
-        qt_agg_distinct_satisfy_dst_key_with_other_func "explain shape plan 
select count(distinct id), sum(dst_key2), avg(dst_key2) from 
t_gbykey_10_dstkey_10_1000_id group by gby_key order by 1,2,3"
 
         qt_agg_distinct_without_gby_key "explain shape plan select 
count(distinct dst_key1) from t_gbykey_10_dstkey_10_1000_id"
         //final multi_distinct + sum0
@@ -95,7 +94,6 @@ suite("agg_strategy") {
         qt_agg_distinct_satisfy_dst_key_low_ndv "explain shape plan select 
count(distinct id) from t_gbykey_2_dstkey_10_30_id group by gby_key order by 1"
         qt_agg_distinct_with_gby_key_with_other_func_low_ndv "explain shape 
plan select count(distinct dst_key1), gby_key, sum(dst_key2), avg(dst_key2) 
from t_gbykey_2_dstkey_10_30_id group by gby_key order by 1,2,3,4"
         qt_agg_distinct_satisfy_gby_key_with_other_func_low_ndv "explain shape 
plan select count(distinct dst_key1), id, sum(dst_key2), avg(dst_key2) from 
t_gbykey_2_dstkey_10_30_id group by id order by 1,2,3,4"
-        qt_agg_distinct_satisfy_dst_key_with_other_func_low_ndv"explain shape 
plan select count(distinct id), sum(dst_key2), avg(dst_key2) from 
t_gbykey_2_dstkey_10_30_id group by gby_key order by 1,2,3"
         qt_agg_distinct_without_gby_key_low_ndv "explain shape plan select 
count(distinct dst_key1) from t_gbykey_2_dstkey_10_30_id"
         //use final multi_distinct + sum0
         qt_agg_distinct_without_gby_key_satisfy_dst_key_low_ndv "explain shape 
plan select count(distinct id) from t_gbykey_2_dstkey_10_30_id"


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to