[HOT-FIX] fix compile

Fix the compilation failure introduced by apache#11555 because of a merge conflict. Author: Wenchen Fan <wenchen@databricks.com> Closes apache#11648 from cloud-fan/hotbug.
roygao94 · Mar 22, 2016 · a219e75 · a219e75
1 parent ee8898b
commit a219e75
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/SQLBuilder.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/SQLBuilder.scala
@@ -356,7 +356,7 @@ class SQLBuilder(logicalPlan: LogicalPlan, sqlContext: SQLContext) extends Loggi
         //            +- MetastoreRelation default, src, None
         case plan @ Project(_, Filter(_, _: Aggregate)) => wrapChildWithSubquery(plan)
 
-        case w @ Window(_, _, _, _, Filter(_, _: Aggregate)) => wrapChildWithSubquery(w)
+        case w @ Window(_, _, _, Filter(_, _: Aggregate)) => wrapChildWithSubquery(w)
 
         case plan @ Project(_,
           _: SubqueryAlias
@@ -373,7 +373,7 @@ class SQLBuilder(logicalPlan: LogicalPlan, sqlContext: SQLContext) extends Loggi
 
         // We will generate "SELECT ... FROM ..." for Window operator, so its child operator should
         // be able to put in the FROM clause, or we wrap it with a subquery.
-        case w @ Window(_, _, _, _,
+        case w @ Window(_, _, _,
           _: SubqueryAlias
             | _: Filter
             | _: Join