Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions datafusion/core/benches/aggregate_query_sql.rs
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,26 @@ fn criterion_benchmark(c: &mut Criterion) {
)
})
});

c.bench_function("aggregate_query_approx_percentile_cont_on_u64", |b| {
b.iter(|| {
query(
ctx.clone(),
"SELECT utf8, approx_percentile_cont(u64_wide, 0.5, 2500) \
FROM t GROUP BY utf8",
)
})
});

c.bench_function("aggregate_query_approx_percentile_cont_on_f32", |b| {
b.iter(|| {
query(
ctx.clone(),
"SELECT utf8, approx_percentile_cont(f32, 0.5, 2500) \
FROM t GROUP BY utf8",
)
})
});
}

criterion_group!(benches, criterion_benchmark);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -370,9 +370,10 @@ impl Accumulator for ApproxPercentileAccumulator {

fn update_batch(&mut self, values: &[ArrayRef]) -> Result<()> {
let values = &values[0];
let unsorted_values =
ApproxPercentileAccumulator::convert_to_ordered_float(values)?;
self.digest = self.digest.merge_unsorted_f64(unsorted_values);
let sorted_values = &arrow::compute::sort(values, None)?;
let sorted_values =
ApproxPercentileAccumulator::convert_to_ordered_float(sorted_values)?;
self.digest = self.digest.merge_sorted_f64(&sorted_values);
Ok(())
}

Expand Down
6 changes: 5 additions & 1 deletion datafusion/physical-expr/src/aggregate/tdigest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ impl TDigest {
}
}

#[cfg(test)]
pub(crate) fn merge_unsorted_f64(
&self,
unsorted_values: Vec<OrderedFloat<f64>>,
Expand All @@ -269,7 +270,10 @@ impl TDigest {
self.merge_sorted_f64(&values)
}

fn merge_sorted_f64(&self, sorted_values: &[OrderedFloat<f64>]) -> TDigest {
pub(crate) fn merge_sorted_f64(
&self,
sorted_values: &[OrderedFloat<f64>],
) -> TDigest {
#[cfg(debug_assertions)]
debug_assert!(is_sorted(sorted_values), "unsorted input to TDigest");

Expand Down