From d0cfbc41e2dc48fa04a79cdff107991cd096d0cc Mon Sep 17 00:00:00 2001 From: Andrew Or Date: Fri, 27 Dec 2013 00:05:27 -0800 Subject: Rename spark.shuffle.buffer variables --- .../org/apache/spark/util/collection/ExternalAppendOnlyMap.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/util/collection/ExternalAppendOnlyMap.scala b/core/src/main/scala/org/apache/spark/util/collection/ExternalAppendOnlyMap.scala index 4b0a87c116..f5a2e8db59 100644 --- a/core/src/main/scala/org/apache/spark/util/collection/ExternalAppendOnlyMap.scala +++ b/core/src/main/scala/org/apache/spark/util/collection/ExternalAppendOnlyMap.scala @@ -91,8 +91,8 @@ private[spark] class SpillableAppendOnlyMap[K, V, M: ClassTag, C: ClassTag]( private var currentMap = new SizeTrackingAppendOnlyMap[K, M] private val oldMaps = new ArrayBuffer[DiskIterator] private val memoryThreshold = { - val bufferSize = System.getProperty("spark.shuffle.buffer", "1024").toLong * 1024 * 1024 - val bufferPercent = System.getProperty("spark.shuffle.buffer.percent", "0.8").toFloat + val bufferSize = System.getProperty("spark.shuffle.buffer.mb", "1024").toLong * 1024 * 1024 + val bufferPercent = System.getProperty("spark.shuffle.buffer.fraction", "0.8").toFloat bufferSize * bufferPercent } private val ordering = new SpillableAppendOnlyMap.KeyHashOrdering[K, M]() -- cgit v1.2.3