Skip to content
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 2 commits into from
Feb 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@ public void setValueCount(int valueCount) {
}
/* valueCount for the data vector is the current end offset */
final int childValueCount = (valueCount == 0) ? 0 :
offsetBuffer.getInt(valueCount * OFFSET_WIDTH);
offsetBuffer.getInt(lastSet * OFFSET_WIDTH);
Copy link
Contributor

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?

Copy link
Contributor

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.

Copy link
Contributor Author

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.

Copy link
Contributor

Choose a reason for hiding this comment

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

/* set the value count of data vector and this will take care of
* checking whether data buffer needs to be reallocated.
*/
Expand Down
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);
}
}
}