diff options
| author | Andrew Or <andrewor14@gmail.com> | 2013-12-27 00:05:27 -0800 |
|---|---|---|
| committer | Andrew Or <andrewor14@gmail.com> | 2013-12-27 00:07:09 -0800 |
| commit | d0cfbc41e2dc48fa04a79cdff107991cd096d0cc (patch) | |
| tree | 348d493d21030c58c07c8f64ae19b53fc6aac702 | |
| parent | 8f3175773c86c2e789cf5717486c295fccaa9106 (diff) | |
| download | spark-d0cfbc41e2dc48fa04a79cdff107991cd096d0cc.tar.gz spark-d0cfbc41e2dc48fa04a79cdff107991cd096d0cc.tar.bz2 spark-d0cfbc41e2dc48fa04a79cdff107991cd096d0cc.zip | |
Rename spark.shuffle.buffer variables
| -rw-r--r-- | core/src/main/scala/org/apache/spark/util/collection/ExternalAppendOnlyMap.scala | 4 |
1 files 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]() |