aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2012-11-01 11:54:23 -0700
committerMatei Zaharia <matei@eecs.berkeley.edu>2012-11-01 11:54:23 -0700
commit590e4aa9cb18648de5ddc943f03489273596b16c (patch)
tree8d71a6a5d2a6fe688824945675c583e7d3f0e1ee
parent4a47d1a47642da6ed893e1769144c25b8011bae9 (diff)
parenta7d967a1cad1a1786b77553eb9ae218423f0dfce (diff)
downloadspark-590e4aa9cb18648de5ddc943f03489273596b16c.tar.gz
spark-590e4aa9cb18648de5ddc943f03489273596b16c.tar.bz2
spark-590e4aa9cb18648de5ddc943f03489273596b16c.zip
Merge pull request #296 from shivaram/block-manager-fix
Remove unnecessary hash-map put in MemoryStore
-rw-r--r--core/src/main/scala/spark/storage/MemoryStore.scala3
1 files changed, 0 insertions, 3 deletions
diff --git a/core/src/main/scala/spark/storage/MemoryStore.scala b/core/src/main/scala/spark/storage/MemoryStore.scala
index 773970446a..074ca2b8a4 100644
--- a/core/src/main/scala/spark/storage/MemoryStore.scala
+++ b/core/src/main/scala/spark/storage/MemoryStore.scala
@@ -37,9 +37,6 @@ private class MemoryStore(blockManager: BlockManager, maxMemory: Long)
val sizeEstimate = SizeEstimator.estimate(elements.asInstanceOf[AnyRef])
tryToPut(blockId, elements, sizeEstimate, true)
} else {
- val entry = new Entry(bytes, bytes.limit, false)
- ensureFreeSpace(blockId, bytes.limit)
- synchronized { entries.put(blockId, entry) }
tryToPut(blockId, bytes, bytes.limit, false)
}
}