refactor: Use SpillManager for all spilling scenarios #15405
Merged
Conversation
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
comphead
approved these changes
Mar 25, 2025
There was a problem hiding this comment.
Thanks @2010YOUY01 lgtm
I'm also thinking if we should give a spill manager the read spilled files functions?
alamb
approved these changes
Mar 25, 2025
There was a problem hiding this comment.
Looks like a very nice refactor to me -- thank you @2010YOUY01
| @@ -981,28 +978,30 @@ impl GroupedHashAggregateStream { | |||
| Ok(()) | |||
| } | |||
|
|
|||
| /// Emit all rows, sort them, and store them on disk. | |||
| /// Emit all intermediate aggregation states, sort them, and store them on disk. | |||
| fn spill(&mut self) -> Result<()> { | ||
| // Emit and sort intermediate aggregation state | ||
| let Some(emit) = self.emit(EmitTo::All, true)? else { | ||
| return Ok(()); | ||
| }; | ||
| let sorted = sort_batch(&emit, self.spill_state.spill_expr.as_ref(), None)?; |
There was a problem hiding this comment.
eventually it might make sense to have the spill manager handle sorting the runs too (so it could potentially merge multiple files into a single run to reduce fanout, etc
| @@ -92,6 +50,10 @@ fn read_spill(sender: Sender<Result<RecordBatch>>, path: &Path) -> Result<()> { | |||
|
|
|||
| /// Spill the `RecordBatch` to disk as smaller batches | |||
| /// split by `batch_size_rows` | |||
| #[deprecated( | |||
| since = "46.0.0", | |||
| note = "This method is deprecated. Use `SpillManager::spill_record_batch_by_size` instead." | |||
Yes there is already a basic one: In the future if there are more functions to read spilled files, I think they should also be included inside SpillManager
|
|
Thank you @2010YOUY01 and @comphead |
qstommyshu
pushed a commit
to qstommyshu/datafusion
that referenced
this pull request
Mar 27, 2025
* Use SpillManager in all spilling scenarios * resolve conflict * fix ci format
nirnayroy
pushed a commit
to nirnayroy/datafusion
that referenced
this pull request
May 2, 2025
* Use SpillManager in all spilling scenarios * resolve conflict * fix ci format
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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?
SpillManagerinAggregateExecandSortMergeJoinExec#15374Rationale for this change
#15355 Introduced
SpillManageras a new interface for spilling related operations, and updateSortExecto use it.This PR update all spilling related operations to use the new
SpillManagerinterface.What changes are included in this PR?
AggregateExec,SortMergeJoinExec]:SpillMetricsspill_managerinsideSpillManagerinterfaceAre these changes tested?
Existing tests.
Are there any user-facing changes?
No