From a66903cda06681c73e5be9bc4d95bb93e3876289 Mon Sep 17 00:00:00 2001
From: Justin Loew <jloloew@gmail.com>
Date: Thu, 3 May 2018 22:29:55 -0500
Subject: [PATCH] Revert "Handle Option.None correctly when removing an RDD"
This reverts commit 1710966b7644641a8dbf19b66f9a3d4387eb6d3e.
---
.../org/apache/spark/storage/memory/MemoryStore.scala | 9 ++-------
1 file changed, 2 insertions(+), 7 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 56d48432a9..7c2bb8d6fa 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
@@ -396,13 +396,8 @@ private[spark] class MemoryStore(
def remove(blockId: BlockId): Boolean = memoryManager.synchronized {
val entry = entries.synchronized {
- entries.get(blockId) match {
- case Some(origEntry) =>
- blockIdAndSizeSet -= new OurBlockIdAndSizeType(blockId, origEntry.size)
- case None =>
- // Do nothing
- logInfo("origEntry was None after all")
- }
+ val origEntry = entries.get(blockId)
+ blockIdAndSizeSet -= new OurBlockIdAndSizeType(blockId, origEntry.size)
entries.remove(blockId)
}
if (entry != null) {
--
GitLab