Skip to content

Commit 2ad469d

Browse files
author
Davies Liu
committed
avoid overflow
1 parent c72cdea commit 2ad469d

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

core/src/main/java/org/apache/spark/shuffle/sort/ShuffleInMemorySorter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public void expandPointerArray(LongArray newArray) {
107107
array.getBaseOffset(),
108108
newArray.getBaseObject(),
109109
newArray.getBaseOffset(),
110-
pos * 8
110+
pos * 8L
111111
);
112112
consumer.freeArray(array);
113113
array = newArray;
@@ -179,8 +179,8 @@ public ShuffleSorterIterator getSortedIterator() {
179179
} else {
180180
MemoryBlock unused = new MemoryBlock(
181181
array.getBaseObject(),
182-
array.getBaseOffset() + pos * 8,
183-
(array.size() - pos) * 8);
182+
array.getBaseOffset() + pos * 8L,
183+
(array.size() - pos) * 8L);
184184
LongArray buffer = new LongArray(unused);
185185
Sorter<PackedRecordPointer, LongArray> sorter =
186186
new Sorter<>(new ShuffleSortDataFormat(buffer));

core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeInMemorySorter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public void expandPointerArray(LongArray newArray) {
190190
array.getBaseOffset(),
191191
newArray.getBaseObject(),
192192
newArray.getBaseOffset(),
193-
pos * 8);
193+
pos * 8L);
194194
consumer.freeArray(array);
195195
array = newArray;
196196
capacity = calcCapacity();
@@ -289,8 +289,8 @@ public SortedIterator getSortedIterator() {
289289
} else {
290290
MemoryBlock unused = new MemoryBlock(
291291
array.getBaseObject(),
292-
array.getBaseOffset() + pos * 8,
293-
(array.size() - pos) * 8);
292+
array.getBaseOffset() + pos * 8L,
293+
(array.size() - pos) * 8L);
294294
LongArray buffer = new LongArray(unused);
295295
Sorter<RecordPointerAndKeyPrefix, LongArray> sorter =
296296
new Sorter<>(new UnsafeSortDataFormat(buffer));

0 commit comments

Comments
 (0)