Repository navigation
Commit 9844182
committed
fix(physical-plan): account for retained sort-key capacity
GroupClusteringPartial::heap_size summed ScalarValue::size() over the live elements of the in-progress key, so the vector's spare capacity was never reported. The key vector produced by get_row_at_idx retains capacity for four scalars after extracting a single key, leaving three scalar slots unaccounted and under-reserving memory.
Use DFHeapSize for the sort key so its full capacity, including spare slots, and the heap payload of each initialized scalar are counted once. The inline Vec descriptor remains owned by GroupClustering::size(), so it is not double-counted.
Update the retained-allocation test to derive the expected key size from ScalarValue::size_of_vec, and add a focused test with spare capacity and a heap-owning scalar.
Part of apache#23393
Closes apache#260991 parent 4bf32cb commit 9844182
2 files changed
Lines changed: 54 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
194 | 194 | | |
195 | 195 | | |
196 | 196 | | |
| 197 | + | |
197 | 198 | | |
198 | 199 | | |
199 | 200 | | |
| |||
215 | 216 | | |
216 | 217 | | |
217 | 218 | | |
218 | | - | |
| 219 | + | |
| 220 | + | |
219 | 221 | | |
220 | 222 | | |
221 | 223 | | |
222 | 224 | | |
223 | | - | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
224 | 231 | | |
225 | 232 | | |
226 | 233 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| 11 | + | |
11 | 12 | | |
12 | 13 | | |
13 | 14 | | |
| |||
87 | 88 | | |
88 | 89 | | |
89 | 90 | | |
90 | | - | |
| 91 | + | |
91 | 92 | | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
| 93 | + | |
| 94 | + | |
99 | 95 | | |
100 | 96 | | |
101 | 97 | | |
| |||
254 | 250 | | |
255 | 251 | | |
256 | 252 | | |
257 | | - | |
| 253 | + | |
| 254 | + | |
258 | 255 | | |
259 | 256 | | |
260 | 257 | | |
261 | 258 | | |
262 | 259 | | |
263 | 260 | | |
264 | 261 | | |
| 262 | + | |
| 263 | + | |
265 | 264 | | |
266 | 265 | | |
267 | 266 | | |
| |||
346 | 345 | | |
347 | 346 | | |
348 | 347 | | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
| 351 | + | |
| 352 | + | |
| 353 | + | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
| 371 | + | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
349 | 385 | | |
0 commit comments