Github user viirya commented on a diff in the pull request:
https://github.com/apache/spark/pull/17948#discussion_r116155780
--- Diff:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
---
@@ -1003,18 +1003,32 @@ class Analyzer(
*/
object ResolveAggAliasInGroupBy extends Rule[LogicalPlan] {
+ // This is a strict check though, we put this to apply the rule only
if the expression is not
+ // resolvable by child.
+ private def notResolvableByChild(attrName: String, child:
LogicalPlan): Boolean = {
+ !child.output.exists(a => resolver(a.name, attrName))
+ }
+
override def apply(plan: LogicalPlan): LogicalPlan =
plan.resolveOperators {
case agg @ Aggregate(groups, aggs, child)
if conf.groupByAliases && child.resolved &&
aggs.forall(_.resolved) &&
- groups.exists(_.isInstanceOf[UnresolvedAttribute]) =>
- // This is a strict check though, we put this to apply the rule
only in alias expressions
- def notResolvableByChild(attrName: String): Boolean =
- !child.output.exists(a => resolver(a.name, attrName))
- agg.copy(groupingExpressions = groups.map {
- case u: UnresolvedAttribute if notResolvableByChild(u.name) =>
+ groups.exists(!_.resolved) =>
+ agg.copy(groupingExpressions = groups.map { _.transform {
+ case u: UnresolvedAttribute if notResolvableByChild(u.name,
child) =>
+ aggs.find(ne => resolver(ne.name, u.name)).getOrElse(u)
+ }
+ })
+
+ case gs @ GroupingSets(selectedGroups, groups, child, aggs)
+ if conf.groupByAliases && child.resolved &&
aggs.forall(_.resolved) &&
+ (selectedGroups :+
groups).exists(_.exists(_.isInstanceOf[UnresolvedAttribute])) =>
--- End diff --
`groups` should cover `selectedGroups`. So we may not need to add
`selectedGroups` here.
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
