You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2013/11/05 02:54:23 UTC
[09/12] git commit: Add javadoc and remove unused code
Add javadoc and remove unused code
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/b0cf19fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/b0cf19fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/b0cf19fe
Branch: refs/heads/master
Commit: b0cf19fe3c395e84e730e97ec211d7ef935951e1
Parents: 39d93ed
Author: Aaron Davidson <aa...@databricks.com>
Authored: Sun Nov 3 22:16:58 2013 -0800
Committer: Aaron Davidson <aa...@databricks.com>
Committed: Sun Nov 3 22:16:58 2013 -0800
----------------------------------------------------------------------
.../main/scala/org/apache/spark/storage/ShuffleBlockManager.scala | 1 -
.../org/apache/spark/util/collection/PrimitiveKeyOpenHashMap.scala | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/b0cf19fe/core/src/main/scala/org/apache/spark/storage/ShuffleBlockManager.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/storage/ShuffleBlockManager.scala b/core/src/main/scala/org/apache/spark/storage/ShuffleBlockManager.scala
index 8b202ac..a3bb425 100644
--- a/core/src/main/scala/org/apache/spark/storage/ShuffleBlockManager.scala
+++ b/core/src/main/scala/org/apache/spark/storage/ShuffleBlockManager.scala
@@ -85,7 +85,6 @@ class ShuffleBlockManager(blockManager: BlockManager) extends Logging {
def getNextFileId() = nextFileId.getAndIncrement()
def getUnusedFileGroup() = unusedFileGroups.poll()
def returnFileGroup(group: ShuffleFileGroup) = unusedFileGroups.add(group)
- def returnFileGroups(groups: Seq[ShuffleFileGroup]) = unusedFileGroups.addAll(groups)
}
type ShuffleId = Int
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/b0cf19fe/core/src/main/scala/org/apache/spark/util/collection/PrimitiveKeyOpenHashMap.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/util/collection/PrimitiveKeyOpenHashMap.scala b/core/src/main/scala/org/apache/spark/util/collection/PrimitiveKeyOpenHashMap.scala
index a119880..d76143e 100644
--- a/core/src/main/scala/org/apache/spark/util/collection/PrimitiveKeyOpenHashMap.scala
+++ b/core/src/main/scala/org/apache/spark/util/collection/PrimitiveKeyOpenHashMap.scala
@@ -53,6 +53,7 @@ class PrimitiveKeyOpenHashMap[@specialized(Long, Int) K: ClassManifest,
_values(pos)
}
+ /** Get the value for a given key, or returns elseValue if it doesn't exist. */
def getOrElse(k: K, elseValue: V): V = {
val pos = _keySet.getPos(k)
if (pos >= 0) _values(pos) else elseValue