Skip to content

minor: clean up distinct window code #17215

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

Merged
merged 2 commits into from
Aug 18, 2025
Merged

minor: clean up distinct window code #17215

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98e4a85
minor: clean up distinct window code
zhuqi-lucas Aug 16, 2025
1a581e1
Merge branch 'main' into address_distinct_window_comments
zhuqi-lucas Aug 17, 2025
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
30 changes: 12 additions & 18 deletions datafusion/physical-plan/src/windows/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,34 +102,28 @@ pub fn create_window_expr(
) -> Result<Arc<dyn WindowExpr>> {
Ok(match fun {
WindowFunctionDefinition::AggregateUDF(fun) => {
if distinct {
let aggregate = AggregateExprBuilder::new(Arc::clone(fun), args.to_vec())
let aggregate = if distinct {
AggregateExprBuilder::new(Arc::clone(fun), args.to_vec())
.schema(Arc::new(input_schema.clone()))
.alias(name)
.with_ignore_nulls(ignore_nulls)
.distinct()
.build()
.map(Arc::new)?;
window_expr_from_aggregate_expr(
partition_by,
order_by,
window_frame,
aggregate,
)
.map(Arc::new)?
} else {
let aggregate = AggregateExprBuilder::new(Arc::clone(fun), args.to_vec())
AggregateExprBuilder::new(Arc::clone(fun), args.to_vec())
.schema(Arc::new(input_schema.clone()))
.alias(name)
.with_ignore_nulls(ignore_nulls)
.build()
.map(Arc::new)?;
window_expr_from_aggregate_expr(
partition_by,
order_by,
window_frame,
aggregate,
)
}
.map(Arc::new)?
};
window_expr_from_aggregate_expr(
partition_by,
order_by,
window_frame,
aggregate,
)
}
WindowFunctionDefinition::WindowUDF(fun) => Arc::new(StandardWindowExpr::new(
create_udwf_window_expr(fun, args, input_schema, name, ignore_nulls)?,
Expand Down