You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/01/18 21:50:15 UTC
git commit: Merge pull request #461 from pwendell/master
Updated Branches:
refs/heads/branch-0.9 7b0d5a5f3 -> ff7201cf9
Merge pull request #461 from pwendell/master
Use renamed shuffle spill config in CoGroupedRDD.scala
This one got missed when it was renamed.
(cherry picked from commit aa981e4e97a11dbd5a4d012bfbdb395982968372)
Signed-off-by: Patrick Wendell <pw...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/ff7201cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/ff7201cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/ff7201cf
Branch: refs/heads/branch-0.9
Commit: ff7201cf9e4f3af6943d6ff5d4b625404a174fec
Parents: 7b0d5a5
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sat Jan 18 12:49:21 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sat Jan 18 12:50:02 2014 -0800
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/rdd/CoGroupedRDD.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/ff7201cf/core/src/main/scala/org/apache/spark/rdd/CoGroupedRDD.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/rdd/CoGroupedRDD.scala b/core/src/main/scala/org/apache/spark/rdd/CoGroupedRDD.scala
index f2feb40..0e47f2e 100644
--- a/core/src/main/scala/org/apache/spark/rdd/CoGroupedRDD.scala
+++ b/core/src/main/scala/org/apache/spark/rdd/CoGroupedRDD.scala
@@ -106,7 +106,7 @@ class CoGroupedRDD[K](@transient var rdds: Seq[RDD[_ <: Product2[K, _]]], part:
override def compute(s: Partition, context: TaskContext): Iterator[(K, CoGroupCombiner)] = {
val sparkConf = SparkEnv.get.conf
- val externalSorting = sparkConf.getBoolean("spark.shuffle.externalSorting", true)
+ val externalSorting = sparkConf.getBoolean("spark.shuffle.spill", true)
val split = s.asInstanceOf[CoGroupPartition]
val numRdds = split.deps.size