aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Wendell <pwendell@gmail.com>2014-01-18 12:49:21 -0800
committerPatrick Wendell <pwendell@gmail.com>2014-01-18 12:49:21 -0800
commitaa981e4e97a11dbd5a4d012bfbdb395982968372 (patch)
tree929f3fde11e0f6cbc4aae7ca582ab02181199e43
parentd749d472b37448edb322bc7208a3db925c9a4fc2 (diff)
parent5316bcac3c8fb14fdff637c8c147c22b373397f4 (diff)
downloadspark-aa981e4e97a11dbd5a4d012bfbdb395982968372.tar.gz
spark-aa981e4e97a11dbd5a4d012bfbdb395982968372.tar.bz2
spark-aa981e4e97a11dbd5a4d012bfbdb395982968372.zip
Merge pull request #461 from pwendell/master
Use renamed shuffle spill config in CoGroupedRDD.scala This one got missed when it was renamed.
-rw-r--r--core/src/main/scala/org/apache/spark/rdd/CoGroupedRDD.scala2
1 files changed, 1 insertions, 1 deletions
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 f2feb406f7..0e47f2e022 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