Github user liancheng commented on a diff in the pull request:
https://github.com/apache/spark/pull/6261#discussion_r32123444
--- Diff:
sql/core/src/main/scala/org/apache/spark/sql/execution/GeneratedAggregate.scala
---
@@ -214,18 +214,19 @@ case class GeneratedAggregate(
}.toMap
val namedGroups = groupingExpressions.zipWithIndex.map {
- case (ne: NamedExpression, _) => (ne, ne)
- case (e, i) => (e, Alias(e, s"GroupingExpr$i")())
+ case (ne: NamedExpression, _) => (ne, ne.toAttribute)
+ case (e, i) => (e, Alias(e, s"GroupingExpr$i")().toAttribute)
}
- val groupMap: Map[Expression, Attribute] =
- namedGroups.map { case (k, v) => k -> v.toAttribute}.toMap
-
// The set of expressions that produce the final output given the
aggregation buffer and the
// grouping expressions.
val resultExpressions = aggregateExpressions.map(_.transform {
case e: Expression if resultMap.contains(new TreeNodeRef(e)) =>
resultMap(new TreeNodeRef(e))
- case e: Expression if groupMap.contains(e) => groupMap(e)
+ case e: Expression =>
+ namedGroups
+ .find { case (expr, _) => expr semanticEquals e }
+ .map(_._2)
+ .getOrElse(e)
--- End diff --
Guess you'd also like to update this one since you updated the other
occurrence?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
