You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2014/12/16 23:12:01 UTC
spark git commit: [SPARK-4847][SQL]Fix "extraStrategies cannot take
effect in SQLContext" issue
Repository: spark
Updated Branches:
refs/heads/master 1a9e35e57 -> dc8280dcc
[SPARK-4847][SQL]Fix "extraStrategies cannot take effect in SQLContext" issue
Author: jerryshao <sa...@intel.com>
Closes #3698 from jerryshao/SPARK-4847 and squashes the following commits:
4741130 [jerryshao] Make later added extraStrategies effect when calling strategies
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/dc8280dc
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/dc8280dc
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/dc8280dc
Branch: refs/heads/master
Commit: dc8280dcca7b54793a3db644f74fd33460960d4a
Parents: 1a9e35e
Author: jerryshao <sa...@intel.com>
Authored: Tue Dec 16 14:08:28 2014 -0800
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Tue Dec 16 14:08:28 2014 -0800
----------------------------------------------------------------------
sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala | 2 +-
.../src/main/scala/org/apache/spark/sql/hive/HiveContext.scala | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/dc8280dc/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
----------------------------------------------------------------------
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 31cc417..ebd4cc9 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 ::
http://git-wip-us.apache.org/repos/asf/spark/blob/dc8280dc/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
----------------------------------------------------------------------
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 6008e46..7de4407 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),
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org