Commit 51c47bc
fix: address PR review comments for StringView/BinaryView GC spill
- Return post-GC sliced size from append_batch so callers use the
correct post-GC size for memory accounting (fixes cetra3's
CHANGES_REQUESTED: max_record_batch_size was measured pre-GC in
sort.rs and spill_manager.rs)
- Fix incorrect comment claiming Arrow gc() is a no-op; it always
allocates new compact buffers
- Add comment in should_gc_view_array explaining why we sum
data_buffers directly instead of using get_buffer_memory_size()
- Enhance append_batch doc comment with GC rationale per reviewer request
- Reduce row counts in heavy GC tests1 parent d9e8295 commit 51c47bc
4 files changed
Lines changed: 34 additions & 42 deletions
File tree
- datafusion/physical-plan/src
- sorts
- spill
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
429 | 429 | | |
430 | 430 | | |
431 | 431 | | |
432 | | - | |
| 432 | + | |
433 | 433 | | |
434 | | - | |
435 | | - | |
| 434 | + | |
436 | 435 | | |
437 | 436 | | |
438 | 437 | | |
| |||
Lines changed: 12 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
28 | 31 | | |
29 | 32 | | |
30 | 33 | | |
| |||
50 | 53 | | |
51 | 54 | | |
52 | 55 | | |
53 | | - | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
54 | 62 | | |
55 | 63 | | |
56 | 64 | | |
57 | 65 | | |
58 | 66 | | |
59 | | - | |
| 67 | + | |
60 | 68 | | |
61 | 69 | | |
62 | 70 | | |
| |||
106 | 114 | | |
107 | 115 | | |
108 | 116 | | |
109 | | - | |
| 117 | + | |
110 | 118 | | |
111 | 119 | | |
112 | 120 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
440 | 440 | | |
441 | 441 | | |
442 | 442 | | |
443 | | - | |
| 443 | + | |
444 | 444 | | |
445 | | - | |
446 | | - | |
447 | | - | |
448 | | - | |
| 445 | + | |
| 446 | + | |
449 | 447 | | |
450 | | - | |
451 | | - | |
452 | | - | |
453 | | - | |
454 | | - | |
455 | | - | |
456 | | - | |
457 | | - | |
458 | | - | |
459 | | - | |
| 448 | + | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
460 | 452 | | |
461 | 453 | | |
462 | 454 | | |
463 | 455 | | |
464 | 456 | | |
465 | | - | |
466 | 457 | | |
467 | 458 | | |
468 | 459 | | |
469 | | - | |
470 | 460 | | |
471 | | - | |
472 | | - | |
473 | 461 | | |
474 | 462 | | |
475 | 463 | | |
| |||
1035 | 1023 | | |
1036 | 1024 | | |
1037 | 1025 | | |
1038 | | - | |
| 1026 | + | |
1039 | 1027 | | |
1040 | 1028 | | |
1041 | 1029 | | |
| |||
1056 | 1044 | | |
1057 | 1045 | | |
1058 | 1046 | | |
1059 | | - | |
| 1047 | + | |
1060 | 1048 | | |
1061 | 1049 | | |
1062 | 1050 | | |
| |||
1069 | 1057 | | |
1070 | 1058 | | |
1071 | 1059 | | |
1072 | | - | |
| 1060 | + | |
1073 | 1061 | | |
1074 | 1062 | | |
1075 | 1063 | | |
| |||
1091 | 1079 | | |
1092 | 1080 | | |
1093 | 1081 | | |
1094 | | - | |
| 1082 | + | |
1095 | 1083 | | |
1096 | 1084 | | |
1097 | 1085 | | |
| |||
1161 | 1149 | | |
1162 | 1150 | | |
1163 | 1151 | | |
1164 | | - | |
| 1152 | + | |
1165 | 1153 | | |
1166 | 1154 | | |
1167 | 1155 | | |
| |||
1181 | 1169 | | |
1182 | 1170 | | |
1183 | 1171 | | |
1184 | | - | |
| 1172 | + | |
1185 | 1173 | | |
1186 | 1174 | | |
1187 | 1175 | | |
| |||
1208 | 1196 | | |
1209 | 1197 | | |
1210 | 1198 | | |
1211 | | - | |
| 1199 | + | |
1212 | 1200 | | |
1213 | 1201 | | |
1214 | 1202 | | |
| |||
1284 | 1272 | | |
1285 | 1273 | | |
1286 | 1274 | | |
1287 | | - | |
| 1275 | + | |
1288 | 1276 | | |
1289 | 1277 | | |
1290 | 1278 | | |
| |||
1303 | 1291 | | |
1304 | 1292 | | |
1305 | 1293 | | |
1306 | | - | |
| 1294 | + | |
1307 | 1295 | | |
1308 | 1296 | | |
1309 | 1297 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
27 | 26 | | |
28 | 27 | | |
29 | 28 | | |
| |||
127 | 126 | | |
128 | 127 | | |
129 | 128 | | |
130 | | - | |
131 | | - | |
132 | | - | |
133 | | - | |
| 129 | + | |
| 130 | + | |
134 | 131 | | |
135 | 132 | | |
136 | 133 | | |
| |||
153 | 150 | | |
154 | 151 | | |
155 | 152 | | |
156 | | - | |
| 153 | + | |
157 | 154 | | |
158 | | - | |
| 155 | + | |
159 | 156 | | |
160 | 157 | | |
161 | 158 | | |
| |||
0 commit comments