bug gix

Author: cloud-fan

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

@@ -630,7 +630,7 @@ class Analyzer(
 
         // Try resolving the ordering as though it is in the aggregate clause.
         try {
-          val unresolvedSortOrders = sortOrder.filterNot(_.resolved)
+          val unresolvedSortOrders = sortOrder.filter(s => !s.resolved || containsAggregate(s))
           val aliasedOrdering = unresolvedSortOrders.map(o => Alias(o.child, "aggOrder")())
           val aggregatedOrdering = aggregate.copy(aggregateExpressions = aliasedOrdering)
           val resolvedAggregate: Aggregate = execute(aggregatedOrdering).asInstanceOf[Aggregate]
@@ -664,10 +664,11 @@ class Analyzer(
               }
           }
 
-          val sortOrdersMap = unresolvedSortOrders.map(
-            new TreeNodeRef(_)).zip(evaluatedOrderings).toMap
-          val finalSortOrders = sortOrder.map(
-            s => sortOrdersMap.getOrElse(new TreeNodeRef(s), s))
+          val sortOrdersMap = unresolvedSortOrders
+            .map(new TreeNodeRef(_))
+            .zip(evaluatedOrderings)
+            .toMap
+          val finalSortOrders = sortOrder.map(s => sortOrdersMap.getOrElse(new TreeNodeRef(s), s))
 
           // Since we don't rely on sort.resolved as the stop condition for this rule,
           // we need to check this and prevent applying this rule multiple times

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/AnalysisSuite.scala

@@ -220,21 +220,21 @@ class AnalysisSuite extends AnalysisTest {
     // checkUDF(udf4, expected4)
     }
 
-  test("SPARK-11863 mixture of aliases and real columns in orderby clause - tpcds 19,55,71") {
+  test("SPARK-11863 mixture of aliases and real columns in order by clause - tpcds 19,55,71") {
     val a = testRelation2.output(0)
     val c = testRelation2.output(2)
     val alias1 = a.as("a1")
     val alias2 = c.as("a2")
     val alias3 = count(a).as("a3")
 
-    val plan = testRelation2.
-      groupBy('a, 'c) ('a.as("a1"), 'c.as("a2"), count('a).as("a3")).
-      orderBy('a1.asc, 'c.asc)
+    val plan = testRelation2
+      .groupBy('a, 'c)('a.as("a1"), 'c.as("a2"), count('a).as("a3"))
+      .orderBy('a1.asc, 'c.asc)
 
-    val expected = testRelation2.
-      groupBy(a, c) (alias1, alias2, alias3).
-      orderBy(alias1.toAttribute.asc, alias2.toAttribute.asc).
-      select(alias1.toAttribute, alias2.toAttribute, alias3.toAttribute)
+    val expected = testRelation2
+      .groupBy(a, c)(alias1, alias2, alias3)
+      .orderBy(alias1.toAttribute.asc, alias2.toAttribute.asc)
+      .select(alias1.toAttribute, alias2.toAttribute, alias3.toAttribute)
     checkAnalysis(plan, expected)
   }