From e9f55b41718c1ca5339fd231403975bc185ced0f Mon Sep 17 00:00:00 2001
From: Justin Loew <jloloew@gmail.com>
Date: Sun, 15 Apr 2018 19:24:32 -0500
Subject: [PATCH] Moving changes, please ignore

---
 .../scala/org/apache/spark/storage/memory/MemoryStore.scala     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 689ba9b9bf..2c237442f4 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
@@ -92,7 +92,7 @@ private[spark] class MemoryStore(
   private class OurBlockIdAndSizeType(
       private var blockId: BlockId,
       private var size: Long) extends Ordering[OurBlockIdAndSizeType] {
-    def compare(other: OurBlockIdAndSizeType) = this.size.compare(other.size)
+    def compare(other: OurBlockIdAndSizeType): Int = this.size.compare(other.size)
   }
 
   private val entries = new LinkedHashMap[BlockId, MemoryEntry[_]](32, 0.75f, true)
-- 
GitLab