Skip to content

GH-109: Implement Vector Validators for StringView #886

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

GH-109: Implement Vector Validators for StringView #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion vector/src/main/java/org/apache/arrow/vector/validate/ValidateVectorBufferVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,15 @@ public Void visit(BaseLargeVariableWidthVector vector, Void value) {

@Override
public Void visit(BaseVariableWidthViewVector vector, Void value) {
throw new UnsupportedOperationException("View vectors are not supported.");
final int valueCount = vector.getValueCount();
validateOrThrow(
vector.getValueCount() >= 0,
"Vector valueCount %s is negative.",
vector.getValueCapacity());
Comment on lines +162 to +165
Copy link
Member

Choose a reason for hiding this comment

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

Can we use validateVectorCommon?

The comment in validateVectorCommon points back to #109. So I feel like figuring that out should be part of resolving 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.

How do you think validateVectorCommon should be modified to support StringView? My idea is

if (vector instanceof BaseVariableWidthViewVector) {
      int typeBufferCount = TypeLayout.getTypeBufferCount(arrowType);
      validateOrThrow(
          fieldVector.getFieldBuffers().size() >= typeBufferCount,
          "Expected at least %s buffers in vector of type %s, got %s.",
          typeBufferCount,
          vector.getField().getType().toString(),
          fieldVector.getFieldBuffers().size());
}

validateOrThrow(vector.getFieldBuffers().size() >= 2, "Expected at least 2 buffers.");
validateValidityBuffer(vector, valueCount);
validateDataBuffer(vector, (long) valueCount * BaseVariableWidthViewVector.ELEMENT_SIZE);
return null;
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion vector/src/main/java/org/apache/arrow/vector/validate/ValidateVectorDataVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ public Void visit(BaseLargeVariableWidthVector vector, Void value) {

@Override
public Void visit(BaseVariableWidthViewVector vector, Void value) {
throw new UnsupportedOperationException("View vectors are not supported.");
vector.validateScalars();
return null;
}

@Override
Expand Down
9 changes: 8 additions & 1 deletion vector/src/main/java/org/apache/arrow/vector/validate/ValidateVectorTypeVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@
import org.apache.arrow.vector.ValueVector;
import org.apache.arrow.vector.VarBinaryVector;
import org.apache.arrow.vector.VarCharVector;
import org.apache.arrow.vector.ViewVarBinaryVector;
import org.apache.arrow.vector.ViewVarCharVector;
import org.apache.arrow.vector.compare.VectorVisitor;
import org.apache.arrow.vector.complex.DenseUnionVector;
import org.apache.arrow.vector.complex.FixedSizeListVector;
Expand Down Expand Up @@ -380,7 +382,12 @@ public Void visit(BaseLargeVariableWidthVector vector, Void value) {

@Override
public Void visit(BaseVariableWidthViewVector vector, Void value) {
throw new UnsupportedOperationException("View vectors are not supported.");
if (vector instanceof ViewVarCharVector) {
validateVectorCommon(vector, ArrowType.Utf8View.class);
} else if (vector instanceof ViewVarBinaryVector) {
validateVectorCommon(vector, ArrowType.BinaryView.class);
}
return null;
}

@Override
Expand Down
9 changes: 7 additions & 2 deletions vector/src/main/java/org/apache/arrow/vector/validate/ValidateVectorVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,13 @@ public Void visit(BaseLargeVariableWidthVector left, Void value) {
}

@Override
public Void visit(BaseVariableWidthViewVector left, Void value) {
throw new UnsupportedOperationException("View vectors are not supported.");
public Void visit(BaseVariableWidthViewVector vector, Void value) {
if (vector.getValueCount() > 0) {
if (vector.getDataBuffer() == null || vector.getDataBuffer().capacity() == 0) {
throw new IllegalArgumentException("valueBuffer is null or capacity is 0");
}
}
return null;
}

@Override
Expand Down
17 changes: 16 additions & 1 deletion vector/src/test/java/org/apache/arrow/vector/TestVariableWidthViewVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
import org.apache.arrow.vector.util.ReusableByteArray;
import org.apache.arrow.vector.util.Text;
import org.apache.arrow.vector.util.TransferPair;
import org.apache.arrow.vector.validate.ValidateUtil;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -2445,7 +2446,7 @@ public void testSplitAndTransferWithLongStringsOnValiditySplit() {
final ViewVarBinaryVector sourceVector =
newViewVarBinaryVector(EMPTY_SCHEMA_PATH, allocator)) {
testSplitAndTransferOnValiditySplitHelper(
targetVector, sourceVector, startIndex, length, data);
targetVector, sourceVector, startIndex, length, binaryData);
}
}

Expand Down Expand Up @@ -2852,4 +2853,18 @@ public void testVectorLoadUnloadOnMixedTypes() {
}
}
}

@Test
public void testValidate() {
try (final ViewVarCharVector vector = new ViewVarCharVector("v", allocator)) {
vector.validateFull();
setVector(vector, STR1, STR2, STR3);
vector.validateFull();

vector.getDataBuffer().capacity(0);
ValidateUtil.ValidateException e =
assertThrows(ValidateUtil.ValidateException.class, () -> vector.validate());
assertTrue(e.getMessage().contains("Not enough capacity for data buffer"));
}
}
}
Loading