Repository navigation
Commit 2ce73e5
committed
Emit PartialMerge states a column at a time for row-only aggregates
MergeAsPartial now wraps an inner aggregate that has no GroupsAccumulator
(first, last and any_value without an ordering) in a GroupsAccumulatorAdapter
itself. Under Single mode, DataFusion otherwise wrapped the wrapper's row
accumulators and evaluated every group to a one-row struct.
Also write the planner's two output wrappers the same way, check the planner
test's output with assert_batches_sorted_eq and cover first there, and drop two
settings that the memory-pressure tests don't read.1 parent 2f35370 commit 2ce73e5
3 files changed
Lines changed: 113 additions & 35 deletions
File tree
- native/core/src/execution
- spark/src/test/scala/org/apache/comet/exec
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
| 36 | + | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | | - | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
46 | 48 | | |
47 | 49 | | |
48 | 50 | | |
| |||
190 | 192 | | |
191 | 193 | | |
192 | 194 | | |
193 | | - | |
194 | | - | |
195 | | - | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
196 | 199 | | |
197 | 200 | | |
198 | 201 | | |
199 | 202 | | |
200 | 203 | | |
201 | 204 | | |
202 | | - | |
| 205 | + | |
| 206 | + | |
203 | 207 | | |
204 | | - | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
205 | 215 | | |
206 | 216 | | |
207 | 217 | | |
| |||
222 | 232 | | |
223 | 233 | | |
224 | 234 | | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
225 | 281 | | |
226 | 282 | | |
227 | 283 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1684 | 1684 | | |
1685 | 1685 | | |
1686 | 1686 | | |
1687 | | - | |
1688 | | - | |
1689 | | - | |
| 1687 | + | |
1690 | 1688 | | |
1691 | 1689 | | |
| 1690 | + | |
1692 | 1691 | | |
1693 | 1692 | | |
1694 | 1693 | | |
1695 | 1694 | | |
1696 | | - | |
1697 | 1695 | | |
1698 | 1696 | | |
1699 | 1697 | | |
| |||
6328 | 6326 | | |
6329 | 6327 | | |
6330 | 6328 | | |
6331 | | - | |
| 6329 | + | |
| 6330 | + | |
6332 | 6331 | | |
6333 | 6332 | | |
6334 | 6333 | | |
6335 | 6334 | | |
6336 | | - | |
| 6335 | + | |
| 6336 | + | |
6337 | 6337 | | |
6338 | 6338 | | |
6339 | 6339 | | |
6340 | 6340 | | |
| 6341 | + | |
| 6342 | + | |
| 6343 | + | |
| 6344 | + | |
6341 | 6345 | | |
6342 | 6346 | | |
6343 | 6347 | | |
| |||
6350 | 6354 | | |
6351 | 6355 | | |
6352 | 6356 | | |
6353 | | - | |
| 6357 | + | |
| 6358 | + | |
| 6359 | + | |
| 6360 | + | |
| 6361 | + | |
| 6362 | + | |
| 6363 | + | |
6354 | 6364 | | |
6355 | 6365 | | |
6356 | 6366 | | |
| |||
6377 | 6387 | | |
6378 | 6388 | | |
6379 | 6389 | | |
| 6390 | + | |
| 6391 | + | |
| 6392 | + | |
| 6393 | + | |
| 6394 | + | |
| 6395 | + | |
| 6396 | + | |
| 6397 | + | |
6380 | 6398 | | |
6381 | 6399 | | |
6382 | | - | |
| 6400 | + | |
6383 | 6401 | | |
6384 | 6402 | | |
6385 | 6403 | | |
| |||
6422 | 6440 | | |
6423 | 6441 | | |
6424 | 6442 | | |
| 6443 | + | |
| 6444 | + | |
| 6445 | + | |
| 6446 | + | |
| 6447 | + | |
| 6448 | + | |
| 6449 | + | |
| 6450 | + | |
6425 | 6451 | | |
6426 | 6452 | | |
6427 | 6453 | | |
| |||
6440 | 6466 | | |
6441 | 6467 | | |
6442 | 6468 | | |
6443 | | - | |
6444 | | - | |
6445 | | - | |
6446 | | - | |
6447 | | - | |
6448 | | - | |
6449 | | - | |
6450 | | - | |
6451 | | - | |
6452 | | - | |
6453 | | - | |
6454 | | - | |
6455 | | - | |
6456 | | - | |
6457 | | - | |
| 6469 | + | |
| 6470 | + | |
| 6471 | + | |
| 6472 | + | |
| 6473 | + | |
| 6474 | + | |
| 6475 | + | |
| 6476 | + | |
| 6477 | + | |
| 6478 | + | |
| 6479 | + | |
| 6480 | + | |
6458 | 6481 | | |
6459 | 6482 | | |
6460 | 6483 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
254 | 254 | | |
255 | 255 | | |
256 | 256 | | |
257 | | - | |
258 | | - | |
259 | | - | |
| 257 | + | |
260 | 258 | | |
261 | 259 | | |
262 | 260 | | |
| |||
313 | 311 | | |
314 | 312 | | |
315 | 313 | | |
| 314 | + | |
316 | 315 | | |
317 | 316 | | |
318 | | - | |
| 317 | + | |
319 | 318 | | |
320 | 319 | | |
321 | | - | |
| 320 | + | |
322 | 321 | | |
323 | 322 | | |
324 | 323 | | |
| |||
0 commit comments