From 9fb973f39582e03ad06bf99c78f01099d493170a Mon Sep 17 00:00:00 2001 From: ravipesala Date: Thu, 2 Oct 2014 09:27:51 +0530 Subject: [PATCH] Removed aliases to grouping expressions. --- .../apache/spark/sql/catalyst/SqlParser.scala | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala index 68d059e938547..26336332c05a2 100755 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala @@ -143,26 +143,6 @@ class SqlParser extends StandardTokenParsers with PackratParsers { case (e, i) => Alias(e, s"c$i")() } } - - /** Creates the aliases to the grouping expressions */ - protected def assignAliasesForGroups( - grpExprs: Seq[Expression], - projExprs: Seq[Expression]): Seq[NamedExpression] = { - grpExprs.zipWithIndex.map { - case (ne: NamedExpression, _) => ne - case (e, i) => - var aliasForGrp:NamedExpression = null - projExprs.foreach { - case Alias(pe,pi) if pe.fastEquals(e) => aliasForGrp = Alias(e, pi)() - case _ => - } - if (aliasForGrp == null) { - Alias(e, s"c$i")() - } else { - aliasForGrp - } - } - } protected lazy val query: Parser[LogicalPlan] = ( select * ( @@ -186,7 +166,7 @@ class SqlParser extends StandardTokenParsers with PackratParsers { val withFilter = f.map(f => Filter(f, base)).getOrElse(base) val withProjection = g.map {g => - Aggregate(assignAliasesForGroups(g,p), assignAliases(p), withFilter) + Aggregate(g, assignAliases(p), withFilter) }.getOrElse(Project(assignAliases(p), withFilter)) val withDistinct = d.map(_ => Distinct(withProjection)).getOrElse(withProjection) val withHaving = h.map(h => Filter(h, withDistinct)).getOrElse(withDistinct)