[SPARK-35898][SQL] Fix arrays and maps in RowToColumnConverter #33108
Conversation
This file contains hidden or 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
Contributor
Author
|
cc @cloud-fan |
Contributor
maropu
reviewed
Jun 28, 2021
sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/WritableColumnVector.java
Show resolved
Hide resolved
| case StringType => StringConverter | ||
| case CalendarIntervalType => CalendarConverter | ||
| case at: ArrayType => new ArrayConverter(getConverterForType(at.elementType, nullable)) | ||
| case at: ArrayType => ArrayConverter(getConverterForType(at.elementType, at.containsNull)) |
Member
There was a problem hiding this comment.
Shouldn't it be nullable || at.containsNull?
| assert(testVector.getArray(3).toIntArray() === Array(3, 4, 5)) | ||
| } | ||
|
|
||
| testVectors("array append", 1, arrayType) { testVector => |
Member
There was a problem hiding this comment.
This is a bug fix, so could you add the prefix: SPARK-35898: in the test names?
Contributor
Author
There was a problem hiding this comment.
Sure, I will add them! I did not add before them since they test general usage patterns instead of a specific edge case.
sql/core/src/test/scala/org/apache/spark/sql/execution/RowToColumnConverterSuite.scala
Outdated
Show resolved
Hide resolved
Contributor
Author
|
@maropu Thank you for the review! I addressed your feedback. PTAL :) |
maropu
approved these changes
Jun 28, 2021
revans2
approved these changes
Jun 28, 2021
Contributor
revans2
left a comment
revans2
left a comment
There was a problem hiding this comment.
Thanks for cleaning up after me.
Contributor
|
Merging to master/3.1 |
hvanhovell
pushed a commit
that referenced
this pull request
Jun 28, 2021
### What changes were proposed in this pull request? This PR fixes support for arrays and maps in `RowToColumnConverter`. In particular this PR fixes two bugs: 1. `appendArray` in `WritableColumnVector` does not reserve any elements in its child arrays, which causes the assertion in `OffHeapColumnVector.putArray` to fail. 2. The nullability of the child columns is propagated incorrectly when creating the child converters of `ArrayConverter` and `MapConverter` in `RowToColumnConverter`. This PR fixes these issues. ### Why are the changes needed? Both bugs cause an exception to be thrown. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? I added additional test cases to `ColumnVectorSuite` to catch the first bug, and I added `RowToColumnConverterSuite` to catch the both bugs (but specifically the second). Closes #33108 from tomvanbussel/SPARK-35898. Authored-by: Tom van Bussel <[email protected]> Signed-off-by: herman <[email protected]> (cherry picked from commit c660650) Signed-off-by: herman <[email protected]>
viirya
reviewed
Jun 28, 2021
| case mt: MapType => new MapConverter(getConverterForType(mt.keyType, nullable), | ||
| getConverterForType(mt.valueType, nullable)) | ||
| case mt: MapType => MapConverter(getConverterForType(mt.keyType, nullable = false), | ||
| getConverterForType(mt.valueType, mt.valueContainsNull)) |
Member
There was a problem hiding this comment.
ditto, nullable || mt.valueContainsNull?
Contributor
There was a problem hiding this comment.
if the map itself is null, I think we won't invoke the converter?
flyrain
pushed a commit
to flyrain/spark
that referenced
this pull request
Sep 21, 2021
### What changes were proposed in this pull request? This PR fixes support for arrays and maps in `RowToColumnConverter`. In particular this PR fixes two bugs: 1. `appendArray` in `WritableColumnVector` does not reserve any elements in its child arrays, which causes the assertion in `OffHeapColumnVector.putArray` to fail. 2. The nullability of the child columns is propagated incorrectly when creating the child converters of `ArrayConverter` and `MapConverter` in `RowToColumnConverter`. This PR fixes these issues. ### Why are the changes needed? Both bugs cause an exception to be thrown. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? I added additional test cases to `ColumnVectorSuite` to catch the first bug, and I added `RowToColumnConverterSuite` to catch the both bugs (but specifically the second). Closes apache#33108 from tomvanbussel/SPARK-35898. Authored-by: Tom van Bussel <[email protected]> Signed-off-by: herman <[email protected]> (cherry picked from commit c660650) Signed-off-by: herman <[email protected]> (cherry picked from commit fe412b6)
fishcus
pushed a commit
to fishcus/spark
that referenced
this pull request
Jan 12, 2022
### What changes were proposed in this pull request? This PR fixes support for arrays and maps in `RowToColumnConverter`. In particular this PR fixes two bugs: 1. `appendArray` in `WritableColumnVector` does not reserve any elements in its child arrays, which causes the assertion in `OffHeapColumnVector.putArray` to fail. 2. The nullability of the child columns is propagated incorrectly when creating the child converters of `ArrayConverter` and `MapConverter` in `RowToColumnConverter`. This PR fixes these issues. ### Why are the changes needed? Both bugs cause an exception to be thrown. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? I added additional test cases to `ColumnVectorSuite` to catch the first bug, and I added `RowToColumnConverterSuite` to catch the both bugs (but specifically the second). Closes apache#33108 from tomvanbussel/SPARK-35898. Authored-by: Tom van Bussel <[email protected]> Signed-off-by: herman <[email protected]> (cherry picked from commit c660650) Signed-off-by: herman <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
What changes were proposed in this pull request?
This PR fixes support for arrays and maps in
RowToColumnConverter. In particular this PR fixes two bugs:appendArrayinWritableColumnVectordoes not reserve any elements in its child arrays, which causes the assertion inOffHeapColumnVector.putArrayto fail.ArrayConverterandMapConverterinRowToColumnConverter.This PR fixes these issues.
Why are the changes needed?
Both bugs cause an exception to be thrown.
Does this PR introduce any user-facing change?
No
How was this patch tested?
I added additional test cases to
ColumnVectorSuiteto catch the first bug, and I addedRowToColumnConverterSuiteto catch the both bugs (but specifically the second).