Skip to content

[SPARK-35005][SQL] Improve error msg if UTF8String concatWs length overflow #32106

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 4 commits into from
Closed

[SPARK-35005][SQL] Improve error msg if UTF8String concatWs length overflow #32106

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fceb65b
[SPARK-35005][SQL] Improve error msg if UTF8String concatWs length ov…
ulysses-you Apr 9, 2021
7411b6e
use math
ulysses-you Apr 12, 2021
9081799
fix
ulysses-you Apr 12, 2021
73f4824
inline
ulysses-you Apr 12, 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
5 changes: 3 additions & 2 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 @@ -993,7 +993,7 @@ public static UTF8String concatWs(UTF8String separator, UTF8String... inputs) {
return null;
}

int numInputBytes = 0; // total number of bytes from the inputs
long numInputBytes = 0L; // total number of bytes from the inputs
int numInputs = 0; // number of non-null inputs
for (int i = 0; i < inputs.length; i++) {
if (inputs[i] != null) {
Expand All @@ -1009,7 +1009,8 @@ public static UTF8String concatWs(UTF8String separator, UTF8String... inputs) {

// Allocate a new byte array, and copy the inputs one by one into it.
// The size of the new array is the size of all inputs, plus the separators.
final byte[] result = new byte[numInputBytes + (numInputs - 1) * separator.numBytes];
int intNumInputBytes = Ints.checkedCast(numInputBytes + (numInputs - 1) * separator.numBytes);
Copy link
Member

@maropu maropu Apr 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you use guava here instead of just checking numInputBytes > Int.MaxValue?

Copy link
Contributor Author

@ulysses-you ulysses-you Apr 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this code just follow the concat that do the same check.

spark/common/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java

Line 974 in c067588

final byte[] result = new byte[Ints.checkedCast(totalLength)];

Copy link
Member

@MaxGekk MaxGekk Apr 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you use Math.toIntExact, and replace Ints.checkedCast by toIntExact, please. I don't see any benefits of the Guava function over the standard function, do you?

Copy link
Contributor Author

@ulysses-you ulysses-you Apr 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replaced it.

final byte[] result = new byte[intNumInputBytes];
int offset = 0;

for (int i = 0, j = 0; i < inputs.length; i++) {
Expand Down