[SPARK-20474] Fixing OnHeapColumnVector reallocation #17773
Closed
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
|
ok to test |
|
Test build #76184 has finished for PR 17773 at commit
|
| @@ -410,53 +410,53 @@ protected void reserveInternal(int newCapacity) { | |||
| int[] newLengths = new int[newCapacity]; | |||
| int[] newOffsets = new int[newCapacity]; | |||
| if (this.arrayLengths != null) { | |||
| System.arraycopy(this.arrayLengths, 0, newLengths, 0, elementsAppended); | |||
| System.arraycopy(this.arrayOffsets, 0, newOffsets, 0, elementsAppended); | |||
| System.arraycopy(this.arrayLengths, 0, newLengths, 0, capacity); | |||
There was a problem hiding this comment.
Nice catch. Do we also need to fix reserveInternal in OffHeapColumnVector? Additionally, after this change, do we even need elementsAppended anymore?
There was a problem hiding this comment.
elementsAppended is necessary to keep the tail position by append<TYPE>().
|
add to whitelist |
1 similar comment
|
add to whitelist |
|
Test build #76191 has finished for PR 17773 at commit
|
|
Test build #76192 has finished for PR 17773 at commit
|
|
Merging in master/branch-2.2. |
asfgit
pushed a commit
that referenced
this pull request
Apr 26, 2017
## What changes were proposed in this pull request? OnHeapColumnVector reallocation copies to the new storage data up to 'elementsAppended'. This variable is only updated when using the ColumnVector.appendX API, while ColumnVector.putX is more commonly used. ## How was this patch tested? Tested using existing unit tests. Author: Michal Szafranski <michal@databricks.com> Closes #17773 from michal-databricks/spark-20474. (cherry picked from commit a277ae8) Signed-off-by: Reynold Xin <rxin@databricks.com>
|
Do we need similar changes for |
|
Actually yes, I missed it because |
|
Yes, I think it should see |
asfgit
pushed a commit
that referenced
this pull request
May 2, 2017
## What changes were proposed in this pull request? As #17773 revealed `OnHeapColumnVector` may copy a part of the original storage. `OffHeapColumnVector` reallocation also copies to the new storage data up to 'elementsAppended'. This variable is only updated when using the `ColumnVector.appendX` API, while `ColumnVector.putX` is more commonly used. This PR copies the new storage data up to the previously-allocated size in`OffHeapColumnVector`. ## How was this patch tested? Existing test suites Author: Kazuaki Ishizaki <ishizaki@jp.ibm.com> Closes #17811 from kiszk/SPARK-20537. (cherry picked from commit afb21bf) Signed-off-by: Wenchen Fan <wenchen@databricks.com>
asfgit
pushed a commit
that referenced
this pull request
May 2, 2017
## What changes were proposed in this pull request? As #17773 revealed `OnHeapColumnVector` may copy a part of the original storage. `OffHeapColumnVector` reallocation also copies to the new storage data up to 'elementsAppended'. This variable is only updated when using the `ColumnVector.appendX` API, while `ColumnVector.putX` is more commonly used. This PR copies the new storage data up to the previously-allocated size in`OffHeapColumnVector`. ## How was this patch tested? Existing test suites Author: Kazuaki Ishizaki <ishizaki@jp.ibm.com> Closes #17811 from kiszk/SPARK-20537.
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.
What changes were proposed in this pull request?
OnHeapColumnVector reallocation copies to the new storage data up to 'elementsAppended'. This variable is only updated when using the ColumnVector.appendX API, while ColumnVector.putX is more commonly used.
How was this patch tested?
Tested using existing unit tests.