Repository: spark Updated Branches: refs/heads/master 6c2d894a2 -> 90a1d8db7
[SPARK-12719][HOTFIX] Fix compilation against Scala 2.10 PR #11696 introduced a complex pattern match that broke Scala 2.10 match unreachability check and caused build failure. This PR fixes this issue by expanding this pattern match into several simpler ones. Note that tuning or turning off `-Dscalac.patmat.analysisBudget` doesn't work for this case. Compilation against Scala 2.10 Author: tedyu <[email protected]> Closes #11798 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/90a1d8db Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/90a1d8db Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/90a1d8db Branch: refs/heads/master Commit: 90a1d8db70b073925ced41c2ba61bebc9060e527 Parents: 6c2d894 Author: tedyu <[email protected]> Authored: Fri Mar 18 12:11:23 2016 +0800 Committer: Cheng Lian <[email protected]> Committed: Fri Mar 18 12:11:32 2016 +0800 ---------------------------------------------------------------------- .../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/90a1d8db/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 da05905..249a685 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 @@ -492,14 +492,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: [email protected] For additional commands, e-mail: [email protected]
