fix bug

cenyuhai · Apr 7, 2015 · 668c47a · 668c47a
1 parent 646f609
commit 668c47a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala
@@ -750,7 +750,7 @@ https://cwiki.apache.org/confluence/display/Hive/Enhanced+Aggregation%2C+Cube%2C
                   Cube(children.map(nodeToExpr), withLateralView, selectExprs)
                 case _ => sys.error("Expect WITH CUBE")
               }),
-              Some(withLateralView)).flatten.head
+              Some(Project(selectExprs, withLateralView))).flatten.head
 
           windowToPlan(selectExpressions, groupPlan)
         }
@@ -1072,6 +1072,10 @@ https://cwiki.apache.org/confluence/display/Hive/Enhanced+Aggregation%2C+Cube%2C
         selectExpressions.filter(
           _.collect { case a @ Alias(WindowExpression(_, _), _) => a }.isEmpty)
 
+      val childPlan = groupPlan(subSelectExprs).transform {
+        case Project(_, child) => child
+      }
+
       val attributes =
         (
           windowExpressions.flatMap(_.collect {
@@ -1084,7 +1088,7 @@ https://cwiki.apache.org/confluence/display/Hive/Enhanced+Aggregation%2C+Cube%2C
       }.distinct
 
       val (restWindowExprs, _, withWindow) =
-        windowPartitions.foldLeft((windowExpressions, attributes, groupPlan(subSelectExprs))) {
+        windowPartitions.foldLeft((windowExpressions, attributes, childPlan)) {
           case ((expressions, attributes, plan), part @ WindowPartition(partitionBy, sortBy)) =>
             val (computeExprs, restWindowExprs) =
               expressions.partition(