From 39434f9afcb9639dec6fd17d9348b4551bdb16b1 Mon Sep 17 00:00:00 2001 From: Josh Rosen Date: Mon, 11 May 2015 14:58:25 -0700 Subject: [PATCH] Avoid integer multiplication overflow in getMemoryUsage (thanks FindBugs!) --- .../spark/shuffle/unsafe/UnsafeShuffleExternalSorter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleExternalSorter.java b/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleExternalSorter.java index 772ed688359dc..44a37fcd43951 100644 --- a/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleExternalSorter.java +++ b/core/src/main/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleExternalSorter.java @@ -246,7 +246,7 @@ void spill() throws IOException { } private long getMemoryUsage() { - return sorter.getMemoryUsage() + (allocatedPages.size() * PAGE_SIZE); + return sorter.getMemoryUsage() + (allocatedPages.size() * (long) PAGE_SIZE); } private long freeMemory() {