[enhance](aggregate) Add rewrite rule DecomposeRepeatWithPreAggregation#59116
Merged
morrySnow merged 14 commits intoapache:masterfrom Jan 15, 2026
Merged
[enhance](aggregate) Add rewrite rule DecomposeRepeatWithPreAggregation#59116morrySnow merged 14 commits intoapache:masterfrom
morrySnow merged 14 commits intoapache:masterfrom
Conversation
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
feiniaofeiafei
force-pushed
the
repeat_rewrite
branch
from
eb05678 to
9941808
Compare
Contributor
Author
|
run buildall |
TPC-H: Total hot run time: 35969 ms |
TPC-DS: Total hot run time: 175590 ms |
ClickBench: Total hot run time: 27.43 s |
Contributor
FE UT Coverage ReportIncrement line coverage |
feiniaofeiafei
force-pushed
the
repeat_rewrite
branch
2 times, most recently
from
fa63eb8 to
7e6da4f
Compare
Contributor
Author
|
run buildall |
TPC-H: Total hot run time: 36182 ms |
TPC-DS: Total hot run time: 178228 ms |
ClickBench: Total hot run time: 27.12 s |
Contributor
FE Regression Coverage ReportIncrement line coverage |
Contributor
Author
|
run buildall |
Contributor
FE Regression Coverage ReportIncrement line coverage |
Contributor
Author
|
run buildall |
TPC-H: Total hot run time: 35538 ms |
TPC-DS: Total hot run time: 180381 ms |
ClickBench: Total hot run time: 27.25 s |
Contributor
FE Regression Coverage ReportIncrement line coverage |
Contributor
Author
|
run buildall |
TPC-H: Total hot run time: 36494 ms |
TPC-DS: Total hot run time: 179283 ms |
ClickBench: Total hot run time: 27.15 s |
Contributor
FE UT Coverage ReportIncrement line coverage |
Contributor
Author
|
run cloud_p0 |
Contributor
FE Regression Coverage ReportIncrement line coverage |
Contributor
|
add desc |
feiniaofeiafei
force-pushed
the
repeat_rewrite
branch
from
19308d6 to
fce2d9e
Compare
Contributor
Author
|
run buildall |
Contributor
Author
|
run feut |
TPC-H: Total hot run time: 31456 ms |
TPC-DS: Total hot run time: 173377 ms |
Contributor
FE UT Coverage ReportIncrement line coverage |
Contributor
Author
|
run feut |
Contributor
Author
|
run p0 |
Contributor
FE UT Coverage ReportIncrement line coverage |
Contributor
Author
|
run nonConcurrent |
morrySnow
changed the title
morrySnow
approved these changes
Jan 14, 2026
Contributor
|
PR approved by at least one committer and no changes requested. |
github-actions
bot
added
approved
Contributor
|
PR approved by anyone and no changes requested. |
englefly
approved these changes
Jan 14, 2026
| * 1. The aggregate's child must be a LogicalRepeat | ||
| * 2. All aggregate functions must be Sum, Min, or Max (non-distinct) | ||
| * 3. No GroupingScalarFunction in repeat output | ||
| * 4. More than 3 grouping sets |
Contributor
There was a problem hiding this comment.
3 grouping sets 的情况也可以有优化吧
Contributor
Author
There was a problem hiding this comment.
目前就先拍了一个3，大于3才能优化
16 tasks
morrySnow
pushed a commit
that referenced
this pull request
Feb 10, 2026
…ation in DecomposeRepeatWithPreAggregation (#60091) Related PR: #59116 #60045 **Problem Summary:** There are 2 problems: 1. When `DecomposeRepeatWithPreAggregation` optimization removes the maximum grouping set, grouping functions (e.g., `grouping()`, `grouping_id()`) that reference expressions only existing in the removed grouping set would fail because of index lookup failure: When computing grouping function values, `GroupingSetShapes.indexOf()` would return -1 for expressions not in `flattenGroupingSetExpression`, causing incorrect behavior. Example scenario: ```sql SELECT a, b, c, grouping(c) FROM t1 GROUP BY GROUPING SETS ((a, b, c), (a, b), (a), ()); ``` After optimization removes the maximum grouping set `(a, b, c)`, the expression `c` no longer exists in the remaining grouping sets. When computing `grouping(c)`, the index lookup would fail. 2. The `repeatSlotIdList` calculation was incorrect because it relied on the assumption that the order of `physicalRepeat.getOutputExpressions()` matches the order of `outputTuple`. However, this assumption can be broken during rule rewriting (e.g., in `DecomposeRepeatWithPreAggregation.constructRepeat()` at line 502-503, where `replacedRepeatOutputs` is constructed by `new ArrayList<>(child.getOutput())` and then appends grouping functions, potentially changing the order). This mismatch causes incorrect slot ID mapping and wrong query results. Example scenario: When `DecomposeRepeatWithPreAggregation` rewrites a repeat plan, the output expressions order may differ from the output tuple order, leading to incorrect slot ID mapping in `repeatSlotIdList`. **Solution:** 1. For problem 1: Modified `Repeat.toShapes()` method to ensure all expressions referenced by grouping functions are included in `flattenGroupingSetExpression`, even if they are not in any grouping set. For expressions that only exist in the removed maximum grouping set, they are correctly marked as `shouldBeErasedToNull = true` in all remaining grouping sets, which is the correct SQL semantics. Key changes: - `Repeat.toShapes()`: Enhanced to collect all expressions referenced by grouping functions using `ExpressionUtils.collectToList()` and merge them into `flattenGroupingSetExpression` - For expressions not in any grouping set, they are correctly marked as `shouldBeErasedToNull = true` in all `GroupingSetShape` instances - This ensures `GroupingSetShapes.indexOf()` always returns a valid index for grouping function arguments, preventing index lookup failures 2. For problem 2: Modified `Repeat.computeRepeatSlotIdList()` method to accept an additional `outputSlots` parameter. Instead of relying on the order of `outputExpressions` matching `outputTuple`, the method now uses `outputSlots` to correctly map grouping set expressions to their indices in the output tuple. This ensures correct slot ID calculation even when rule rewriting changes the order of output expressions. Key changes: - `computeRepeatSlotIdList(List<Integer> slotIdList, List<Slot> outputSlots)`: Added `outputSlots` parameter - `getGroupingSetsIndexesInOutput(List<Slot> outputSlots)`: Modified to use `outputSlots` instead of `getOutputExpressions()` - `indexesOfOutput(List<Slot> outputSlots)`: Modified to build index map from `outputSlots` instead of `getOutputExpressions()` - `PhysicalPlanTranslator.visitPhysicalRepeat()`: Updated to pass `outputSlots` to `computeRepeatSlotIdList()` 3. Another task for this pull request is to set the shuffle key for the rewritten bottom aggregation. Choosing a suitable shuffle key can improve the aggregation rate of the top aggregation's local aggregation.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What problem does this PR solve?
Issue Number: close #xxx
Related PR: #xxx
Problem Summary:
This PR add a rewrite rule:
The scenario where performance optimization is achieved is when pre-aggregation significantly reduces the amount of data. This rewrite reduces the number of rows generated by the repeat operator, resulting in improved performance.
Release note
None
Check List (For Author)
Test
Behavior changed:
Does this need documentation?
Check List (For Reviewer who merge this PR)