diff options
author | Yin Huai <yhuai@databricks.com> | 2016-03-17 11:16:03 -0700 |
---|---|---|
committer | Yin Huai <yhuai@databricks.com> | 2016-03-17 11:16:03 -0700 |
commit | 4c08e2c0850cda03aa930445652c03881594b4ce (patch) | |
tree | af57ef44492dd5f0b363a8736b40b14bd7524e31 | |
parent | edf8b8775b81f5522680094bf24f372aa0c61447 (diff) | |
download | spark-4c08e2c0850cda03aa930445652c03881594b4ce.tar.gz spark-4c08e2c0850cda03aa930445652c03881594b4ce.tar.bz2 spark-4c08e2c0850cda03aa930445652c03881594b4ce.zip |
Revert "[SPARK-12719][HOTFIX] Fix compilation against Scala 2.10"
This reverts commit 3ee7996187bbef008c10681bc4e048c6383f5187.
-rw-r--r-- | sql/hive/src/main/scala/org/apache/spark/sql/hive/SQLBuilder.scala | 16 |
1 files 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 ba14ff2d23..05dfad239a 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 => plan - case _: Filter => plan - case _: Join => plan - case _: LocalLimit => plan - case _: GlobalLimit => plan - case _: SQLTable => plan - case _: Generate => plan - case _: OneRowRelation => plan + case _: SubqueryAlias | + _: Filter | + _: Join | + _: LocalLimit | + _: GlobalLimit | + _: SQLTable | + _: Generate | + OneRowRelation => plan case _ => addSubquery(plan) } } |