vibhatha commented on code in PR #40340:
URL: https://github.com/apache/arrow/pull/40340#discussion_r1555119893
##########
java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java:
##########
@@ -2167,140 +2279,179 @@ public void testVectorLoadUnload() {
}
}
- @Test
- public void testFillEmptiesUsage() {
- try (final VarCharVector vector = new VarCharVector("myvector",
allocator)) {
-
- vector.allocateNew(1024 * 10, 1024);
-
- setBytes(0, STR1, vector);
- setBytes(1, STR2, vector);
- setBytes(2, STR3, vector);
- setBytes(3, STR4, vector);
- setBytes(4, STR5, vector);
- setBytes(5, STR6, vector);
-
- /* Check current lastSet */
- assertEquals(-1, vector.getLastSet());
-
- /* Check the vector output */
- assertArrayEquals(STR1, vector.get(0));
- assertArrayEquals(STR2, vector.get(1));
- assertArrayEquals(STR3, vector.get(2));
- assertArrayEquals(STR4, vector.get(3));
- assertArrayEquals(STR5, vector.get(4));
- assertArrayEquals(STR6, vector.get(5));
-
- vector.setLastSet(5);
- /* fill empty byte arrays from index [6, 9] */
- vector.fillEmpties(10);
-
- /* Check current lastSet */
- assertEquals(9, vector.getLastSet());
-
- /* Check the vector output */
- assertArrayEquals(STR1, vector.get(0));
- assertArrayEquals(STR2, vector.get(1));
- assertArrayEquals(STR3, vector.get(2));
- assertArrayEquals(STR4, vector.get(3));
- assertArrayEquals(STR5, vector.get(4));
- assertArrayEquals(STR6, vector.get(5));
- assertEquals(0, vector.getValueLength(6));
- assertEquals(0, vector.getValueLength(7));
- assertEquals(0, vector.getValueLength(8));
- assertEquals(0, vector.getValueLength(9));
-
- setBytes(10, STR1, vector);
- setBytes(11, STR2, vector);
-
- vector.setLastSet(11);
- /* fill empty byte arrays from index [12, 14] */
- vector.setValueCount(15);
-
- /* Check current lastSet */
- assertEquals(14, vector.getLastSet());
-
- /* Check the vector output */
- assertArrayEquals(STR1, vector.get(0));
- assertArrayEquals(STR2, vector.get(1));
- assertArrayEquals(STR3, vector.get(2));
- assertArrayEquals(STR4, vector.get(3));
- assertArrayEquals(STR5, vector.get(4));
- assertArrayEquals(STR6, vector.get(5));
- assertEquals(0, vector.getValueLength(6));
- assertEquals(0, vector.getValueLength(7));
- assertEquals(0, vector.getValueLength(8));
- assertEquals(0, vector.getValueLength(9));
- assertArrayEquals(STR1, vector.get(10));
- assertArrayEquals(STR2, vector.get(11));
- assertEquals(0, vector.getValueLength(12));
- assertEquals(0, vector.getValueLength(13));
- assertEquals(0, vector.getValueLength(14));
-
- /* Check offsets */
+ private void testFillEmptiesUsageHelper(AbstractVariableWidthVector vector) {
+ vector.allocateNew(1024 * 10, 1024);
+
+ setBytes(0, STR1, vector);
+ setBytes(1, STR2, vector);
+ setBytes(2, STR3, vector);
+ setBytes(3, STR4, vector);
+ setBytes(4, STR5, vector);
+ setBytes(5, STR6, vector);
+
+ /* Check current lastSet */
+ assertEquals(-1, vector.getLastSet());
+
+ /* Check the vector output */
+ assertArrayEquals(STR1, vector.get(0));
+ assertArrayEquals(STR2, vector.get(1));
+ assertArrayEquals(STR3, vector.get(2));
+ assertArrayEquals(STR4, vector.get(3));
+ assertArrayEquals(STR5, vector.get(4));
+ assertArrayEquals(STR6, vector.get(5));
+
+ vector.setLastSet(5);
+ /* fill empty byte arrays from index [6, 9] */
+ vector.fillEmpties(10);
+
+ /* Check current lastSet */
+ assertEquals(9, vector.getLastSet());
+
+ /* Check the vector output */
+ assertArrayEquals(STR1, vector.get(0));
+ assertArrayEquals(STR2, vector.get(1));
+ assertArrayEquals(STR3, vector.get(2));
+ assertArrayEquals(STR4, vector.get(3));
+ assertArrayEquals(STR5, vector.get(4));
+ assertArrayEquals(STR6, vector.get(5));
+ assertEquals(0, vector.getValueLength(6));
+ assertEquals(0, vector.getValueLength(7));
+ assertEquals(0, vector.getValueLength(8));
+ assertEquals(0, vector.getValueLength(9));
+
+ setBytes(10, STR1, vector);
+ setBytes(11, STR2, vector);
+
+ vector.setLastSet(11);
+ /* fill empty byte arrays from index [12, 14] */
+ vector.setValueCount(15);
+
+ /* Check current lastSet */
+ assertEquals(14, vector.getLastSet());
+
+ /* Check the vector output */
+ assertArrayEquals(STR1, vector.get(0));
+ assertArrayEquals(STR2, vector.get(1));
+ assertArrayEquals(STR3, vector.get(2));
+ assertArrayEquals(STR4, vector.get(3));
+ assertArrayEquals(STR5, vector.get(4));
+ assertArrayEquals(STR6, vector.get(5));
+ assertEquals(0, vector.getValueLength(6));
+ assertEquals(0, vector.getValueLength(7));
+ assertEquals(0, vector.getValueLength(8));
+ assertEquals(0, vector.getValueLength(9));
+ assertArrayEquals(STR1, vector.get(10));
+ assertArrayEquals(STR2, vector.get(11));
+ assertEquals(0, vector.getValueLength(12));
+ assertEquals(0, vector.getValueLength(13));
+ assertEquals(0, vector.getValueLength(14));
+
+ /* Check offsets */
+ if (vector instanceof BaseVariableWidthVector) {
assertEquals(0,
- vector.offsetBuffer.getInt(0 *
BaseVariableWidthVector.OFFSET_WIDTH));
+ vector.getOffsetBuffer().getInt(0 *
BaseVariableWidthVector.OFFSET_WIDTH));
assertEquals(6,
- vector.offsetBuffer.getInt(1 *
BaseVariableWidthVector.OFFSET_WIDTH));
+ vector.getOffsetBuffer().getInt(1 *
BaseVariableWidthVector.OFFSET_WIDTH));
assertEquals(16,
- vector.offsetBuffer.getInt(2 *
BaseVariableWidthVector.OFFSET_WIDTH));
+ vector.getOffsetBuffer().getInt(2 *
BaseVariableWidthVector.OFFSET_WIDTH));
assertEquals(21,
- vector.offsetBuffer.getInt(3 *
BaseVariableWidthVector.OFFSET_WIDTH));
+ vector.getOffsetBuffer().getInt(3 *
BaseVariableWidthVector.OFFSET_WIDTH));
assertEquals(30,
- vector.offsetBuffer.getInt(4 *
BaseVariableWidthVector.OFFSET_WIDTH));
+ vector.getOffsetBuffer().getInt(4 *
BaseVariableWidthVector.OFFSET_WIDTH));
assertEquals(34,
- vector.offsetBuffer.getInt(5 *
BaseVariableWidthVector.OFFSET_WIDTH));
+ vector.getOffsetBuffer().getInt(5 *
BaseVariableWidthVector.OFFSET_WIDTH));
assertEquals(40,
- vector.offsetBuffer.getInt(6 *
BaseVariableWidthVector.OFFSET_WIDTH));
+ vector.getOffsetBuffer().getInt(6 *
BaseVariableWidthVector.OFFSET_WIDTH));
assertEquals(40,
- vector.offsetBuffer.getInt(7 *
BaseVariableWidthVector.OFFSET_WIDTH));
+ vector.getOffsetBuffer().getInt(7 *
BaseVariableWidthVector.OFFSET_WIDTH));
assertEquals(40,
- vector.offsetBuffer.getInt(8 *
BaseVariableWidthVector.OFFSET_WIDTH));
+ vector.getOffsetBuffer().getInt(8 *
BaseVariableWidthVector.OFFSET_WIDTH));
assertEquals(40,
- vector.offsetBuffer.getInt(9 *
BaseVariableWidthVector.OFFSET_WIDTH));
+ vector.getOffsetBuffer().getInt(9 *
BaseVariableWidthVector.OFFSET_WIDTH));
assertEquals(40,
- vector.offsetBuffer.getInt(10 *
BaseVariableWidthVector.OFFSET_WIDTH));
+ vector.getOffsetBuffer().getInt(10 *
BaseVariableWidthVector.OFFSET_WIDTH));
assertEquals(46,
- vector.offsetBuffer.getInt(11 *
BaseVariableWidthVector.OFFSET_WIDTH));
+ vector.getOffsetBuffer().getInt(11 *
BaseVariableWidthVector.OFFSET_WIDTH));
assertEquals(56,
- vector.offsetBuffer.getInt(12 *
BaseVariableWidthVector.OFFSET_WIDTH));
+ vector.getOffsetBuffer().getInt(12 *
BaseVariableWidthVector.OFFSET_WIDTH));
assertEquals(56,
- vector.offsetBuffer.getInt(13 *
BaseVariableWidthVector.OFFSET_WIDTH));
+ vector.getOffsetBuffer().getInt(13 *
BaseVariableWidthVector.OFFSET_WIDTH));
assertEquals(56,
- vector.offsetBuffer.getInt(14 *
BaseVariableWidthVector.OFFSET_WIDTH));
+ vector.getOffsetBuffer().getInt(14 *
BaseVariableWidthVector.OFFSET_WIDTH));
assertEquals(56,
- vector.offsetBuffer.getInt(15 *
BaseVariableWidthVector.OFFSET_WIDTH));
+ vector.getOffsetBuffer().getInt(15 *
BaseVariableWidthVector.OFFSET_WIDTH));
}
}
- @Test /* VarCharVector */
- public void testGetBufferAddress1() {
-
+ @Test
+ public void testFillEmptiesUsage() {
try (final VarCharVector vector = new VarCharVector("myvector",
allocator)) {
+ testFillEmptiesUsageHelper(vector);
+ }
- setVector(vector, STR1, STR2, STR3, STR4, STR5, STR6);
- vector.setValueCount(15);
+ try (final ViewVarCharVector vector = new ViewVarCharVector("myvector",
allocator)) {
+ testFillEmptiesUsageHelper(vector);
+ }
+ }
- /* check the vector output */
- assertArrayEquals(STR1, vector.get(0));
- assertArrayEquals(STR2, vector.get(1));
- assertArrayEquals(STR3, vector.get(2));
- assertArrayEquals(STR4, vector.get(3));
- assertArrayEquals(STR5, vector.get(4));
- assertArrayEquals(STR6, vector.get(5));
+ private void testGetBufferAddress1VarCharVector(VarCharVector vector) {
+ setVector(vector, STR1, STR2, STR3, STR4, STR5, STR6);
+ vector.setValueCount(15);
- List<ArrowBuf> buffers = vector.getFieldBuffers();
- long bitAddress = vector.getValidityBufferAddress();
- long offsetAddress = vector.getOffsetBufferAddress();
- long dataAddress = vector.getDataBufferAddress();
+ /* check the vector output */
+ assertArrayEquals(STR1, vector.get(0));
+ assertArrayEquals(STR2, vector.get(1));
+ assertArrayEquals(STR3, vector.get(2));
+ assertArrayEquals(STR4, vector.get(3));
+ assertArrayEquals(STR5, vector.get(4));
+ assertArrayEquals(STR6, vector.get(5));
- assertEquals(3, buffers.size());
- assertEquals(bitAddress, buffers.get(0).memoryAddress());
- assertEquals(offsetAddress, buffers.get(1).memoryAddress());
- assertEquals(dataAddress, buffers.get(2).memoryAddress());
+ List<ArrowBuf> buffers = vector.getFieldBuffers();
+ long bitAddress = vector.getValidityBufferAddress();
+ long offsetAddress = vector.getOffsetBufferAddress();
+ long dataAddress = vector.getDataBufferAddress();
+
+ assertEquals(bitAddress, buffers.get(0).memoryAddress());
+ assertEquals(offsetAddress, buffers.get(1).memoryAddress());
+ assertEquals(dataAddress, buffers.get(2).memoryAddress());
+ assertEquals(3, buffers.size());
+ }
+
+ private void testGetBufferAddress1ViewVarCharVector(ViewVarCharVector
vector) {
+ setVector(vector, STR1, STR2, STR3, STR4, STR5, STR6);
+ vector.setValueCount(15);
+
+ /* check the vector output */
+ assertArrayEquals(STR1, vector.get(0));
+ assertArrayEquals(STR2, vector.get(1));
+ assertArrayEquals(STR3, vector.get(2));
+ assertArrayEquals(STR4, vector.get(3));
+ assertArrayEquals(STR5, vector.get(4));
+ assertArrayEquals(STR6, vector.get(5));
+
+ List<ArrowBuf> buffers = vector.getFieldBuffers();
+ long bitAddress = vector.getValidityBufferAddress();
+ long dataAddress = vector.getDataBufferAddress();
+
+ // ViewVarCharVector only have two buffers
+ // ViewVarCharVector does not have an offset buffer
+ assertEquals(2, buffers.size());
+ assertEquals(bitAddress, buffers.get(0).memoryAddress());
+ assertEquals(dataAddress, buffers.get(1).memoryAddress());
+ }
+
+ @Test /* VarCharVector */
+ public void testGetBufferAddress1() {
Review Comment:
here I did split for readability.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
