You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by yh...@apache.org on 2016/03/17 19:16:37 UTC
spark git commit: Revert "[SPARK-12719][HOTFIX] Fix compilation
against Scala 2.10"
Repository: spark
Updated Branches:
refs/heads/master edf8b8775 -> 4c08e2c08
Revert "[SPARK-12719][HOTFIX] Fix compilation against Scala 2.10"
This reverts commit 3ee7996187bbef008c10681bc4e048c6383f5187.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/4c08e2c0
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/4c08e2c0
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/4c08e2c0
Branch: refs/heads/master
Commit: 4c08e2c0850cda03aa930445652c03881594b4ce
Parents: edf8b87
Author: Yin Huai <yh...@databricks.com>
Authored: Thu Mar 17 11:16:03 2016 -0700
Committer: Yin Huai <yh...@databricks.com>
Committed: Thu Mar 17 11:16:03 2016 -0700
----------------------------------------------------------------------
.../org/apache/spark/sql/hive/SQLBuilder.scala | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/4c08e2c0/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 ba14ff2..05dfad2 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
@@ -481,14 +481,14 @@ class SQLBuilder(logicalPlan: LogicalPlan, sqlContext: SQLContext) extends Loggi
}
private def addSubqueryIfNeeded(plan: LogicalPlan): LogicalPlan = plan match {
- case _: SubqueryAlias => plan
- case _: Filter => plan
- case _: Join => plan
- case _: LocalLimit => plan
- case _: GlobalLimit => plan
- case _: SQLTable => plan
- case _: Generate => plan
- case _: OneRowRelation => plan
+ case _: SubqueryAlias |
+ _: Filter |
+ _: Join |
+ _: LocalLimit |
+ _: GlobalLimit |
+ _: SQLTable |
+ _: Generate |
+ OneRowRelation => plan
case _ => addSubquery(plan)
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org