Skip to content

Commit 45714e9

Browse files
Rich-T-kidclaude
andcommitted
refactor: widen GroupColumn::vectorized_equal_to to &mut self
Mechanical signature change across the trait and all 8 impls as the first step toward letting `DictionaryGroupValuesColumn` reuse its cached `val_to_inner` map in `vectorized_equal_to` instead of rebuilding it per batch (apache#25219). `GroupValuesColumns::vectorized_equal_to` switches to `iter_mut` and uses `mem::replace` to temporarily extract the index slices from `vectorized_operation_buffers`, avoiding a split-borrow conflict. Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
1 parent f8cc678 commit 45714e9

9 files changed

Lines changed: 22 additions & 12 deletions

File tree

‎datafusion/physical-plan/src/aggregates/group_values/multi_group_by/boolean.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ impl<const NULLABLE: bool> GroupColumn for BooleanGroupValueBuilder<NULLABLE> {
7979
}
8080

8181
fn vectorized_equal_to(
82-
&self,
82+
&mut self,
8383
lhs_rows: &[usize],
8484
array: &ArrayRef,
8585
rhs_rows: &[usize],

‎datafusion/physical-plan/src/aggregates/group_values/multi_group_by/bytes.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ where
280280
}
281281

282282
fn vectorized_equal_to(
283-
&self,
283+
&mut self,
284284
lhs_rows: &[usize],
285285
array: &ArrayRef,
286286
rhs_rows: &[usize],

‎datafusion/physical-plan/src/aggregates/group_values/multi_group_by/bytes_view.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ impl<B: ByteViewType> GroupColumn for ByteViewGroupValueBuilder<B> {
584584
}
585585

586586
fn vectorized_equal_to(
587-
&self,
587+
&mut self,
588588
group_indices: &[usize],
589589
array: &ArrayRef,
590590
rows: &[usize],

‎datafusion/physical-plan/src/aggregates/group_values/multi_group_by/dictionary.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ impl<K: ArrowDictionaryKeyType + Send + Sync> GroupColumn
328328
}
329329

330330
fn vectorized_equal_to(
331-
&self,
331+
&mut self,
332332
lhs_rows: &[usize],
333333
array: &ArrayRef,
334334
rhs_rows: &[usize],

‎datafusion/physical-plan/src/aggregates/group_values/multi_group_by/fixed_size_binary.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ impl GroupColumn for FixedSizeBinaryGroupValueBuilder {
140140
}
141141

142142
fn vectorized_equal_to(
143-
&self,
143+
&mut self,
144144
lhs_rows: &[usize],
145145
array: &ArrayRef,
146146
rhs_rows: &[usize],

‎datafusion/physical-plan/src/aggregates/group_values/multi_group_by/list.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ impl<O: OffsetSizeTrait> GroupColumn for ListGroupValueBuilder<O> {
152152
}
153153

154154
fn vectorized_equal_to(
155-
&self,
155+
&mut self,
156156
lhs_rows: &[usize],
157157
array: &ArrayRef,
158158
rhs_rows: &[usize],

‎datafusion/physical-plan/src/aggregates/group_values/multi_group_by/mod.rs‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ pub trait GroupColumn: Send + Sync {
8787
/// And if found nth result in `equal_to_results` is already
8888
/// `false`, the check for nth row will be skipped.
8989
fn vectorized_equal_to(
90-
&self,
90+
&mut self,
9191
lhs_rows: &[usize],
9292
array: &ArrayRef,
9393
rhs_rows: &[usize],
@@ -664,14 +664,24 @@ impl<const STREAMING: bool> GroupValuesColumn<STREAMING> {
664664
equal_to_results.truncate(0);
665665
equal_to_results.append_n(n, true);
666666

667-
for (col_idx, group_col) in self.group_values.iter().enumerate() {
667+
let equal_to_group_indices = mem::replace(
668+
&mut self.vectorized_operation_buffers.equal_to_group_indices,
669+
Vec::new(),
670+
);
671+
let equal_to_row_indices = mem::replace(
672+
&mut self.vectorized_operation_buffers.equal_to_row_indices,
673+
Vec::new(),
674+
);
675+
for (col_idx, group_col) in self.group_values.iter_mut().enumerate() {
668676
group_col.vectorized_equal_to(
669-
&self.vectorized_operation_buffers.equal_to_group_indices,
677+
&equal_to_group_indices,
670678
&cols[col_idx],
671-
&self.vectorized_operation_buffers.equal_to_row_indices,
679+
&equal_to_row_indices,
672680
&mut equal_to_results,
673681
);
674682
}
683+
self.vectorized_operation_buffers.equal_to_group_indices = equal_to_group_indices;
684+
self.vectorized_operation_buffers.equal_to_row_indices = equal_to_row_indices;
675685

676686
// 2. Check `equal_to_results`, if found not equal to `row`s, just add them
677687
// to `scalarized_indices`, and perform `scalarized_intern` for them after.

‎datafusion/physical-plan/src/aggregates/group_values/multi_group_by/primitive.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ where
187187
}
188188

189189
fn vectorized_equal_to(
190-
&self,
190+
&mut self,
191191
lhs_rows: &[usize],
192192
array: &ArrayRef,
193193
rhs_rows: &[usize],

‎datafusion/physical-plan/src/aggregates/group_values/multi_group_by/row_backed.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ impl GroupColumn for RowsGroupColumn {
251251
}
252252

253253
fn vectorized_equal_to(
254-
&self,
254+
&mut self,
255255
lhs_rows: &[usize],
256256
array: &ArrayRef,
257257
rhs_rows: &[usize],

0 commit comments

Comments
 (0)