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/11 01:25:34 UTC
[17/50] git commit: Rename spark.shuffle.buffer variables
Rename spark.shuffle.buffer variables
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/d0cfbc41
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/d0cfbc41
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/d0cfbc41
Branch: refs/heads/master
Commit: d0cfbc41e2dc48fa04a79cdff107991cd096d0cc
Parents: 8f31757
Author: Andrew Or <an...@gmail.com>
Authored: Fri Dec 27 00:05:27 2013 -0800
Committer: Andrew Or <an...@gmail.com>
Committed: Fri Dec 27 00:07:09 2013 -0800
----------------------------------------------------------------------
.../org/apache/spark/util/collection/ExternalAppendOnlyMap.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/d0cfbc41/core/src/main/scala/org/apache/spark/util/collection/ExternalAppendOnlyMap.scala
----------------------------------------------------------------------
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 4b0a87c..f5a2e8d 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]()