Skip to content

Apache DataFusion SQL Query Engine

minor: speedup one slow aggregate unit test (#26925)

Yongting You0ad5049a94d6
diff --git a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/clustered.rs b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/clustered.rs
index ca87a9a573..efb4e24e6c 100644
--- a/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/clustered.rs
+++ b/datafusion/physical-plan/src/aggregates/group_values/multi_group_by/clustered.rs
@@ -396,35 +396,38 @@ mod tests {
}
for key_type in key_types {
for nullable in [false, true] {
- let rows = 1025;
- let first: ArrayRef =
- Arc::new(Int32Array::from_iter((0..rows).map(|row| {
- let group = (row / 7) as i32;
- let key = group / 4;
- // Swap neighboring key values while keeping each run contiguous.
- (!nullable || group >= 4).then_some(if unsorted {
- key ^ 1
- } else {
- key
- })
- })));
- let second = clustered_key_array(&key_type, rows, nullable)?;
- for descending in [false, true] {
- let mut input = vec![Arc::clone(&first), Arc::clone(&second)];
- if descending {
- let reverse =
- UInt32Array::from_iter_values((0..rows as u32).rev());
- input = input
- .iter()
- .map(|array| take(array, &reverse, None))
- .collect::<std::result::Result<_, _>>()?;
- }
- let schema = Arc::new(Schema::new(vec![
- Field::new("a", DataType::Int32, nullable),
- Field::new("b", key_type.clone(), nullable),
- ]));
- assert!(GroupValuesClustered::supports_schema(&schema), "{key_type}");
- for batch_size in [1, 2, 7, 8, 63, 1024] {
+ for batch_size in [1, 2, 7, 8, 63, 1024] {
+ let rows = 129.max(batch_size + 1);
+ let first: ArrayRef =
+ Arc::new(Int32Array::from_iter((0..rows).map(|row| {
+ let group = (row / 7) as i32;
+ let key = group / 4;
+ // Swap neighboring key values while keeping each run contiguous.
+ (!nullable || group >= 4).then_some(if unsorted {
+ key ^ 1
+ } else {
+ key
+ })
+ })));
+ let second = clustered_key_array(&key_type, rows, nullable)?;
+ for descending in [false, true] {
+ let mut input = vec![Arc::clone(&first), Arc::clone(&second)];
+ if descending {
+ let reverse =
+ UInt32Array::from_iter_values((0..rows as u32).rev());
+ input = input
+ .iter()
+ .map(|array| take(array, &reverse, None))
+ .collect::<std::result::Result<_, _>>()?;
+ }
+ let schema = Arc::new(Schema::new(vec![
+ Field::new("a", DataType::Int32, nullable),
+ Field::new("b", key_type.clone(), nullable),
+ ]));
+ assert!(
+ GroupValuesClustered::supports_schema(&schema),
+ "{key_type}"
+ );
for emit_limit in [0, 1, 17, usize::MAX] {
let mut clustered =
GroupValuesClustered::try_new(Arc::clone(&schema))?;