From cdf6aab08552c70ea02d9d76ee5e8ef3565ef9cc Mon Sep 17 00:00:00 2001 From: RIchard Baah Date: Sun, 16 Aug 2026 12:14:09 -0400 Subject: [PATCH 1/4] introduce new dictionary benchmarks --- .../benches/dictionary_group_values.rs | 87 ++++++++++++++++++- 1 file changed, 85 insertions(+), 2 deletions(-) diff --git a/datafusion/physical-plan/benches/dictionary_group_values.rs b/datafusion/physical-plan/benches/dictionary_group_values.rs index ded52aebd1100..b175c4d392bc7 100644 --- a/datafusion/physical-plan/benches/dictionary_group_values.rs +++ b/datafusion/physical-plan/benches/dictionary_group_values.rs @@ -29,7 +29,7 @@ use criterion::{ }; use datafusion_expr::EmitTo; use datafusion_physical_plan::aggregates::group_values::new_group_values; -use datafusion_physical_plan::aggregates::order::GroupOrdering; +use datafusion_physical_plan::aggregates::order::{GroupOrdering, GroupOrderingFull}; use rand::rngs::StdRng; use rand::seq::SliceRandom; use rand::{Rng, SeedableRng}; @@ -172,5 +172,88 @@ fn bench_repeated_intern_emit(c: &mut Criterion) { group.finish(); } -criterion_group!(benches, bench_intern_emit, bench_repeated_intern_emit); +// GroupOrdering::Full -> GroupValuesColumn::: scalar append_val/equal_to path. +fn bench_scalar_append_equal(c: &mut Criterion) { + let mut group = c.benchmark_group("dict_scalar_append_equal"); + let schema = dict_schema(); + let null_density = 0.1; + let size = SIZES[1]; + + let mut cards = CARDS_RELATIVE.to_vec(); + cards.push(size); + for cardinality in cards { + let array = make_dict(size, cardinality, null_density, SEED); + group.throughput(Throughput::Elements(size as u64)); + group.bench_function( + bench_id("scalar_append_equal", size, cardinality, null_density), + |b| { + b.iter_batched_ref( + || { + ( + new_group_values( + schema.clone(), + &GroupOrdering::Full(GroupOrderingFull::new()), + ) + .unwrap(), + Vec::::with_capacity(size), + ) + }, + |(gv, groups)| { + gv.intern(std::slice::from_ref(&array), groups).unwrap(); + black_box(&*groups); + black_box(gv.emit(EmitTo::All).unwrap()); + }, + BatchSize::SmallInput, + ); + }, + ); + } + group.finish(); +} + +// EmitTo::First exercises the take-n path; two interns + partial emit per iteration. +fn bench_take_n(c: &mut Criterion) { + let mut group = c.benchmark_group("dict_take_n"); + let schema = dict_schema(); + let null_density = 0.10; + let size = SIZES[1]; + + let mut cards = CARDS_RELATIVE.to_vec(); + cards.push(size); + for cardinality in cards { + let batch_a = make_dict(size, cardinality, null_density, SEED); + let batch_b = make_dict(size, cardinality, null_density, SEED.wrapping_add(1)); + group.throughput(Throughput::Elements((size * 2 * N_BATCHES) as u64)); + group.bench_function(bench_id("take_n", size, cardinality, null_density), |b| { + b.iter_batched_ref( + || { + ( + new_group_values(schema.clone(), &GroupOrdering::None).unwrap(), + Vec::::with_capacity(size), + ) + }, + |(gv, groups)| { + for _ in 0..N_BATCHES { + gv.intern(std::slice::from_ref(&batch_a), groups).unwrap(); + black_box(&*groups); + gv.intern(std::slice::from_ref(&batch_b), groups).unwrap(); + black_box(&*groups); + black_box(gv.emit(EmitTo::First(1)).unwrap()); + } + black_box(gv.emit(EmitTo::All).unwrap()); + }, + BatchSize::SmallInput, + ); + }); + } + group.finish(); +} + +criterion_group!( + benches, + bench_intern_emit, + bench_repeated_intern_emit, + bench_scalar_append_equal, + bench_take_n +); criterion_main!(benches); From 529295b9e6c3678582a428020bbb728e2853d3aa Mon Sep 17 00:00:00 2001 From: RIchard Baah Date: Sun, 16 Aug 2026 12:20:27 -0400 Subject: [PATCH 2/4] tweak benchmarks --- .../benches/dictionary_group_values.rs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/datafusion/physical-plan/benches/dictionary_group_values.rs b/datafusion/physical-plan/benches/dictionary_group_values.rs index b175c4d392bc7..c0dafccd7316d 100644 --- a/datafusion/physical-plan/benches/dictionary_group_values.rs +++ b/datafusion/physical-plan/benches/dictionary_group_values.rs @@ -221,9 +221,8 @@ fn bench_take_n(c: &mut Criterion) { let mut cards = CARDS_RELATIVE.to_vec(); cards.push(size); for cardinality in cards { - let batch_a = make_dict(size, cardinality, null_density, SEED); - let batch_b = make_dict(size, cardinality, null_density, SEED.wrapping_add(1)); - group.throughput(Throughput::Elements((size * 2 * N_BATCHES) as u64)); + let batch = make_dict(size, cardinality, null_density, SEED); + group.throughput(Throughput::Elements((size * N_BATCHES) as u64)); group.bench_function(bench_id("take_n", size, cardinality, null_density), |b| { b.iter_batched_ref( || { @@ -234,13 +233,11 @@ fn bench_take_n(c: &mut Criterion) { }, |(gv, groups)| { for _ in 0..N_BATCHES { - gv.intern(std::slice::from_ref(&batch_a), groups).unwrap(); + gv.intern(std::slice::from_ref(&batch), groups).unwrap(); black_box(&*groups); - gv.intern(std::slice::from_ref(&batch_b), groups).unwrap(); - black_box(&*groups); - black_box(gv.emit(EmitTo::First(1)).unwrap()); + black_box(gv.emit(EmitTo::First(size / 2)).unwrap()); } - black_box(gv.emit(EmitTo::All).unwrap()); + black_box(gv.emit(EmitTo::First(gv.len())).unwrap()); }, BatchSize::SmallInput, ); From e283300183cc5374a189b52779c924ccf0064c94 Mon Sep 17 00:00:00 2001 From: RIchard Baah Date: Sun, 16 Aug 2026 13:08:56 -0400 Subject: [PATCH 3/4] tweak emit size --- datafusion/physical-plan/benches/dictionary_group_values.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/datafusion/physical-plan/benches/dictionary_group_values.rs b/datafusion/physical-plan/benches/dictionary_group_values.rs index c0dafccd7316d..370faed1b1fda 100644 --- a/datafusion/physical-plan/benches/dictionary_group_values.rs +++ b/datafusion/physical-plan/benches/dictionary_group_values.rs @@ -235,7 +235,8 @@ fn bench_take_n(c: &mut Criterion) { for _ in 0..N_BATCHES { gv.intern(std::slice::from_ref(&batch), groups).unwrap(); black_box(&*groups); - black_box(gv.emit(EmitTo::First(size / 2)).unwrap()); + let emit_n = (size / 2).min(gv.len()); + black_box(gv.emit(EmitTo::First(emit_n)).unwrap()); } black_box(gv.emit(EmitTo::First(gv.len())).unwrap()); }, From e76e3896f0e2a9c091ee1da89f44572d29e2f93c Mon Sep 17 00:00:00 2001 From: RIchard Baah Date: Tue, 18 Aug 2026 00:27:29 -0400 Subject: [PATCH 4/4] address Pr comments --- datafusion/physical-plan/benches/dictionary_group_values.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datafusion/physical-plan/benches/dictionary_group_values.rs b/datafusion/physical-plan/benches/dictionary_group_values.rs index 370faed1b1fda..e0cbc3577ce7c 100644 --- a/datafusion/physical-plan/benches/dictionary_group_values.rs +++ b/datafusion/physical-plan/benches/dictionary_group_values.rs @@ -211,7 +211,7 @@ fn bench_scalar_append_equal(c: &mut Criterion) { group.finish(); } -// EmitTo::First exercises the take-n path; two interns + partial emit per iteration. +//EmitTo::First exercises repeated fn bench_take_n(c: &mut Criterion) { let mut group = c.benchmark_group("dict_take_n"); let schema = dict_schema(); @@ -235,7 +235,7 @@ fn bench_take_n(c: &mut Criterion) { for _ in 0..N_BATCHES { gv.intern(std::slice::from_ref(&batch), groups).unwrap(); black_box(&*groups); - let emit_n = (size / 2).min(gv.len()); + let emit_n = (gv.len() / 2).min(gv.len()); black_box(gv.emit(EmitTo::First(emit_n)).unwrap()); } black_box(gv.emit(EmitTo::First(gv.len())).unwrap());