Github user chenghao-intel commented on a diff in the pull request:
https://github.com/apache/spark/pull/7343#discussion_r34645391
--- Diff:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
---
@@ -193,16 +193,52 @@ class Analyzer(
}
def apply(plan: LogicalPlan): LogicalPlan = plan transform {
+ case a if !a.childrenResolved => a // be sure all of the children
are resolved.
case a: Cube =>
GroupingSets(bitmasks(a), a.groupByExprs, a.child, a.aggregations)
case a: Rollup =>
GroupingSets(bitmasks(a), a.groupByExprs, a.child, a.aggregations)
case x: GroupingSets =>
val gid = AttributeReference(VirtualColumn.groupingIdName,
IntegerType, false)()
+ // We will insert another Projection if the GROUP BY keys contains
the
+ // non-attribute expressions. And the top operators can references
those
+ // expressions by its alias.
+ // e.g. SELECT key%5 as c1 FROM src GROUP BY key%5 ==>
+ // SELECT a as c1 FROM (SELECT key%5 AS a FROM src) GROUP BY a
+
+ // find all of the non-attribute expressions in the GROUP BY keys
+ val nonAttributeGroupByExpressions = new ArrayBuffer[Alias]()
+
+ // The pair of (the non-attributes expression, associated
attribute (alias))
+ val groupByExprPairs = x.groupByExprs.map(_ match {
+ case e: NamedExpression => (e, e)
+ case other => {
+ val alias = Alias(other, other.toString)()
+ nonAttributeGroupByExpressions += alias // add the
non-attributes expression alias
+ (other, alias.toAttribute)
+ }
+ })
+
+ // substitute the non-attribute expressions for aggregations.
+ val aggregation = x.aggregations.map(expr => expr.transformDown {
+ case e =>
groupByExprPairs.find(_._1.semanticEquals(e)).map(_._2).getOrElse(e)
--- End diff --
As the `AttributeReference` probably be in the problem of case insensitive,
we can not just use the `expr1 == expr2`, but `expr1.semanticEquals(expr2)`.
See more discussion at #6587 .
For example: `SELECT key%5 FROM src GROUP BY Key%5`, we will fails in
finding the identical expression from the `Aggregate Expression`.
---
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]
