From dc8280dcca7b54793a3db644f74fd33460960d4a Mon Sep 17 00:00:00 2001 From: jerryshao Date: Tue, 16 Dec 2014 14:08:28 -0800 Subject: [SPARK-4847][SQL]Fix "extraStrategies cannot take effect in SQLContext" issue Author: jerryshao Closes #3698 from jerryshao/SPARK-4847 and squashes the following commits: 4741130 [jerryshao] Make later added extraStrategies effect when calling strategies --- sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala | 2 +- sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala index 31cc4170aa..ebd4cc920b 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala @@ -327,7 +327,7 @@ class SQLContext(@transient val sparkContext: SparkContext) def numPartitions = self.numShufflePartitions - val strategies: Seq[Strategy] = + def strategies: Seq[Strategy] = extraStrategies ++ ( CommandStrategy(self) :: DataSourceStrategy :: diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala index 6008e46fef..7de4407730 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala @@ -338,7 +338,7 @@ class HiveContext(sc: SparkContext) extends SQLContext(sc) { val hivePlanner = new SparkPlanner with HiveStrategies { val hiveContext = self - override val strategies: Seq[Strategy] = extraStrategies ++ Seq( + override def strategies: Seq[Strategy] = extraStrategies ++ Seq( DataSourceStrategy, CommandStrategy(self), HiveCommandStrategy(self), -- cgit v1.2.3