maropu commented on a change in pull request #26656: [SPARK-27986][SQL] Support
ANSI SQL filter clause for aggregate expression.
URL: https://github.com/apache/spark/pull/26656#discussion_r350151439
##########
File path:
sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/AggregationIterator.scala
##########
@@ -160,16 +160,41 @@ abstract class AggregationIterator(
val mergeExpressions = functions.zip(expressions).flatMap {
case (ae: DeclarativeAggregate, expression) =>
expression.mode match {
- case Partial | Complete => ae.updateExpressions
+ case Partial | Complete =>
+ expression match {
+ case AggregateExpression(_, _, _, Some(filter), _) =>
+ ae.updateExpressions.zip(ae.aggBufferAttributes).map{
+ case (newVal, attr) => If(filter, newVal, attr)
+ }
+ case _ => ae.updateExpressions
+ }
Review comment:
like this?
```
val mergeExpressions = functions.zip(expressions.map(ae => (ae.mode,
ae.filter))).flatMap {
case (ae: DeclarativeAggregate, (mode, filter)) =>
mode match {
case Partial | Complete =>
if (filter.isDefined) {
ae.updateExpressions.zip(ae.aggBufferAttributes).map {
case (newVal, attr) => If(filter.get, newVal, attr)
}
} else {
ae.updateExpressions
}
case PartialMerge | Final =>
ae.mergeExpressions
}
case (agg: AggregateFunction, _) =>
Seq.fill(agg.aggBufferAttributes.length)(NoOp)
}
```
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
