From 8299f68693a6e37bc82e968a98abac254452c88a Mon Sep 17 00:00:00 2001 From: Praveen Date: Tue, 12 Feb 2019 17:36:56 +0530 Subject: [PATCH 1/2] ARROW-4539: [Java] Fix child vector count for lists. - Child vector count was not set correctly for lists. Fixed to use the right count. --- .../arrow/vector/complex/ListVector.java | 2 +- .../arrow/vector/TestVarCharListVector.java | 65 +++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 java/vector/src/test/java/org/apache/arrow/vector/TestVarCharListVector.java diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java index 067060a4f7fa7..7d98f71477d1a 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java @@ -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); /* set the value count of data vector and this will take care of * checking whether data buffer needs to be reallocated. */ diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestVarCharListVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestVarCharListVector.java new file mode 100644 index 0000000000000..b1b72c50a9e5e --- /dev/null +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestVarCharListVector.java @@ -0,0 +1,65 @@ +package org.apache.arrow.vector; + +import java.util.Arrays; + +import org.apache.arrow.memory.BufferAllocator; +import org.apache.arrow.vector.complex.FixedSizeListVector; +import org.apache.arrow.vector.complex.ListVector; +import org.apache.arrow.vector.complex.impl.UnionFixedSizeListReader; +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); + } + } +} From 09bf45cd8f81cf7435b8c89026fd9b84bfab3b8e Mon Sep 17 00:00:00 2001 From: Praveen Date: Tue, 12 Feb 2019 22:41:16 +0530 Subject: [PATCH 2/2] ARROW-4539: [Java] Add license header. --- .../arrow/vector/TestVarCharListVector.java | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestVarCharListVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestVarCharListVector.java index b1b72c50a9e5e..5dd2a9835e55b 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestVarCharListVector.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestVarCharListVector.java @@ -1,11 +1,24 @@ -package org.apache.arrow.vector; +/* + * 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. + */ -import java.util.Arrays; +package org.apache.arrow.vector; import org.apache.arrow.memory.BufferAllocator; -import org.apache.arrow.vector.complex.FixedSizeListVector; import org.apache.arrow.vector.complex.ListVector; -import org.apache.arrow.vector.complex.impl.UnionFixedSizeListReader; import org.apache.arrow.vector.complex.impl.UnionListWriter; import org.apache.arrow.vector.types.Types; import org.apache.arrow.vector.types.pojo.FieldType;