Put strick checker

Author: maropu

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala

@@ -1007,8 +1007,12 @@ class Analyzer(
       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 checkIfChildOutputHasNo(attrName: String): Boolean =
+          !child.output.exists(a => resolver(a.name, attrName))
         agg.copy(groupingExpressions = groups.map {
-          case u: UnresolvedAttribute => aggs.find(ne => resolver(ne.name, u.name)).getOrElse(u)
+          case u: UnresolvedAttribute if checkIfChildOutputHasNo(u.name) =>
+            aggs.find(ne => resolver(ne.name, u.name)).getOrElse(u)
           case e => e
         })
     }