Apache DataFusion SQL Query Engine
refactor: widen `GroupColumn::vectorized_equal_to` to `&mut self` (#25238)
RIchard Baah9a1ad7c79296
diff --git a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/boolean.rs b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/boolean.rsindex a90c4379c1..da656e0a85 100644--- a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/boolean.rs+++ b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/boolean.rs@@ -79,7 +79,7 @@ impl<const NULLABLE: bool> GroupColumn for BooleanGroupValueBuilder<NULLABLE> {}fn vectorized_equal_to(- &self,+ &mut self,lhs_rows: &[usize],array: &ArrayRef,rhs_rows: &[usize],@@ -235,7 +235,7 @@ mod tests {};let equal_to =- |builder: &BooleanGroupValueBuilder<true>,+ |builder: &mut BooleanGroupValueBuilder<true>,lhs_rows: &[usize],input_array: &ArrayRef,rhs_rows: &[usize],@@ -261,7 +261,7 @@ mod tests {};let equal_to =- |builder: &BooleanGroupValueBuilder<true>,+ |builder: &mut BooleanGroupValueBuilder<true>,lhs_rows: &[usize],input_array: &ArrayRef,rhs_rows: &[usize],@@ -281,7 +281,7 @@ mod tests {whereA: FnMut(&mut BooleanGroupValueBuilder<true>, &ArrayRef, &[usize]),E: FnMut(- &BooleanGroupValueBuilder<true>,+ &mut BooleanGroupValueBuilder<true>,&[usize],&ArrayRef,&[usize],@@ -332,7 +332,7 @@ mod tests {// Checklet mut equal_to_results = make_true_buffer(builder.len());equal_to(- &builder,+ &mut builder,&[0, 1, 2, 3, 4, 5],&input_array,&[0, 1, 2, 3, 4, 5],@@ -359,7 +359,7 @@ mod tests {};let equal_to =- |builder: &BooleanGroupValueBuilder<false>,+ |builder: &mut BooleanGroupValueBuilder<false>,lhs_rows: &[usize],input_array: &ArrayRef,rhs_rows: &[usize],@@ -385,7 +385,7 @@ mod tests {};let equal_to =- |builder: &BooleanGroupValueBuilder<false>,+ |builder: &mut BooleanGroupValueBuilder<false>,lhs_rows: &[usize],input_array: &ArrayRef,rhs_rows: &[usize],@@ -405,7 +405,7 @@ mod tests {whereA: FnMut(&mut BooleanGroupValueBuilder<false>, &ArrayRef, &[usize]),E: FnMut(- &BooleanGroupValueBuilder<false>,+ &mut BooleanGroupValueBuilder<false>,&[usize],&ArrayRef,&[usize],@@ -437,7 +437,7 @@ mod tests {// Checklet mut equal_to_results = make_true_buffer(builder.len());equal_to(- &builder,+ &mut builder,&[0, 1, 2, 3],&input_array,&[0, 1, 2, 3],diff --git a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/bytes.rs b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/bytes.rsindex 94d2e48ad3..3032536657 100644--- a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/bytes.rs+++ b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/bytes.rs@@ -280,7 +280,7 @@ where}fn vectorized_equal_to(- &self,+ &mut self,lhs_rows: &[usize],array: &ArrayRef,rhs_rows: &[usize],@@ -581,7 +581,7 @@ mod tests {};let equal_to =- |builder: &ByteGroupValueBuilder<i32>,+ |builder: &mut ByteGroupValueBuilder<i32>,lhs_rows: &[usize],input_array: &ArrayRef,rhs_rows: &[usize],@@ -607,7 +607,7 @@ mod tests {};let equal_to =- |builder: &ByteGroupValueBuilder<i32>,+ |builder: &mut ByteGroupValueBuilder<i32>,lhs_rows: &[usize],input_array: &ArrayRef,rhs_rows: &[usize],@@ -689,7 +689,7 @@ mod tests {whereA: FnMut(&mut ByteGroupValueBuilder<i32>, &ArrayRef, &[usize]),E: FnMut(- &ByteGroupValueBuilder<i32>,+ &mut ByteGroupValueBuilder<i32>,&[usize],&ArrayRef,&[usize],@@ -741,7 +741,7 @@ mod tests {// Checklet mut equal_to_results = make_true_buffer(builder.len());equal_to(- &builder,+ &mut builder,&[0, 1, 2, 3, 4, 5],&input_array,&[0, 1, 2, 3, 4, 5],diff --git a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/bytes_view.rs b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/bytes_view.rsindex 190438f3c8..8153b67d6c 100644--- a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/bytes_view.rs+++ b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/bytes_view.rs@@ -584,7 +584,7 @@ impl<B: ByteViewType> GroupColumn for ByteViewGroupValueBuilder<B> {}fn vectorized_equal_to(- &self,+ &mut self,group_indices: &[usize],array: &ArrayRef,rows: &[usize],@@ -714,7 +714,7 @@ mod tests {};let equal_to =- |builder: &ByteViewGroupValueBuilder<StringViewType>,+ |builder: &mut ByteViewGroupValueBuilder<StringViewType>,lhs_rows: &[usize],input_array: &ArrayRef,rhs_rows: &[usize],@@ -740,7 +740,7 @@ mod tests {};let equal_to =- |builder: &ByteViewGroupValueBuilder<StringViewType>,+ |builder: &mut ByteViewGroupValueBuilder<StringViewType>,lhs_rows: &[usize],input_array: &ArrayRef,rhs_rows: &[usize],@@ -823,7 +823,7 @@ mod tests {whereA: FnMut(&mut ByteViewGroupValueBuilder<StringViewType>, &ArrayRef, &[usize]),E: FnMut(- &ByteViewGroupValueBuilder<StringViewType>,+ &mut ByteViewGroupValueBuilder<StringViewType>,&[usize],&ArrayRef,&[usize],@@ -908,7 +908,7 @@ mod tests {// Checklet mut equal_to_results = make_true_buffer(input_array.len());equal_to(- &builder,+ &mut builder,&[0, 1, 2, 3, 4, 5, 6, 7, 7, 7, 8, 8],&input_array,&[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11],diff --git a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/dictionary.rs b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/dictionary.rsindex d73018fbc1..b190c17297 100644--- a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/dictionary.rs+++ b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/dictionary.rs@@ -328,7 +328,7 @@ impl<K: ArrowDictionaryKeyType + Send + Sync> GroupColumn}fn vectorized_equal_to(- &self,+ &mut self,lhs_rows: &[usize],array: &ArrayRef,rhs_rows: &[usize],diff --git a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/fixed_size_binary.rs b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/fixed_size_binary.rsindex 26dd7f8e05..bd59e564c7 100644--- a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/fixed_size_binary.rs+++ b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/fixed_size_binary.rs@@ -140,7 +140,7 @@ impl GroupColumn for FixedSizeBinaryGroupValueBuilder {}fn vectorized_equal_to(- &self,+ &mut self,lhs_rows: &[usize],array: &ArrayRef,rhs_rows: &[usize],@@ -295,7 +295,7 @@ mod tests {};let equal_to =- |builder: &FixedSizeBinaryGroupValueBuilder,+ |builder: &mut FixedSizeBinaryGroupValueBuilder,lhs_rows: &[usize],input_array: &ArrayRef,rhs_rows: &[usize],@@ -321,7 +321,7 @@ mod tests {};let equal_to =- |builder: &FixedSizeBinaryGroupValueBuilder,+ |builder: &mut FixedSizeBinaryGroupValueBuilder,lhs_rows: &[usize],input_array: &ArrayRef,rhs_rows: &[usize],@@ -341,7 +341,7 @@ mod tests {whereA: FnMut(&mut FixedSizeBinaryGroupValueBuilder, &ArrayRef, &[usize]),E: FnMut(- &FixedSizeBinaryGroupValueBuilder,+ &mut FixedSizeBinaryGroupValueBuilder,&[usize],&ArrayRef,&[usize],@@ -388,7 +388,7 @@ mod tests {// Checklet mut equal_to_results = make_true_buffer(builder.len());equal_to(- &builder,+ &mut builder,&[0, 1, 2, 3, 4, 5],&input_array,&[0, 1, 2, 3, 4, 5],diff --git a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/list.rs b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/list.rsindex 8c681698be..b5dbdb3876 100644--- a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/list.rs+++ b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/list.rs@@ -152,7 +152,7 @@ impl<O: OffsetSizeTrait> GroupColumn for ListGroupValueBuilder<O> {}fn vectorized_equal_to(- &self,+ &mut self,lhs_rows: &[usize],array: &ArrayRef,rhs_rows: &[usize],diff --git a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/mod.rs b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/mod.rsindex 6c1926b402..b206fdd94e 100644--- a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/mod.rs+++ b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/mod.rs@@ -87,7 +87,7 @@ pub trait GroupColumn: Send + Sync {/// And if found nth result in `equal_to_results` is already/// `false`, the check for nth row will be skipped.fn vectorized_equal_to(- &self,+ &mut self,lhs_rows: &[usize],array: &ArrayRef,rhs_rows: &[usize],@@ -664,7 +664,7 @@ impl<const STREAMING: bool> GroupValuesColumn<STREAMING> {equal_to_results.truncate(0);equal_to_results.append_n(n, true);- for (col_idx, group_col) in self.group_values.iter().enumerate() {+ for (col_idx, group_col) in self.group_values.iter_mut().enumerate() {group_col.vectorized_equal_to(&self.vectorized_operation_buffers.equal_to_group_indices,&cols[col_idx],diff --git a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/primitive.rs b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/primitive.rsindex 441d4b489d..fe160b58db 100644--- a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/primitive.rs+++ b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/primitive.rs@@ -187,7 +187,7 @@ where}fn vectorized_equal_to(- &self,+ &mut self,lhs_rows: &[usize],array: &ArrayRef,rhs_rows: &[usize],@@ -341,7 +341,7 @@ mod tests {};let equal_to =- |builder: &PrimitiveGroupValueBuilder<Float32Type, true>,+ |builder: &mut PrimitiveGroupValueBuilder<Float32Type, true>,lhs_rows: &[usize],input_array: &ArrayRef,rhs_rows: &[usize],@@ -367,7 +367,7 @@ mod tests {};let equal_to =- |builder: &PrimitiveGroupValueBuilder<Float32Type, true>,+ |builder: &mut PrimitiveGroupValueBuilder<Float32Type, true>,lhs_rows: &[usize],input_array: &ArrayRef,rhs_rows: &[usize],@@ -387,7 +387,7 @@ mod tests {whereA: FnMut(&mut PrimitiveGroupValueBuilder<Float32Type, true>, &ArrayRef, &[usize]),E: FnMut(- &PrimitiveGroupValueBuilder<Float32Type, true>,+ &mut PrimitiveGroupValueBuilder<Float32Type, true>,&[usize],&ArrayRef,&[usize],@@ -442,7 +442,7 @@ mod tests {// Checklet mut equal_to_results = make_true_buffer(builder.len());equal_to(- &builder,+ &mut builder,&[0, 1, 2, 3, 4, 5, 6],&input_array,&[0, 1, 2, 3, 4, 5, 6],@@ -470,7 +470,7 @@ mod tests {};let equal_to =- |builder: &PrimitiveGroupValueBuilder<Int64Type, false>,+ |builder: &mut PrimitiveGroupValueBuilder<Int64Type, false>,lhs_rows: &[usize],input_array: &ArrayRef,rhs_rows: &[usize],@@ -496,7 +496,7 @@ mod tests {};let equal_to =- |builder: &PrimitiveGroupValueBuilder<Int64Type, false>,+ |builder: &mut PrimitiveGroupValueBuilder<Int64Type, false>,lhs_rows: &[usize],input_array: &ArrayRef,rhs_rows: &[usize],@@ -516,7 +516,7 @@ mod tests {whereA: FnMut(&mut PrimitiveGroupValueBuilder<Int64Type, false>, &ArrayRef, &[usize]),E: FnMut(- &PrimitiveGroupValueBuilder<Int64Type, false>,+ &mut PrimitiveGroupValueBuilder<Int64Type, false>,&[usize],&ArrayRef,&[usize],@@ -540,7 +540,7 @@ mod tests {// Checklet mut equal_to_results = make_true_buffer(builder.len());equal_to(- &builder,+ &mut builder,&[0, 1],&input_array,&[0, 1],diff --git a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/row_backed.rs b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/row_backed.rsindex 2fa01e1ae2..f488ef79df 100644--- a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/row_backed.rs+++ b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/row_backed.rs@@ -251,7 +251,7 @@ impl GroupColumn for RowsGroupColumn {}fn vectorized_equal_to(- &self,+ &mut self,lhs_rows: &[usize],array: &ArrayRef,rhs_rows: &[usize],