Ngone51 commented on a change in pull request #28869:
URL: https://github.com/apache/spark/pull/28869#discussion_r442848163
##########
File path:
sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/BaseAggregateExec.scala
##########
@@ -53,15 +53,24 @@ trait BaseAggregateExec extends UnaryExecNode {
// can't bind the `mergeExpressions` with the output of the partial
aggregate, as they use
// the `inputAggBufferAttributes` of the original `DeclarativeAggregate`
before copy. Instead,
// we shall use `inputAggBufferAttributes` after copy to match the new
`mergeExpressions`.
- val aggAttrs = aggregateExpressions
- // there're exactly four cases needs `inputAggBufferAttributes` from
child according to the
- // agg planning in `AggUtils`: Partial -> Final, PartialMerge -> Final,
- // Partial -> PartialMerge, PartialMerge -> PartialMerge.
- .filter(a => a.mode == Final || a.mode ==
PartialMerge).map(_.aggregateFunction)
- .flatMap(_.inputAggBufferAttributes)
+ val aggAttrs = inputAggBufferAttributes
child.output.dropRight(aggAttrs.length) ++ aggAttrs
} else {
child.output
}
}
+
+ protected def inputAggBufferAttributes: Seq[Attribute] = {
Review comment:
make sense, changed to "private val" since it will be used anyway.
##########
File path:
sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/SortAggregateExec.scala
##########
@@ -49,7 +49,7 @@ case class SortAggregateExec(
override def producedAttributes: AttributeSet =
AttributeSet(aggregateAttributes) ++
AttributeSet(resultExpressions.diff(groupingExpressions).map(_.toAttribute)) ++
- AttributeSet(aggregateBufferAttributes)
+ AttributeSet(aggregateBufferAttributes) ++ super.producedAttributes
Review comment:
Good idea!
----------------------------------------------------------------
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]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
