keep project

Author: adrian-wang

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala

@@ -119,9 +119,9 @@ object ColumnPruning extends Rule[LogicalPlan] {
     case a @ Aggregate(_, _, child) if (child.outputSet -- a.references).nonEmpty =>
       a.copy(child = Project(a.references.toSeq, child))
 
-    case p @ Project(_, Aggregate(ge, ec, child))
+    case p @ Project(pl, Aggregate(ge, ec, child))
       if (ec.map(_.references).toSet -- p.references).nonEmpty =>
-      Aggregate(ge, ec.filter(e => p.references.contains(e)), child)
+      Project(pl, Aggregate(ge, ec.filter(e => p.references.contains(e)), child))
 
     // Eliminate unneeded attributes from either side of a Join.
     case Project(projectList, Join(left, right, joinType, condition)) =>