refactor(hash-aggr): Forward port the soft limit optimization to the new hash aggregation impl#22824
Merged
Merged
Conversation
github-actions
Bot
added
core
ariel-miculas
approved these changes
Jun 8, 2026
alamb
approved these changes
Jun 8, 2026
alamb
left a comment
alamb
left a comment
Contributor
There was a problem hiding this comment.
Looks good to me -- thank you @2010YOUY01 and @ariel-miculas
| }; | ||
|
|
||
| #[derive(Debug)] | ||
| struct AggregateRuntimeMetric { |
Contributor
There was a problem hiding this comment.
A few comments here (explaining what the limit and output row fields are in particualr) I think would help this test be easier to read
Contributor
Author
There was a problem hiding this comment.
Thank you, makes sense to me. Addressed in f54bf19
| } | ||
|
|
||
| #[tokio::test] | ||
| async fn limited_distinct_aggregate_uses_migrated_hash_streams() -> Result<()> { |
Contributor
There was a problem hiding this comment.
I would recommend a different term that "migrated" as once the migration is complete it will not be relevant anympre
Perhaps something like "limited_distinct_aggregate_uses_partial_hash_stream" would be more future proof
Contributor
Author
|
By estimation, there are around 5 PRs to go for this refactor. |
martin-g
approved these changes
Jun 9, 2026
…egation.rs Co-authored-by: Martin Grigorov <martin-g@users.noreply.github.com>
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
4 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.
Which issue does this PR close?
Rationale for this change
Part of rewriting hash aggregation into several dedicated streams.
In the first step #22729,
PartialHashAggregateStreamandFinalHashAggregateStreamhas been split from the oldGroupsHashAggregateStream, but both stream only have basic implementation, no optimizations and extra features like spilling.* it's incremental migration, so old impl won't change, we plan to delete it once migration is finished
This PR forward ports the below optimization to the new implementation:
The optimizer part don't have to move, ported changes are only inside aggregate operator.
What changes are included in this PR?
Extends
PartialHashAggregateStreamandFinalHashAggregateStreamto apply the optimization. See code comment atdatafusion/physical-plan/src/aggregates/hash_aggregate.rsfor the background.Are these changes tested?
Yes, the original test in #8038 is only at
ExecutionPlanlevel, they're still passing after the change.This PR added new test coverage: check
explain analyzeto ensure the implementation actually respects this soft limit at runtime.Are there any user-facing changes?