-
Notifications
You must be signed in to change notification settings - Fork 3.5k
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.
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
ARROW-4539: [Java] Fix child vector count for lists. #3625
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
78 changes: 78 additions & 0 deletions
78
java/vector/src/test/java/org/apache/arrow/vector/TestVarCharListVector.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.apache.arrow.vector; | ||
|
||
import org.apache.arrow.memory.BufferAllocator; | ||
import org.apache.arrow.vector.complex.ListVector; | ||
import org.apache.arrow.vector.complex.impl.UnionListWriter; | ||
import org.apache.arrow.vector.types.Types; | ||
import org.apache.arrow.vector.types.pojo.FieldType; | ||
import org.junit.After; | ||
import org.junit.Assert; | ||
import org.junit.Before; | ||
import org.junit.Test; | ||
|
||
import io.netty.buffer.ArrowBuf; | ||
|
||
public class TestVarCharListVector { | ||
|
||
private BufferAllocator allocator; | ||
|
||
@Before | ||
public void init() { | ||
allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100); | ||
} | ||
|
||
@After | ||
public void terminate() throws Exception { | ||
allocator.close(); | ||
} | ||
|
||
@Test | ||
public void testVarCharListWithNulls() { | ||
byte[] bytes = "a".getBytes(); | ||
try (ListVector vector = new ListVector("VarList", allocator, FieldType.nullable(Types | ||
.MinorType.VARCHAR.getType()),null); | ||
ArrowBuf tempBuf = allocator.buffer(bytes.length)) { | ||
UnionListWriter writer = vector.getWriter(); | ||
writer.allocate(); | ||
|
||
// populate input vector with the following records | ||
// ["a"] | ||
// null | ||
// ["b"] | ||
writer.setPosition(0); // optional | ||
writer.startList(); | ||
tempBuf.setBytes(0, bytes); | ||
writer.writeVarChar(0, bytes.length, tempBuf); | ||
writer.endList(); | ||
|
||
writer.setPosition(2); | ||
writer.startList(); | ||
bytes = "b".getBytes(); | ||
tempBuf.setBytes(0, bytes); | ||
writer.writeVarChar(0, bytes.length, tempBuf); | ||
writer.endList(); | ||
|
||
writer.setValueCount(2); | ||
|
||
Assert.assertTrue(vector.getValueCount() == 2); | ||
Assert.assertTrue(vector.getDataVector().getValueCount() == 2); | ||
} | ||
} | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So were we always setting the value count for child vector incorrectly? I am not clear what the problem is. Is there a special case we have run into?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi! I ran into this over on #3294, when I tried to convert a string array from a JDBC field into a VarChar ListVector. If one of the values in the JDBC string array was
null
, I couldn't read the value after it from the VarChar ListVector (the following value came back as an empty string).@praveenbingo was kind enough to put together this PR to fix the issue.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yup, @siddharthteotia - we were not correctly handling lists that could have null values (setting child vector count using valuecount will not handle cases where valuecount < lastSet i.e. presence of nulls).
It does not affect List of FixedWidthVectors and only VariableWidthVectors.
Please let me know if you would need more information.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @mikepigott and @praveenbingo