maropu commented on a change in pull request #26420: [SPARK-27986][SQL] Support
ANSI SQL filter predicate for aggregate expression.
URL: https://github.com/apache/spark/pull/26420#discussion_r349851169
##########
File path:
sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/AggregationIterator.scala
##########
@@ -157,38 +180,89 @@ abstract class AggregationIterator(
inputAttributes: Seq[Attribute]): (InternalRow, InternalRow) => Unit = {
val joinedRow = new JoinedRow
if (expressions.nonEmpty) {
- val mergeExpressions = functions.zip(expressions).flatMap {
- case (ae: DeclarativeAggregate, expression) =>
- expression.mode match {
+ val filterExpressions = expressions.map(_.filter)
+ var isFinalOrMerge = false
+ val mergeExpressions = functions.zipWithIndex.collect {
+ case (ae: DeclarativeAggregate, i) =>
+ expressions(i).mode match {
case Partial | Complete => ae.updateExpressions
- case PartialMerge | Final => ae.mergeExpressions
+ case PartialMerge | Final =>
+ isFinalOrMerge = true
+ ae.mergeExpressions
}
case (agg: AggregateFunction, _) =>
Seq.fill(agg.aggBufferAttributes.length)(NoOp)
}
val updateFunctions = functions.zipWithIndex.collect {
Review comment:
After `predicates` modified as commented above, then like this?
```
val updateFunctions = functions.zipWithIndex.collect {
case (ae: ImperativeAggregate, i) =>
expressions(i).mode match {
case Partial | Complete if predicates(i).isDefined =>
(buffer: InternalRow, row: InternalRow) =>
if (predicates(i).get.eval(row)) { ae.update(buffer, row) }
case Partial | Complete if predicates(i).isEmpty =>
(buffer: InternalRow, row: InternalRow) => ae.update(buffer,
row)
case PartialMerge | Final =>
(buffer: InternalRow, row: InternalRow) => ae.merge(buffer,
row)
}
}.toArray
```
----------------------------------------------------------------
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]
