You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by we...@apache.org on 2016/03/11 06:52:19 UTC
spark git commit: [HOT-FIX] fix compile
Repository: spark
Updated Branches:
refs/heads/master 6871cc8f3 -> 74c4e2651
[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 <we...@databricks.com>
Closes #11648 from cloud-fan/hotbug.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/74c4e265
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/74c4e265
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/74c4e265
Branch: refs/heads/master
Commit: 74c4e2651fa27d65ad1fb71c1855f5c44a37a462
Parents: 6871cc8
Author: Wenchen Fan <we...@databricks.com>
Authored: Fri Mar 11 13:52:11 2016 +0800
Committer: Wenchen Fan <we...@databricks.com>
Committed: Fri Mar 11 13:52:11 2016 +0800
----------------------------------------------------------------------
.../src/main/scala/org/apache/spark/sql/hive/SQLBuilder.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/74c4e265/sql/hive/src/main/scala/org/apache/spark/sql/hive/SQLBuilder.scala
----------------------------------------------------------------------
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 bf12982..760335b 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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org