From 47c358f2e2ccdf80341c49117baa65d3b6f0228d Mon Sep 17 00:00:00 2001 From: tedyu Date: Fri, 18 Mar 2016 12:11:23 +0800 Subject: [PATCH] [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 Closes #11798 from yy2016/master. --- .../org/apache/spark/sql/hive/SQLBuilder.scala | 16 ++++++++-------- 1 file 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 da05905a89e73..249a685b9f74d 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) } }