fix: Unaccounted spill sort in row_hash#20314
Merged
rluvaton merged 16 commits intoapache:mainfrom Feb 26, 2026
Merged
Conversation
rluvaton
reviewed
Feb 23, 2026
rluvaton
reviewed
Feb 23, 2026
rluvaton
reviewed
Feb 23, 2026
rluvaton
reviewed
Feb 23, 2026
rluvaton
reviewed
Feb 23, 2026
rluvaton
reviewed
Feb 23, 2026
rluvaton
reviewed
Feb 23, 2026
rluvaton
approved these changes
Feb 23, 2026
Member
rluvaton
left a comment
rluvaton
left a comment
There was a problem hiding this comment.
LGTM, thank you for your contribution, hope to see you again
rluvaton
approved these changes
Feb 23, 2026
de-bgunter
pushed a commit
to de-bgunter/datafusion
that referenced
this pull request
Mar 24, 2026
## Which issue does this PR close? <!-- We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes apache#123` indicates that this PR will close issue apache#123. --> - Closes apache#20313 . ## Rationale for this change <!-- Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed. Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes. --> We must not use that much memory without reserving it. ## What changes are included in this PR? <!-- There is no need to duplicate the description in the issue here but it is sometimes worth providing a summary of the individual changes in this PR. --> Added a reservation before the sort, made a shrink call for the group values after the emit and updated the reservation so the reservation will be possible. Moved the sort to use sort_chunked so we can immediately drop the original batch and shrink the reservation to the used sizes, added a new spill method for iterators, so we can use an accurate memory accounting. If said reservation did not succeed, fallback to an incrementing sort method which holds the original batch the whole time, and outputs one batch at the time, this requires a much smaller reservation. Made the reservation much more robust(otherwise the fuzz tests were failing now that we actually reserve the memory in the sort) ## Are these changes tested? <!-- We typically require tests for all PRs in order to: 1. Prevent the code from being accidentally broken by subsequent changes 2. Serve as another way to document the expected behavior of the code If tests are not included in your PR, please explain why (for example, are they covered by existing tests)? --> Current tests should still function, but memory should be reserved. Added test that specifically verifies that we error on this when we shouldn't do the sort. Modified the tests that used to test the splitting function in the spill to test the new iter spilling function ## Are there any user-facing changes? <!-- If there are user-facing changes then we may require documentation to be updated before approving the PR. --> <!-- If there are any breaking changes to public APIs, please add the `api change` label. --> No
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
2 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
We must not use that much memory without reserving it.
What changes are included in this PR?
Added a reservation before the sort, made a shrink call for the group values after the emit and updated the reservation so the reservation will be possible.
Moved the sort to use sort_chunked so we can immediately drop the original batch and shrink the reservation to the used sizes, added a new spill method for iterators, so we can use an accurate memory accounting.
If said reservation did not succeed, fallback to an incrementing sort method which holds the original batch the whole time, and outputs one batch at the time, this requires a much smaller reservation.
Made the reservation much more robust(otherwise the fuzz tests were failing now that we actually reserve the memory in the sort)
Are these changes tested?
Current tests should still function, but memory should be reserved.
Added test that specifically verifies that we error on this when we shouldn't do the sort.
Modified the tests that used to test the splitting function in the spill to test the new iter spilling function
Are there any user-facing changes?
No