Backport [SPARK-24133][SQL] Check for integer overflows when resizing WritableColumnVectors #21227
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ColumnVectors `ColumnVector`s store string data in one big byte array. Since the array size is capped at just under Integer.MAX_VALUE, a single `ColumnVector` cannot store more than 2GB of string data. But since the Parquet files commonly contain large blobs stored as strings, and `ColumnVector`s by default carry 4096 values, it's entirely possible to go past that limit. In such cases a negative capacity is requested from `WritableColumnVector.reserve()`. The call succeeds (requested capacity is smaller than already allocated capacity), and consequently `java.lang.ArrayIndexOutOfBoundsException` is thrown when the reader actually attempts to put the data into the array. This change introduces a simple check for integer overflow to `WritableColumnVector.reserve()` which should help catch the error earlier and provide more informative exception. Additionally, the error message in `WritableColumnVector.throwUnsupportedException()` was corrected, as it previously encouraged users to increase rather than reduce the batch size. New units tests were added. Author: Ala Luszczak <ala@databricks.com> Closes apache#21206 from ala/overflow-reserve. (cherry picked from commit 8bd2702) Signed-off-by: Ala Luszczak <ala@databricks.com>
|
@gatorsmile I got rid of the references to batch size config (not available in 2.3), and now it should be fine. |
adrian-wang
reviewed
May 3, 2018
| @@ -81,7 +81,9 @@ public void close() { | |||
| } | |||
|
|
|||
| public void reserve(int requiredCapacity) { | |||
| if (requiredCapacity > capacity) { | |||
| if (requiredCapacity < 0) { | |||
| throwUnsupportedException(requiredCapacity, null); | |||
There was a problem hiding this comment.
how about use ArithmeticException instead of null?
There was a problem hiding this comment.
@adrian-wang Since this is just a backport, I would prefer to keep the modifications of the original commit to the minimum. Also, it might be a bit confusing the user, if we create ArithmeticException here, as this is not the place where invalid computation was performed, but just the place where we realize the input is not sane.
There was a problem hiding this comment.
thanks for the explanation!
ala
changed the title
|
Test build #90119 has finished for PR 21227 at commit
|
|
LGTM - merging to 2.3. Thanks! |
asfgit
pushed a commit
that referenced
this pull request
May 3, 2018
…ing WritableColumnVectors `ColumnVector`s store string data in one big byte array. Since the array size is capped at just under Integer.MAX_VALUE, a single `ColumnVector` cannot store more than 2GB of string data. But since the Parquet files commonly contain large blobs stored as strings, and `ColumnVector`s by default carry 4096 values, it's entirely possible to go past that limit. In such cases a negative capacity is requested from `WritableColumnVector.reserve()`. The call succeeds (requested capacity is smaller than already allocated capacity), and consequently `java.lang.ArrayIndexOutOfBoundsException` is thrown when the reader actually attempts to put the data into the array. This change introduces a simple check for integer overflow to `WritableColumnVector.reserve()` which should help catch the error earlier and provide more informative exception. Additionally, the error message in `WritableColumnVector.throwUnsupportedException()` was corrected. New units tests were added. Author: Ala Luszczak <aladatabricks.com> Closes #21206 from ala/overflow-reserve. (cherry picked from commit 8bd2702) Signed-off-by: Ala Luszczak <aladatabricks.com> Author: Ala Luszczak <ala@databricks.com> Closes #21227 from ala/cherry-pick-overflow-reserve.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ColumnVectors store string data in one big byte array. Since the array size is capped at just under Integer.MAX_VALUE, a singleColumnVectorcannot store more than 2GB of string data.But since the Parquet files commonly contain large blobs stored as strings, and
ColumnVectors by default carry 4096 values, it's entirely possible to go past that limit. In such cases a negative capacity is requested fromWritableColumnVector.reserve(). The call succeeds (requested capacity is smaller than already allocated capacity), and consequentlyjava.lang.ArrayIndexOutOfBoundsExceptionis thrown when the reader actually attempts to put the data into the array.This change introduces a simple check for integer overflow to
WritableColumnVector.reserve()which should help catch the error earlier and provide more informative exception. Additionally, the error message inWritableColumnVector.throwUnsupportedException()was corrected.New units tests were added.
Author: Ala Luszczak ala@databricks.com
Closes #21206 from ala/overflow-reserve.
(cherry picked from commit 8bd2702)
Signed-off-by: Ala Luszczak ala@databricks.com