Skip to content

[fix](agg) Fix local shuffle before agg#60494

Merged
Gabriel39 merged 1 commit intoapache:masterfrom
Gabriel39:fix_0204_agg
Feb 5, 2026
Merged

[fix](agg) Fix local shuffle before agg#60494
Gabriel39 merged 1 commit intoapache:masterfrom
Gabriel39:fix_0204_agg

Conversation

@Gabriel39
Copy link
Contributor

@Gabriel39 Gabriel39 commented Feb 4, 2026

What problem does this PR solve?

This bug was introduced by #60334

Check List (For Author)

  • Test

    • 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
  • Behavior changed:

    • No.
    • Yes.
  • Does this need documentation?

    • No.
    • Yes.

Check List (For Reviewer who merge this PR)

  • Confirm the release note
  • Confirm test cases
  • Confirm document
  • Add branch pick label

@hello-stephen
Copy link
Contributor

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR.

Please clearly describe your PR:

  1. What problem was fixed (it's best to include specific error reporting information). How it was fixed.
  2. Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
  3. What features were added. Why was this function added?
  4. Which code was refactored and why was this part of the code refactored?
  5. Which functions were optimized and what is the difference before and after the optimization?

@Gabriel39
Copy link
Contributor Author

run buildall

@doris-robot
Copy link

TPC-H: Total hot run time: 31925 ms
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpch-tools
Tpch sf100 test result on commit 11c1a0c8670efc933e6dbb819dbd8ca115acdf9a, data reload: false

------ Round 1 ----------------------------------
q1	17648	5375	5090	5090
q2	2049	320	235	235
q3	10166	1322	792	792
q4	10222	921	331	331
q5	7553	2161	1943	1943
q6	199	185	153	153
q7	889	740	608	608
q8	9265	1400	1114	1114
q9	5266	4854	4799	4799
q10	6780	1999	1555	1555
q11	487	298	272	272
q12	335	392	238	238
q13	17794	4071	3290	3290
q14	240	242	220	220
q15	936	815	828	815
q16	678	667	623	623
q17	644	813	474	474
q18	6807	6563	6370	6370
q19	1234	990	619	619
q20	396	341	231	231
q21	2615	2110	1883	1883
q22	351	320	270	270
Total cold run time: 102554 ms
Total hot run time: 31925 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5296	5353	5303	5303
q2	266	351	258	258
q3	2185	2703	2262	2262
q4	1344	1730	1306	1306
q5	4305	4173	4212	4173
q6	220	185	146	146
q7	2352	2078	1915	1915
q8	2587	2456	2432	2432
q9	7637	7603	7657	7603
q10	2767	3096	2729	2729
q11	540	471	456	456
q12	711	813	660	660
q13	3954	4359	3541	3541
q14	358	469	303	303
q15	868	842	816	816
q16	683	717	699	699
q17	1173	1425	1404	1404
q18	8218	8219	8046	8046
q19	893	867	817	817
q20	2150	2273	2017	2017
q21	4981	4489	4122	4122
q22	596	569	511	511
Total cold run time: 54084 ms
Total hot run time: 51519 ms

@doris-robot
Copy link

ClickBench: Total hot run time: 28.36 s
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/clickbench-tools
ClickBench test result on commit 11c1a0c8670efc933e6dbb819dbd8ca115acdf9a, data reload: false

query1	0.06	0.05	0.06
query2	0.10	0.05	0.05
query3	0.25	0.09	0.08
query4	1.61	0.11	0.11
query5	0.28	0.25	0.24
query6	1.16	0.68	0.68
query7	0.03	0.02	0.03
query8	0.05	0.04	0.04
query9	0.57	0.50	0.51
query10	0.55	0.54	0.54
query11	0.14	0.10	0.09
query12	0.15	0.10	0.11
query13	0.63	0.64	0.61
query14	1.07	1.07	1.05
query15	0.88	0.87	0.86
query16	0.39	0.42	0.39
query17	1.10	1.17	1.14
query18	0.22	0.21	0.22
query19	2.13	2.01	2.01
query20	0.03	0.02	0.02
query21	15.40	0.26	0.17
query22	5.05	0.07	0.06
query23	15.93	0.29	0.11
query24	2.15	0.30	0.19
query25	0.12	0.06	0.10
query26	0.14	0.14	0.14
query27	0.06	0.06	0.05
query28	4.52	1.15	0.98
query29	12.56	3.87	3.13
query30	0.27	0.14	0.13
query31	2.82	0.65	0.41
query32	3.23	0.60	0.50
query33	3.28	3.26	3.29
query34	16.47	5.42	4.72
query35	4.80	4.77	4.80
query36	0.66	0.51	0.50
query37	0.12	0.07	0.07
query38	0.07	0.04	0.04
query39	0.04	0.03	0.03
query40	0.19	0.15	0.16
query41	0.10	0.04	0.03
query42	0.04	0.03	0.03
query43	0.05	0.04	0.04
Total cold run time: 99.47 s
Total hot run time: 28.36 s

@hello-stephen
Copy link
Contributor

BE UT Coverage Report

Increment line coverage 100.00% (3/3) 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 52.56% (19370/36854)
Line Coverage 36.05% (179951/499189)
Region Coverage 32.42% (139549/430415)
Branch Coverage 33.42% (60421/180809)

@hello-stephen
Copy link
Contributor

BE Regression && UT Coverage Report

Increment line coverage 100.00% (3/3) 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 73.26% (26461/36118)
Line Coverage 56.33% (280530/497994)
Region Coverage 54.08% (235173/434831)
Branch Coverage 55.71% (101133/181539)

@github-actions
Copy link
Contributor

github-actions bot commented Feb 5, 2026

PR approved by anyone and no changes requested.

@Gabriel39 Gabriel39 merged commit 705ca19 into apache:master Feb 5, 2026
31 of 33 checks passed
@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Feb 5, 2026
@github-actions
Copy link
Contributor

github-actions bot commented Feb 5, 2026

PR approved by at least one committer and no changes requested.

Gabriel39 added a commit to Gabriel39/incubator-doris that referenced this pull request Feb 6, 2026
@Gabriel39 Gabriel39 mentioned this pull request Feb 6, 2026
16 tasks
yiguolei pushed a commit that referenced this pull request Feb 7, 2026
### What problem does this PR solve?

Pick #60253 #60393 #60481 #56956 #60334 #60494

### 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:
apache/doris-website#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 -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by one committer. dev/4.0.4-merged reviewed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

Comments