Commit 18f3fe8
fix: reset merge_function_wrapper in SortMergeReader::Close to prevent use-after-free
Move the merge_function_wrapper_->Reset() into SortMergeReader::Close()
(both LoserTree and MinHeap variants) so that cached KeyValue data is
released before underlying readers are destroyed. This prevents Arrow
Buffer objects from calling Free() on a dangling pool pointer when
SpillReader is later destructed.
Also reorder the cleanup in MergeTreeCompactRewriter::RewriteCompaction
to call reader->Close() before merge_file_split_read_.reset(), ensuring
the Reset() triggered by Close() runs while all resource providers are
still alive.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>1 parent 9f16343 commit 18f3fe8
4 files changed
Lines changed: 7 additions & 2 deletions
File tree
- src/paimon/core/mergetree
- compact
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
263 | 263 | | |
264 | 264 | | |
265 | 265 | | |
266 | | - | |
267 | 266 | | |
268 | 267 | | |
269 | 268 | | |
| 269 | + | |
270 | 270 | | |
271 | 271 | | |
272 | 272 | | |
| |||
Lines changed: 3 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
54 | 57 | | |
55 | 58 | | |
56 | 59 | | |
| |||
Lines changed: 3 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
73 | 76 | | |
74 | 77 | | |
75 | 78 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
273 | 273 | | |
274 | 274 | | |
275 | 275 | | |
276 | | - | |
277 | 276 | | |
278 | 277 | | |
279 | 278 | | |
| |||
0 commit comments