Skip to content

Add DecomposeAggregate optimizer to rewrite AVG as SUM/COUNT #21613

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

Open
Dandandan wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Add DecomposeAggregate optimizer to rewrite AVG as SUM/COUNT #21613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
75ecb4c
Add DecomposeAggregate optimizer rule to rewrite AVG as SUM/COUNT
Dandandan Apr 14, 2026
4b81d40
Skip GroupingSet aggregates in DecomposeAggregate rule
Dandandan Apr 14, 2026
b32f34d
Update preserve_file_partitioning test for DecomposeAggregate
Dandandan Apr 14, 2026
21a2fd4
Fix pgjson explain test to match actual key ordering
Dandandan Apr 14, 2026
97344c2
Strip AVG's CAST to Float64 and let SUM use native integer types
Dandandan Apr 14, 2026
959565a
Fix pgjson explain test to match actual key ordering
Dandandan Apr 14, 2026
e3a7725
Simplify DecomposeAggregate CAST handling: let SUM do its own coercion
Dandandan Apr 14, 2026
cfd1beb
Simplify DecomposeAggregate: pass AVG args directly to SUM
Dandandan Apr 14, 2026
0d7da0a
Strip CAST to Float64 only for types SUM handles natively
Dandandan Apr 14, 2026
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
18 changes: 18 additions & 0 deletions datafusion/functions-aggregate/src/sum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,24 @@ impl AggregateUDFImpl for Sum {
&self.signature
}

fn coerce_types(&self, arg_types: &[DataType]) -> Result<Vec<DataType>> {
// Unwrap dictionary types to their value type first.
let arg = match &arg_types[0] {
DataType::Dictionary(_, v) => v.as_ref(),
other => other,
};
match arg {
DataType::Int8 | DataType::Int16 | DataType::Int32 => {
Ok(vec![DataType::Int64])
}
DataType::UInt8 | DataType::UInt16 | DataType::UInt32 => {
Ok(vec![DataType::UInt64])
}
DataType::Float32 => Ok(vec![DataType::Float64]),
_ => Ok(arg_types.to_vec()),
}
}

fn return_type(&self, arg_types: &[DataType]) -> Result<DataType> {
match &arg_types[0] {
DataType::Int64 => Ok(DataType::Int64),
Expand Down
Loading
Loading