findepi commented on code in PR #16615:
URL: https://github.com/apache/datafusion/pull/16615#discussion_r2180825074
##########
datafusion/expr/src/expr_fn.rs:
##########
@@ -821,7 +821,7 @@ impl ExprFuncBuilder {
let fun_expr = match fun {
ExprFuncKind::Aggregate(mut udaf) => {
- udaf.params.order_by = order_by;
+ udaf.params.order_by = order_by.unwrap_or_default();
Review Comment:
as a follow-up, the builder `order_by` field can be changed to non-optional
as well
##########
datafusion/expr/src/expr.rs:
##########
@@ -2303,18 +2303,15 @@ impl NormalizeEq for Expr {
(None, None) => true,
_ => false,
}
- && match (self_order_by, other_order_by) {
- (Some(self_order_by), Some(other_order_by)) =>
self_order_by
- .iter()
- .zip(other_order_by.iter())
- .all(|(a, b)| {
- a.asc == b.asc
- && a.nulls_first == b.nulls_first
- && a.expr.normalize_eq(&b.expr)
- }),
- (None, None) => true,
- _ => false,
- }
+ && self_order_by
+ .iter()
+ .zip(other_order_by.iter())
+ .all(|(a, b)| {
+ a.asc == b.asc
+ && a.nulls_first == b.nulls_first
+ && a.expr.normalize_eq(&b.expr)
+ })
+ && self_order_by.len() == other_order_by.len()
Review Comment:
The length check was missing, thanks for adding it.
Coincidentally, recently i was reflecting about precisely this -- how
`Iter::zip` is error-prone to use.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscr...@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscr...@datafusion.apache.org
For additional commands, e-mail: github-h...@datafusion.apache.org
