check isFixedBufferCount

Author: ViggoC

vector/src/main/java/org/apache/arrow/vector/TypeLayout.java

@@ -37,10 +37,7 @@
 import org.apache.arrow.vector.types.pojo.ArrowType.Int;
 import org.apache.arrow.vector.types.pojo.ArrowType.Interval;
 import org.apache.arrow.vector.types.pojo.ArrowType.LargeBinary;
-import org.apache.arrow.vector.types.pojo.ArrowType.LargeList;
-import org.apache.arrow.vector.types.pojo.ArrowType.LargeListView;
 import org.apache.arrow.vector.types.pojo.ArrowType.LargeUtf8;
-import org.apache.arrow.vector.types.pojo.ArrowType.ListView;
 import org.apache.arrow.vector.types.pojo.ArrowType.Map;
 import org.apache.arrow.vector.types.pojo.ArrowType.Null;
 import org.apache.arrow.vector.types.pojo.ArrowType.RunEndEncoded;
@@ -461,142 +458,6 @@ public Integer visit(RunEndEncoded type) {
         });
   }
 
-  public static boolean isVariableBuffer(final ArrowType arrowType) {
-    return arrowType.accept(
-        new ArrowTypeVisitor<>() {
-
-          @Override
-          public Boolean visit(Null type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(Struct type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(ArrowType.List type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(LargeList type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(FixedSizeList type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(Union type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(Map type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(Int type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(FloatingPoint type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(Utf8 type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(Utf8View type) {
-            return true;
-          }
-
-          @Override
-          public Boolean visit(LargeUtf8 type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(Binary type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(BinaryView type) {
-            return true;
-          }
-
-          @Override
-          public Boolean visit(LargeBinary type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(FixedSizeBinary type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(Bool type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(Decimal type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(Date type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(Time type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(Timestamp type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(Interval type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(Duration type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(ListView type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(LargeListView type) {
-            return false;
-          }
-
-          @Override
-          public Boolean visit(RunEndEncoded type) {
-            return false;
-          }
-        });
-  }
-
   private final List<BufferLayout> bufferLayouts;
 
   private final boolean isFixedBufferCount;

vector/src/main/java/org/apache/arrow/vector/validate/ValidateVectorBufferVisitor.java

@@ -53,17 +53,17 @@ private void validateVectorCommon(ValueVector vector) {
     if (vector instanceof FieldVector) {
       FieldVector fieldVector = (FieldVector) vector;
       int typeBufferCount = TypeLayout.getTypeBufferCount(arrowType);
-      if (TypeLayout.isVariableBuffer(arrowType)) {
+      if (TypeLayout.getTypeLayout(arrowType).isFixedBufferCount()) {
         validateOrThrow(
-            fieldVector.getFieldBuffers().size() >= typeBufferCount,
-            "Expected at least %s buffers in vector of type %s, got %s.",
+            fieldVector.getFieldBuffers().size() == typeBufferCount,
+            "Expected %s buffers in vector of type %s, got %s.",
             typeBufferCount,
             vector.getField().getType().toString(),
             fieldVector.getFieldBuffers().size());
       } else {
         validateOrThrow(
-            fieldVector.getFieldBuffers().size() == typeBufferCount,
-            "Expected %s buffers in vector of type %s, got %s.",
+            fieldVector.getFieldBuffers().size() >= typeBufferCount,
+            "Expected at least %s buffers in vector of type %s, got %s.",
             typeBufferCount,
             vector.getField().getType().toString(),
             fieldVector.getFieldBuffers().size());