fix(spill): stop at max level instead of erroring, fix memory leaks#24850
Merged
mergify[bot] merged 1 commit intoJun 5, 2026
Merged
Conversation
- group spill: return nil at spillMaxPass instead of erroring, keeping remaining data in memory rather than failing the query. - group spill: fix spillAggList leak on error paths in loadSpilledData by freeing in deferred cleanup. - group/hashbuild/hashjoin: nil cached spill buffers (bufio.Reader, bytes.Buffer, hashCodes, chunkFlags, flagFlat, nonEmptyBuckets, bucketRowIds, expression executors) in Free() to allow GC on operator reuse. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Qodo reviews are paused for this user.Troubleshooting steps vary by plan Learn more → On a Teams plan? Using GitHub Enterprise Server, GitLab Self-Managed, or Bitbucket Data Center? |
ouyuanning
approved these changes
Jun 4, 2026
XuPeng-SH
approved these changes
Jun 4, 2026
Contributor
Merge Queue Status
This pull request spent 18 hours 41 minutes 12 seconds in the queue, including 5 seconds running CI. Required conditions to merge
|
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.
What type of PR is this?
Which issue(s) this PR fixes:
Fixes #23353
Fixes #24836
What this PR does / why we need it:
Cherry-pick of #24848 to 4.0-dev. Four fixes in the spill code:
1. Spill max level: stop instead of erroring. When group-by spill hits the 3-level limit, now returns nil instead of erroring — data stays in memory.
2.
spillAggListleak on error paths. AddedfreeSpillAggList()to deferred cleanup inloadSpilledData.3. Group spill cached buffers never freed. Nil
spillBuf,spillReader,spillHashCodes,spillChunkFlags,spillFlagFlat,spillNonEmptyBuckets,spillBucketRowIdsinfree().4. Hashbuild/hashjoin spill executors and buffers never freed. Added
freeSpillExprExecs/freeSpillBuildExprExecsand buffer nil toFree().Co-Authored-By: Claude Opus 4.7 noreply@anthropic.com