diff options
author | Reynold Xin <rxin@databricks.com> | 2016-04-21 17:52:10 -0700 |
---|---|---|
committer | Reynold Xin <rxin@databricks.com> | 2016-04-21 17:52:10 -0700 |
commit | 0bf8df250e0aeae306e2ef33e612ca27187447ed (patch) | |
tree | 3dfb1cc72597800ea2fa4af2ceda6ca5df4e44ce /core/src/main/java | |
parent | f181aee07c0ee105b2a34581105eeeada7d42363 (diff) | |
download | spark-0bf8df250e0aeae306e2ef33e612ca27187447ed.tar.gz spark-0bf8df250e0aeae306e2ef33e612ca27187447ed.tar.bz2 spark-0bf8df250e0aeae306e2ef33e612ca27187447ed.zip |
[HOTFIX] Fix Java 7 compilation break
Diffstat (limited to 'core/src/main/java')
-rw-r--r-- | core/src/main/java/org/apache/spark/shuffle/sort/ShuffleInMemorySorter.java | 5 | ||||
-rw-r--r-- | core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeInMemorySorter.java | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/core/src/main/java/org/apache/spark/shuffle/sort/ShuffleInMemorySorter.java b/core/src/main/java/org/apache/spark/shuffle/sort/ShuffleInMemorySorter.java index 68630946ac..75a0e807d7 100644 --- a/core/src/main/java/org/apache/spark/shuffle/sort/ShuffleInMemorySorter.java +++ b/core/src/main/java/org/apache/spark/shuffle/sort/ShuffleInMemorySorter.java @@ -17,7 +17,6 @@ package org.apache.spark.shuffle.sort; -import java.lang.Long; import java.util.Comparator; import org.apache.spark.memory.MemoryConsumer; @@ -102,7 +101,7 @@ final class ShuffleInMemorySorter { array.getBaseOffset(), newArray.getBaseObject(), newArray.getBaseOffset(), - array.size() * (Long.BYTES / memoryAllocationFactor) + array.size() * (8 / memoryAllocationFactor) ); consumer.freeArray(array); array = newArray; @@ -113,7 +112,7 @@ final class ShuffleInMemorySorter { } public long getMemoryUsage() { - return array.size() * Long.BYTES; + return array.size() * 8; } /** diff --git a/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeInMemorySorter.java b/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeInMemorySorter.java index 5f46ef9a81..03973f3c12 100644 --- a/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeInMemorySorter.java +++ b/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeInMemorySorter.java @@ -17,7 +17,6 @@ package org.apache.spark.util.collection.unsafe.sort; -import java.lang.Long; import java.util.Comparator; import org.apache.avro.reflect.Nullable; @@ -27,7 +26,6 @@ import org.apache.spark.memory.TaskMemoryManager; import org.apache.spark.unsafe.Platform; import org.apache.spark.unsafe.array.LongArray; import org.apache.spark.util.collection.Sorter; -import org.apache.spark.util.collection.unsafe.sort.RadixSort; /** * Sorts records using an AlphaSort-style key-prefix sort. This sort stores pointers to records @@ -163,7 +161,7 @@ public final class UnsafeInMemorySorter { } public long getMemoryUsage() { - return array.size() * Long.BYTES; + return array.size() * 8; } public boolean hasSpaceForAnotherRecord() { @@ -179,7 +177,7 @@ public final class UnsafeInMemorySorter { array.getBaseOffset(), newArray.getBaseObject(), newArray.getBaseOffset(), - array.size() * (Long.BYTES / memoryAllocationFactor)); + array.size() * (8 / memoryAllocationFactor)); consumer.freeArray(array); array = newArray; } |