Skip to content

fix: Do not skip partial aggregates in case where there are no aggregate expressions #11867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

fix: Do not skip partial aggregates in case where there are no aggregate expressions #11867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce300c7
Do not skip partial aggregates in case where there are no aggregate e…
andygrove Aug 7, 2024
97d6bea
add test
andygrove Aug 7, 2024
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
2 changes: 2 additions & 0 deletions datafusion/physical-plan/src/aggregates/row_hash.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,11 +463,13 @@ impl GroupedHashAggregateStream {
// - aggregation mode is Partial
// - input is not ordered by GROUP BY expressions,
// since Final mode expects unique group values as its input
// - there is at least one accumulator
// - all accumulators support input batch to intermediate
// aggregate state conversion
// - there is only one GROUP BY expressions set
let skip_aggregation_probe = if agg.mode == AggregateMode::Partial
&& matches!(group_ordering, GroupOrdering::None)
&& !accumulators.is_empty()
&& accumulators
.iter()
.all(|acc| acc.supports_convert_to_state())
Expand Down
22 changes: 22 additions & 0 deletions datafusion/sqllogictest/test_files/aggregate_skip_partial.slt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,28 @@ set datafusion.execution.batch_size = 1;
statement ok
set datafusion.sql_parser.dialect = 'Postgres';

# Regression test for https://github.com/apache/datafusion/issues/11850
# Loosely based on TPC-DS q97
query IIIIII
WITH left AS (
SELECT c1 as l1, c2 as l2, c3 as l3, c4 as l4
FROM aggregate_test_100
GROUP BY 1, 2, 3, 4),
right AS (
SELECT c1 as r1, c2 as r2, c3 as r3, c4 as r4
FROM aggregate_test_100
GROUP BY 1, 2, 3, 4)
SELECT
SUM(l2), sum(l3), sum(l4),
sum(r2), sum(r3), sum(r4) FROM left
FULL OUTER JOIN right
ON left.l1 = right.r1
AND left.l2 = right.r2
AND left.l3 = right.r3
AND left.l4 = right.r4;
----
285 781 231997 285 781 231997

# Grouping by unique fields allows to check all accumulators
query ITIIII
SELECT c5, c1,
Expand Down