From 1d55a8e13739c40172f4ab9f7051299895d1ed71 Mon Sep 17 00:00:00 2001
From: Justin Loew <jloloew@gmail.com>
Date: Sun, 15 Apr 2018 19:35:58 -0500
Subject: [PATCH] Moving changes, please ignore
---
.../scala/org/apache/spark/storage/memory/MemoryStore.scala | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/core/src/main/scala/org/apache/spark/storage/memory/MemoryStore.scala b/core/src/main/scala/org/apache/spark/storage/memory/MemoryStore.scala
index 43c79ce8f2..6726d7d6af 100644
--- a/core/src/main/scala/org/apache/spark/storage/memory/MemoryStore.scala
+++ b/core/src/main/scala/org/apache/spark/storage/memory/MemoryStore.scala
@@ -21,9 +21,9 @@ import java.io.OutputStream
import java.nio.ByteBuffer
import java.util.LinkedHashMap
-import scala.collection.SortedMap
import scala.collection.mutable
import scala.collection.mutable.ArrayBuffer
+import scala.collection.mutable.SortedSet
import scala.reflect.ClassTag
import com.google.common.io.ByteStreams
@@ -95,6 +95,7 @@ private[spark] class MemoryStore(
def compare(other: OurBlockIdAndSizeType): Int = this.size.compare(other.size)
}
+ private val blockIdAndSizeSet = new SortedSet[OurBlockIdAndSizeType]()
private val entries = new LinkedHashMap[BlockId, MemoryEntry[_]](32, 0.75f, true)
// A mapping from taskAttemptId to amount of memory used for unrolling a block (in bytes)
@@ -134,7 +135,7 @@ private[spark] class MemoryStore(
def getSize(blockId: BlockId): Long = {
entries.synchronized {
- entries.get(blockId).size
+ entries.get(blockIdblockId).size
}
}
--
GitLab