Avoid integer multiplication overflow in getMemoryUsage (thanks FindBugs!)

JoshRosen · JoshRosen · commit 39434f9afcb9 · 2015-05-11T14:58:25.000-07:00
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
@@ -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() {

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ void spill() throws IOException {`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`private long getMemoryUsage() {`
`249`		`- return sorter.getMemoryUsage() + (allocatedPages.size() * PAGE_SIZE);`
	`249`	`+ return sorter.getMemoryUsage() + (allocatedPages.size() * (long) PAGE_SIZE);`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`private long freeMemory() {`