From 74c4e2651fa27d65ad1fb71c1855f5c44a37a462 Mon Sep 17 00:00:00 2001 From: Wenchen Fan Date: Fri, 11 Mar 2016 13:52:11 +0800 Subject: [HOT-FIX] fix compile Fix the compilation failure introduced by https://github.com/apache/spark/pull/11555 because of a merge conflict. Author: Wenchen Fan Closes #11648 from cloud-fan/hotbug. --- sql/hive/src/main/scala/org/apache/spark/sql/hive/SQLBuilder.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql') 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 index bf12982da7..760335bba5 100644 --- 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 -- cgit v1.2.3