Skip to content

Commit

Permalink
[SPARK-12719][HOTFIX] Fix compilation against Scala 2.10
Browse files Browse the repository at this point in the history
## 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 <[email protected]>

Closes #11787 from yy2016/master.
  • Loading branch information
tedyu authored and yhuai committed Mar 17, 2016
1 parent 5f3bda6 commit 3ee7996
Showing 1 changed file with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down

0 comments on commit 3ee7996

Please sign in to comment.