diff options
| author | Aaron Davidson <aaron@databricks.com> | 2013-11-03 22:16:58 -0800 |
|---|---|---|
| committer | Aaron Davidson <aaron@databricks.com> | 2013-11-03 22:16:58 -0800 |
| commit | b0cf19fe3c395e84e730e97ec211d7ef935951e1 (patch) | |
| tree | 1706de095703ec8553c5b54fdbbcee143dbf58df /core | |
| parent | 39d93ed4b90b8b302a978df878fd020e7d1fcf56 (diff) | |
| download | spark-b0cf19fe3c395e84e730e97ec211d7ef935951e1.tar.gz spark-b0cf19fe3c395e84e730e97ec211d7ef935951e1.tar.bz2 spark-b0cf19fe3c395e84e730e97ec211d7ef935951e1.zip | |
Add javadoc and remove unused code
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/storage/ShuffleBlockManager.scala | 1 | ||||
| -rw-r--r-- | core/src/main/scala/org/apache/spark/util/collection/PrimitiveKeyOpenHashMap.scala | 1 |
2 files changed, 1 insertions, 1 deletions
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 8b202ac112..a3bb425208 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 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 a119880884..d76143e45a 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 |