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
PR apache#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 <yuzhihong@gmail.com>

Closes apache#11798 from yy2016/master.
  • Loading branch information
tedyu authored and roygao94 committed Mar 22, 2016
1 parent dfbc421 commit 47c358f
Showing 1 changed file with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down

0 comments on commit 47c358f

Please sign in to comment.