Skip to content

Commit 33c5bb1

Browse files
committed
cargo fmt failing
1 parent 0ae8e11 commit 33c5bb1

2 files changed

Lines changed: 16 additions & 13 deletions

File tree

datafusion/functions-aggregate/benches/array_agg.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,15 @@ use std::hint::black_box;
1919
use std::sync::Arc;
2020

2121
use arrow::array::{
22-
Array, ArrayRef, ArrowPrimitiveType, AsArray, ListArray, NullBufferBuilder, StringArray,
22+
Array, ArrayRef, ArrowPrimitiveType, AsArray, ListArray, NullBufferBuilder,
23+
StringArray,
2324
};
2425
use arrow::datatypes::{DataType, Field, Int64Type};
2526
use criterion::{Criterion, criterion_group, criterion_main};
2627
use datafusion_expr::Accumulator;
27-
use datafusion_functions_aggregate::array_agg::{ArrayAggAccumulator, DistinctArrayAggAccumulator};
28+
use datafusion_functions_aggregate::array_agg::{
29+
ArrayAggAccumulator, DistinctArrayAggAccumulator,
30+
};
2831

2932
use arrow::buffer::OffsetBuffer;
3033
use arrow::util::bench_util::create_primitive_array;
@@ -278,8 +281,7 @@ fn distinct_array_agg_benchmark(c: &mut Criterion) {
278281
// --- High cardinality: ~5 % DB names, ~95 % near-unique random strings --
279282
// Worst-case scenario: almost every row is a new distinct value, so the
280283
// accumulator pays the full insertion cost for nearly every row.
281-
let values =
282-
Arc::new(create_string_array_high_cardinality(8192, 0.05)) as ArrayRef;
284+
let values = Arc::new(create_string_array_high_cardinality(8192, 0.05)) as ArrayRef;
283285
distinct_update_batch_bench(
284286
c,
285287
"distinct_array_agg utf8 high cardinality (~7800 distinct, 5% db names)",

datafusion/functions-aggregate/src/array_agg.rs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,12 @@ use arrow::array::{
2828
};
2929
use arrow::buffer::{NullBuffer, OffsetBuffer, ScalarBuffer};
3030
use arrow::compute::{SortOptions, filter};
31-
use arrow::row::{Row, RowConverter, Rows, SortField};
3231
use arrow::datatypes::{DataType, Field, FieldRef, Fields};
32+
use arrow::row::{Row, RowConverter, Rows, SortField};
3333

3434
use datafusion_common::cast::as_list_array;
35+
use datafusion_common::hash_utils::{RandomState, create_hashes};
36+
use datafusion_common::utils::proxy::HashTableAllocExt;
3537
use datafusion_common::utils::{
3638
SingleRowListArrayBuilder, compare_rows, get_row_at_idx, take_function_args,
3739
};
@@ -48,11 +50,9 @@ use datafusion_functions_aggregate_common::aggregate::groups_accumulator::nulls:
4850
use datafusion_functions_aggregate_common::merge_arrays::merge_ordered_arrays;
4951
use datafusion_functions_aggregate_common::order::AggregateOrderSensitivity;
5052
use datafusion_functions_aggregate_common::utils::ordering_fields;
51-
use datafusion_common::hash_utils::{RandomState, create_hashes};
52-
use datafusion_common::utils::proxy::HashTableAllocExt;
5353
use datafusion_macros::user_doc;
54-
use hashbrown::hash_table::HashTable;
5554
use datafusion_physical_expr_common::sort_expr::{LexOrdering, PhysicalSortExpr};
55+
use hashbrown::hash_table::HashTable;
5656

5757
make_udaf_expr_and_func!(
5858
ArrayAgg,
@@ -1109,7 +1109,8 @@ impl Accumulator for DistinctArrayAggAccumulator {
11091109
+ self.map_size
11101110
+ self.counts.capacity() * size_of::<u64>()
11111111
+ self.hashes_buffer.capacity() * size_of::<u64>()
1112-
+ self.datatype.size() - size_of_val(&self.datatype)
1112+
+ self.datatype.size()
1113+
- size_of_val(&self.datatype)
11131114
}
11141115
}
11151116

@@ -2736,8 +2737,7 @@ mod tests {
27362737
"postgres", "mysql", "postgres", "redis", "mysql", "duckdb", "redis",
27372738
]));
27382739

2739-
let mut acc =
2740-
DistinctArrayAggAccumulator::try_new(&DataType::Utf8, None, false)?;
2740+
let mut acc = DistinctArrayAggAccumulator::try_new(&DataType::Utf8, None, false)?;
27412741
acc.update_batch(&[input])?;
27422742

27432743
let result = acc.evaluate()?;
@@ -2826,8 +2826,9 @@ mod tests {
28262826
use arrow::array::Date32Array;
28272827

28282828
// 7 rows with 4 distinct dates (days since epoch), each duplicate appearing twice.
2829-
let input: ArrayRef =
2830-
Arc::new(Date32Array::from(vec![100i32, 200, 100, 300, 200, 400, 300]));
2829+
let input: ArrayRef = Arc::new(Date32Array::from(vec![
2830+
100i32, 200, 100, 300, 200, 400, 300,
2831+
]));
28312832

28322833
let mut acc =
28332834
DistinctArrayAggAccumulator::try_new(&DataType::Date32, None, false)?;

0 commit comments

Comments
 (0)