Repository navigation
Commit 9bffbea
authored
minor: move
## Which issue does this PR close?
- Part of apache#25537. Follow-up to apache#22710.
## Rationale for this change
`create_group_accumulator` is defined in `grouped_hash_stream.rs`, the
legacy `GroupedHashAggregateStream` that is only reachable with
`datafusion.execution.enable_migration_aggregate = false` and is
scheduled for removal. It is, however, the one piece of that file the
new code depends on: both `AggregateHashTable`
(`aggregate_hash_table/common.rs`) and `OrderedAggregateTable`
(`aggregate_hash_table/common_ordered.rs`) import it from there.
Moving it next to its real users removes the only dependency of the new
aggregation code on the legacy file, so the legacy stream can later be
deleted without touching the new streams.
## What changes are included in this PR?
Pure code move, no behaviour change.
- Move `create_group_accumulator` to `aggregate_hash_table/common.rs`
and re-export it from `aggregate_hash_table`.
- `grouped_hash_stream.rs` now imports it from there (dependency
direction reversed: legacy → new).
## What is the testing strategy for this PR?
Existing tests; no new behaviour.
## Are there any user-facing changes?
No.create_group_accumulator out of the legacy aggregate stream (apache#25539)1 parent 4e603e1 commit 9bffbea
4 files changed
Lines changed: 31 additions & 32 deletions
File tree
- datafusion/physical-plan/src/aggregates
- aggregate_hash_table
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| 32 | + | |
32 | 33 | | |
| 34 | + | |
33 | 35 | | |
34 | 36 | | |
35 | 37 | | |
36 | 38 | | |
37 | 39 | | |
38 | 40 | | |
39 | | - | |
40 | 41 | | |
41 | 42 | | |
42 | 43 | | |
| |||
56 | 57 | | |
57 | 58 | | |
58 | 59 | | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
59 | 83 | | |
60 | 84 | | |
61 | 85 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
38 | 37 | | |
39 | 38 | | |
40 | 39 | | |
| |||
44 | 43 | | |
45 | 44 | | |
46 | 45 | | |
47 | | - | |
| 46 | + | |
48 | 47 | | |
49 | 48 | | |
50 | 49 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
99 | 99 | | |
100 | 100 | | |
101 | 101 | | |
102 | | - | |
| 102 | + | |
103 | 103 | | |
104 | 104 | | |
105 | 105 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
| 37 | + | |
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| |||
64 | 64 | | |
65 | 65 | | |
66 | 66 | | |
67 | | - | |
68 | | - | |
| 67 | + | |
| 68 | + | |
69 | 69 | | |
70 | | - | |
71 | 70 | | |
72 | 71 | | |
73 | 72 | | |
| |||
652 | 651 | | |
653 | 652 | | |
654 | 653 | | |
655 | | - | |
656 | | - | |
657 | | - | |
658 | | - | |
659 | | - | |
660 | | - | |
661 | | - | |
662 | | - | |
663 | | - | |
664 | | - | |
665 | | - | |
666 | | - | |
667 | | - | |
668 | | - | |
669 | | - | |
670 | | - | |
671 | | - | |
672 | | - | |
673 | | - | |
674 | | - | |
675 | | - | |
676 | | - | |
677 | | - | |
678 | 654 | | |
679 | 655 | | |
680 | 656 | | |
| |||
1512 | 1488 | | |
1513 | 1489 | | |
1514 | 1490 | | |
1515 | | - | |
| 1491 | + | |
1516 | 1492 | | |
1517 | 1493 | | |
1518 | 1494 | | |
| |||
0 commit comments