Skip to content

[SPARK-35041][SQL] Revise the overflow in UTF8String #32142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ulysses-you wants to merge 3 commits into from
Closed

[SPARK-35041][SQL] Revise the overflow in UTF8String #32142

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d43643e
Revise the overflow in UTF8String
ulysses-you Apr 13, 2021
d542627
address
ulysses-you Apr 13, 2021
6f48d88
fix
ulysses-you Apr 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions common/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import com.esotericsoftware.kryo.KryoSerializable;
import com.esotericsoftware.kryo.io.Input;
import com.esotericsoftware.kryo.io.Output;
import com.google.common.primitives.Ints;

import org.apache.spark.unsafe.Platform;
import org.apache.spark.unsafe.UTF8StringBuilder;
Expand Down Expand Up @@ -764,7 +763,7 @@ public UTF8String repeat(int times) {
return EMPTY_UTF8;
}

byte[] newBytes = new byte[numBytes * times];
byte[] newBytes = new byte[Math.multiplyExact(numBytes, times)];
copyMemory(this.base, this.offset, newBytes, BYTE_ARRAY_OFFSET, numBytes);

int copied = 1;
Expand Down Expand Up @@ -907,7 +906,8 @@ public UTF8String rpad(int len, UTF8String pad) {
// the partial string of the padding
UTF8String remain = pad.substring(0, spaces - padChars * count);

byte[] data = new byte[this.numBytes + pad.numBytes * count + remain.numBytes];
int resultSize = Math.toIntExact((long)numBytes + pad.numBytes * count + remain.numBytes);
byte[] data = new byte[resultSize];
copyMemory(this.base, this.offset, data, BYTE_ARRAY_OFFSET, this.numBytes);
int offset = this.numBytes;
int idx = 0;
Expand Down Expand Up @@ -939,7 +939,8 @@ public UTF8String lpad(int len, UTF8String pad) {
// the partial string of the padding
UTF8String remain = pad.substring(0, spaces - padChars * count);

byte[] data = new byte[this.numBytes + pad.numBytes * count + remain.numBytes];
int resultSize = Math.toIntExact((long)numBytes + pad.numBytes * count + remain.numBytes);
byte[] data = new byte[resultSize];

int offset = 0;
int idx = 0;
Expand Down Expand Up @@ -971,7 +972,7 @@ public static UTF8String concat(UTF8String... inputs) {
}

// Allocate a new byte array, and copy the inputs one by one into it.
final byte[] result = new byte[Ints.checkedCast(totalLength)];
final byte[] result = new byte[Math.toIntExact(totalLength)];
int offset = 0;
for (int i = 0; i < inputs.length; i++) {
int len = inputs[i].numBytes;
Expand Down