aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortedyu <yuzhihong@gmail.com>2016-03-17 10:09:37 -0700
committerYin Huai <yhuai@databricks.com>2016-03-17 10:09:37 -0700
commit3ee7996187bbef008c10681bc4e048c6383f5187 (patch)
tree9e00a95c638ffcfbd676c5aa442f0d75e0aa9e52
parent5f3bda6fe2def15a1960b0feab42b07950ce691f (diff)
downloadspark-3ee7996187bbef008c10681bc4e048c6383f5187.tar.gz
spark-3ee7996187bbef008c10681bc4e048c6383f5187.tar.bz2
spark-3ee7996187bbef008c10681bc4e048c6383f5187.zip
[SPARK-12719][HOTFIX] Fix compilation against Scala 2.10
## What changes were proposed in this pull request? Compilation against Scala 2.10 fails with: ``` [error] [warn] /home/jenkins/workspace/spark-master-compile-sbt-scala-2.10/sql/hive/src/main/scala/org/apache/spark/sql/hive/SQLBuilder.scala:483: Cannot check match for unreachability. [error] (The analysis required more space than allowed. Please try with scalac -Dscalac.patmat.analysisBudget=512 or -Dscalac.patmat.analysisBudget=off.) [error] [warn] private def addSubqueryIfNeeded(plan: LogicalPlan): LogicalPlan = plan match { ``` ## How was this patch tested? Compilation against Scala 2.10 Author: tedyu <yuzhihong@gmail.com> Closes #11787 from yy2016/master.
-rw-r--r--sql/hive/src/main/scala/org/apache/spark/sql/hive/SQLBuilder.scala16
1 files changed, 8 insertions, 8 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
index 05dfad239a..ba14ff2d23 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 |
- _: Filter |
- _: Join |
- _: LocalLimit |
- _: GlobalLimit |
- _: SQLTable |
- _: Generate |
- OneRowRelation => plan
+ 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 _ => addSubquery(plan)
}
}