minor enhance

Author: cloud-fan

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

@@ -263,15 +263,17 @@ class Analyzer(catalog: Catalog,
             q.asInstanceOf[GroupingAnalytics].gid
           case u @ UnresolvedAttribute(name) if q.isInstanceOf[Sort] =>
             val s = q.asInstanceOf[Sort]
-            val input = s.child match {
-              case Project(list, c) => list.filter {
-                case Alias(g: GetField, _) => false
-                case Alias(g: GetItem, _) => false
-                case _ => true
-              }.map(_.toAttribute)
-              case other => other.output
+            val newChild = s.child match {
+              case Project(list, c) =>
+                val newList = list.filter {
+                  case Alias(g: GetField, _) => false
+                  case Alias(g: GetItem, _) => false
+                  case _ => true
+                }
+                Project(newList, c)
+              case other => other
             }
-            s.resolve(name, input, resolver).getOrElse(u)
+            Sort(s.order, s.global, newChild).resolveChildren(name, resolver).getOrElse(u)
           case u @ UnresolvedAttribute(name) =>
             // Leave unchanged if resolution fails.  Hopefully will be resolved next round.
             val result = q.resolveChildren(name, resolver).getOrElse(u)

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/LogicalPlan.scala

@@ -155,7 +155,7 @@ abstract class LogicalPlan extends QueryPlan[LogicalPlan] with Logging {
   }
 
   /** Performs attribute resolution given a name and a sequence of possible attributes. */
-  def resolve(
+  protected def resolve(
       name: String,
       input: Seq[Attribute],
       resolver: Resolver): Option[NamedExpression] = {