spark git commit: [SPARK-12719][HOTFIX] Fix compilation against Scala 2.10

[yhuai]

Repository: spark
Updated Branches:
  refs/heads/master 5f3bda6fe -> 3ee799618


[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 <yuzhih...@gmail.com>

Closes #11787 from yy2016/master.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/3ee79961
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/3ee79961
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/3ee79961

Branch: refs/heads/master
Commit: 3ee7996187bbef008c10681bc4e048c6383f5187
Parents: 5f3bda6
Author: tedyu <yuzhih...@gmail.com>
Authored: Thu Mar 17 10:09:37 2016 -0700
Committer: Yin Huai <yh...@databricks.com>
Committed: Thu Mar 17 10:09:37 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/3ee79961/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 05dfad2..ba14ff2 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)
     }
   }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org