From 9ee42edd4ff333546c780bcbdeba90da5dacdab4 Mon Sep 17 00:00:00 2001 From: Divjot Arora Date: Thu, 22 Oct 2026 15:24:58 +0000 Subject: [PATCH 01/15] Define the VECTOR schema contract --- .../parquet/schema/LogicalTypeAnnotation.java | 59 ++++++++++ .../org/apache/parquet/schema/TypeUtil.java | 109 ++++++++++++++++++ .../TestTypeBuildersWithLogicalTypes.java | 91 +++++++++++++++ .../apache/parquet/format/LogicalTypes.java | 4 + .../src/main/thrift/parquet.thrift | 5 + 5 files changed, 268 insertions(+) diff --git a/parquet-column/src/main/java/org/apache/parquet/schema/LogicalTypeAnnotation.java b/parquet-column/src/main/java/org/apache/parquet/schema/LogicalTypeAnnotation.java index 4040b55e31..0a7c4f130b 100644 --- a/parquet-column/src/main/java/org/apache/parquet/schema/LogicalTypeAnnotation.java +++ b/parquet-column/src/main/java/org/apache/parquet/schema/LogicalTypeAnnotation.java @@ -62,6 +62,13 @@ protected LogicalTypeAnnotation fromString(List params) { return listType(); } }, + VECTOR { + @Override + protected LogicalTypeAnnotation fromString(List params) { + Preconditions.checkArgument(params.size() == 1, "Expecting 1 parameter for VECTOR: %s", params); + return vectorType(Integer.parseInt(params.get(0))); + } + }, VARIANT { @Override protected LogicalTypeAnnotation fromString(List params) { @@ -314,6 +321,10 @@ public static ListLogicalTypeAnnotation listType() { return ListLogicalTypeAnnotation.INSTANCE; } + public static VectorLogicalTypeAnnotation vectorType(int numElements) { + return new VectorLogicalTypeAnnotation(numElements); + } + public static VariantLogicalTypeAnnotation variantType(byte specVersion) { return new VariantLogicalTypeAnnotation(specVersion); } @@ -513,6 +524,50 @@ public int hashCode() { } } + public static class VectorLogicalTypeAnnotation extends LogicalTypeAnnotation { + private final int numElements; + + private VectorLogicalTypeAnnotation(int numElements) { + Preconditions.checkArgument(numElements > 0, "Invalid VECTOR length: %s", numElements); + this.numElements = numElements; + } + + public int getNumElements() { + return numElements; + } + + @Override + public OriginalType toOriginalType() { + return OriginalType.LIST; + } + + @Override + public Optional accept(LogicalTypeAnnotationVisitor visitor) { + return visitor.visit(this); + } + + @Override + LogicalTypeToken getType() { + return LogicalTypeToken.VECTOR; + } + + @Override + protected String typeParametersAsString() { + return "(" + numElements + ")"; + } + + @Override + public boolean equals(Object obj) { + return obj instanceof VectorLogicalTypeAnnotation + && numElements == ((VectorLogicalTypeAnnotation) obj).numElements; + } + + @Override + public int hashCode() { + return 31 * getClass().hashCode() + numElements; + } + } + public static class EnumLogicalTypeAnnotation extends LogicalTypeAnnotation { private static final EnumLogicalTypeAnnotation INSTANCE = new EnumLogicalTypeAnnotation(); @@ -1536,6 +1591,10 @@ default Optional visit(ListLogicalTypeAnnotation listLogicalType) { return empty(); } + default Optional visit(VectorLogicalTypeAnnotation vectorLogicalType) { + return empty(); + } + default Optional visit(VariantLogicalTypeAnnotation variantLogicalType) { return empty(); } diff --git a/parquet-column/src/main/java/org/apache/parquet/schema/TypeUtil.java b/parquet-column/src/main/java/org/apache/parquet/schema/TypeUtil.java index bb1278fc57..283098e069 100644 --- a/parquet-column/src/main/java/org/apache/parquet/schema/TypeUtil.java +++ b/parquet-column/src/main/java/org/apache/parquet/schema/TypeUtil.java @@ -18,8 +18,117 @@ */ package org.apache.parquet.schema; +import org.apache.parquet.schema.LogicalTypeAnnotation.DecimalLogicalTypeAnnotation; +import org.apache.parquet.schema.LogicalTypeAnnotation.Float16LogicalTypeAnnotation; +import org.apache.parquet.schema.LogicalTypeAnnotation.IntLogicalTypeAnnotation; +import org.apache.parquet.schema.LogicalTypeAnnotation.VectorLogicalTypeAnnotation; +import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName; +import org.apache.parquet.schema.Type.Repetition; + public class TypeUtil { + public static boolean hasVector(Type type) { + if (type.getLogicalTypeAnnotation() instanceof VectorLogicalTypeAnnotation) { + return true; + } + if (!type.isPrimitive()) { + for (Type child : type.asGroupType().getFields()) { + if (hasVector(child)) { + return true; + } + } + } + return false; + } + + public static void checkValidVectorSchema(Type type) { + if (type.getLogicalTypeAnnotation() instanceof VectorLogicalTypeAnnotation) { + if (type.isPrimitive()) { + throw new InvalidSchemaException("Invalid VECTOR schema: " + type); + } + checkVector(type.asGroupType()); + } + if (!type.isPrimitive()) { + for (Type child : type.asGroupType().getFields()) { + checkValidVectorSchema(child); + } + } + } + + private static void checkVector(GroupType vector) { + if (vector.getRepetition() == Repetition.REPEATED || vector.getFieldCount() != 1) { + throw new InvalidSchemaException("Invalid VECTOR schema: " + vector); + } + Type listType = vector.getType(0); + if (listType.isPrimitive() + || !listType.getName().equals("list") + || listType.getRepetition() != Repetition.REPEATED + || listType.getLogicalTypeAnnotation() != null) { + throw new InvalidSchemaException("Invalid VECTOR schema: " + vector); + } + GroupType list = listType.asGroupType(); + if (list.getFieldCount() != 1) { + throw new InvalidSchemaException("Invalid VECTOR schema: " + vector); + } + Type elementType = list.getType(0); + if (!elementType.isPrimitive() + || !elementType.getName().equals("element") + || elementType.getRepetition() != Repetition.REQUIRED) { + throw new InvalidSchemaException("Invalid VECTOR schema: " + vector); + } + PrimitiveType element = elementType.asPrimitiveType(); + PrimitiveTypeName physical = element.getPrimitiveTypeName(); + LogicalTypeAnnotation logical = element.getLogicalTypeAnnotation(); + boolean allowed; + switch (physical) { + case BOOLEAN: + case FLOAT: + case DOUBLE: + allowed = logical == null; + break; + case INT32: + case INT64: + allowed = logical == null + || logical instanceof IntLogicalTypeAnnotation + || logical instanceof DecimalLogicalTypeAnnotation; + break; + case FIXED_LEN_BYTE_ARRAY: + allowed = logical instanceof Float16LogicalTypeAnnotation + || logical instanceof DecimalLogicalTypeAnnotation; + break; + default: + allowed = false; + } + if (!allowed) { + throw new InvalidSchemaException("Invalid VECTOR schema: " + vector); + } + try { + Types.PrimitiveBuilder builder = Types.primitive(physical, element.getRepetition()); + if (physical == PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY) { + builder.length(element.getTypeLength()); + } + if (logical != null) { + builder.as(logical); + } + builder.named(element.getName()); + } catch (IllegalArgumentException | IllegalStateException e) { + throw new InvalidSchemaException("Invalid VECTOR schema: " + vector, e); + } + } + + public static VectorLogicalTypeAnnotation getVectorType(GroupType schema, String[] path) { + if (path.length < 3) { + return null; + } + GroupType group = schema; + for (int i = 0; i < path.length - 2; i++) { + group = group.getType(path[i]).asGroupType(); + } + LogicalTypeAnnotation logical = group.getLogicalTypeAnnotation(); + return logical instanceof VectorLogicalTypeAnnotation ? (VectorLogicalTypeAnnotation) logical : null; + } + public static void checkValidWriteSchema(GroupType schema) { + checkValidVectorSchema(schema); schema.accept(new TypeVisitor() { @Override public void visit(GroupType groupType) { diff --git a/parquet-column/src/test/java/org/apache/parquet/schema/TestTypeBuildersWithLogicalTypes.java b/parquet-column/src/test/java/org/apache/parquet/schema/TestTypeBuildersWithLogicalTypes.java index ae2f32477c..07aa3db239 100644 --- a/parquet-column/src/test/java/org/apache/parquet/schema/TestTypeBuildersWithLogicalTypes.java +++ b/parquet-column/src/test/java/org/apache/parquet/schema/TestTypeBuildersWithLogicalTypes.java @@ -31,6 +31,7 @@ import static org.apache.parquet.schema.LogicalTypeAnnotation.timeType; import static org.apache.parquet.schema.LogicalTypeAnnotation.timestampType; import static org.apache.parquet.schema.LogicalTypeAnnotation.uuidType; +import static org.apache.parquet.schema.LogicalTypeAnnotation.vectorType; import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.BINARY; import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.BOOLEAN; import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.DOUBLE; @@ -46,13 +47,103 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.stream.Stream; import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName; import org.apache.parquet.schema.Type.Repetition; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.ValueSource; public class TestTypeBuildersWithLogicalTypes { + private static GroupType vector(Type element) { + return new GroupType(REQUIRED, "v", vectorType(5), new GroupType(Repetition.REPEATED, "list", element)); + } + + @ParameterizedTest + @ValueSource(ints = {1, Integer.MAX_VALUE}) + public void testVectorAnnotation(int length) { + GroupType vector = new GroupType( + REQUIRED, + "v", + vectorType(length), + new GroupType(Repetition.REPEATED, "list", Types.required(FLOAT).named("element"))); + MessageType schema = Types.buildMessage().addField(vector).named("m"); + TypeUtil.checkValidWriteSchema(schema); + assertThat(MessageTypeParser.parseMessageType(schema.toString())).isEqualTo(schema); + assertThat(vectorType(length).getNumElements()).isEqualTo(length); + assertThat(vectorType(length).toOriginalType()).isEqualTo(OriginalType.LIST); + assertThat(vectorType(length)).isEqualTo(vectorType(length)).hasSameHashCodeAs(vectorType(length)); + assertThat(vectorType(length)).isNotEqualTo(vectorType(length == 1 ? 5 : 1)); + assertThat(vectorType(length)).isNotEqualTo(LogicalTypeAnnotation.listType()); + } + + @ParameterizedTest + @ValueSource(ints = {0, -1}) + public void testInvalidVectorLength(int length) { + assertThatThrownBy(() -> vectorType(length)) + .isInstanceOf(IllegalArgumentException.class) + .hasMessage("Invalid VECTOR length: " + length); + } + + private static Stream invalidVectors() { + PrimitiveType element = Types.required(FLOAT).named("element"); + GroupType list = new GroupType(Repetition.REPEATED, "list", element); + return Stream.of( + Arguments.of(new GroupType(Repetition.REPEATED, "v", vectorType(5), list)), + Arguments.of(new GroupType( + REQUIRED, "v", vectorType(5), new GroupType(Repetition.REPEATED, "items", element))), + Arguments.of(new GroupType(REQUIRED, "v", vectorType(5), list, list)), + Arguments.of(new GroupType(REQUIRED, "v", vectorType(5), new GroupType(REQUIRED, "list", element))), + Arguments.of(new GroupType( + REQUIRED, + "v", + vectorType(5), + new GroupType(Repetition.REPEATED, "list", LogicalTypeAnnotation.listType(), element))), + Arguments.of(new GroupType( + REQUIRED, "v", vectorType(5), new GroupType(Repetition.REPEATED, "list", element, element))), + Arguments.of(vector(Types.required(FLOAT).named("item"))), + Arguments.of(vector(Types.optional(FLOAT).named("element"))), + Arguments.of(vector(Types.repeated(FLOAT).named("element"))), + Arguments.of(vector(new GroupType(REQUIRED, "element", element))), + Arguments.of(vector(Types.required(BINARY).as(decimalType(2, 9)).named("element"))), + Arguments.of( + vector(Types.required(FIXED_LEN_BYTE_ARRAY).length(2).named("element"))), + Arguments.of(vector(Types.required(INT96).named("element"))), + Arguments.of(vector(Types.required(BINARY).as(stringType()).named("element"))), + Arguments.of(vector(Types.required(INT32).as(dateType()).named("element"))), + Arguments.of( + vector(Types.required(INT32).named("element").withLogicalTypeAnnotation(intType(64, true)))), + Arguments.of( + vector(Types.required(FLOAT).named("element").withLogicalTypeAnnotation(intType(32, true)))), + Arguments.of( + vector(Types.required(INT32).named("element").withLogicalTypeAnnotation(decimalType(0, 10)))), + Arguments.of(vector(Types.required(FIXED_LEN_BYTE_ARRAY) + .length(4) + .named("element") + .withLogicalTypeAnnotation(decimalType(0, 10)))), + Arguments.of( + vector(Types.required(INT32).named("element").withLogicalTypeAnnotation(decimalType(-1, 9)))), + Arguments.of( + vector(Types.required(INT32).named("element").withLogicalTypeAnnotation(decimalType(10, 9))))); + } + + @ParameterizedTest + @MethodSource("invalidVectors") + public void testInvalidVectorSchema(GroupType vector) { + assertThatThrownBy(() -> TypeUtil.checkValidVectorSchema(new MessageType("m", vector))) + .isInstanceOf(InvalidSchemaException.class) + .hasMessage("Invalid VECTOR schema: " + vector); + } + + @Test + public void testVectorOnPrimitive() { + assertThatThrownBy(() -> Types.required(FLOAT).as(vectorType(5)).named("v")) + .isInstanceOf(IllegalStateException.class) + .hasMessage("VECTOR(5) can not be applied to a primitive type"); + } + @Test public void testGroupTypeConstruction() { PrimitiveType f1 = Types.required(BINARY).as(stringType()).named("f1"); diff --git a/parquet-format-structures/src/main/java/org/apache/parquet/format/LogicalTypes.java b/parquet-format-structures/src/main/java/org/apache/parquet/format/LogicalTypes.java index 8aa21e0ae3..d2d5026614 100644 --- a/parquet-format-structures/src/main/java/org/apache/parquet/format/LogicalTypes.java +++ b/parquet-format-structures/src/main/java/org/apache/parquet/format/LogicalTypes.java @@ -38,6 +38,10 @@ public static LogicalType VARIANT(byte specificationVersion) { return LogicalType.VARIANT(type); } + public static LogicalType VECTOR(int numElements) { + return LogicalType.VECTOR(new VectorType(numElements)); + } + public static final LogicalType UTF8 = LogicalType.STRING(new StringType()); public static final LogicalType MAP = LogicalType.MAP(new MapType()); public static final LogicalType LIST = LogicalType.LIST(new ListType()); diff --git a/parquet-format-structures/src/main/thrift/parquet.thrift b/parquet-format-structures/src/main/thrift/parquet.thrift index bb582017bf..bcb32c4034 100644 --- a/parquet-format-structures/src/main/thrift/parquet.thrift +++ b/parquet-format-structures/src/main/thrift/parquet.thrift @@ -323,6 +323,10 @@ struct StringType {} // allowed for BYTE_ARRAY, must be encoded with UTF-8 struct UUIDType {} // allowed for FIXED[16], must be encoded as raw UUID bytes struct MapType {} // see LogicalTypes.md struct ListType {} // see LogicalTypes.md +// A fixed-length LIST with exactly num_elements required primitive elements. +struct VectorType { + 1: required i32 num_elements +} struct EnumType {} // allowed for BYTE_ARRAY, must be encoded with UTF-8 struct DateType {} // allowed for INT32 struct Float16Type {} // allowed for FIXED[2], must be encoded as raw FLOAT16 bytes (see LogicalTypes.md) @@ -513,6 +517,7 @@ union LogicalType { 17: GeometryType GEOMETRY // no compatible ConvertedType 18: GeographyType GEOGRAPHY // no compatible ConvertedType 19: FileType FILE // no compatible ConvertedType + 20: VectorType VECTOR // use ConvertedType LIST } /** From 1c8d3988707bcb191da05f2a6e309fab47f1e227 Mon Sep 17 00:00:00 2001 From: Divjot Arora Date: Thu, 22 Oct 2026 15:26:57 +0000 Subject: [PATCH 02/15] Preserve metadata fallback for VECTOR elements --- .../converter/ParquetMetadataConverter.java | 33 +++++- .../TestParquetMetadataConverter.java | 103 ++++++++++++++++++ 2 files changed, 135 insertions(+), 1 deletion(-) diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java b/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java index 811e69f458..7b1baf6087 100644 --- a/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java +++ b/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java @@ -132,13 +132,16 @@ import org.apache.parquet.io.api.Binary; import org.apache.parquet.schema.ColumnOrder.ColumnOrderName; import org.apache.parquet.schema.GroupType; +import org.apache.parquet.schema.InvalidSchemaException; import org.apache.parquet.schema.LogicalTypeAnnotation; import org.apache.parquet.schema.LogicalTypeAnnotation.UUIDLogicalTypeAnnotation; +import org.apache.parquet.schema.LogicalTypeAnnotation.VectorLogicalTypeAnnotation; import org.apache.parquet.schema.MessageType; import org.apache.parquet.schema.OriginalType; import org.apache.parquet.schema.PrimitiveType; import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName; import org.apache.parquet.schema.Type.Repetition; +import org.apache.parquet.schema.TypeUtil; import org.apache.parquet.schema.TypeVisitor; import org.apache.parquet.schema.Types; import org.slf4j.Logger; @@ -416,6 +419,11 @@ public Optional visit(LogicalTypeAnnotation.ListLogicalTypeAnnota return of(ConvertedType.LIST); } + @Override + public Optional visit(VectorLogicalTypeAnnotation vectorLogicalType) { + return of(ConvertedType.LIST); + } + @Override public Optional visit(LogicalTypeAnnotation.EnumLogicalTypeAnnotation enumLogicalType) { return of(ConvertedType.ENUM); @@ -503,6 +511,11 @@ public Optional visit(LogicalTypeAnnotation.ListLogicalTypeAnnotati return of(LogicalTypes.LIST); } + @Override + public Optional visit(VectorLogicalTypeAnnotation vectorLogicalType) { + return of(LogicalTypes.VECTOR(vectorLogicalType.getNumElements())); + } + @Override public Optional visit(LogicalTypeAnnotation.EnumLogicalTypeAnnotation enumLogicalType) { return of(LogicalTypes.ENUM); @@ -1333,6 +1346,7 @@ LogicalTypeAnnotation getLogicalTypeAnnotation(LogicalType type) { case ENUM -> LogicalTypeAnnotation.enumType(); case JSON -> LogicalTypeAnnotation.jsonType(); case LIST -> LogicalTypeAnnotation.listType(); + case VECTOR -> LogicalTypeAnnotation.vectorType(type.getVECTOR().getNum_elements()); case TIME -> { TimeType time = type.getTIME(); yield LogicalTypeAnnotation.timeType(time.isAdjustedToUTC, convertTimeUnit(time.unit)); @@ -2017,13 +2031,22 @@ private static ColumnPath getPath(ColumnMetaData metaData) { MessageType fromParquetSchema(List schema, List columnOrders) { Iterator iterator = schema.iterator(); SchemaElement root = iterator.next(); + if (root.isSetLogicalType() && root.logicalType.isSetVECTOR()) { + throw new ParquetDecodingException("Invalid VECTOR metadata for " + root.name); + } Types.MessageTypeBuilder builder = Types.buildMessage(); if (root.isSetField_id()) { builder.id(root.field_id); } Iterator columnOrderIterator = columnOrders == null ? null : columnOrders.iterator(); buildChildren(builder, iterator, root.getNum_children(), columnOrderIterator); - return builder.named(root.name); + MessageType messageType = builder.named(root.name); + try { + TypeUtil.checkValidVectorSchema(messageType); + } catch (InvalidSchemaException e) { + throw new ParquetDecodingException("Invalid VECTOR schema in file metadata", e); + } + return messageType; } private void buildChildren( @@ -2033,6 +2056,14 @@ private void buildChildren( Iterator columnOrders) { for (int i = 0; i < childrenCount; i++) { SchemaElement schemaElement = schema.next(); + if (schemaElement.isSetLogicalType() + && schemaElement.logicalType.isSetVECTOR() + && (schemaElement.type != null + || schemaElement.converted_type != ConvertedType.LIST + || !schemaElement.logicalType.getVECTOR().isSetNum_elements() + || schemaElement.logicalType.getVECTOR().getNum_elements() <= 0)) { + throw new ParquetDecodingException("Invalid VECTOR metadata for " + schemaElement.name); + } // Create Parquet Type. Types.Builder childBuilder; diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java b/parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java index c7b92dbca1..0f839af1c0 100644 --- a/parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java +++ b/parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java @@ -68,6 +68,7 @@ import java.util.Random; import java.util.Set; import java.util.TreeSet; +import java.util.function.Consumer; import java.util.stream.Stream; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; @@ -134,6 +135,7 @@ import org.apache.parquet.internal.column.columnindex.ColumnIndexBuilder; import org.apache.parquet.internal.column.columnindex.OffsetIndex; import org.apache.parquet.internal.column.columnindex.OffsetIndexBuilder; +import org.apache.parquet.io.ParquetDecodingException; import org.apache.parquet.io.api.Binary; import org.apache.parquet.schema.ColumnOrder; import org.apache.parquet.schema.LogicalTypeAnnotation; @@ -146,9 +148,110 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; public class TestParquetMetadataConverter { + private static MessageType vectorSchema() { + return parseMessageType("message m { required group v (VECTOR(5)) { repeated group list {" + + " required float element columnorder(TYPE_DEFINED_ORDER); } } }"); + } + + private static Stream invalidVectorMetadata() { + return Stream.of( + Arguments.of( + "missing length", + (Consumer>) + wire -> wire.get(1).getLogicalType().getVECTOR().unsetNum_elements(), + "Invalid VECTOR metadata for v"), + Arguments.of( + "zero length", + (Consumer>) + wire -> wire.get(1).getLogicalType().getVECTOR().setNum_elements(0), + "Invalid VECTOR metadata for v"), + Arguments.of( + "negative length", + (Consumer>) + wire -> wire.get(1).getLogicalType().getVECTOR().setNum_elements(-1), + "Invalid VECTOR metadata for v"), + Arguments.of( + "missing converted", + (Consumer>) wire -> wire.get(1).unsetConverted_type(), + "Invalid VECTOR metadata for v"), + Arguments.of( + "wrong converted", + (Consumer>) wire -> wire.get(1).setConverted_type(ConvertedType.MAP), + "Invalid VECTOR metadata for v"), + Arguments.of( + "primitive outer", + (Consumer>) wire -> wire.get(1).setType(Type.FLOAT), + "Invalid VECTOR metadata for v"), + Arguments.of( + "root", + (Consumer>) + wire -> wire.get(0).setLogicalType(org.apache.parquet.format.LogicalTypes.VECTOR(5)), + "Invalid VECTOR metadata for m"), + Arguments.of( + "element name", + (Consumer>) wire -> wire.get(3).setName("item"), + "Invalid VECTOR schema in file metadata")); + } + + @ParameterizedTest(name = "{0}") + @MethodSource("invalidVectorMetadata") + public void testInvalidVectorMetadata(String name, Consumer> edit, String message) { + ParquetMetadataConverter converter = new ParquetMetadataConverter(); + List wire = converter.toParquetSchema(vectorSchema()); + edit.accept(wire); + assertThatThrownBy(() -> converter.fromParquetSchema(wire, null)) + .isInstanceOf(ParquetDecodingException.class) + .hasMessageStartingWith(message); + } + + private static Stream vectorElementFallbacks() { + return Stream.of( + Arguments.of( + "unsupported FLOAT annotation", + (Consumer) + element -> element.setLogicalType(org.apache.parquet.format.LogicalTypes.UTF8), + PrimitiveTypeName.FLOAT, + null), + Arguments.of( + "future FLOAT annotation", + (Consumer) element -> element.setLogicalType(new LogicalType()), + PrimitiveTypeName.FLOAT, + null), + Arguments.of( + "future INT32 annotation with converted fallback", + (Consumer) element -> element.setType(Type.INT32) + .setLogicalType(new LogicalType()) + .setConverted_type(ConvertedType.INT_16), + PrimitiveTypeName.INT32, + LogicalTypeAnnotation.intType(16, true)), + Arguments.of( + "conflicting INT32 annotations", + (Consumer) element -> element.setType(Type.INT32) + .setLogicalType(org.apache.parquet.format.LogicalTypes.INT_16) + .setConverted_type(ConvertedType.INT_32), + PrimitiveTypeName.INT32, + LogicalTypeAnnotation.intType(32, true))); + } + + @ParameterizedTest(name = "{0}") + @MethodSource("vectorElementFallbacks") + public void testVectorElementAnnotationFallback( + String name, Consumer edit, PrimitiveTypeName physical, LogicalTypeAnnotation logical) { + ParquetMetadataConverter converter = new ParquetMetadataConverter(); + List wire = converter.toParquetSchema(vectorSchema()); + edit.accept(wire.get(3)); + PrimitiveType element = converter + .fromParquetSchema(wire, null) + .getType("v", "list", "element") + .asPrimitiveType(); + assertThat(element.getPrimitiveTypeName()).isEqualTo(physical); + assertThat(element.getLogicalTypeAnnotation()).isEqualTo(logical); + } + private static SecureRandom random = new SecureRandom(); private static final String CHAR_LOWER = "abcdefghijklmnopqrstuvwxyz"; private static final String CHAR_UPPER = CHAR_LOWER.toUpperCase(); From d7d8da62a372439e1ea0a41caa150388d71510b1 Mon Sep 17 00:00:00 2001 From: Divjot Arora Date: Thu, 22 Oct 2026 15:28:00 +0000 Subject: [PATCH 03/15] Enforce VECTOR validity during record writes --- .../apache/parquet/io/MessageColumnIO.java | 5 +- .../parquet/io/ValidatingRecordConsumer.java | 62 ++++++++- .../io/ValidatingRecordConsumerTest.java | 121 ++++++++++++++++++ 3 files changed, 186 insertions(+), 2 deletions(-) diff --git a/parquet-column/src/main/java/org/apache/parquet/io/MessageColumnIO.java b/parquet-column/src/main/java/org/apache/parquet/io/MessageColumnIO.java index 0ab2db39f6..fef551e5ae 100644 --- a/parquet-column/src/main/java/org/apache/parquet/io/MessageColumnIO.java +++ b/parquet-column/src/main/java/org/apache/parquet/io/MessageColumnIO.java @@ -47,6 +47,7 @@ import org.apache.parquet.io.api.RecordConsumer; import org.apache.parquet.io.api.RecordMaterializer; import org.apache.parquet.schema.MessageType; +import org.apache.parquet.schema.TypeUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -508,7 +509,9 @@ public void flush() { public RecordConsumer getRecordWriter(ColumnWriteStore columns) { RecordConsumer recordWriter = new MessageColumnIORecordConsumer(columns); if (DEBUG) recordWriter = new RecordConsumerLoggingWrapper(recordWriter); - return validating ? new ValidatingRecordConsumer(recordWriter, getType()) : recordWriter; + return validating || TypeUtil.hasVector(getType()) + ? new ValidatingRecordConsumer(recordWriter, getType()) + : recordWriter; } void setLevels() { diff --git a/parquet-column/src/main/java/org/apache/parquet/io/ValidatingRecordConsumer.java b/parquet-column/src/main/java/org/apache/parquet/io/ValidatingRecordConsumer.java index 5a2aa20bf3..2e49f8cc25 100644 --- a/parquet-column/src/main/java/org/apache/parquet/io/ValidatingRecordConsumer.java +++ b/parquet-column/src/main/java/org/apache/parquet/io/ValidatingRecordConsumer.java @@ -32,10 +32,13 @@ import java.util.Deque; import org.apache.parquet.io.api.Binary; import org.apache.parquet.io.api.RecordConsumer; +import org.apache.parquet.schema.LogicalTypeAnnotation.Float16LogicalTypeAnnotation; +import org.apache.parquet.schema.LogicalTypeAnnotation.VectorLogicalTypeAnnotation; import org.apache.parquet.schema.MessageType; import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName; import org.apache.parquet.schema.Type; import org.apache.parquet.schema.Type.Repetition; +import org.apache.parquet.schema.TypeUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,12 +55,17 @@ public class ValidatingRecordConsumer extends RecordConsumer { private Deque fields = new ArrayDeque<>(); private Deque previousField = new ArrayDeque<>(); private Deque fieldValueCount = new ArrayDeque<>(); + private VectorLogicalTypeAnnotation vectorType; + private String vectorName; + private long vectorCount; + private int vectorDepth; /** * @param delegate the consumer to pass down the event to * @param schema the schema to validate against */ public ValidatingRecordConsumer(RecordConsumer delegate, MessageType schema) { + TypeUtil.checkValidVectorSchema(schema); this.delegate = delegate; this.types.push(schema); } @@ -110,6 +118,13 @@ private void validateMissingFields(int index) { */ @Override public void endField(String field, int index) { + Type currentType = types.peek().asGroupType().getType(fields.peek()); + if (fieldValueCount.peek() == 0 + && currentType.isRepetition(Repetition.REQUIRED) + && (currentType.getLogicalTypeAnnotation() instanceof VectorLogicalTypeAnnotation + || vectorType != null && types.size() == vectorDepth + 1)) { + throw new InvalidRecordException("required field is missing " + currentType); + } delegate.endField(field, index); fieldValueCount.pop(); previousField.pop(); @@ -121,8 +136,26 @@ public void endField(String field, int index) { */ @Override public void startGroup() { + Type child = types.peek().asGroupType().getType(fields.peek()); + if (child.getLogicalTypeAnnotation() instanceof VectorLogicalTypeAnnotation) { + int count = fieldValueCount.pop() + 1; + fieldValueCount.push(count); + if (count > 1) { + throw new InvalidRecordException("repeated value when the type is not repeated in " + child); + } + vectorType = (VectorLogicalTypeAnnotation) child.getLogicalTypeAnnotation(); + vectorName = child.getName(); + vectorCount = 0; + vectorDepth = types.size() + 1; + } else if (vectorType != null && types.size() == vectorDepth) { + vectorCount++; + if (vectorCount > vectorType.getNumElements()) { + throw new InvalidRecordException("Invalid VECTOR length for " + vectorName + ": expected " + + vectorType.getNumElements() + ", got " + vectorCount); + } + } previousField.push(-1); - types.push(types.peek().asGroupType().getType(fields.peek())); + types.push(child); delegate.startGroup(); } @@ -131,10 +164,21 @@ public void startGroup() { */ @Override public void endGroup() { + boolean endingVector = vectorType != null && types.size() == vectorDepth; + if (endingVector && vectorCount != vectorType.getNumElements()) { + throw new InvalidRecordException("Invalid VECTOR length for " + vectorName + ": expected " + + vectorType.getNumElements() + ", got " + vectorCount); + } delegate.endGroup(); validateMissingFields(types.peek().asGroupType().getFieldCount()); types.pop(); previousField.pop(); + if (endingVector) { + vectorType = null; + vectorName = null; + vectorCount = 0; + vectorDepth = 0; + } } /** @@ -230,6 +274,16 @@ public void addBoolean(boolean value) { @Override public void addBinary(Binary value) { validate(BINARY, INT96, FIXED_LEN_BYTE_ARRAY); + if (vectorType != null + && types.peek().asGroupType().getType(fields.peek()).getLogicalTypeAnnotation() + instanceof Float16LogicalTypeAnnotation) { + if (value.length() != 2) { + throw new InvalidRecordException("Invalid FLOAT16 VECTOR element length: " + value.length()); + } + if ((value.get2BytesLittleEndian() & 0x7c00) == 0x7c00) { + throw new InvalidRecordException("Non-finite VECTOR element in " + vectorName); + } + } delegate.addBinary(value); } @@ -239,6 +293,9 @@ public void addBinary(Binary value) { @Override public void addFloat(float value) { validate(FLOAT); + if (vectorType != null && !Float.isFinite(value)) { + throw new InvalidRecordException("Non-finite VECTOR element in " + vectorName); + } delegate.addFloat(value); } @@ -248,6 +305,9 @@ public void addFloat(float value) { @Override public void addDouble(double value) { validate(DOUBLE); + if (vectorType != null && !Double.isFinite(value)) { + throw new InvalidRecordException("Non-finite VECTOR element in " + vectorName); + } delegate.addDouble(value); } } diff --git a/parquet-column/src/test/java/org/apache/parquet/io/ValidatingRecordConsumerTest.java b/parquet-column/src/test/java/org/apache/parquet/io/ValidatingRecordConsumerTest.java index 118fcbbcde..feb567e616 100644 --- a/parquet-column/src/test/java/org/apache/parquet/io/ValidatingRecordConsumerTest.java +++ b/parquet-column/src/test/java/org/apache/parquet/io/ValidatingRecordConsumerTest.java @@ -21,16 +21,137 @@ import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.INT32; import static org.apache.parquet.schema.Type.Repetition.REQUIRED; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.Mockito.clearInvocations; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verifyNoInteractions; import java.lang.reflect.Field; import java.util.Deque; +import java.util.function.Consumer; +import java.util.stream.Stream; import org.apache.parquet.io.api.Binary; import org.apache.parquet.io.api.RecordConsumer; import org.apache.parquet.schema.MessageType; +import org.apache.parquet.schema.MessageTypeParser; import org.apache.parquet.schema.PrimitiveType; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.junit.jupiter.params.provider.ValueSource; public class ValidatingRecordConsumerTest { + private static MessageType vectorSchema(String element) { + return MessageTypeParser.parseMessageType("message m { required group v (VECTOR(2)) {" + + " repeated group list { required " + element + "; } } }"); + } + + private static void startVector(RecordConsumer c) { + c.startField("v", 0); + c.startGroup(); + } + + private static void startEntry(RecordConsumer c) { + c.startGroup(); + c.startField("element", 0); + } + + private static void endEntry(RecordConsumer c) { + c.endField("element", 0); + c.endGroup(); + } + + private static void addEntry(RecordConsumer c, float value) { + startEntry(c); + c.addFloat(value); + endEntry(c); + } + + @ParameterizedTest + @ValueSource(ints = {1, 3}) + public void testVectorLengthRejectedAtBoundary(int count) { + MessageType schema = vectorSchema("float element"); + RecordConsumer delegate = mock(RecordConsumer.class); + ValidatingRecordConsumer c = new ValidatingRecordConsumer(delegate, schema); + c.startMessage(); + startVector(c); + c.startField("list", 0); + for (int i = 0; i < Math.min(count, 2); i++) addEntry(c, i); + if (count == 1) { + c.endField("list", 0); + clearInvocations(delegate); + assertThatThrownBy(c::endGroup) + .isInstanceOf(InvalidRecordException.class) + .hasMessage("Invalid VECTOR length for v: expected 2, got 1"); + verifyNoInteractions(delegate); + } else { + clearInvocations(delegate); + assertThatThrownBy(c::startGroup) + .isInstanceOf(InvalidRecordException.class) + .hasMessage("Invalid VECTOR length for v: expected 2, got 3"); + verifyNoInteractions(delegate); + } + } + + @ParameterizedTest + @ValueSource(strings = {"v", "element"}) + public void testEmptyRequiredVectorField(String field) { + MessageType schema = vectorSchema("float element"); + RecordConsumer delegate = mock(RecordConsumer.class); + ValidatingRecordConsumer c = new ValidatingRecordConsumer(delegate, schema); + c.startMessage(); + c.startField("v", 0); + if (field.equals("element")) { + c.startGroup(); + c.startField("list", 0); + startEntry(c); + } + clearInvocations(delegate); + assertThatThrownBy(() -> c.endField(field, 0)) + .isInstanceOf(InvalidRecordException.class) + .hasMessage("required field is missing " + + (field.equals("v") ? schema.getType("v") : schema.getType("v", "list", "element"))); + verifyNoInteractions(delegate); + } + + private static Stream rejectedVectorElements() { + return Stream.of( + Arguments.of( + "float element", + (Consumer) c -> c.addFloat(Float.NaN), + "Non-finite VECTOR element in v"), + Arguments.of( + "double element", + (Consumer) c -> c.addDouble(Double.POSITIVE_INFINITY), + "Non-finite VECTOR element in v"), + Arguments.of( + "fixed_len_byte_array(2) element (FLOAT16)", + (Consumer) + c -> c.addBinary(Binary.fromConstantByteArray(new byte[] {0, (byte) 0xfc})), + "Non-finite VECTOR element in v"), + Arguments.of( + "fixed_len_byte_array(2) element (FLOAT16)", + (Consumer) c -> c.addBinary(Binary.fromConstantByteArray(new byte[] {0})), + "Invalid FLOAT16 VECTOR element length: 1")); + } + + @ParameterizedTest + @MethodSource("rejectedVectorElements") + public void testVectorElementRejectedImmediately(String element, Consumer add, String message) { + MessageType schema = vectorSchema(element); + RecordConsumer delegate = mock(RecordConsumer.class); + ValidatingRecordConsumer c = new ValidatingRecordConsumer(delegate, schema); + c.startMessage(); + startVector(c); + c.startField("list", 0); + startEntry(c); + clearInvocations(delegate); + assertThatThrownBy(() -> add.accept(c)) + .isInstanceOf(InvalidRecordException.class) + .hasMessage(message); + verifyNoInteractions(delegate); + } private static final RecordConsumer NOOP = new RecordConsumer() { @Override From 8a44a999ea50dffa83df737b944cd8290c351f9f Mon Sep 17 00:00:00 2001 From: Divjot Arora Date: Thu, 22 Oct 2026 15:29:49 +0000 Subject: [PATCH 04/15] Validate stored VECTOR boundaries during record reads --- .../apache/parquet/io/ColumnIOFactory.java | 2 + .../parquet/io/FilteredRecordReader.java | 5 +- .../io/RecordReaderImplementation.java | 72 +++++++++++++++++++ .../org/apache/parquet/io/TestColumnIO.java | 54 ++++++++++++++ 4 files changed, 132 insertions(+), 1 deletion(-) diff --git a/parquet-column/src/main/java/org/apache/parquet/io/ColumnIOFactory.java b/parquet-column/src/main/java/org/apache/parquet/io/ColumnIOFactory.java index 24868acaf1..a28d481cbf 100644 --- a/parquet-column/src/main/java/org/apache/parquet/io/ColumnIOFactory.java +++ b/parquet-column/src/main/java/org/apache/parquet/io/ColumnIOFactory.java @@ -24,6 +24,7 @@ import org.apache.parquet.schema.MessageType; import org.apache.parquet.schema.PrimitiveType; import org.apache.parquet.schema.Type; +import org.apache.parquet.schema.TypeUtil; import org.apache.parquet.schema.TypeVisitor; /** @@ -53,6 +54,7 @@ private ColumnIOCreatorVisitor( @Override public void visit(MessageType messageType) { + TypeUtil.checkValidVectorSchema(messageType); columnIO = new MessageColumnIO(requestedSchema, validating, createdBy); visitChildren(columnIO, messageType, requestedSchema); columnIO.setLevels(); diff --git a/parquet-column/src/main/java/org/apache/parquet/io/FilteredRecordReader.java b/parquet-column/src/main/java/org/apache/parquet/io/FilteredRecordReader.java index f877842945..3c52368c9b 100644 --- a/parquet-column/src/main/java/org/apache/parquet/io/FilteredRecordReader.java +++ b/parquet-column/src/main/java/org/apache/parquet/io/FilteredRecordReader.java @@ -84,16 +84,19 @@ private void skipToMatch() { State currentState = getState(0); do { ColumnReader columnReader = currentState.column; + int d = columnReader.getCurrentDefinitionLevel(); + currentState.validateVector(d); // currentLevel = depth + 1 at this point // set the current value - if (columnReader.getCurrentDefinitionLevel() >= currentState.maxDefinitionLevel) { + if (d >= currentState.maxDefinitionLevel) { columnReader.skip(); } columnReader.consume(); // Based on repetition level work out next state to go to int nextR = currentState.maxRepetitionLevel == 0 ? 0 : columnReader.getCurrentRepetitionLevel(); + currentState.endVector(nextR); currentState = currentState.getNextState(nextR); } while (currentState != null); ++recordsRead; diff --git a/parquet-column/src/main/java/org/apache/parquet/io/RecordReaderImplementation.java b/parquet-column/src/main/java/org/apache/parquet/io/RecordReaderImplementation.java index 46c4b714a2..e05578c1fe 100644 --- a/parquet-column/src/main/java/org/apache/parquet/io/RecordReaderImplementation.java +++ b/parquet-column/src/main/java/org/apache/parquet/io/RecordReaderImplementation.java @@ -27,11 +27,15 @@ import java.util.Map; import org.apache.parquet.column.ColumnReader; import org.apache.parquet.column.impl.ColumnReadStoreImpl; +import org.apache.parquet.io.api.Binary; import org.apache.parquet.io.api.Converter; import org.apache.parquet.io.api.GroupConverter; import org.apache.parquet.io.api.PrimitiveConverter; import org.apache.parquet.io.api.RecordConsumer; import org.apache.parquet.io.api.RecordMaterializer; +import org.apache.parquet.schema.LogicalTypeAnnotation; +import org.apache.parquet.schema.LogicalTypeAnnotation.Float16LogicalTypeAnnotation; +import org.apache.parquet.schema.LogicalTypeAnnotation.VectorLogicalTypeAnnotation; import org.apache.parquet.schema.MessageType; import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName; import org.slf4j.Logger; @@ -192,6 +196,9 @@ public static class State { private Case[][][] caseLookup; private List definedCases; private List undefinedCases; + private final int vectorLength; + private final boolean vectorFloat16; + private long vectorCount; private State( int id, @@ -213,6 +220,69 @@ private State( this.primitiveField = fieldPath[fieldPath.length - 1]; this.indexFieldPath = primitiveColumnIO.getIndexFieldPath(); this.primitiveFieldIndex = indexFieldPath[indexFieldPath.length - 1]; + VectorLogicalTypeAnnotation vector = null; + if (fieldPath.length >= 3) { + LogicalTypeAnnotation logical = + primitiveColumnIO.getParent().getParent().getType().getLogicalTypeAnnotation(); + if (logical instanceof VectorLogicalTypeAnnotation) { + vector = (VectorLogicalTypeAnnotation) logical; + } + } + this.vectorLength = vector == null ? 0 : vector.getNumElements(); + this.vectorFloat16 = vector != null + && primitiveColumnIO.getType().getLogicalTypeAnnotation() instanceof Float16LogicalTypeAnnotation; + } + + void validateVector(int d) { + if (vectorLength == 0) return; + int r = column.getCurrentRepetitionLevel(); + if (d < 0 || d > maxDefinitionLevel || r < 0 || r > maxRepetitionLevel) { + throw invalidVector("invalid levels"); + } + if (vectorCount == 0 && r == maxRepetitionLevel) { + throw invalidVector("invalid continuation"); + } + if (d < maxDefinitionLevel) { + if (vectorCount > 0) throw invalidVector("null within vector"); + if (d == maxDefinitionLevel - 1) throw invalidVector("empty vector"); + return; + } + vectorCount++; + if (vectorCount > vectorLength) { + throw invalidVector("expected " + vectorLength + " elements, got " + vectorCount); + } + if (primitive == PrimitiveTypeName.FLOAT && !Float.isFinite(column.getFloat()) + || primitive == PrimitiveTypeName.DOUBLE && !Double.isFinite(column.getDouble())) { + throw invalidVector("non-finite element"); + } + if (vectorFloat16) { + Binary value = column.getBinary(); + if (value.length() != 2) { + throw invalidVector("invalid FLOAT16 element length: " + value.length()); + } + if ((value.get2BytesLittleEndian() & 0x7c00) == 0x7c00) { + throw invalidVector("non-finite element"); + } + } + } + + void endVector(int nextR) { + if (vectorLength == 0) return; + if (nextR < 0 || nextR > maxRepetitionLevel) throw invalidVector("invalid levels"); + if (nextR == maxRepetitionLevel && vectorCount == 0) { + throw invalidVector("null within vector"); + } + if (nextR < maxRepetitionLevel && vectorCount > 0) { + if (vectorCount != vectorLength) { + throw invalidVector("expected " + vectorLength + " elements, got " + vectorCount); + } + vectorCount = 0; + } + } + + private ParquetDecodingException invalidVector(String reason) { + return new ParquetDecodingException( + "Invalid VECTOR data for " + Arrays.toString(fieldPath) + ": " + reason); } public int getDepth(int definitionLevel) { @@ -413,6 +483,7 @@ public T read() { do { ColumnReader columnReader = currentState.column; int d = columnReader.getCurrentDefinitionLevel(); + currentState.validateVector(d); // creating needed nested groups until the current field (opening tags) int depth = currentState.definitionLevelToDepth[d]; for (; currentLevel <= depth; ++currentLevel) { @@ -427,6 +498,7 @@ public T read() { columnReader.consume(); int nextR = currentState.maxRepetitionLevel == 0 ? 0 : columnReader.getCurrentRepetitionLevel(); + currentState.endVector(nextR); // level to go to close current groups int next = currentState.nextLevel[nextR]; for (; currentLevel > next; currentLevel--) { diff --git a/parquet-column/src/test/java/org/apache/parquet/io/TestColumnIO.java b/parquet-column/src/test/java/org/apache/parquet/io/TestColumnIO.java index ca12479323..cd11ba9c85 100644 --- a/parquet-column/src/test/java/org/apache/parquet/io/TestColumnIO.java +++ b/parquet-column/src/test/java/org/apache/parquet/io/TestColumnIO.java @@ -31,17 +31,25 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import java.util.List; +import java.util.stream.Stream; +import org.apache.parquet.bytes.BytesInput; +import org.apache.parquet.bytes.HeapByteBufferAllocator; import org.apache.parquet.column.ColumnDescriptor; import org.apache.parquet.column.ColumnWriteStore; import org.apache.parquet.column.ColumnWriter; +import org.apache.parquet.column.Encoding; import org.apache.parquet.column.ParquetProperties; import org.apache.parquet.column.impl.ColumnWriteStoreV1; import org.apache.parquet.column.page.PageReadStore; import org.apache.parquet.column.page.mem.MemPageStore; +import org.apache.parquet.column.statistics.FloatStatistics; +import org.apache.parquet.column.values.plain.PlainValuesWriter; +import org.apache.parquet.column.values.rle.RunLengthBitPackingHybridValuesWriter; import org.apache.parquet.example.data.Group; import org.apache.parquet.example.data.GroupFactory; import org.apache.parquet.example.data.GroupWriter; @@ -62,6 +70,8 @@ import org.apache.parquet.schema.Types; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.ValueSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -69,6 +79,50 @@ public class TestColumnIO { private static final Logger LOG = LoggerFactory.getLogger(TestColumnIO.class); + private static Stream invalidVectorLevels() { + return Stream.of( + Arguments.of(new int[] {0}, new int[] {3}, "invalid levels"), + Arguments.of(new int[] {3}, new int[] {2}, "invalid levels"), + Arguments.of(new int[] {2}, new int[] {2}, "invalid continuation"), + Arguments.of(new int[] {0, 2}, new int[] {2, 1}, "null within vector"), + Arguments.of(new int[] {0, 2}, new int[] {0, 2}, "null within vector")); + } + + @ParameterizedTest + @MethodSource("invalidVectorLevels") + public void testInvalidVectorLevels(int[] repetition, int[] definition, String reason) throws IOException { + MessageType schema = MessageTypeParser.parseMessageType("message m { repeated group outer {" + + " required group v (VECTOR(2)) { repeated group list { required float element; } } } }"); + ColumnDescriptor descriptor = schema.getColumnDescription(new String[] {"outer", "v", "list", "element"}); + HeapByteBufferAllocator allocator = new HeapByteBufferAllocator(); + try (MemPageStore pages = new MemPageStore(1); + RunLengthBitPackingHybridValuesWriter rl = + new RunLengthBitPackingHybridValuesWriter(2, 64, 64, allocator); + RunLengthBitPackingHybridValuesWriter dl = + new RunLengthBitPackingHybridValuesWriter(2, 64, 64, allocator); + PlainValuesWriter values = new PlainValuesWriter(64, 64, allocator)) { + for (int i = 0; i < repetition.length; i++) { + rl.writeInteger(repetition[i]); + dl.writeInteger(definition[i]); + if (definition[i] >= 2) values.writeFloat(1.0f); + } + pages.getPageWriter(descriptor) + .writePage( + BytesInput.concat(rl.getBytes(), dl.getBytes(), values.getBytes()), + repetition.length, + new FloatStatistics(), + Encoding.RLE, + Encoding.RLE, + Encoding.PLAIN); + MessageColumnIO columnIO = new ColumnIOFactory().getColumnIO(schema); + RecordReaderImplementation reader = getRecordReader(columnIO, schema, pages); + assertThatThrownBy(reader::read) + .isInstanceOf(ParquetDecodingException.class) + .hasMessageContaining("[outer, v, list, element]") + .hasMessageContaining(reason); + } + } + private static final String oneOfEach = "message Document {\n" + " required int64 a;\n" + " required int32 b;\n" From 4f95e9c47c78534a7e3461f20b418e1bb1edb492 Mon Sep 17 00:00:00 2001 From: Divjot Arora Date: Thu, 22 Oct 2026 15:31:32 +0000 Subject: [PATCH 05/15] Reject contradictory VECTOR counts in selected chunks --- .../parquet/internal/column/VectorUtils.java | 55 +++++++++++++++++++ .../parquet/hadoop/ParquetFileReader.java | 43 +++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 parquet-column/src/main/java/org/apache/parquet/internal/column/VectorUtils.java diff --git a/parquet-column/src/main/java/org/apache/parquet/internal/column/VectorUtils.java b/parquet-column/src/main/java/org/apache/parquet/internal/column/VectorUtils.java new file mode 100644 index 0000000000..0c0a52e8ec --- /dev/null +++ b/parquet-column/src/main/java/org/apache/parquet/internal/column/VectorUtils.java @@ -0,0 +1,55 @@ +/* + * 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.parquet.internal.column; + +import java.util.Arrays; +import org.apache.parquet.column.ColumnDescriptor; +import org.apache.parquet.io.ParquetDecodingException; + +public final class VectorUtils { + private VectorUtils() {} + + public static void checkCounts(ColumnDescriptor path, int numElements, long rows, long values, long nulls) { + long declaredNulls = nulls; + boolean invalid = rows < 0 || values < 0 || nulls < -1 || nulls > values; + if (!invalid && path.getMaxRepetitionLevel() == 1) { + if (path.getMaxDefinitionLevel() == 1) { + invalid = nulls > 0; + nulls = 0; + } + if (nulls >= 0) { + long present = values - nulls; + invalid |= nulls > rows || present % numElements != 0 || present / numElements != rows - nulls; + } else { + long extra = values - rows; + invalid |= values < rows + || (numElements == 1 + ? values != rows + : extra % (numElements - 1) != 0 || extra / (numElements - 1) > rows); + } + } else if (!invalid && nulls >= 0) { + invalid = (values - nulls) % numElements != 0; + } + if (invalid) { + throw new ParquetDecodingException("Invalid VECTOR counts for " + Arrays.toString(path.getPath()) + + ": rows=" + rows + ", values=" + values + ", nulls=" + declaredNulls + + ", length=" + numElements); + } + } +} diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java index 5a611b41d1..7ece837c76 100644 --- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java +++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java @@ -107,6 +107,7 @@ import org.apache.parquet.hadoop.util.HadoopInputFile; import org.apache.parquet.hadoop.util.counters.BenchmarkCounter; import org.apache.parquet.hadoop.util.wrapped.io.FutureIO; +import org.apache.parquet.internal.column.VectorUtils; import org.apache.parquet.internal.column.columnindex.ColumnIndex; import org.apache.parquet.internal.column.columnindex.OffsetIndex; import org.apache.parquet.internal.filter2.columnindex.ColumnIndexFilter; @@ -117,8 +118,10 @@ import org.apache.parquet.io.ParquetDecodingException; import org.apache.parquet.io.ParquetFileRange; import org.apache.parquet.io.SeekableInputStream; +import org.apache.parquet.schema.LogicalTypeAnnotation.VectorLogicalTypeAnnotation; import org.apache.parquet.schema.MessageType; import org.apache.parquet.schema.PrimitiveType; +import org.apache.parquet.schema.TypeUtil; import org.apache.parquet.util.AutoCloseables; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1158,6 +1161,17 @@ public PageReadStore readNextRowGroup() throws IOException { return currentRowGroup; } + private void checkVectorColumnCounts(ColumnChunkMetaData column, long rows) { + MessageType fileSchema = getFileMetaData().getSchema(); + String[] path = column.getPath().toArray(); + VectorLogicalTypeAnnotation vector = TypeUtil.getVectorType(fileSchema, path); + if (vector == null) return; + ColumnDescriptor descriptor = fileSchema.getColumnDescription(path); + org.apache.parquet.column.statistics.Statistics stats = column.getStatistics(); + long nulls = stats != null && stats.isNumNullsSet() ? stats.getNumNulls() : -1; + VectorUtils.checkCounts(descriptor, vector.getNumElements(), rows, column.getValueCount(), nulls); + } + private ColumnChunkPageReadStore internalReadRowGroup(int blockIndex) throws IOException { if (blockIndex < 0 || blockIndex >= blocks.size()) { return null; @@ -1175,6 +1189,7 @@ private ColumnChunkPageReadStore internalReadRowGroup(int blockIndex) throws IOE ColumnPath pathKey = mc.getPath(); ColumnDescriptor columnDescriptor = paths.get(pathKey); if (columnDescriptor != null) { + checkVectorColumnCounts(mc, block.getRowCount()); BenchmarkCounter.incrementTotalBytes(mc.getTotalSize()); long startingPos = mc.getStartingPos(); // first part or not consecutive => new list @@ -1573,6 +1588,7 @@ private ColumnChunkPageReadStore internalReadFilteredRowGroup( ColumnPath pathKey = mc.getPath(); ColumnDescriptor columnDescriptor = paths.get(pathKey); if (columnDescriptor != null) { + checkVectorColumnCounts(mc, block.getRowCount()); OffsetIndex offsetIndex = ciStore.getOffsetIndex(mc.getPath()); OffsetIndex filteredOffsetIndex = @@ -2135,6 +2151,10 @@ public ColumnChunkPageReader readAllPages( .getSchema() .getType(descriptor.col.getPath()) .asPrimitiveType(); + MessageType fileSchema = getFileMetaData().getSchema(); + String[] path = descriptor.col.getPath(); + VectorLogicalTypeAnnotation vector = TypeUtil.getVectorType(fileSchema, path); + ColumnDescriptor fileDescriptor = vector == null ? null : fileSchema.getColumnDescription(path); long valuesCountReadSoFar = 0L; int dataPageCountReadSoFar = 0; byte[] dataPageHeaderAAD = null; @@ -2209,12 +2229,35 @@ public ColumnChunkPageReader readAllPages( if (pageHeader.isSetCrc()) { dataPageV1.setCrc(pageHeader.getCrc()); } + if (vector != null && offsetIndex != null) { + long rows = offsetIndex.getLastRowIndex(dataPageCountReadSoFar, rowCount) + - offsetIndex.getFirstRowIndex(dataPageCountReadSoFar) + + 1; + org.apache.parquet.column.statistics.Statistics stats = dataPageV1.getStatistics(); + long nulls = stats != null && stats.isNumNullsSet() ? stats.getNumNulls() : -1; + VectorUtils.checkCounts( + fileDescriptor, vector.getNumElements(), rows, dataPageV1.getValueCount(), nulls); + } pagesInChunk.add(dataPageV1); valuesCountReadSoFar += dataHeaderV1.getNum_values(); ++dataPageCountReadSoFar; break; case DATA_PAGE_V2: DataPageHeaderV2 dataHeaderV2 = pageHeader.getData_page_header_v2(); + if (vector != null) { + if (dataHeaderV2.getNum_nulls() < 0) { + throw new ParquetDecodingException("Invalid VECTOR counts for " + Arrays.toString(path) + + ": rows=" + dataHeaderV2.getNum_rows() + ", values=" + + dataHeaderV2.getNum_values() + ", nulls=" + dataHeaderV2.getNum_nulls() + + ", length=" + vector.getNumElements()); + } + VectorUtils.checkCounts( + fileDescriptor, + vector.getNumElements(), + dataHeaderV2.getNum_rows(), + dataHeaderV2.getNum_values(), + dataHeaderV2.getNum_nulls()); + } int dataSize = compressedPageSize - dataHeaderV2.getRepetition_levels_byte_length() - dataHeaderV2.getDefinition_levels_byte_length(); From 5e5daecd3721ddb24b3a90c754ca8c9c3315d84a Mon Sep 17 00:00:00 2001 From: Divjot Arora Date: Thu, 22 Oct 2026 15:32:42 +0000 Subject: [PATCH 06/15] Read VECTOR files as Avro arrays --- .../apache/parquet/avro/AvroReadSupport.java | 3 +- .../parquet/avro/AvroSchemaConverter.java | 8 +++ .../parquet/avro/TestArrayCompatibility.java | 49 +++++++++++++++++++ 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroReadSupport.java b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroReadSupport.java index ee8f9ab272..62332b197e 100644 --- a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroReadSupport.java +++ b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroReadSupport.java @@ -281,7 +281,8 @@ private static Boolean allListStructuresAreThreeLevel(Type type) { return null; } GroupType group = type.asGroupType(); - if (group.getLogicalTypeAnnotation() instanceof LogicalTypeAnnotation.ListLogicalTypeAnnotation) { + if (group.getLogicalTypeAnnotation() instanceof LogicalTypeAnnotation.ListLogicalTypeAnnotation + || group.getLogicalTypeAnnotation() instanceof LogicalTypeAnnotation.VectorLogicalTypeAnnotation) { if (group.isRepetition(Type.Repetition.REPEATED) || group.getFieldCount() != 1) { return false; } diff --git a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroSchemaConverter.java b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroSchemaConverter.java index 782c009db4..d9b0a1e2df 100644 --- a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroSchemaConverter.java +++ b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroSchemaConverter.java @@ -71,6 +71,7 @@ import org.apache.parquet.schema.PrimitiveType; import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName; import org.apache.parquet.schema.Type; +import org.apache.parquet.schema.TypeUtil; import org.apache.parquet.schema.Types; /** @@ -484,6 +485,13 @@ public Optional visit( } } + @Override + public Optional visit( + LogicalTypeAnnotation.VectorLogicalTypeAnnotation vectorLogicalType) { + TypeUtil.checkValidVectorSchema(parquetGroupType); + return visit(LogicalTypeAnnotation.listType()); + } + @Override // for backward-compatibility public Optional visit( diff --git a/parquet-avro/src/test/java/org/apache/parquet/avro/TestArrayCompatibility.java b/parquet-avro/src/test/java/org/apache/parquet/avro/TestArrayCompatibility.java index 242fd2fcf0..e799d38613 100644 --- a/parquet-avro/src/test/java/org/apache/parquet/avro/TestArrayCompatibility.java +++ b/parquet-avro/src/test/java/org/apache/parquet/avro/TestArrayCompatibility.java @@ -39,13 +39,20 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.parquet.DirectWriterTest; +import org.apache.parquet.example.data.Group; +import org.apache.parquet.example.data.simple.SimpleGroupFactory; import org.apache.parquet.hadoop.ParquetFileReader; +import org.apache.parquet.hadoop.ParquetWriter; +import org.apache.parquet.hadoop.example.ExampleParquetWriter; +import org.apache.parquet.hadoop.metadata.CompressionCodecName; import org.apache.parquet.io.InvalidRecordException; +import org.apache.parquet.io.LocalInputFile; import org.apache.parquet.schema.MessageType; import org.apache.parquet.schema.MessageTypeParser; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class TestArrayCompatibility extends DirectWriterTest { @@ -1610,6 +1617,48 @@ public void testAutoDetectTwoLevelRepeatedPrimitive() throws Exception { assertReaderContains(new AvroParquetReader<>(newAutoDetectConf(), test), expectedSchema, expectedRecord); } + @Test + public void testVectorWithoutAvroSchema(@TempDir java.nio.file.Path dir) throws IOException { + MessageType schema = MessageTypeParser.parseMessageType("message VectorWithoutAvroSchema {" + + " required group v (VECTOR(2)) { repeated group list { required float element; } }" + + " optional group o (VECTOR(1)) { repeated group list { required float element; } } }"); + Path path = new Path(dir.resolve("vector.parquet").toUri()); + SimpleGroupFactory factory = new SimpleGroupFactory(schema); + Group first = factory.newGroup(); + first.addGroup("v").addGroup("list").append("element", 1.0f); + first.getGroup("v", 0).addGroup("list").append("element", 2.0f); + first.addGroup("o").addGroup("list").append("element", 9.0f); + Group second = factory.newGroup(); + second.addGroup("v").addGroup("list").append("element", 3.0f); + second.getGroup("v", 0).addGroup("list").append("element", 4.0f); + try (ParquetWriter writer = ExampleParquetWriter.builder(path) + .withType(schema) + .withWriterVersion(org.apache.parquet.column.ParquetProperties.WriterVersion.PARQUET_1_0) + .withDictionaryEncoding(false) + .withCompressionCodec(CompressionCodecName.UNCOMPRESSED) + .withValidation(false) + .build()) { + writer.write(first); + writer.write(second); + } + try (ParquetFileReader reader = ParquetFileReader.open(new LocalInputFile(dir.resolve("vector.parquet")))) { + assertThat(reader.getFileMetaData().getKeyValueMetaData()) + .doesNotContainKeys( + AvroReadSupport.AVRO_SCHEMA_METADATA_KEY, AvroReadSupport.OLD_AVRO_SCHEMA_METADATA_KEY); + } + Schema expectedSchema = record( + "VectorWithoutAvroSchema", + field("v", array(primitive(Schema.Type.FLOAT))), + optionalField("o", array(primitive(Schema.Type.FLOAT)))); + try (AvroParquetReader reader = autoDetectReader(path)) { + assertReaderContains( + reader, + expectedSchema, + instance(expectedSchema, "v", Arrays.asList(1.0f, 2.0f), "o", Arrays.asList(9.0f)), + instance(expectedSchema, "v", Arrays.asList(3.0f, 4.0f), "o", null)); + } + } + private static Configuration newAutoDetectConf() { Configuration conf = new Configuration(); conf.setBoolean(AvroReadSupport.AUTO_DETECT_LIST_STRUCTURE, true); From 1b316545194d123d94588dfb87984d4e1baebc3b Mon Sep 17 00:00:00 2001 From: Divjot Arora Date: Thu, 22 Oct 2026 15:33:49 +0000 Subject: [PATCH 07/15] Map VECTOR files through existing model LIST paths --- .../parquet/arrow/schema/List3Levels.java | 2 ++ .../parquet/arrow/schema/SchemaConverter.java | 8 +++++ .../arrow/schema/TestSchemaConverter.java | 20 +++++++++++ .../parquet/proto/ProtoMessageConverter.java | 9 +++++ .../proto/ProtoRecordConverterTest.java | 36 +++++++++++++++++++ 5 files changed, 75 insertions(+) diff --git a/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/List3Levels.java b/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/List3Levels.java index 297b063320..701b63e733 100644 --- a/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/List3Levels.java +++ b/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/List3Levels.java @@ -43,6 +43,8 @@ class List3Levels { */ public List3Levels(GroupType list) { if (list.getLogicalTypeAnnotation() != LogicalTypeAnnotation.listType() + && !(list.getLogicalTypeAnnotation() + instanceof LogicalTypeAnnotation.VectorLogicalTypeAnnotation) || list.getFields().size() != 1) { throw new IllegalArgumentException("invalid list type: " + list); } diff --git a/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/SchemaConverter.java b/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/SchemaConverter.java index e779b6b8c2..d8985eeebd 100644 --- a/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/SchemaConverter.java +++ b/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/SchemaConverter.java @@ -79,6 +79,7 @@ import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName; import org.apache.parquet.schema.Type; import org.apache.parquet.schema.Type.Repetition; +import org.apache.parquet.schema.TypeUtil; import org.apache.parquet.schema.Types; import org.apache.parquet.schema.Types.GroupBuilder; @@ -486,6 +487,13 @@ public Optional visit( return of(new ListTypeMapping(arrowField, list3Levels, child)); } + @Override + public Optional visit( + LogicalTypeAnnotation.VectorLogicalTypeAnnotation vectorLogicalType) { + TypeUtil.checkValidVectorSchema(type); + return visit(LogicalTypeAnnotation.listType()); + } + @Override public Optional visit( LogicalTypeAnnotation.MapLogicalTypeAnnotation mapLogicalType) { diff --git a/parquet-arrow/src/test/java/org/apache/parquet/arrow/schema/TestSchemaConverter.java b/parquet-arrow/src/test/java/org/apache/parquet/arrow/schema/TestSchemaConverter.java index 4d8a21a8d0..a8d517feaf 100644 --- a/parquet-arrow/src/test/java/org/apache/parquet/arrow/schema/TestSchemaConverter.java +++ b/parquet-arrow/src/test/java/org/apache/parquet/arrow/schema/TestSchemaConverter.java @@ -55,13 +55,33 @@ import org.apache.parquet.schema.GroupType; import org.apache.parquet.schema.LogicalTypeAnnotation; import org.apache.parquet.schema.MessageType; +import org.apache.parquet.schema.MessageTypeParser; import org.apache.parquet.schema.Types; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; /** * @see SchemaConverter */ public class TestSchemaConverter { + @ParameterizedTest + @ValueSource(strings = {"required", "optional"}) + public void testVectorAsList(String repetition) { + String children = "repeated group list { required float element; }"; + MessageType vector = MessageTypeParser.parseMessageType( + "message m { " + repetition + " group v (VECTOR(5)) { " + children + " } }"); + MessageType list = MessageTypeParser.parseMessageType( + "message m { " + repetition + " group v (LIST) { " + children + " } }"); + SchemaMapping mapping = converter.fromParquet(vector); + assertThat(mapping.getArrowSchema()) + .isEqualTo(converter.fromParquet(list).getArrowSchema()); + Field field = mapping.getArrowSchema().findField("v"); + assertThat(field.getType()).isEqualTo(new ArrowType.List()); + assertThat(field.getChildren()).hasSize(1); + assertThat(field.getChildren().get(0).getType()) + .isEqualTo(new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)); + } private static Field field(String name, boolean nullable, ArrowType type, Field... children) { if (nullable) { diff --git a/parquet-protobuf/src/main/java/org/apache/parquet/proto/ProtoMessageConverter.java b/parquet-protobuf/src/main/java/org/apache/parquet/proto/ProtoMessageConverter.java index 0da0dfca96..f938bfefcd 100644 --- a/parquet-protobuf/src/main/java/org/apache/parquet/proto/ProtoMessageConverter.java +++ b/parquet-protobuf/src/main/java/org/apache/parquet/proto/ProtoMessageConverter.java @@ -67,6 +67,7 @@ import org.apache.parquet.schema.LogicalTypeAnnotation; import org.apache.parquet.schema.PrimitiveType; import org.apache.parquet.schema.Type; +import org.apache.parquet.schema.TypeUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -268,6 +269,13 @@ public Optional visit(LogicalTypeAnnotation.ListLogicalTypeAnnotation return of(new ListConverter(parentBuilder, fieldDescriptor, parquetType)); } + @Override + public Optional visit( + LogicalTypeAnnotation.VectorLogicalTypeAnnotation vectorLogicalType) { + TypeUtil.checkValidVectorSchema(parquetType); + return visit(LogicalTypeAnnotation.listType()); + } + @Override public Optional visit(LogicalTypeAnnotation.MapLogicalTypeAnnotation mapLogicalType) { return of(new MapConverter(parentBuilder, fieldDescriptor, parquetType)); @@ -885,6 +893,7 @@ public ListConverter( Message.Builder parentBuilder, Descriptors.FieldDescriptor fieldDescriptor, Type parquetType) { LogicalTypeAnnotation logicalTypeAnnotation = parquetType.getLogicalTypeAnnotation(); if (!(logicalTypeAnnotation instanceof LogicalTypeAnnotation.ListLogicalTypeAnnotation) + && !(logicalTypeAnnotation instanceof LogicalTypeAnnotation.VectorLogicalTypeAnnotation) || parquetType.isPrimitive()) { throw new ParquetDecodingException( "Expected LIST wrapper. Found: " + logicalTypeAnnotation + " instead."); diff --git a/parquet-protobuf/src/test/java/org/apache/parquet/proto/ProtoRecordConverterTest.java b/parquet-protobuf/src/test/java/org/apache/parquet/proto/ProtoRecordConverterTest.java index 6a3560dc61..2b85d561cf 100644 --- a/parquet-protobuf/src/test/java/org/apache/parquet/proto/ProtoRecordConverterTest.java +++ b/parquet-protobuf/src/test/java/org/apache/parquet/proto/ProtoRecordConverterTest.java @@ -24,12 +24,48 @@ import static org.assertj.core.data.Offset.offset; import com.google.protobuf.ByteString; +import java.io.IOException; import java.util.List; +import org.apache.hadoop.fs.Path; +import org.apache.parquet.column.ParquetProperties.WriterVersion; +import org.apache.parquet.example.data.Group; +import org.apache.parquet.example.data.simple.SimpleGroupFactory; +import org.apache.parquet.hadoop.ParquetWriter; +import org.apache.parquet.hadoop.example.ExampleParquetWriter; +import org.apache.parquet.hadoop.metadata.CompressionCodecName; import org.apache.parquet.proto.test.TestProto3; import org.apache.parquet.proto.test.TestProtobuf; +import org.apache.parquet.schema.MessageType; +import org.apache.parquet.schema.MessageTypeParser; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class ProtoRecordConverterTest { + @Test + public void testVectorRepeatedPrimitive(@TempDir java.nio.file.Path dir) throws IOException { + MessageType schema = MessageTypeParser.parseMessageType("message m { required group repeatedInt" + + " (VECTOR(3)) { repeated group list { required int32 element; } } }"); + Path path = new Path(dir.resolve("vector.parquet").toUri()); + try (ParquetWriter writer = ExampleParquetWriter.builder(path) + .withType(schema) + .withWriterVersion(WriterVersion.PARQUET_1_0) + .withDictionaryEncoding(false) + .withCompressionCodec(CompressionCodecName.UNCOMPRESSED) + .withValidation(false) + .build()) { + for (int row = 0; row < 2; row++) { + Group group = new SimpleGroupFactory(schema).newGroup(); + Group vector = group.addGroup("repeatedInt"); + for (int i = 1; i <= 3; i++) vector.addGroup("list").append("element", row * 3 + i); + writer.write(group); + } + } + List messages = + TestUtils.readMessages(path, TestProtobuf.RepeatedIntMessage.class); + assertThat(messages).hasSize(2); + assertThat(messages.get(0).getRepeatedIntList()).containsExactly(1, 2, 3); + assertThat(messages.get(1).getRepeatedIntList()).containsExactly(4, 5, 6); + } @Test public void testAllTypes() throws Exception { From 36e534d0ad0e26d69d995a8265c987be1c032f87 Mon Sep 17 00:00:00 2001 From: Divjot Arora Date: Thu, 22 Oct 2026 15:44:26 +0000 Subject: [PATCH 08/15] Cover VECTOR file contracts and malformed boundaries --- .../parquet/hadoop/TestVectorReadWrite.java | 780 ++++++++++++++++++ .../hadoop/VectorInteropFileGenerator.java | 314 +++++++ .../src/test/resources/vector/README.md | 132 +++ .../vector_invalid_v1_dictionary.parquet | Bin 0 -> 3205 bytes .../vector/vector_mixed_v1_plain.parquet | Bin 0 -> 4363 bytes .../vector/vector_mixed_v2_dictionary.parquet | Bin 0 -> 4344 bytes .../resources/vector/vector_split_v1.parquet | Bin 0 -> 347 bytes 7 files changed, 1226 insertions(+) create mode 100644 parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestVectorReadWrite.java create mode 100644 parquet-hadoop/src/test/java/org/apache/parquet/hadoop/VectorInteropFileGenerator.java create mode 100644 parquet-hadoop/src/test/resources/vector/README.md create mode 100644 parquet-hadoop/src/test/resources/vector/vector_invalid_v1_dictionary.parquet create mode 100644 parquet-hadoop/src/test/resources/vector/vector_mixed_v1_plain.parquet create mode 100644 parquet-hadoop/src/test/resources/vector/vector_mixed_v2_dictionary.parquet create mode 100644 parquet-hadoop/src/test/resources/vector/vector_split_v1.parquet diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestVectorReadWrite.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestVectorReadWrite.java new file mode 100644 index 0000000000..e8ca84006d --- /dev/null +++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestVectorReadWrite.java @@ -0,0 +1,780 @@ +/* + * 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.parquet.hadoop; + +import static org.apache.parquet.column.Encoding.BIT_PACKED; +import static org.apache.parquet.column.Encoding.PLAIN; +import static org.apache.parquet.column.Encoding.PLAIN_DICTIONARY; +import static org.apache.parquet.column.Encoding.RLE; +import static org.apache.parquet.column.Encoding.RLE_DICTIONARY; +import static org.apache.parquet.column.ParquetProperties.WriterVersion.PARQUET_2_0; +import static org.apache.parquet.filter.ColumnPredicates.equalTo; +import static org.apache.parquet.filter2.predicate.FilterApi.and; +import static org.apache.parquet.filter2.predicate.FilterApi.eq; +import static org.apache.parquet.filter2.predicate.FilterApi.gtEq; +import static org.apache.parquet.filter2.predicate.FilterApi.intColumn; +import static org.apache.parquet.filter2.predicate.FilterApi.ltEq; +import static org.apache.parquet.hadoop.ParquetFileWriter.Mode.CREATE; +import static org.apache.parquet.hadoop.ParquetWriter.DEFAULT_BLOCK_SIZE; +import static org.apache.parquet.hadoop.ParquetWriter.MAX_PADDING_SIZE_DEFAULT; +import static org.apache.parquet.hadoop.VectorInteropFileGenerator.readFooter; +import static org.apache.parquet.hadoop.VectorInteropFileGenerator.rewriteFooter; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.io.IOException; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.UUID; +import java.util.stream.Stream; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.Path; +import org.apache.parquet.ParquetReadOptions; +import org.apache.parquet.bytes.BytesInput; +import org.apache.parquet.column.ColumnReader; +import org.apache.parquet.column.ParquetProperties; +import org.apache.parquet.column.ParquetProperties.WriterVersion; +import org.apache.parquet.column.impl.ColumnReadStoreImpl; +import org.apache.parquet.column.page.DataPage; +import org.apache.parquet.column.page.DataPageV1; +import org.apache.parquet.column.page.DataPageV2; +import org.apache.parquet.column.page.DictionaryPage; +import org.apache.parquet.column.page.PageReadStore; +import org.apache.parquet.column.page.PageReader; +import org.apache.parquet.column.statistics.FloatStatistics; +import org.apache.parquet.example.data.Group; +import org.apache.parquet.example.data.simple.SimpleGroup; +import org.apache.parquet.example.data.simple.SimpleGroupFactory; +import org.apache.parquet.example.data.simple.convert.GroupRecordConverter; +import org.apache.parquet.filter2.columnindex.RowRanges; +import org.apache.parquet.filter2.compat.FilterCompat; +import org.apache.parquet.format.ConvertedType; +import org.apache.parquet.format.LogicalTypes; +import org.apache.parquet.hadoop.example.ExampleParquetWriter; +import org.apache.parquet.hadoop.example.GroupReadSupport; +import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData; +import org.apache.parquet.hadoop.metadata.CompressionCodecName; +import org.apache.parquet.hadoop.util.HadoopOutputFile; +import org.apache.parquet.io.ColumnIOFactory; +import org.apache.parquet.io.InvalidRecordException; +import org.apache.parquet.io.LocalInputFile; +import org.apache.parquet.io.MessageColumnIO; +import org.apache.parquet.io.ParquetDecodingException; +import org.apache.parquet.io.RecordReader; +import org.apache.parquet.io.api.Binary; +import org.apache.parquet.schema.MessageType; +import org.apache.parquet.schema.MessageTypeParser; +import org.junit.jupiter.api.io.TempDir; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.CsvSource; +import org.junit.jupiter.params.provider.MethodSource; + +public class TestVectorReadWrite { + @TempDir + private java.nio.file.Path tempDir; + + private static MessageType schema(String outer, int length, boolean nested) { + String vector = outer + " group v (VECTOR(" + length + ")) { repeated group list { required float element; } }"; + return MessageTypeParser.parseMessageType( + nested ? "message m { repeated group outer { " + vector + " } }" : "message m { " + vector + " }"); + } + + private Path writeVectors(MessageType schema, WriterVersion version, boolean dictionary, List rows) + throws IOException { + Path path = new Path(tempDir.resolve(UUID.randomUUID() + ".parquet").toUri()); + VectorInteropFileGenerator.writeRows(path, schema, version, dictionary, rows); + return path; + } + + private static List listRows(MessageType schema, int... lengths) { + List rows = new ArrayList<>(); + int value = 0; + for (int length : lengths) { + Group row = new SimpleGroupFactory(schema).newGroup(); + if (length >= 0) { + Group parent = schema.containsField("outer") ? row.addGroup("outer") : row; + Group vector = parent.addGroup("v"); + for (int i = 0; i < length; i++) { + vector.addGroup("list").append("element", (float) value++); + } + } + rows.add(row); + } + return rows; + } + + private static List readGroups(Path path, MessageType requested) throws IOException { + try (ParquetFileReader reader = + ParquetFileReader.open(new LocalInputFile(java.nio.file.Path.of(path.toUri())))) { + reader.setRequestedSchema(requested); + try (PageReadStore pages = reader.readRowGroup(0)) { + MessageType fileSchema = reader.getFileMetaData().getSchema(); + MessageColumnIO columns = new ColumnIOFactory().getColumnIO(requested, fileSchema); + RecordReader records = columns.getRecordReader(pages, new GroupRecordConverter(requested)); + List result = new ArrayList<>(); + for (long i = 0; i < pages.getRowCount(); i++) result.add(records.read()); + return result; + } + } + } + + private static void assertVectorRows(List actual, int... lengths) { + assertThat(actual).hasSize(lengths.length); + int value = 0; + for (int row = 0; row < lengths.length; row++) { + Group vector = actual.get(row).getGroup("v", 0); + assertThat(vector.getFieldRepetitionCount("list")).isEqualTo(lengths[row]); + for (int i = 0; i < lengths[row]; i++) { + assertThat(vector.getGroup("list", i).getFloat("element", 0)).isEqualTo((float) value++); + } + } + } + + @ParameterizedTest + @CsvSource({"PARQUET_1_0,false", "PARQUET_1_0,true", "PARQUET_2_0,false", "PARQUET_2_0,true"}) + public void testVectorRoundTrip(WriterVersion version, boolean dictionary) throws IOException { + Path path = new Path(tempDir.resolve(UUID.randomUUID() + ".parquet").toUri()); + VectorInteropFileGenerator.writeMixed(path, version, dictionary); + verifyMixedFile(path, version, dictionary); + if (!dictionary) verifyFilteredRows(path); + if (version == WriterVersion.PARQUET_1_0 && !dictionary) { + Path legacy = new Path(tempDir.resolve("legacy-list.parquet").toUri()); + Files.copy(java.nio.file.Path.of(path.toUri()), java.nio.file.Path.of(legacy.toUri())); + rewriteFooter(legacy, footer -> footer.getSchema().stream() + .filter(element -> element.isSetLogicalType() + && element.getLogicalType().isSetVECTOR()) + .forEach(org.apache.parquet.format.SchemaElement::unsetLogicalType)); + List vectors = readFooter(legacy).getSchema().stream() + .filter(element -> element.getConverted_type() == org.apache.parquet.format.ConvertedType.LIST) + .toList(); + assertThat(vectors).hasSize(10); + try (ParquetReader reader = + ParquetReader.builder(new GroupReadSupport(), legacy).build()) { + for (Group expected : VectorInteropFileGenerator.mixedRows()) assertRow(reader.read(), expected); + assertThat(reader.read()).isNull(); + } + } + } + + private static void assertRow(Group actual, Group expected) { + assertThat(actual).isNotNull(); + assertThat(actual.getType().getFieldCount()) + .isEqualTo(expected.getType().getFieldCount()); + for (int field = 0; field < expected.getType().getFieldCount(); field++) { + assertThat(actual.getType().getFieldName(field)) + .isEqualTo(expected.getType().getFieldName(field)); + assertThat(actual.getFieldRepetitionCount(field)).isEqualTo(expected.getFieldRepetitionCount(field)); + for (int index = 0; index < expected.getFieldRepetitionCount(field); index++) { + if (!expected.getType().getType(field).isPrimitive()) { + assertRow(actual.getGroup(field, index), expected.getGroup(field, index)); + } else { + assertThat(((SimpleGroup) actual).getObject(field, index)) + .isEqualTo(((SimpleGroup) expected).getObject(field, index)); + } + } + } + } + + private static void verifyMixedFile(Path path, WriterVersion version, boolean dictionary) throws IOException { + MessageType schema = VectorInteropFileGenerator.mixedSchema(); + try (ParquetReader reader = + ParquetReader.builder(new GroupReadSupport(), path).build()) { + for (Group expected : VectorInteropFileGenerator.mixedRows()) assertRow(reader.read(), expected); + assertThat(reader.read()).isNull(); + } + try (ParquetFileReader reader = + ParquetFileReader.open(new LocalInputFile(java.nio.file.Path.of(path.toUri())))) { + assertThat(reader.getFooter().getFileMetaData().getSchema()).isEqualTo(schema); + assertThat(reader.getFooter().getBlocks()).hasSize(1); + assertThat(reader.getFooter().getBlocks().get(0).getRowCount()).isEqualTo(6); + List columns = + reader.getFooter().getBlocks().get(0).getColumns(); + for (ColumnChunkMetaData column : columns) { + assertThat(column.getCodec()).isEqualTo(CompressionCodecName.UNCOMPRESSED); + } + assertThat(reader.readColumnIndex(columns.get(0))).isNotNull(); + assertThat(reader.readOffsetIndex(columns.get(0)).getPageCount()).isEqualTo(3); + try (PageReadStore pages = reader.readRowGroup(0)) { + PageReader f = pages.getPageReader(schema.getColumns().get(1)); + if (dictionary) { + DictionaryPage page = f.readDictionaryPage(); + assertThat(page.getDictionarySize()).isEqualTo(10); + assertThat(page.getEncoding()) + .isEqualTo(version == WriterVersion.PARQUET_1_0 ? PLAIN_DICTIONARY : PLAIN); + } else { + assertThat(f.readDictionaryPage()).isNull(); + } + for (int i = 0; i < 3; i++) { + DataPage page = f.readPage(); + assertThat(page.getValueCount()).isEqualTo(10); + if (version == WriterVersion.PARQUET_1_0) { + DataPageV1 v1 = (DataPageV1) page; + assertThat(v1.getRlEncoding()).isEqualTo(RLE); + assertThat(v1.getDlEncoding()).isEqualTo(RLE); + assertThat(v1.getValueEncoding()).isEqualTo(dictionary ? PLAIN_DICTIONARY : PLAIN); + } else { + DataPageV2 v2 = (DataPageV2) page; + assertThat(v2.getRowCount()).isEqualTo(2); + assertThat(v2.getNullCount()).isZero(); + assertThat(v2.getDataEncoding()).isEqualTo(dictionary ? RLE_DICTIONARY : PLAIN); + } + } + assertThat(f.readPage()).isNull(); + } + } + List vectors = readFooter(path).getSchema().stream() + .filter(element -> + element.isSetLogicalType() && element.getLogicalType().isSetVECTOR()) + .toList(); + assertThat(vectors) + .hasSize(10) + .extracting(element -> element.getConverted_type()) + .containsOnly(ConvertedType.LIST); + assertThat((int) vectors.get(0).getLogicalType().getSetField().getThriftFieldId()) + .isEqualTo(20); + } + + private static void verifyFilteredRows(Path path) throws IOException { + MessageType schema = VectorInteropFileGenerator.mixedSchema(); + List expected = VectorInteropFileGenerator.mixedRows(); + var predicate = and(gtEq(intColumn("id"), 2), ltEq(intColumn("id"), 3)); + try (ParquetFileReader reader = ParquetFileReader.open( + new LocalInputFile(java.nio.file.Path.of(path.toUri())), + ParquetReadOptions.builder() + .withRecordFilter(FilterCompat.get(predicate)) + .useColumnIndexFilter(true) + .build())) { + assertThat(reader.getFilteredRecordCount()).isEqualTo(2); + } + try (ParquetReader reader = ParquetReader.builder(new GroupReadSupport(), path) + .withFilter(FilterCompat.get(predicate)) + .useColumnIndexFilter(true) + .build()) { + assertRow(reader.read(), expected.get(2)); + assertRow(reader.read(), expected.get(3)); + assertThat(reader.read()).isNull(); + } + try (ParquetFileReader reader = + ParquetFileReader.open(new LocalInputFile(java.nio.file.Path.of(path.toUri()))); + PageReadStore pages = reader.readFilteredRowGroup( + 0, RowRanges.builder().addSelectedRange(1, 4).build())) { + assertThat(pages.getRowCount()).isEqualTo(4); + assertThat(pages.getRowIndexes()).isPresent(); + assertThat(pages.getRowIndexes().get()).toIterable().containsExactly(1L, 2L, 3L, 4L); + MessageColumnIO columns = new ColumnIOFactory().getColumnIO(schema, schema); + RecordReader records = columns.getRecordReader(pages, new GroupRecordConverter(schema)); + for (int i = 1; i <= 4; i++) assertRow(records.read(), expected.get(i)); + } + try (ParquetFileReader reader = + ParquetFileReader.open(new LocalInputFile(java.nio.file.Path.of(path.toUri()))); + PageReadStore pages = reader.readRowGroup(0)) { + MessageColumnIO columns = new ColumnIOFactory().getColumnIO(schema, schema); + RecordReader records = columns.getRecordReader( + pages, + new GroupRecordConverter(schema), + FilterCompat.get(org.apache.parquet.filter.ColumnRecordFilter.column("id", equalTo(3)))); + assertRow(records.read(), expected.get(3)); + assertThat(records.read()).isNull(); + } + } + + private static Stream invalidVectorWrites() { + return Stream.of( + Arguments.of("float element", 2, List.of(), "Invalid VECTOR length for v: expected 2, got 0"), + Arguments.of("float element", 2, List.of(1.0f), "Invalid VECTOR length for v: expected 2, got 1"), + Arguments.of( + "float element", + 2, + List.of(1.0f, 2.0f, 3.0f), + "Invalid VECTOR length for v: expected 2, got 3"), + Arguments.of("float element", 1, List.of(Float.NaN), "Non-finite VECTOR element in v"), + Arguments.of("float element", 1, List.of(Float.POSITIVE_INFINITY), "Non-finite VECTOR element in v"), + Arguments.of("float element", 1, List.of(Float.NEGATIVE_INFINITY), "Non-finite VECTOR element in v"), + Arguments.of("double element", 1, List.of(Double.NaN), "Non-finite VECTOR element in v"), + Arguments.of("double element", 1, List.of(Double.POSITIVE_INFINITY), "Non-finite VECTOR element in v"), + Arguments.of("double element", 1, List.of(Double.NEGATIVE_INFINITY), "Non-finite VECTOR element in v"), + Arguments.of( + "fixed_len_byte_array(2) element (FLOAT16)", + 1, + List.of(Binary.fromConstantByteArray(new byte[] {0, 0x7e})), + "Non-finite VECTOR element in v"), + Arguments.of( + "fixed_len_byte_array(2) element (FLOAT16)", + 1, + List.of(Binary.fromConstantByteArray(new byte[] {0, 0x7c})), + "Non-finite VECTOR element in v"), + Arguments.of( + "fixed_len_byte_array(2) element (FLOAT16)", + 1, + List.of(Binary.fromConstantByteArray(new byte[] {0, (byte) 0xfc})), + "Non-finite VECTOR element in v"), + Arguments.of( + "fixed_len_byte_array(2) element (FLOAT16)", + 1, + List.of(Binary.fromConstantByteArray(new byte[] {0})), + "Invalid FLOAT16 VECTOR element length: 1")); + } + + private void assertInvalidWrite(MessageType schema, Group row, String message) throws IOException { + Path path = new Path(tempDir.resolve(UUID.randomUUID() + ".parquet").toUri()); + try (ParquetWriter writer = ExampleParquetWriter.builder(path) + .withType(schema) + .withValidation(false) + .build()) { + assertThatThrownBy(() -> writer.write(row)) + .isInstanceOf(InvalidRecordException.class) + .hasMessage(message); + } + } + + @ParameterizedTest + @MethodSource("invalidVectorWrites") + public void testInvalidVectorWrite(String element, int length, List values, String message) throws IOException { + MessageType schema = MessageTypeParser.parseMessageType("message m { required group v (VECTOR(" + length + + ")) { repeated group list { required " + element + "; } } }"); + Group row = new SimpleGroupFactory(schema).newGroup(); + Group vector = row.addGroup("v"); + for (Object value : values) { + Group entry = vector.addGroup("list"); + if (value instanceof Float) { + entry.append("element", (Float) value); + } else if (value instanceof Double) { + entry.append("element", (Double) value); + } else { + entry.append("element", (Binary) value); + } + } + assertInvalidWrite(schema, row, message); + } + + @org.junit.jupiter.api.Test + public void testMandatoryVectorValidation() throws IOException { + MessageType missingId = MessageTypeParser.parseMessageType("message m { required int32 id;" + + " required group v (VECTOR(2)) { repeated group list { required float element; } } }"); + Group missingRow = new SimpleGroupFactory(missingId).newGroup(); + Group v = missingRow.addGroup("v"); + v.addGroup("list").append("element", 1.0f); + v.addGroup("list").append("element", 2.0f); + assertInvalidWrite(missingId, missingRow, "required field is missing required int32 id"); + + MessageType duplicate = schema("required", 2, false); + Group duplicateRow = new SimpleGroupFactory(duplicate).newGroup(); + for (int i = 0; i < 2; i++) { + Group entry = duplicateRow.addGroup("v"); + entry.addGroup("list").append("element", i == 0 ? 1.0f : 3.0f); + entry.addGroup("list").append("element", i == 0 ? 2.0f : 4.0f); + } + assertInvalidWrite( + duplicate, duplicateRow, "repeated value when the type is not repeated in " + duplicate.getType("v")); + } + + @org.junit.jupiter.api.Test + public void testVectorReadProjection() throws Exception { + MessageType list = MessageTypeParser.parseMessageType( + schema("required", 5, false).toString().replace("VECTOR(5)", "LIST")); + MessageType vector = schema("required", 5, false); + Path original = writeVectors(list, WriterVersion.PARQUET_1_0, false, listRows(list, 4, 6)); + try (ParquetFileReader reader = + ParquetFileReader.open(new LocalInputFile(java.nio.file.Path.of(original.toUri())))) { + assertThat(reader.getFooter().getBlocks()).hasSize(1); + assertThat(reader.readOffsetIndex(reader.getFooter() + .getBlocks() + .get(0) + .getColumns() + .get(0)) + .getPageCount()) + .isEqualTo(1); + } + assertVectorRows(readGroups(original, vector), 4, 6); + + Path relabeled = new Path(tempDir.resolve("relabeled.parquet").toUri()); + Files.copy(java.nio.file.Path.of(original.toUri()), java.nio.file.Path.of(relabeled.toUri())); + rewriteFooter(relabeled, footer -> footer.getSchema().get(1).setLogicalType(LogicalTypes.VECTOR(5))); + assertThatThrownBy(() -> readGroups(relabeled, vector)) + .isInstanceOf(ParquetDecodingException.class) + .hasMessage("Invalid VECTOR data for [v, list, element]: expected 5 elements, got 4"); + assertThatThrownBy(() -> readGroups(relabeled, list)) + .isInstanceOf(ParquetDecodingException.class) + .hasMessage("Invalid VECTOR data for [v, list, element]: expected 5 elements, got 4"); + + assertStoredLevels(relabeled, 4); + + Path generated = new Path(tempDir.resolve("invalid-generated.parquet").toUri()); + VectorInteropFileGenerator.writeInvalid(generated); + Path reference = new Path(java.nio.file.Path.of(TestVectorReadWrite.class + .getResource("/vector/vector_invalid_v1_dictionary.parquet") + .toURI()) + .toUri()); + assertThat(readFooter(generated).getSchema()) + .isEqualTo(readFooter(reference).getSchema()); + verifyInvalidFixture(generated); + verifyInvalidFixture(reference); + } + + private void verifyInvalidFixture(Path path) throws IOException { + MessageType schema = VectorInteropFileGenerator.invalidSchema(); + try (ParquetFileReader reader = + ParquetFileReader.open(new LocalInputFile(java.nio.file.Path.of(path.toUri()))); + PageReadStore pages = reader.readRowGroup(0)) { + assertThat(reader.getFooter().getBlocks()).hasSize(1); + assertThat(pages.getRowCount()).isEqualTo(4); + for (ColumnChunkMetaData chunk : + reader.getFooter().getBlocks().get(0).getColumns()) { + assertThat(chunk.getCodec()).isEqualTo(CompressionCodecName.UNCOMPRESSED); + assertThat(chunk.getColumnIndexReference()).isNull(); + assertThat(chunk.getOffsetIndexReference()).isNull(); + assertThat(chunk.getStatistics().isNumNullsSet()).isFalse(); + } + for (String name : List.of("nf_f", "nf_d", "nf_h")) { + PageReader column = + pages.getPageReader(schema.getColumnDescription(new String[] {name, "list", "element"})); + boolean dictionary = !name.equals("nf_h"); + if (dictionary) { + assertThat(column.readDictionaryPage()).as(name).isNotNull(); + } else { + assertThat(column.readDictionaryPage()).as(name).isNull(); + } + for (int i = 0; i < 2; i++) { + DataPageV1 page = (DataPageV1) column.readPage(); + assertThat(page.getValueCount()).isEqualTo(16); + assertThat(page.getValueEncoding()).isEqualTo(dictionary ? PLAIN_DICTIONARY : PLAIN); + } + assertThat(column.readPage()).isNull(); + } + } + Path copy = new Path(tempDir.resolve(UUID.randomUUID() + ".parquet").toUri()); + Files.copy(java.nio.file.Path.of(path.toUri()), java.nio.file.Path.of(copy.toUri())); + rewriteFooter(copy, footer -> footer.getSchema().stream() + .filter(element -> + element.isSetLogicalType() && element.getLogicalType().isSetVECTOR()) + .forEach(org.apache.parquet.format.SchemaElement::unsetLogicalType)); + List actual = readGroups(copy, schema); + List expected = VectorInteropFileGenerator.invalidRows(); + assertThat(actual).hasSameSizeAs(expected); + for (int i = 0; i < expected.size(); i++) assertRow(actual.get(i), expected.get(i)); + } + + @ParameterizedTest + @CsvSource( + value = { + "short_v|expected 5 elements, got 4", + "long_v|expected 5 elements, got 6", + "empty_v|empty vector", + "nested|expected 5 elements, got 4", + "partial|expected 5 elements, got 3", + "nf_f|non-finite element", + "nf_d|non-finite element", + "nf_h|non-finite element" + }, + delimiter = '|') + public void testInvalidVectorReferenceFile(String field, String reason) throws Exception { + Path path = new Path(java.nio.file.Path.of(TestVectorReadWrite.class + .getResource("/vector/vector_invalid_v1_dictionary.parquet") + .toURI()) + .toUri()); + MessageType file; + try (ParquetFileReader reader = + ParquetFileReader.open(new LocalInputFile(java.nio.file.Path.of(path.toUri())))) { + file = reader.getFileMetaData().getSchema(); + } + MessageType projected = new MessageType("m", file.getType("id"), file.getType(field)); + String name = field.equals("nested") || field.equals("partial") ? field + ", v" : field; + assertThatThrownBy(() -> readGroups(path, projected)) + .isInstanceOf(ParquetDecodingException.class) + .hasMessage("Invalid VECTOR data for [" + name + ", list, element]: " + reason); + } + + @ParameterizedTest + @org.junit.jupiter.params.provider.ValueSource(strings = {"filter2", "legacy", "indexed"}) + public void testInvalidFilteredVector(String mode) throws Exception { + Path path; + MessageType requested; + if (mode.equals("indexed")) { + MessageType list = MessageTypeParser.parseMessageType( + schema("required", 5, false).toString().replace("VECTOR(5)", "LIST")); + path = writeVectors(list, WriterVersion.PARQUET_1_0, false, listRows(list, 4, 6)); + rewriteFooter(path, footer -> footer.getSchema().get(1).setLogicalType(LogicalTypes.VECTOR(5))); + requested = schema("required", 5, false); + } else { + path = new Path(java.nio.file.Path.of(TestVectorReadWrite.class + .getResource("/vector/vector_invalid_v1_dictionary.parquet") + .toURI()) + .toUri()); + MessageType file; + try (ParquetFileReader reader = + ParquetFileReader.open(new LocalInputFile(java.nio.file.Path.of(path.toUri())))) { + file = reader.getFileMetaData().getSchema(); + } + requested = new MessageType("m", file.getType("id"), file.getType("short_v")); + } + try (ParquetFileReader reader = + ParquetFileReader.open(new LocalInputFile(java.nio.file.Path.of(path.toUri()))); + PageReadStore pages = mode.equals("indexed") + ? reader.readFilteredRowGroup(0, RowRanges.createSingle(1)) + : reader.readRowGroup(0)) { + MessageColumnIO columns = new ColumnIOFactory() + .getColumnIO(requested, reader.getFileMetaData().getSchema()); + RecordReader records = mode.equals("indexed") + ? columns.getRecordReader(pages, new GroupRecordConverter(requested)) + : columns.getRecordReader( + pages, + new GroupRecordConverter(requested), + mode.equals("filter2") + ? FilterCompat.get(eq(intColumn("id"), 1)) + : FilterCompat.get( + org.apache.parquet.filter.ColumnRecordFilter.column("id", equalTo(1)))); + String name = mode.equals("indexed") ? "v" : "short_v"; + assertThatThrownBy(records::read) + .isInstanceOf(ParquetDecodingException.class) + .hasMessage("Invalid VECTOR data for [" + name + ", list, element]: expected 5 elements, got 4"); + } + } + + private static org.apache.parquet.format.ColumnMetaData column(org.apache.parquet.format.FileMetaData footer) { + return footer.getRow_groups().get(0).getColumns().get(0).getMeta_data(); + } + + @ParameterizedTest + @CsvSource({"vector_mixed_v1_plain.parquet,PARQUET_1_0,false", "vector_mixed_v2_dictionary.parquet,PARQUET_2_0,true" + }) + public void testVectorReferenceFile(String name, WriterVersion version, boolean dictionary) throws Exception { + java.nio.file.Path local = java.nio.file.Path.of( + TestVectorReadWrite.class.getResource("/vector/" + name).toURI()); + verifyMixedFile(new Path(local.toUri()), version, dictionary); + } + + @org.junit.jupiter.api.Test + public void testSplitVectorFile() throws Exception { + Path generated = new Path(tempDir.resolve("split.parquet").toUri()); + VectorInteropFileGenerator.writeSplit(generated); + Path reference = new Path(java.nio.file.Path.of(TestVectorReadWrite.class + .getResource("/vector/vector_split_v1.parquet") + .toURI()) + .toUri()); + for (Path path : List.of(generated, reference)) verifySplitFile(path); + } + + private static void verifySplitFile(Path path) throws IOException { + MessageType schema = schema("required", 5, false); + try (ParquetFileReader reader = + ParquetFileReader.open(new LocalInputFile(java.nio.file.Path.of(path.toUri())))) { + assertThat(reader.getFileMetaData().getSchema()).isEqualTo(schema); + assertThat(reader.getFooter().getBlocks()).hasSize(1); + assertThat(reader.getFooter().getBlocks().get(0).getRowCount()).isEqualTo(2); + ColumnChunkMetaData chunk = + reader.getFooter().getBlocks().get(0).getColumns().get(0); + assertThat(chunk.getValueCount()).isEqualTo(10); + assertThat(chunk.getCodec()).isEqualTo(CompressionCodecName.UNCOMPRESSED); + assertThat(chunk.getColumnIndexReference()).isNull(); + assertThat(chunk.getOffsetIndexReference()).isNull(); + try (PageReadStore pages = reader.readRowGroup(0)) { + PageReader column = pages.getPageReader(schema.getColumns().get(0)); + assertThat(column.readDictionaryPage()).isNull(); + int[] counts = {3, 4, 3}; + for (int i = 0; i < counts.length; i++) { + DataPageV1 page = (DataPageV1) column.readPage(); + assertThat(page.getValueCount()).isEqualTo(counts[i]); + assertThat(page.getValueEncoding()).isEqualTo(PLAIN); + assertThat(page.getRlEncoding()).isEqualTo(i == 1 ? BIT_PACKED : RLE); + assertThat(page.getDlEncoding()).isEqualTo(i == 1 ? BIT_PACKED : RLE); + } + assertThat(column.readPage()).isNull(); + } + } + assertVectorRows(readGroups(path, schema), 5, 5); + assertStoredLevels(path, 5); + } + + private static void assertStoredLevels(Path path, int secondStart) throws IOException { + try (ParquetFileReader reader = + ParquetFileReader.open(new LocalInputFile(java.nio.file.Path.of(path.toUri()))); + PageReadStore pages = reader.readRowGroup(0)) { + MessageType schema = reader.getFileMetaData().getSchema(); + ColumnReadStoreImpl store = new ColumnReadStoreImpl( + pages, + new GroupRecordConverter(schema).getRootConverter(), + schema, + reader.getFileMetaData().getCreatedBy()); + ColumnReader column = store.getColumnReader(schema.getColumns().get(0)); + for (int i = 0; i < 10; i++) { + assertThat(column.getFloat()).isEqualTo((float) i); + assertThat(column.getCurrentRepetitionLevel()).isEqualTo(i == 0 || i == secondStart ? 0 : 1); + assertThat(column.getCurrentDefinitionLevel()).isEqualTo(1); + column.consume(); + } + } + } + + @ParameterizedTest + @CsvSource({ + "required,5,false,4,18,0,false,false", + "required,5,false,4,15,0,true,true", + "optional,5,false,3,11,0,false,true", + "optional,5,false,3,10,-1,false,false", + "required,1,false,3,2,0,false,false", + "required,5,false,9223372036854775807,15,0,false,false", + "required,2,true,3,5,0,false,false" + }) + public void testInvalidVectorFooter( + String outer, + int length, + boolean nested, + long rowCount, + long values, + long nulls, + boolean projectList, + boolean filtered) + throws IOException { + MessageType fileSchema = schema(outer, length, nested); + int count = rowCount == Long.MAX_VALUE ? 3 : (int) rowCount; + int[] lengths = new int[count]; + Arrays.fill(lengths, length); + if (outer.equals("optional")) lengths[0] = -1; + Path path = writeVectors(fileSchema, PARQUET_2_0, false, listRows(fileSchema, lengths)); + rewriteFooter(path, footer -> { + footer.setNum_rows(rowCount); + footer.getRow_groups().get(0).setNum_rows(rowCount); + column(footer).setNum_values(values); + if (nulls == -1) { + column(footer).getStatistics().unsetNull_count(); + } else { + column(footer).getStatistics().setNull_count(nulls); + } + }); + String expected = (nested ? "[outer, v, list, element]" : "[v, list, element]") + ": rows=" + rowCount + + ", values=" + values + ", nulls=" + nulls + ", length=" + length; + for (boolean select : filtered ? new boolean[] {false, true} : new boolean[] {false}) { + assertThatThrownBy(() -> { + try (ParquetFileReader reader = + ParquetFileReader.open(new LocalInputFile(java.nio.file.Path.of(path.toUri())))) { + if (projectList) { + reader.setRequestedSchema(MessageTypeParser.parseMessageType( + "message m { repeated group v (LIST) { repeated group list {" + + " required float element; } } }")); + } + assertThat(reader.readOffsetIndex(reader.getFooter() + .getBlocks() + .get(0) + .getColumns() + .get(0))) + .isNotNull(); + if (select) { + reader.readFilteredRowGroup(0, RowRanges.createSingle(1)); + } else { + reader.readRowGroup(0); + } + } + }) + .isInstanceOf(ParquetDecodingException.class) + .hasMessageContaining("Invalid VECTOR counts for " + expected); + } + } + + @ParameterizedTest + @CsvSource({"false,3,10,0", "false,2,10,1", "false,-1,10,0", "false,2,10,-1", "true,2,9,0"}) + public void testInvalidVectorPageHeader(boolean nested, int headerRows, int headerValues, int headerNulls) + throws IOException { + MessageType fileSchema = schema("required", nested ? 2 : 5, nested); + Path path = new Path(tempDir.resolve(UUID.randomUUID() + ".parquet").toUri()); + try (ParquetFileWriter writer = new ParquetFileWriter( + HadoopOutputFile.fromPath(path, new Configuration()), + fileSchema, + CREATE, + DEFAULT_BLOCK_SIZE, + MAX_PADDING_SIZE_DEFAULT, + null, + ParquetProperties.builder().build())) { + FloatStatistics stats = new FloatStatistics(); + stats.updateStats(1.0f); + stats.setNumNulls(0); + writer.start(); + writer.startBlock(2); + writer.startColumn(fileSchema.getColumns().get(0), 10, CompressionCodecName.UNCOMPRESSED); + writer.writeDataPageV2( + headerRows, + headerNulls, + headerValues, + BytesInput.empty(), + BytesInput.empty(), + PLAIN, + BytesInput.empty(), + false, + 0, + stats); + writer.endColumn(); + writer.endBlock(); + writer.end(Collections.emptyMap()); + } + assertThatThrownBy(() -> { + try (ParquetFileReader reader = + ParquetFileReader.open(new LocalInputFile(java.nio.file.Path.of(path.toUri())))) { + reader.readRowGroup(0); + } + }) + .isInstanceOf(ParquetDecodingException.class) + .hasMessage("Invalid VECTOR counts for " + + (nested ? "[outer, v, list, element]" : "[v, list, element]") + + ": rows=" + headerRows + ", values=" + headerValues + ", nulls=" + headerNulls + + ", length=" + (nested ? 2 : 5)); + } + + @org.junit.jupiter.api.Test + public void testInvalidIndexedVectorPage() throws IOException { + MessageType fileSchema = schema("required", 5, false); + Path path = new Path(tempDir.resolve("invalid-indexed.parquet").toUri()); + FloatStatistics stats = new FloatStatistics(); + stats.updateStats(1.0f); + stats.setNumNulls(0); + try (ParquetFileWriter writer = new ParquetFileWriter( + HadoopOutputFile.fromPath(path, new Configuration()), + fileSchema, + CREATE, + DEFAULT_BLOCK_SIZE, + MAX_PADDING_SIZE_DEFAULT, + null, + ParquetProperties.builder().build())) { + writer.start(); + writer.startBlock(4); + writer.startColumn(fileSchema.getColumns().get(0), 20, CompressionCodecName.UNCOMPRESSED); + writer.writeDataPage(9, 0, BytesInput.empty(), stats, 2, RLE, RLE, PLAIN); + writer.writeDataPage(11, 0, BytesInput.empty(), stats, 2, RLE, RLE, PLAIN); + writer.endColumn(); + writer.endBlock(); + writer.end(Collections.emptyMap()); + } + assertThatThrownBy(() -> { + try (ParquetFileReader reader = + ParquetFileReader.open(new LocalInputFile(java.nio.file.Path.of(path.toUri())))) { + assertThat(reader.readOffsetIndex(reader.getFooter() + .getBlocks() + .get(0) + .getColumns() + .get(0))) + .isNotNull(); + reader.readFilteredRowGroup(0, RowRanges.createSingle(1)); + } + }) + .isInstanceOf(ParquetDecodingException.class) + .hasMessage("Invalid VECTOR counts for [v, list, element]: rows=2, values=9, nulls=-1, length=5"); + } +} diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/VectorInteropFileGenerator.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/VectorInteropFileGenerator.java new file mode 100644 index 0000000000..f5217bb32e --- /dev/null +++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/VectorInteropFileGenerator.java @@ -0,0 +1,314 @@ +/* + * 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.parquet.hadoop; + +import static org.apache.parquet.column.Encoding.BIT_PACKED; +import static org.apache.parquet.column.Encoding.PLAIN; +import static org.apache.parquet.column.Encoding.RLE; +import static org.apache.parquet.hadoop.ParquetFileWriter.Mode.CREATE; +import static org.apache.parquet.hadoop.ParquetWriter.DEFAULT_BLOCK_SIZE; +import static org.apache.parquet.hadoop.ParquetWriter.MAX_PADDING_SIZE_DEFAULT; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.function.Consumer; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.Path; +import org.apache.parquet.bytes.BytesInput; +import org.apache.parquet.bytes.BytesUtils; +import org.apache.parquet.bytes.HeapByteBufferAllocator; +import org.apache.parquet.column.Encoding; +import org.apache.parquet.column.ParquetProperties; +import org.apache.parquet.column.ParquetProperties.WriterVersion; +import org.apache.parquet.column.values.ValuesWriter; +import org.apache.parquet.column.values.bitpacking.ByteBitPackingValuesWriter; +import org.apache.parquet.column.values.bitpacking.Packer; +import org.apache.parquet.column.values.plain.PlainValuesWriter; +import org.apache.parquet.column.values.rle.RunLengthBitPackingHybridValuesWriter; +import org.apache.parquet.example.data.Group; +import org.apache.parquet.example.data.simple.SimpleGroupFactory; +import org.apache.parquet.format.ConvertedType; +import org.apache.parquet.format.LogicalTypes; +import org.apache.parquet.format.Util; +import org.apache.parquet.hadoop.example.ExampleParquetWriter; +import org.apache.parquet.hadoop.metadata.CompressionCodecName; +import org.apache.parquet.hadoop.util.HadoopOutputFile; +import org.apache.parquet.io.api.Binary; +import org.apache.parquet.schema.MessageType; +import org.apache.parquet.schema.MessageTypeParser; + +public final class VectorInteropFileGenerator { + private VectorInteropFileGenerator() {} + + static MessageType mixedSchema() { + return MessageTypeParser.parseMessageType("message m {" + + " required int32 id;" + + " required group f (VECTOR(5)) { repeated group list { required float element; } }" + + " optional group o (VECTOR(2)) { repeated group list { required int32 element; } }" + + " optional group a { required group h (VECTOR(2)) { repeated group list {" + + " required fixed_len_byte_array(2) element (FLOAT16); } } }" + + " repeated group outer { required group d (VECTOR(2)) { repeated group list {" + + " required double element; } } }" + + " required group b (VECTOR(2)) { repeated group list { required boolean element; } }" + + " required group l (VECTOR(1)) { repeated group list { required int64 element; } }" + + " required group s (VECTOR(1)) { repeated group list {" + + " required int32 element (INTEGER(16,true)); } }" + + " required group u (VECTOR(1)) { repeated group list {" + + " required int64 element (INTEGER(64,false)); } }" + + " required group dec (VECTOR(1)) { repeated group list {" + + " required int32 element (DECIMAL(9,2)); } }" + + " required group bytes (VECTOR(1)) { repeated group list {" + + " required fixed_len_byte_array(4) element (DECIMAL(9,2)); } } }"); + } + + static List mixedRows() { + List rows = new ArrayList<>(); + SimpleGroupFactory factory = new SimpleGroupFactory(mixedSchema()); + for (int i = 0; i < 6; i++) { + Group row = factory.newGroup().append("id", i); + Group f = row.addGroup("f"); + for (float value : new float[] {i + 0.5f, -0.0f, Float.MIN_VALUE, -0.25f, 100.0f}) { + f.addGroup("list").append("element", value); + } + if (i % 2 != 0) { + row.addGroup("o").addGroup("list").append("element", 7); + row.getGroup("o", 0).addGroup("list").append("element", 8); + } + if (i != 1 && i != 4) { + Group h = row.addGroup("a").addGroup("h"); + h.addGroup("list").append("element", Binary.fromConstantByteArray(new byte[] {0, (byte) 0x80})); + h.addGroup("list").append("element", Binary.fromConstantByteArray(new byte[] {1, 0})); + } + for (int j = 0; j < i % 3; j++) { + Group d = row.addGroup("outer").addGroup("d"); + d.addGroup("list").append("element", -0.0d); + d.addGroup("list").append("element", Double.MIN_VALUE); + } + Group b = row.addGroup("b"); + b.addGroup("list").append("element", true); + b.addGroup("list").append("element", false); + row.addGroup("l").addGroup("list").append("element", 9L); + row.addGroup("s").addGroup("list").append("element", -7); + row.addGroup("u").addGroup("list").append("element", 9L); + row.addGroup("dec").addGroup("list").append("element", 125); + row.addGroup("bytes") + .addGroup("list") + .append("element", Binary.fromConstantByteArray(new byte[] {0, 0, 0x7c, 0})); + rows.add(row); + } + return rows; + } + + static void writeMixed(Path path, WriterVersion version, boolean dictionary) throws IOException { + writeRows(path, mixedSchema(), version, dictionary, mixedRows()); + } + + static void writeRows(Path path, MessageType schema, WriterVersion version, boolean dictionary, List rows) + throws IOException { + try (ParquetWriter writer = ExampleParquetWriter.builder(path) + .withType(schema) + .withWriterVersion(version) + .withDictionaryEncoding(dictionary) + .withValidation(false) + .withCompressionCodec(CompressionCodecName.UNCOMPRESSED) + .withPageRowCountLimit(2) + .withMinRowCountForPageSizeCheck(1) + .withMaxRowCountForPageSizeCheck(1) + .build()) { + for (Group row : rows) writer.write(row); + } + } + + static MessageType invalidSchema() { + return MessageTypeParser.parseMessageType("message m { required int32 id;" + + " required group short_v (LIST) { repeated group list { required float element; } }" + + " required group long_v (LIST) { repeated group list { required float element; } }" + + " optional group empty_v (LIST) { repeated group list { required float element; } }" + + " repeated group nested { required group v (LIST) { repeated group list {" + + " required float element; } } }" + + " repeated group partial { required group v (LIST) { repeated group list {" + + " required float element; } } }" + + " required group nf_f (LIST) { repeated group list { required float element; } }" + + " required group nf_d (LIST) { repeated group list { required double element; } }" + + " required group nf_h (LIST) { repeated group list {" + + " required fixed_len_byte_array(2) element (FLOAT16); } } }"); + } + + static List invalidRows() { + MessageType schema = invalidSchema(); + SimpleGroupFactory factory = new SimpleGroupFactory(schema); + List rows = new ArrayList<>(); + int[] shortLengths = {4, 6, 5, 5}; + int[] longLengths = {6, 4, 5, 5}; + int[] emptyLengths = {0, 5, 5, 5}; + int[] partialLengths = {5, 5, 5, 3}; + byte[] halfNegativeInfinity = {0, (byte) 0xfc}; + byte[] halfZero = {0, 0}; + byte[] halfOne = {0, 0x3c}; + for (int i = 0; i < 4; i++) { + Group row = factory.newGroup().append("id", i); + for (String name : List.of("short_v", "long_v", "empty_v")) { + int length = name.equals("short_v") + ? shortLengths[i] + : name.equals("long_v") ? longLengths[i] : emptyLengths[i]; + Group vector = row.addGroup(name); + for (int k = 0; k < length; k++) { + vector.addGroup("list").append("element", (float) (100 * i + k)); + } + } + int[] nestedLengths = i == 0 ? new int[] {4, 6} : i == 1 ? new int[0] : new int[] {5}; + for (int j = 0; j < nestedLengths.length; j++) { + Group vector = row.addGroup("nested").addGroup("v"); + for (int k = 0; k < nestedLengths[j]; k++) { + vector.addGroup("list").append("element", (float) (100 * i + 10 * j + k)); + } + } + Group partial = row.addGroup("partial").addGroup("v"); + for (int k = 0; k < partialLengths[i]; k++) { + partial.addGroup("list").append("element", (float) (100 * i + k)); + } + Group nfFloat = row.addGroup("nf_f"); + Group nfDouble = row.addGroup("nf_d"); + Group nfHalf = row.addGroup("nf_h"); + for (int k = 0; k < 8; k++) { + nfFloat.addGroup("list").append("element", i == 0 && k == 0 ? Float.NaN : k == 0 ? 0.0f : 1.0f); + nfDouble.addGroup("list") + .append("element", i == 0 && k == 0 ? Double.POSITIVE_INFINITY : k == 0 ? 0.0d : 1.0d); + nfHalf.addGroup("list") + .append( + "element", + Binary.fromConstantByteArray( + i == 0 && k == 0 ? halfNegativeInfinity : k == 0 ? halfZero : halfOne)); + } + rows.add(row); + } + return rows; + } + + static void writeInvalid(Path path) throws IOException { + writeRows(path, invalidSchema(), WriterVersion.PARQUET_1_0, true, invalidRows()); + rewriteFooter(path, footer -> { + footer.getSchema().stream() + .filter(element -> element.getConverted_type() == ConvertedType.LIST) + .forEach(element -> element.setLogicalType( + LogicalTypes.VECTOR(element.getName().startsWith("nf_") ? 8 : 5))); + for (org.apache.parquet.format.ColumnChunk chunk : + footer.getRow_groups().get(0).getColumns()) { + chunk.getMeta_data().getStatistics().unsetNull_count(); + chunk.unsetColumn_index_offset(); + chunk.unsetColumn_index_length(); + chunk.unsetOffset_index_offset(); + chunk.unsetOffset_index_length(); + } + }); + } + + static org.apache.parquet.format.FileMetaData readFooter(Path path) throws IOException { + java.nio.file.Path local = java.nio.file.Path.of(path.toUri()); + byte[] original = Files.readAllBytes(local); + int footerLength = BytesUtils.readIntLittleEndian(original, original.length - 8); + int footerStart = original.length - 8 - footerLength; + return Util.readFileMetaData(new ByteArrayInputStream(original, footerStart, footerLength)); + } + + static void rewriteFooter(Path path, Consumer edit) throws IOException { + java.nio.file.Path local = java.nio.file.Path.of(path.toUri()); + byte[] original = Files.readAllBytes(local); + int footerLength = BytesUtils.readIntLittleEndian(original, original.length - 8); + int footerStart = original.length - 8 - footerLength; + org.apache.parquet.format.FileMetaData footer = readFooter(path); + edit.accept(footer); + ByteArrayOutputStream encodedFooter = new ByteArrayOutputStream(); + Util.writeFileMetaData(footer, encodedFooter); + ByteArrayOutputStream rewritten = new ByteArrayOutputStream(); + rewritten.write(original, 0, footerStart); + rewritten.write(encodedFooter.toByteArray()); + BytesUtils.writeIntLittleEndian(rewritten, encodedFooter.size()); + rewritten.write(original, original.length - 4, 4); + Files.write(local, rewritten.toByteArray()); + } + + static void writeSplit(Path path) throws IOException { + MessageType schema = MessageTypeParser.parseMessageType( + "message m { required group v (VECTOR(5)) {" + " repeated group list { required float element; } } }"); + ParquetFileWriter writer = new ParquetFileWriter( + HadoopOutputFile.fromPath(path, new Configuration()), + schema, + CREATE, + DEFAULT_BLOCK_SIZE, + MAX_PADDING_SIZE_DEFAULT, + null, + ParquetProperties.builder().build()); + writer.start(); + writer.startBlock(2); + writer.startColumn(schema.getColumns().get(0), 10, CompressionCodecName.UNCOMPRESSED); + int start = 0; + for (int count : new int[] {3, 4, 3}) { + boolean packed = start == 3; + ValuesWriter rl = packed + ? new ByteBitPackingValuesWriter(1, Packer.BIG_ENDIAN) + : new RunLengthBitPackingHybridValuesWriter(1, 64, 64, new HeapByteBufferAllocator()); + ValuesWriter dl = packed + ? new ByteBitPackingValuesWriter(1, Packer.BIG_ENDIAN) + : new RunLengthBitPackingHybridValuesWriter(1, 64, 64, new HeapByteBufferAllocator()); + ValuesWriter values = new PlainValuesWriter(64, 64, new HeapByteBufferAllocator()); + try { + for (int i = start; i < start + count; i++) { + rl.writeInteger(i == 0 || i == 5 ? 0 : 1); + dl.writeInteger(1); + values.writeFloat(i); + } + BytesInput bytes = BytesInput.concat( + BytesInput.from(rl.getBytes().toByteArray()), + BytesInput.from(dl.getBytes().toByteArray()), + BytesInput.from(values.getBytes().toByteArray())); + Encoding levelEncoding = packed ? BIT_PACKED : RLE; + writer.writeDataPage(count, (int) bytes.size(), bytes, levelEncoding, levelEncoding, PLAIN); + } finally { + rl.close(); + dl.close(); + values.close(); + } + start += count; + } + writer.endColumn(); + writer.endBlock(); + writer.end(Collections.emptyMap()); + writer.close(); + } + + public static void main(String[] args) throws IOException { + if (args.length != 1) { + throw new IllegalArgumentException("Usage: VectorInteropFileGenerator "); + } + java.nio.file.Path dir = java.nio.file.Path.of(args[0]); + Files.createDirectories(dir); + writeMixed(new Path(dir.resolve("vector_mixed_v1_plain.parquet").toUri()), WriterVersion.PARQUET_1_0, false); + writeMixed( + new Path(dir.resolve("vector_mixed_v2_dictionary.parquet").toUri()), WriterVersion.PARQUET_2_0, true); + writeSplit(new Path(dir.resolve("vector_split_v1.parquet").toUri())); + writeInvalid( + new Path(dir.resolve("vector_invalid_v1_dictionary.parquet").toUri())); + } +} diff --git a/parquet-hadoop/src/test/resources/vector/README.md b/parquet-hadoop/src/test/resources/vector/README.md new file mode 100644 index 0000000000..01be352d34 --- /dev/null +++ b/parquet-hadoop/src/test/resources/vector/README.md @@ -0,0 +1,132 @@ + + +# VECTOR reference files + +These files use the draft [VECTOR proposal](https://github.com/apache/parquet-format/pull/624) +at revision `3573b3e1357f6546f3710d8cb48103e61ad40350`. They are +parquet-java-generated examples, not independent interoperability evidence. Runtime +mixed-file tests exercise the writer; these fixed bytes exercise reader compatibility. +The valid files are intended for a later parquet-testing/data export. Malformed 4/6, +content, and count cases and Java exception policy are excluded from portable conformance. + +The current `VectorInteropFileGenerator` source blob is +`f5217bb32e86abfac965a3eebab9709adbaa549d`. The three valid files came from +the Round 2 generator source `2d496dad2213216ca6e75f1ab0b4249822829421`. +The malformed file came from the current source. Both used Java 17, Maven 3.9.16, +and Thrift 0.25.0. + +## Mixed files + +Both mixed files use this schema: + +```text +message m { + required int32 id; + required group f (VECTOR(5)) { repeated group list { required float element; } } + optional group o (VECTOR(2)) { repeated group list { required int32 element; } } + optional group a { required group h (VECTOR(2)) { + repeated group list { required fixed_len_byte_array(2) element (FLOAT16); } } } + repeated group outer { required group d (VECTOR(2)) { + repeated group list { required double element; } } } + required group b (VECTOR(2)) { repeated group list { required boolean element; } } + required group l (VECTOR(1)) { repeated group list { required int64 element; } } + required group s (VECTOR(1)) { repeated group list { + required int32 element (INTEGER(16,true)); } } + required group u (VECTOR(1)) { repeated group list { + required int64 element (INTEGER(64,false)); } } + required group dec (VECTOR(1)) { repeated group list { + required int32 element (DECIMAL(9,2)); } } + required group bytes (VECTOR(1)) { repeated group list { + required fixed_len_byte_array(4) element (DECIMAL(9,2)); } } +} +``` + +For each row `i=0..5`, `id=i`, `f=[i+0.5f,-0.0f,Float.MIN_VALUE,-0.25f,100.0f]`, +`o` is absent for even `i` and `[7,8]` for odd `i`, and `a` is absent for `i=1,4`. +When present, `a.h=[0080,0100]` in hex. There are `i%3` `outer` instances, +each with `d=[-0.0d,Double.MIN_VALUE]`. Every row has `b=[true,false]`, +`l=[9L]`, `s=[-7]`, `u=[9L]`, `dec=[125]` (logical 1.25), and +`bytes=[00007c00]` in hex (logical 317.44). + +The first `f` scalar in rows 0..5 has raw bits `3f000000/3fc00000/40200000/40600000/40900000/40b00000`. +The other four `f` scalars have `80000000/00000001/be800000/42c80000`; +`d` scalars have `8000000000000000/0000000000000001`. Both files are UNCOMPRESSED. +The `f` column has three pages of ten values. V1/plain uses RLE/RLE levels and +PLAIN data, without a dictionary. V2/dictionary uses RLE levels, RLE_DICTIONARY +data, and a ten-entry PLAIN dictionary; its pages each declare rowCount=2 and +nullCount=0. The V1 dictionary form exercised by runtime generation uses +PLAIN_DICTIONARY data and dictionary encodings. The `id` column has a column +index and an offset index with first-row indexes `[0,2,4]`. + +## Split file + +```text +message m { + required group v (VECTOR(5)) { repeated group list { required float element; } } +} +``` + +The two rows are `[0f,1f,2f,3f,4f]` and `[5f,6f,7f,8f,9f]`. Their stored RLs +are `[0,1,1,1,1,0,1,1,1,1]`, with DL=1 throughout. Three unindexed V1 pages +contain 3/4/3 values. The first and last pages use RLE/RLE levels; the middle +uses BIT_PACKED/BIT_PACKED levels. Values are PLAIN, compression is UNCOMPRESSED, +and column and offset indexes are absent. + +## Malformed file + +`vector_invalid_v1_dictionary.parquet` is deliberately invalid VECTOR data. Its +ordinary V1 writer used a canonical LIST schema with `id=0..3`, then changed only +the footer to annotate eight LIST groups as VECTOR. `short_v` has lengths +`[4,6,5,5]`, `long_v` has `[6,4,5,5]`, `empty_v` has `[0,5,5,5]`, nested `v` +has per-row instance lengths `[[4,6],[],[5],[5]]`, and partial `v` has +`[[5],[5],[5],[3]]`. These groups declare VECTOR(5). Their finite element `k` +in instance `j` of row `i` is `100*i+10*j+k` as FLOAT. + +`nf_f`, `nf_d`, and `nf_h` declare VECTOR(8). Each row contains seven ones; +element zero is zero except in row zero, where the fields contain FLOAT NaN, +DOUBLE positive infinity, and FLOAT16 negative infinity respectively. The FLOAT16 +values use little-endian bytes `00fc`, `0000`, and `003c` for negative infinity, +zero, and one. The file is UNCOMPRESSED with a page row limit of two. `nf_f` and +`nf_d` each have a dictionary and two V1 PLAIN_DICTIONARY pages of 16 values; +`nf_h` has no dictionary and two V1 PLAIN pages of 16 values. All column-chunk +null counts are unset, and column and offset index references are absent. The +file tests require the malformed VECTOR fields to be rejected and verify every +scalar by reading a temporary copy with only the VECTOR footer annotations removed. + +## SHA-256 + +```text +c0e182b7f019d394a26bf863626cd58fed3916d930195ab0741fe15b41afb6e8 vector_mixed_v1_plain.parquet +939ce11a1cbe84c68d867deeab85546162d04cab8fd191d5a8efe203bfbb0765 vector_mixed_v2_dictionary.parquet +a598252a6f5715742bdb0e52c86be992f609189096e1cdc518701f4520f4c657 vector_split_v1.parquet +a87042f46c3d56bb9b236795c9c44f13bd02eecb4107040d6bb4b245a73dd7fd vector_invalid_v1_dictionary.parquet +``` + +## Reproduce + +From the repository root, use a new empty `target/vector-reference` directory. +An occupied directory fails by design; the generator does not overwrite files. +The pinned source and toolchain reproduce the documented rows and layout; future +writer changes need not produce byte-identical files. + +```bash +JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 /home/div.arora/.m2/wrapper/dists/apache-maven-3.9.16/c51baac8/bin/mvn -Dthrift.executable=/home/div.arora/parquet-java-worktrees/vector/target/vector-tools/bin/thrift -pl parquet-hadoop -am -DskipTests package dependency:build-classpath -DincludeScope=test -Dmdep.outputFile=target/vector-test-classpath.txt -Dmdep.regenerateFile=true +/usr/lib/jvm/java-17-openjdk-amd64/bin/java -cp "parquet-hadoop/target/test-classes:parquet-hadoop/target/classes:$(cat parquet-hadoop/target/vector-test-classpath.txt)" org.apache.parquet.hadoop.VectorInteropFileGenerator target/vector-reference +``` diff --git a/parquet-hadoop/src/test/resources/vector/vector_invalid_v1_dictionary.parquet b/parquet-hadoop/src/test/resources/vector/vector_invalid_v1_dictionary.parquet new file mode 100644 index 0000000000000000000000000000000000000000..cbac84231486fa404fa3093347b72862bc9cd7f5 GIT binary patch literal 3205 zcmcInZ)jUp6uQ z)xn@er<783Q)Y+Oe^o{;e$Y}7CsgsnEHcU%8zSnaP~E`cridWa>hHe1mw#>6PV~Kd z-o3f+oZs)9bI-j=dO9C#VT5^cUw?D#tf(;&A0;Lc^Ahm1UjKgWL&6YbPH zS4x*|6&iQ0)VGn2Dv9f7{p{DD|6UR_)OksPI;N+%XWn%^!>&+pkNx%HYczxc7diE3 z!xlZ?B0BC{&%FMuLt}nu7x%!*3a9W3)Y-Rh|2|9e`D^cgi_ofR?&q2!YsP(L>Cf@H z0wt%t4O+A3+sVBC7kYx6^|K$YzxpF~y}vYTPCF#BOhRQhDf<+H5y!Z3YwkN74OK8I zY!FZxrg|@>YQW65$PCUa!j2*i8 zs}gJ@?SitdGxq&-*;fSY3YVD(~}CvtDiiwR2l7Qv|WBbqguB4HZ>S6q<;VR-(8E z4-aH>2Zk7BuDvw@h6N_Aq9P^}gE>a=B?(n`EE!A1(mAg0N)Du-*r+;%X)2RDwo!di zaiwE}xmXm;;1V|Im8iHgk!&szN#30uQN(ooK->=9yH4m_8J^|yRH^K#$P-sSTur%_ z|NbbXHMtC8SyDB1QYRYLsh&tGUmu29`M7*smqLnp6ew6+LX46zQ8k=D1V?oUZ@9Sx zbC+t^>uN5fy?_7=$RAKN{e%EaesezTtIEmC4V`xRRPt2=N$hQ*shgIWWPL0 z(ex!}3GzbND7e26u5?*ZgM{8w=6APMTEb8z{(bU1MbmG(OYnJ`tED6;QNJ3bBv4LZ z7vXA#?ee=6O`q|Y3=<_ux5woX1SO&&1hT!zAYxI?a;k*dk=C|dZTAO_gGM}VG`H-G1b4-E#*H=uU9>@+)Cg&;(#SFVqU*sQ GkbeN;IS5by literal 0 HcmV?d00001 diff --git a/parquet-hadoop/src/test/resources/vector/vector_mixed_v1_plain.parquet b/parquet-hadoop/src/test/resources/vector/vector_mixed_v1_plain.parquet new file mode 100644 index 0000000000000000000000000000000000000000..fc2e8aa647737f1d7b84ca3b65fcb329433ac445 GIT binary patch literal 4363 zcmcgwTWl0n7(O#QyWQ5cl(J`>!ByAFu8V<&UE6hQHVQnL#t?197$1mn%Wgx-w#8l$ zlbUP@L9CZlY_K5)-k?DeNW%kZYDGd~9}J0!8lwpi9tt5E3Bf3li{F3F>}6&c9uSy0 zdv5>#egEa0Ij3pYn%9z?@g}?%_KzLVB3#2T$b(Eg3TjJy_3Y=r1!}}9M82x{>uaYc z{54_?BEJ-G=9~G%r$2uQbQoj-9*{`?86S~^$;gZNm8gSej17%4cPMmh2&SREQl z>V4F0;Vt~^h4BMHrw^*|p+RKDvVY{p%!iE;EOf1}4MOjb%pNibA#v{AfAC|Uld~Kb zWg2=}yyw0d{ns%{?kPMx|_BWhGh6 zjH)nM1d2(NW}$FO17&mEx(iv!-7zykdC>so>PV-UxkqEZUxZeQrknU1B-*tYEktLim7-(K618`UM3ur7)IwOIX1PS|)+?xs)CJ+(BT_VB zND*>(y`@v><2vJNj2UWgp0zVW>ES95tP3SLU8wDvp%r_FhPjHr7NJyEC>Ht({llzX zHI#v}CRWI%Npv>N9Pq@w$qUg)cVY!oyehnI7_(=uKbSqF@nj_}wD2-3H!o55m zS_S^nG7hZCw+Vi7miPyp{LT6<6(v6A2R}X>W{3+#4flEi%5?0UYeb7v6tO@*Ai2u~1e5;^uko0nw zD|x4hh`!H<5+AG28kJkepor)pbGMnbn@)!`+&~&LV0$XYpVwz1{FIE1S^4XBnlC~GK+q0pL()}Av;*ZCO2x%n7>S%jlmj72A7NS{_w;-y9eQog{dJ@DUV)@}^} z>yvRwSAc2(c5#;2RG0qC-mHEpo!$W4Em=og;g{kC96-0U)#W6l37 zm>o~U+K*93FmwR84a#s9!U%_MO<7Yo)sZ`#88UF?Nh=(=lQZ&|@Un1G7hmKkEYOup z7O0gYw}s1O;am$W=;sYR6c3^a(|2nues{1J2X|}VK)z6H?a%cUaQJM?^=&B@n6Z9K zZt$Iv!tlzz!RXe);85>Ce>B;e>}XxJa{Vi7y4H8T`g%0cJj&wekPopPb2h@*3dUqDJLuOIb{YSU=)%82{saAe BYZCwf literal 0 HcmV?d00001 diff --git a/parquet-hadoop/src/test/resources/vector/vector_mixed_v2_dictionary.parquet b/parquet-hadoop/src/test/resources/vector/vector_mixed_v2_dictionary.parquet new file mode 100644 index 0000000000000000000000000000000000000000..ad809ff47878380d929ac661bbbcc553e84fd3b1 GIT binary patch literal 4344 zcmd5=eP~-%6uy7*5bZS9NZsj5%eFp`)8HhF@rz3Np)B{hfDTUYexOfmHF` zoBQ$3$M2kT&%O7NmW`W3+`}tThQE7#qAbQ$&hYc0W#x>eB~@lJ!(($@KXCVsvJe;e zvRo(j|J1*9Aug}rQh5u?^dG+-lB0koNyZ+>FD+Ta^aNv5n;829@2WO1_7Z;k@jJNz zW~@LtGrV`o6C+U=8^F&4V~cJmm6B34IQi5X%U)vq{GAg=OI#R-C!ZFKEBQ*kcXax9 zbwNh8NDm)c^#lw9II(^|`t1l4y86;-LR!c{6<{C8MY?nOC&?AVWL6yUIl zLIzU;C_nu2@fW2Ty8?J=*(EDJCMmMbGqdmABgHZ35P`FKe9Cd~_-vjNA6_`)E6_v! z2|cyEmfsmWbJ?5WAp>Xulqv=$`>~hOidu}v_~|!hzQL0Dtf)B>Z!tjUOXSa?K85nx zy-%l+ResBMN5kL}<+v|j;(l{zq?|u>{peXK6Ai>dM9im@(Hbg6i^@fL8sPm0W{#Fc z5d#1$v8@D*A7$>;+ixPIVgpi6Tg%53g(-`|A#&&R+_kI79m{|}=jP@XMfLq1_@8)x z{^oD@ytenRA^iWD_q1(KeLeV9i4D%!?*9nf2+6W+G^&(r)*-FZ5HIMcRTXNA&~Vv^ zpkrC~^aL2~#*&}fgco*Wvm0${fXdn&* zu>x-FCSUBv%BA@)3dEwCm&Y{5w5{k=rj1JIu?|L5yD9U{MEO8L57L0jpSMZVGz97W zBJ>~)dK}VFF>fZ)73x7c>_smW-tzJUk*1dLeu-!oeSA!^iMLCH9pips$ly}PkbR~6 zNs_xnJ;V-{p%*Iq1A;U~JxD|44r!o5kSaI{&)YaFU?6zeSZnC}{G@!J)ak6~QRECqT z?D@W``J6p&ob!FHu8O_4EP!tr%h^6Rk@?E2gAmzJAw-l!a+{k_4vr7us;GT|S|M4~ z`f6{|)y7i#WOJfhohz;Rji51ZvLF(I`wYqh&NRPvOF}ihQQbP>by{Plv6^`^W(08s z;=_+cK{~#ghqcM&{6$8(yhb$(;FxQ((kGJ)P#o26%c$l}+5A}wlG>?F)TSp$d3F}T zj;*Dvpwy#JRG_Ri{p*1=y_!d~F`e(SkSwbkrLKIS3T=;!YEG+g0eg$-)~%v>YUa)6 zxd7!JBjRCxARJr+gu@0lwFOaXInyk~rS17BmD+%eY7P~fH#|Wdw~da=M^kI;k&7E% zBcieZkfsP}bOqmO0r?EhjAoJcQX(HKs0}Ho<}ECWa|h|<8a)KMz*{namI*;b03&`C z_mRqUK;K)#AJax2;OB&s%-|j@SZhA2ZfC;nlBh08xN?{cNgQ9h;vG9uNv3bv5$}GvFWI}Uqq}Nn zvb(3ftFtOp7iy|ozi!L38(X$CKex52rnRpYE~ocp@AQJrWK@w#6gKM;qEg q@z(XN_2K%a#&EbX+*BV9tu@AjjMXwGS~0+Qeq~{NmA2qNkG}xD^m?HH literal 0 HcmV?d00001 diff --git a/parquet-hadoop/src/test/resources/vector/vector_split_v1.parquet b/parquet-hadoop/src/test/resources/vector/vector_split_v1.parquet new file mode 100644 index 0000000000000000000000000000000000000000..5b000135010e6422c34e103a9247e9f6c549ad85 GIT binary patch literal 347 zcmZut!A^rf5FL=f#(411Atm9!p%R+VhFt+6F|pig(kKys00a{fs7fj4eu|&sCwTVc z*^{5(v`KGn=FPtBdwDy%Y4X4k&_mBfm57QefD8a9>Y-~yY3**PEl8i>#6?DgAp`jQ zrPBq;gm=Qn-tteDcFg)F6C?oV3ChN5DYYm=0Ap!D8P(O9gQuhi%2;XYO-~xK3m9uv zQ?=E)2VF5t!?eLfW(1%zBa()L^XNd(NBWOMWwTq8W}yec_0*!!3s>BnK2mqPGM!NaFKtgeD*o)=!> W3qOv8h(zoQJ~d32?)f65^sRr*7CZ+4 literal 0 HcmV?d00001 From 99ef06501c4d9c496ac88417bbeba107981dee1e Mon Sep 17 00:00:00 2001 From: Divjot Arora Date: Thu, 22 Oct 2026 16:06:35 +0000 Subject: [PATCH 09/15] Reject invalid VECTOR adapter interpretations --- .../apache/parquet/avro/AvroSchemaConverter.java | 4 +++- .../parquet/avro/TestArrayCompatibility.java | 1 + .../parquet/proto/ProtoMessageConverter.java | 4 ++++ .../parquet/proto/ProtoRecordConverterTest.java | 14 ++++++++++++++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroSchemaConverter.java b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroSchemaConverter.java index d9b0a1e2df..8a395a2f2e 100644 --- a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroSchemaConverter.java +++ b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroSchemaConverter.java @@ -471,7 +471,9 @@ public Optional visit( if (!repeatedType.isRepetition(REPEATED)) { throw new UnsupportedOperationException("Invalid list type " + parquetGroupType); } - if (isElementType(repeatedType, parquetGroupType.getName())) { + if (!(logicalTypeAnnotation + instanceof LogicalTypeAnnotation.VectorLogicalTypeAnnotation) + && isElementType(repeatedType, parquetGroupType.getName())) { // repeated element types are always required return of(Schema.createArray(convertField(repeatedType, names))); } else { diff --git a/parquet-avro/src/test/java/org/apache/parquet/avro/TestArrayCompatibility.java b/parquet-avro/src/test/java/org/apache/parquet/avro/TestArrayCompatibility.java index e799d38613..61c93362f2 100644 --- a/parquet-avro/src/test/java/org/apache/parquet/avro/TestArrayCompatibility.java +++ b/parquet-avro/src/test/java/org/apache/parquet/avro/TestArrayCompatibility.java @@ -1650,6 +1650,7 @@ public void testVectorWithoutAvroSchema(@TempDir java.nio.file.Path dir) throws "VectorWithoutAvroSchema", field("v", array(primitive(Schema.Type.FLOAT))), optionalField("o", array(primitive(Schema.Type.FLOAT)))); + assertThat(new AvroSchemaConverter().convert(schema)).isEqualTo(expectedSchema); try (AvroParquetReader reader = autoDetectReader(path)) { assertReaderContains( reader, diff --git a/parquet-protobuf/src/main/java/org/apache/parquet/proto/ProtoMessageConverter.java b/parquet-protobuf/src/main/java/org/apache/parquet/proto/ProtoMessageConverter.java index f938bfefcd..c5a01352c2 100644 --- a/parquet-protobuf/src/main/java/org/apache/parquet/proto/ProtoMessageConverter.java +++ b/parquet-protobuf/src/main/java/org/apache/parquet/proto/ProtoMessageConverter.java @@ -273,6 +273,10 @@ public Optional visit(LogicalTypeAnnotation.ListLogicalTypeAnnotation public Optional visit( LogicalTypeAnnotation.VectorLogicalTypeAnnotation vectorLogicalType) { TypeUtil.checkValidVectorSchema(parquetType); + if (!fieldDescriptor.isRepeated()) { + throw new IncompatibleSchemaModificationException("VECTOR field " + + fieldDescriptor.getName() + " requires a repeated protobuf field"); + } return visit(LogicalTypeAnnotation.listType()); } diff --git a/parquet-protobuf/src/test/java/org/apache/parquet/proto/ProtoRecordConverterTest.java b/parquet-protobuf/src/test/java/org/apache/parquet/proto/ProtoRecordConverterTest.java index 2b85d561cf..b7eb09dd16 100644 --- a/parquet-protobuf/src/test/java/org/apache/parquet/proto/ProtoRecordConverterTest.java +++ b/parquet-protobuf/src/test/java/org/apache/parquet/proto/ProtoRecordConverterTest.java @@ -21,11 +21,14 @@ import static org.apache.parquet.proto.TestUtils.testData; import static org.apache.parquet.proto.test.TestProtobuf.SchemaConverterAllDatatypes; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.data.Offset.offset; import com.google.protobuf.ByteString; import java.io.IOException; +import java.util.Collections; import java.util.List; +import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.parquet.column.ParquetProperties.WriterVersion; import org.apache.parquet.example.data.Group; @@ -35,6 +38,7 @@ import org.apache.parquet.hadoop.metadata.CompressionCodecName; import org.apache.parquet.proto.test.TestProto3; import org.apache.parquet.proto.test.TestProtobuf; +import org.apache.parquet.schema.IncompatibleSchemaModificationException; import org.apache.parquet.schema.MessageType; import org.apache.parquet.schema.MessageTypeParser; import org.junit.jupiter.api.Test; @@ -67,6 +71,16 @@ public void testVectorRepeatedPrimitive(@TempDir java.nio.file.Path dir) throws assertThat(messages.get(1).getRepeatedIntList()).containsExactly(4, 5, 6); } + @Test + public void testVectorRejectsScalarTarget() { + MessageType schema = MessageTypeParser.parseMessageType("message m { required group optionalInt32" + + " (VECTOR(3)) { repeated group list { required int32 element; } } }"); + assertThatThrownBy(() -> new ProtoRecordConverter<>( + new Configuration(), SchemaConverterAllDatatypes.class, schema, Collections.emptyMap())) + .isInstanceOf(IncompatibleSchemaModificationException.class) + .hasMessageContaining("VECTOR field optionalInt32 requires a repeated protobuf field"); + } + @Test public void testAllTypes() throws Exception { SchemaConverterAllDatatypes.Builder data; From 4b1e8722cb00d46e85e7930c6f11fbddd201e43a Mon Sep 17 00:00:00 2001 From: Divjot Arora Date: Thu, 22 Oct 2026 16:59:09 +0000 Subject: [PATCH 10/15] Consolidate VECTOR schema and count validation --- .../parquet/internal/column/VectorUtils.java | 55 ------------------- .../apache/parquet/io/MessageColumnIO.java | 2 +- .../org/apache/parquet/schema/TypeUtil.java | 25 ++------- .../parquet/hadoop/ParquetFileReader.java | 35 ++++++++++-- .../TestParquetMetadataConverter.java | 44 --------------- 5 files changed, 38 insertions(+), 123 deletions(-) delete mode 100644 parquet-column/src/main/java/org/apache/parquet/internal/column/VectorUtils.java diff --git a/parquet-column/src/main/java/org/apache/parquet/internal/column/VectorUtils.java b/parquet-column/src/main/java/org/apache/parquet/internal/column/VectorUtils.java deleted file mode 100644 index 0c0a52e8ec..0000000000 --- a/parquet-column/src/main/java/org/apache/parquet/internal/column/VectorUtils.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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.parquet.internal.column; - -import java.util.Arrays; -import org.apache.parquet.column.ColumnDescriptor; -import org.apache.parquet.io.ParquetDecodingException; - -public final class VectorUtils { - private VectorUtils() {} - - public static void checkCounts(ColumnDescriptor path, int numElements, long rows, long values, long nulls) { - long declaredNulls = nulls; - boolean invalid = rows < 0 || values < 0 || nulls < -1 || nulls > values; - if (!invalid && path.getMaxRepetitionLevel() == 1) { - if (path.getMaxDefinitionLevel() == 1) { - invalid = nulls > 0; - nulls = 0; - } - if (nulls >= 0) { - long present = values - nulls; - invalid |= nulls > rows || present % numElements != 0 || present / numElements != rows - nulls; - } else { - long extra = values - rows; - invalid |= values < rows - || (numElements == 1 - ? values != rows - : extra % (numElements - 1) != 0 || extra / (numElements - 1) > rows); - } - } else if (!invalid && nulls >= 0) { - invalid = (values - nulls) % numElements != 0; - } - if (invalid) { - throw new ParquetDecodingException("Invalid VECTOR counts for " + Arrays.toString(path.getPath()) - + ": rows=" + rows + ", values=" + values + ", nulls=" + declaredNulls - + ", length=" + numElements); - } - } -} diff --git a/parquet-column/src/main/java/org/apache/parquet/io/MessageColumnIO.java b/parquet-column/src/main/java/org/apache/parquet/io/MessageColumnIO.java index fef551e5ae..7150182abb 100644 --- a/parquet-column/src/main/java/org/apache/parquet/io/MessageColumnIO.java +++ b/parquet-column/src/main/java/org/apache/parquet/io/MessageColumnIO.java @@ -509,7 +509,7 @@ public void flush() { public RecordConsumer getRecordWriter(ColumnWriteStore columns) { RecordConsumer recordWriter = new MessageColumnIORecordConsumer(columns); if (DEBUG) recordWriter = new RecordConsumerLoggingWrapper(recordWriter); - return validating || TypeUtil.hasVector(getType()) + return validating || TypeUtil.checkValidVectorSchema(getType()) ? new ValidatingRecordConsumer(recordWriter, getType()) : recordWriter; } diff --git a/parquet-column/src/main/java/org/apache/parquet/schema/TypeUtil.java b/parquet-column/src/main/java/org/apache/parquet/schema/TypeUtil.java index 283098e069..b30e39cf8d 100644 --- a/parquet-column/src/main/java/org/apache/parquet/schema/TypeUtil.java +++ b/parquet-column/src/main/java/org/apache/parquet/schema/TypeUtil.java @@ -26,32 +26,19 @@ import org.apache.parquet.schema.Type.Repetition; public class TypeUtil { - public static boolean hasVector(Type type) { - if (type.getLogicalTypeAnnotation() instanceof VectorLogicalTypeAnnotation) { - return true; - } - if (!type.isPrimitive()) { - for (Type child : type.asGroupType().getFields()) { - if (hasVector(child)) { - return true; - } - } - } - return false; - } - - public static void checkValidVectorSchema(Type type) { - if (type.getLogicalTypeAnnotation() instanceof VectorLogicalTypeAnnotation) { + public static boolean checkValidVectorSchema(Type type) { + boolean found = type.getLogicalTypeAnnotation() instanceof VectorLogicalTypeAnnotation; + if (found) { if (type.isPrimitive()) { throw new InvalidSchemaException("Invalid VECTOR schema: " + type); } checkVector(type.asGroupType()); - } - if (!type.isPrimitive()) { + } else if (!type.isPrimitive()) { for (Type child : type.asGroupType().getFields()) { - checkValidVectorSchema(child); + found |= checkValidVectorSchema(child); } } + return found; } private static void checkVector(GroupType vector) { diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java index 7ece837c76..d71d60983d 100644 --- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java +++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java @@ -107,7 +107,6 @@ import org.apache.parquet.hadoop.util.HadoopInputFile; import org.apache.parquet.hadoop.util.counters.BenchmarkCounter; import org.apache.parquet.hadoop.util.wrapped.io.FutureIO; -import org.apache.parquet.internal.column.VectorUtils; import org.apache.parquet.internal.column.columnindex.ColumnIndex; import org.apache.parquet.internal.column.columnindex.OffsetIndex; import org.apache.parquet.internal.filter2.columnindex.ColumnIndexFilter; @@ -1161,6 +1160,34 @@ public PageReadStore readNextRowGroup() throws IOException { return currentRowGroup; } + private static void checkVectorCounts(ColumnDescriptor path, int numElements, long rows, long values, long nulls) { + long declaredNulls = nulls; + boolean invalid = rows < 0 || values < 0 || nulls < -1 || nulls > values; + if (!invalid && path.getMaxRepetitionLevel() == 1) { + if (path.getMaxDefinitionLevel() == 1) { + invalid = nulls > 0; + nulls = 0; + } + if (nulls >= 0) { + long present = values - nulls; + invalid |= nulls > rows || present % numElements != 0 || present / numElements != rows - nulls; + } else { + long extra = values - rows; + invalid |= values < rows + || (numElements == 1 + ? values != rows + : extra % (numElements - 1) != 0 || extra / (numElements - 1) > rows); + } + } else if (!invalid && nulls >= 0) { + invalid = (values - nulls) % numElements != 0; + } + if (invalid) { + throw new ParquetDecodingException("Invalid VECTOR counts for " + Arrays.toString(path.getPath()) + + ": rows=" + rows + ", values=" + values + ", nulls=" + declaredNulls + + ", length=" + numElements); + } + } + private void checkVectorColumnCounts(ColumnChunkMetaData column, long rows) { MessageType fileSchema = getFileMetaData().getSchema(); String[] path = column.getPath().toArray(); @@ -1169,7 +1196,7 @@ private void checkVectorColumnCounts(ColumnChunkMetaData column, long rows) { ColumnDescriptor descriptor = fileSchema.getColumnDescription(path); org.apache.parquet.column.statistics.Statistics stats = column.getStatistics(); long nulls = stats != null && stats.isNumNullsSet() ? stats.getNumNulls() : -1; - VectorUtils.checkCounts(descriptor, vector.getNumElements(), rows, column.getValueCount(), nulls); + checkVectorCounts(descriptor, vector.getNumElements(), rows, column.getValueCount(), nulls); } private ColumnChunkPageReadStore internalReadRowGroup(int blockIndex) throws IOException { @@ -2235,7 +2262,7 @@ public ColumnChunkPageReader readAllPages( + 1; org.apache.parquet.column.statistics.Statistics stats = dataPageV1.getStatistics(); long nulls = stats != null && stats.isNumNullsSet() ? stats.getNumNulls() : -1; - VectorUtils.checkCounts( + checkVectorCounts( fileDescriptor, vector.getNumElements(), rows, dataPageV1.getValueCount(), nulls); } pagesInChunk.add(dataPageV1); @@ -2251,7 +2278,7 @@ public ColumnChunkPageReader readAllPages( + dataHeaderV2.getNum_values() + ", nulls=" + dataHeaderV2.getNum_nulls() + ", length=" + vector.getNumElements()); } - VectorUtils.checkCounts( + checkVectorCounts( fileDescriptor, vector.getNumElements(), dataHeaderV2.getNum_rows(), diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java b/parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java index 0f839af1c0..76d4900188 100644 --- a/parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java +++ b/parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java @@ -208,50 +208,6 @@ public void testInvalidVectorMetadata(String name, Consumer> .hasMessageStartingWith(message); } - private static Stream vectorElementFallbacks() { - return Stream.of( - Arguments.of( - "unsupported FLOAT annotation", - (Consumer) - element -> element.setLogicalType(org.apache.parquet.format.LogicalTypes.UTF8), - PrimitiveTypeName.FLOAT, - null), - Arguments.of( - "future FLOAT annotation", - (Consumer) element -> element.setLogicalType(new LogicalType()), - PrimitiveTypeName.FLOAT, - null), - Arguments.of( - "future INT32 annotation with converted fallback", - (Consumer) element -> element.setType(Type.INT32) - .setLogicalType(new LogicalType()) - .setConverted_type(ConvertedType.INT_16), - PrimitiveTypeName.INT32, - LogicalTypeAnnotation.intType(16, true)), - Arguments.of( - "conflicting INT32 annotations", - (Consumer) element -> element.setType(Type.INT32) - .setLogicalType(org.apache.parquet.format.LogicalTypes.INT_16) - .setConverted_type(ConvertedType.INT_32), - PrimitiveTypeName.INT32, - LogicalTypeAnnotation.intType(32, true))); - } - - @ParameterizedTest(name = "{0}") - @MethodSource("vectorElementFallbacks") - public void testVectorElementAnnotationFallback( - String name, Consumer edit, PrimitiveTypeName physical, LogicalTypeAnnotation logical) { - ParquetMetadataConverter converter = new ParquetMetadataConverter(); - List wire = converter.toParquetSchema(vectorSchema()); - edit.accept(wire.get(3)); - PrimitiveType element = converter - .fromParquetSchema(wire, null) - .getType("v", "list", "element") - .asPrimitiveType(); - assertThat(element.getPrimitiveTypeName()).isEqualTo(physical); - assertThat(element.getLogicalTypeAnnotation()).isEqualTo(logical); - } - private static SecureRandom random = new SecureRandom(); private static final String CHAR_LOWER = "abcdefghijklmnopqrstuvwxyz"; private static final String CHAR_UPPER = CHAR_LOWER.toUpperCase(); From 5bdd8f17d8488b22f9f4ecab16ec7e3d7c476470 Mon Sep 17 00:00:00 2001 From: Divjot Arora Date: Thu, 22 Oct 2026 17:00:08 +0000 Subject: [PATCH 11/15] Keep distinct VECTOR validation regressions --- .../io/ValidatingRecordConsumerTest.java | 100 +----------------- .../TestTypeBuildersWithLogicalTypes.java | 14 +-- .../parquet/hadoop/TestVectorReadWrite.java | 14 --- 3 files changed, 5 insertions(+), 123 deletions(-) diff --git a/parquet-column/src/test/java/org/apache/parquet/io/ValidatingRecordConsumerTest.java b/parquet-column/src/test/java/org/apache/parquet/io/ValidatingRecordConsumerTest.java index feb567e616..729e4104b8 100644 --- a/parquet-column/src/test/java/org/apache/parquet/io/ValidatingRecordConsumerTest.java +++ b/parquet-column/src/test/java/org/apache/parquet/io/ValidatingRecordConsumerTest.java @@ -28,8 +28,6 @@ import java.lang.reflect.Field; import java.util.Deque; -import java.util.function.Consumer; -import java.util.stream.Stream; import org.apache.parquet.io.api.Binary; import org.apache.parquet.io.api.RecordConsumer; import org.apache.parquet.schema.MessageType; @@ -37,67 +35,14 @@ import org.apache.parquet.schema.PrimitiveType; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.ValueSource; public class ValidatingRecordConsumerTest { - private static MessageType vectorSchema(String element) { - return MessageTypeParser.parseMessageType("message m { required group v (VECTOR(2)) {" - + " repeated group list { required " + element + "; } } }"); - } - - private static void startVector(RecordConsumer c) { - c.startField("v", 0); - c.startGroup(); - } - - private static void startEntry(RecordConsumer c) { - c.startGroup(); - c.startField("element", 0); - } - - private static void endEntry(RecordConsumer c) { - c.endField("element", 0); - c.endGroup(); - } - - private static void addEntry(RecordConsumer c, float value) { - startEntry(c); - c.addFloat(value); - endEntry(c); - } - - @ParameterizedTest - @ValueSource(ints = {1, 3}) - public void testVectorLengthRejectedAtBoundary(int count) { - MessageType schema = vectorSchema("float element"); - RecordConsumer delegate = mock(RecordConsumer.class); - ValidatingRecordConsumer c = new ValidatingRecordConsumer(delegate, schema); - c.startMessage(); - startVector(c); - c.startField("list", 0); - for (int i = 0; i < Math.min(count, 2); i++) addEntry(c, i); - if (count == 1) { - c.endField("list", 0); - clearInvocations(delegate); - assertThatThrownBy(c::endGroup) - .isInstanceOf(InvalidRecordException.class) - .hasMessage("Invalid VECTOR length for v: expected 2, got 1"); - verifyNoInteractions(delegate); - } else { - clearInvocations(delegate); - assertThatThrownBy(c::startGroup) - .isInstanceOf(InvalidRecordException.class) - .hasMessage("Invalid VECTOR length for v: expected 2, got 3"); - verifyNoInteractions(delegate); - } - } - @ParameterizedTest @ValueSource(strings = {"v", "element"}) public void testEmptyRequiredVectorField(String field) { - MessageType schema = vectorSchema("float element"); + MessageType schema = MessageTypeParser.parseMessageType( + "message m { required group v (VECTOR(2)) {" + " repeated group list { required float element; } } }"); RecordConsumer delegate = mock(RecordConsumer.class); ValidatingRecordConsumer c = new ValidatingRecordConsumer(delegate, schema); c.startMessage(); @@ -105,7 +50,8 @@ public void testEmptyRequiredVectorField(String field) { if (field.equals("element")) { c.startGroup(); c.startField("list", 0); - startEntry(c); + c.startGroup(); + c.startField("element", 0); } clearInvocations(delegate); assertThatThrownBy(() -> c.endField(field, 0)) @@ -115,44 +61,6 @@ public void testEmptyRequiredVectorField(String field) { verifyNoInteractions(delegate); } - private static Stream rejectedVectorElements() { - return Stream.of( - Arguments.of( - "float element", - (Consumer) c -> c.addFloat(Float.NaN), - "Non-finite VECTOR element in v"), - Arguments.of( - "double element", - (Consumer) c -> c.addDouble(Double.POSITIVE_INFINITY), - "Non-finite VECTOR element in v"), - Arguments.of( - "fixed_len_byte_array(2) element (FLOAT16)", - (Consumer) - c -> c.addBinary(Binary.fromConstantByteArray(new byte[] {0, (byte) 0xfc})), - "Non-finite VECTOR element in v"), - Arguments.of( - "fixed_len_byte_array(2) element (FLOAT16)", - (Consumer) c -> c.addBinary(Binary.fromConstantByteArray(new byte[] {0})), - "Invalid FLOAT16 VECTOR element length: 1")); - } - - @ParameterizedTest - @MethodSource("rejectedVectorElements") - public void testVectorElementRejectedImmediately(String element, Consumer add, String message) { - MessageType schema = vectorSchema(element); - RecordConsumer delegate = mock(RecordConsumer.class); - ValidatingRecordConsumer c = new ValidatingRecordConsumer(delegate, schema); - c.startMessage(); - startVector(c); - c.startField("list", 0); - startEntry(c); - clearInvocations(delegate); - assertThatThrownBy(() -> add.accept(c)) - .isInstanceOf(InvalidRecordException.class) - .hasMessage(message); - verifyNoInteractions(delegate); - } - private static final RecordConsumer NOOP = new RecordConsumer() { @Override public void startMessage() {} diff --git a/parquet-column/src/test/java/org/apache/parquet/schema/TestTypeBuildersWithLogicalTypes.java b/parquet-column/src/test/java/org/apache/parquet/schema/TestTypeBuildersWithLogicalTypes.java index 07aa3db239..ef860b222b 100644 --- a/parquet-column/src/test/java/org/apache/parquet/schema/TestTypeBuildersWithLogicalTypes.java +++ b/parquet-column/src/test/java/org/apache/parquet/schema/TestTypeBuildersWithLogicalTypes.java @@ -114,19 +114,7 @@ private static Stream invalidVectors() { Arguments.of(vector(Types.required(BINARY).as(stringType()).named("element"))), Arguments.of(vector(Types.required(INT32).as(dateType()).named("element"))), Arguments.of( - vector(Types.required(INT32).named("element").withLogicalTypeAnnotation(intType(64, true)))), - Arguments.of( - vector(Types.required(FLOAT).named("element").withLogicalTypeAnnotation(intType(32, true)))), - Arguments.of( - vector(Types.required(INT32).named("element").withLogicalTypeAnnotation(decimalType(0, 10)))), - Arguments.of(vector(Types.required(FIXED_LEN_BYTE_ARRAY) - .length(4) - .named("element") - .withLogicalTypeAnnotation(decimalType(0, 10)))), - Arguments.of( - vector(Types.required(INT32).named("element").withLogicalTypeAnnotation(decimalType(-1, 9)))), - Arguments.of( - vector(Types.required(INT32).named("element").withLogicalTypeAnnotation(decimalType(10, 9))))); + vector(Types.required(INT32).named("element").withLogicalTypeAnnotation(intType(64, true))))); } @ParameterizedTest diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestVectorReadWrite.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestVectorReadWrite.java index e8ca84006d..634ef7e6d8 100644 --- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestVectorReadWrite.java +++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestVectorReadWrite.java @@ -308,21 +308,7 @@ private static Stream invalidVectorWrites() { List.of(1.0f, 2.0f, 3.0f), "Invalid VECTOR length for v: expected 2, got 3"), Arguments.of("float element", 1, List.of(Float.NaN), "Non-finite VECTOR element in v"), - Arguments.of("float element", 1, List.of(Float.POSITIVE_INFINITY), "Non-finite VECTOR element in v"), - Arguments.of("float element", 1, List.of(Float.NEGATIVE_INFINITY), "Non-finite VECTOR element in v"), - Arguments.of("double element", 1, List.of(Double.NaN), "Non-finite VECTOR element in v"), Arguments.of("double element", 1, List.of(Double.POSITIVE_INFINITY), "Non-finite VECTOR element in v"), - Arguments.of("double element", 1, List.of(Double.NEGATIVE_INFINITY), "Non-finite VECTOR element in v"), - Arguments.of( - "fixed_len_byte_array(2) element (FLOAT16)", - 1, - List.of(Binary.fromConstantByteArray(new byte[] {0, 0x7e})), - "Non-finite VECTOR element in v"), - Arguments.of( - "fixed_len_byte_array(2) element (FLOAT16)", - 1, - List.of(Binary.fromConstantByteArray(new byte[] {0, 0x7c})), - "Non-finite VECTOR element in v"), Arguments.of( "fixed_len_byte_array(2) element (FLOAT16)", 1, From 0b4bba9e65d525cda6767125116343b0f80bbc5f Mon Sep 17 00:00:00 2001 From: Divjot Arora Date: Thu, 22 Oct 2026 17:01:48 +0000 Subject: [PATCH 12/15] Use fixed VECTOR resources for focused file coverage --- .../parquet/hadoop/TestVectorReadWrite.java | 301 ++++-------------- .../src/test/resources/vector/README.md | 45 +-- 2 files changed, 65 insertions(+), 281 deletions(-) diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestVectorReadWrite.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestVectorReadWrite.java index 634ef7e6d8..b18549f854 100644 --- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestVectorReadWrite.java +++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestVectorReadWrite.java @@ -18,11 +18,8 @@ */ package org.apache.parquet.hadoop; -import static org.apache.parquet.column.Encoding.BIT_PACKED; import static org.apache.parquet.column.Encoding.PLAIN; -import static org.apache.parquet.column.Encoding.PLAIN_DICTIONARY; import static org.apache.parquet.column.Encoding.RLE; -import static org.apache.parquet.column.Encoding.RLE_DICTIONARY; import static org.apache.parquet.column.ParquetProperties.WriterVersion.PARQUET_2_0; import static org.apache.parquet.filter.ColumnPredicates.equalTo; import static org.apache.parquet.filter2.predicate.FilterApi.and; @@ -48,16 +45,12 @@ import java.util.stream.Stream; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; -import org.apache.parquet.ParquetReadOptions; import org.apache.parquet.bytes.BytesInput; -import org.apache.parquet.column.ColumnReader; import org.apache.parquet.column.ParquetProperties; import org.apache.parquet.column.ParquetProperties.WriterVersion; -import org.apache.parquet.column.impl.ColumnReadStoreImpl; import org.apache.parquet.column.page.DataPage; import org.apache.parquet.column.page.DataPageV1; import org.apache.parquet.column.page.DataPageV2; -import org.apache.parquet.column.page.DictionaryPage; import org.apache.parquet.column.page.PageReadStore; import org.apache.parquet.column.page.PageReader; import org.apache.parquet.column.statistics.FloatStatistics; @@ -71,7 +64,6 @@ import org.apache.parquet.format.LogicalTypes; import org.apache.parquet.hadoop.example.ExampleParquetWriter; import org.apache.parquet.hadoop.example.GroupReadSupport; -import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData; import org.apache.parquet.hadoop.metadata.CompressionCodecName; import org.apache.parquet.hadoop.util.HadoopOutputFile; import org.apache.parquet.io.ColumnIOFactory; @@ -106,6 +98,12 @@ private Path writeVectors(MessageType schema, WriterVersion version, boolean dic return path; } + private static Path referenceFile(String name) throws java.net.URISyntaxException { + return new Path(java.nio.file.Path.of( + TestVectorReadWrite.class.getResource("/vector/" + name).toURI()) + .toUri()); + } + private static List listRows(MessageType schema, int... lengths) { List rows = new ArrayList<>(); int value = 0; @@ -207,39 +205,16 @@ private static void verifyMixedFile(Path path, WriterVersion version, boolean di assertThat(reader.getFooter().getFileMetaData().getSchema()).isEqualTo(schema); assertThat(reader.getFooter().getBlocks()).hasSize(1); assertThat(reader.getFooter().getBlocks().get(0).getRowCount()).isEqualTo(6); - List columns = - reader.getFooter().getBlocks().get(0).getColumns(); - for (ColumnChunkMetaData column : columns) { - assertThat(column.getCodec()).isEqualTo(CompressionCodecName.UNCOMPRESSED); - } - assertThat(reader.readColumnIndex(columns.get(0))).isNotNull(); - assertThat(reader.readOffsetIndex(columns.get(0)).getPageCount()).isEqualTo(3); try (PageReadStore pages = reader.readRowGroup(0)) { PageReader f = pages.getPageReader(schema.getColumns().get(1)); if (dictionary) { - DictionaryPage page = f.readDictionaryPage(); - assertThat(page.getDictionarySize()).isEqualTo(10); - assertThat(page.getEncoding()) - .isEqualTo(version == WriterVersion.PARQUET_1_0 ? PLAIN_DICTIONARY : PLAIN); + assertThat(f.readDictionaryPage()).isNotNull(); } else { assertThat(f.readDictionaryPage()).isNull(); } - for (int i = 0; i < 3; i++) { - DataPage page = f.readPage(); - assertThat(page.getValueCount()).isEqualTo(10); - if (version == WriterVersion.PARQUET_1_0) { - DataPageV1 v1 = (DataPageV1) page; - assertThat(v1.getRlEncoding()).isEqualTo(RLE); - assertThat(v1.getDlEncoding()).isEqualTo(RLE); - assertThat(v1.getValueEncoding()).isEqualTo(dictionary ? PLAIN_DICTIONARY : PLAIN); - } else { - DataPageV2 v2 = (DataPageV2) page; - assertThat(v2.getRowCount()).isEqualTo(2); - assertThat(v2.getNullCount()).isZero(); - assertThat(v2.getDataEncoding()).isEqualTo(dictionary ? RLE_DICTIONARY : PLAIN); - } - } - assertThat(f.readPage()).isNull(); + DataPage page = f.readPage(); + assertThat(page) + .isInstanceOf(version == WriterVersion.PARQUET_1_0 ? DataPageV1.class : DataPageV2.class); } } List vectors = readFooter(path).getSchema().stream() @@ -258,14 +233,6 @@ private static void verifyFilteredRows(Path path) throws IOException { MessageType schema = VectorInteropFileGenerator.mixedSchema(); List expected = VectorInteropFileGenerator.mixedRows(); var predicate = and(gtEq(intColumn("id"), 2), ltEq(intColumn("id"), 3)); - try (ParquetFileReader reader = ParquetFileReader.open( - new LocalInputFile(java.nio.file.Path.of(path.toUri())), - ParquetReadOptions.builder() - .withRecordFilter(FilterCompat.get(predicate)) - .useColumnIndexFilter(true) - .build())) { - assertThat(reader.getFilteredRecordCount()).isEqualTo(2); - } try (ParquetReader reader = ParquetReader.builder(new GroupReadSupport(), path) .withFilter(FilterCompat.get(predicate)) .useColumnIndexFilter(true) @@ -278,9 +245,7 @@ private static void verifyFilteredRows(Path path) throws IOException { ParquetFileReader.open(new LocalInputFile(java.nio.file.Path.of(path.toUri()))); PageReadStore pages = reader.readFilteredRowGroup( 0, RowRanges.builder().addSelectedRange(1, 4).build())) { - assertThat(pages.getRowCount()).isEqualTo(4); assertThat(pages.getRowIndexes()).isPresent(); - assertThat(pages.getRowIndexes().get()).toIterable().containsExactly(1L, 2L, 3L, 4L); MessageColumnIO columns = new ColumnIOFactory().getColumnIO(schema, schema); RecordReader records = columns.getRecordReader(pages, new GroupRecordConverter(schema)); for (int i = 1; i <= 4; i++) assertRow(records.read(), expected.get(i)); @@ -379,160 +344,67 @@ public void testVectorReadProjection() throws Exception { MessageType list = MessageTypeParser.parseMessageType( schema("required", 5, false).toString().replace("VECTOR(5)", "LIST")); MessageType vector = schema("required", 5, false); - Path original = writeVectors(list, WriterVersion.PARQUET_1_0, false, listRows(list, 4, 6)); - try (ParquetFileReader reader = - ParquetFileReader.open(new LocalInputFile(java.nio.file.Path.of(original.toUri())))) { - assertThat(reader.getFooter().getBlocks()).hasSize(1); - assertThat(reader.readOffsetIndex(reader.getFooter() - .getBlocks() - .get(0) - .getColumns() - .get(0)) - .getPageCount()) - .isEqualTo(1); - } - assertVectorRows(readGroups(original, vector), 4, 6); + Path path = writeVectors(list, WriterVersion.PARQUET_1_0, false, listRows(list, 4, 6)); + assertVectorRows(readGroups(path, vector), 4, 6); - Path relabeled = new Path(tempDir.resolve("relabeled.parquet").toUri()); - Files.copy(java.nio.file.Path.of(original.toUri()), java.nio.file.Path.of(relabeled.toUri())); - rewriteFooter(relabeled, footer -> footer.getSchema().get(1).setLogicalType(LogicalTypes.VECTOR(5))); - assertThatThrownBy(() -> readGroups(relabeled, vector)) - .isInstanceOf(ParquetDecodingException.class) - .hasMessage("Invalid VECTOR data for [v, list, element]: expected 5 elements, got 4"); - assertThatThrownBy(() -> readGroups(relabeled, list)) - .isInstanceOf(ParquetDecodingException.class) - .hasMessage("Invalid VECTOR data for [v, list, element]: expected 5 elements, got 4"); - - assertStoredLevels(relabeled, 4); - - Path generated = new Path(tempDir.resolve("invalid-generated.parquet").toUri()); - VectorInteropFileGenerator.writeInvalid(generated); - Path reference = new Path(java.nio.file.Path.of(TestVectorReadWrite.class - .getResource("/vector/vector_invalid_v1_dictionary.parquet") - .toURI()) - .toUri()); - assertThat(readFooter(generated).getSchema()) - .isEqualTo(readFooter(reference).getSchema()); - verifyInvalidFixture(generated); - verifyInvalidFixture(reference); - } + rewriteFooter(path, footer -> footer.getSchema().get(1).setLogicalType(LogicalTypes.VECTOR(5))); + for (MessageType requested : List.of(vector, list)) { + assertThatThrownBy(() -> readGroups(path, requested)) + .isInstanceOf(ParquetDecodingException.class) + .hasMessage("Invalid VECTOR data for [v, list, element]: expected 5 elements, got 4"); + } - private void verifyInvalidFixture(Path path) throws IOException { - MessageType schema = VectorInteropFileGenerator.invalidSchema(); try (ParquetFileReader reader = ParquetFileReader.open(new LocalInputFile(java.nio.file.Path.of(path.toUri()))); - PageReadStore pages = reader.readRowGroup(0)) { - assertThat(reader.getFooter().getBlocks()).hasSize(1); - assertThat(pages.getRowCount()).isEqualTo(4); - for (ColumnChunkMetaData chunk : - reader.getFooter().getBlocks().get(0).getColumns()) { - assertThat(chunk.getCodec()).isEqualTo(CompressionCodecName.UNCOMPRESSED); - assertThat(chunk.getColumnIndexReference()).isNull(); - assertThat(chunk.getOffsetIndexReference()).isNull(); - assertThat(chunk.getStatistics().isNumNullsSet()).isFalse(); - } - for (String name : List.of("nf_f", "nf_d", "nf_h")) { - PageReader column = - pages.getPageReader(schema.getColumnDescription(new String[] {name, "list", "element"})); - boolean dictionary = !name.equals("nf_h"); - if (dictionary) { - assertThat(column.readDictionaryPage()).as(name).isNotNull(); - } else { - assertThat(column.readDictionaryPage()).as(name).isNull(); - } - for (int i = 0; i < 2; i++) { - DataPageV1 page = (DataPageV1) column.readPage(); - assertThat(page.getValueCount()).isEqualTo(16); - assertThat(page.getValueEncoding()).isEqualTo(dictionary ? PLAIN_DICTIONARY : PLAIN); - } - assertThat(column.readPage()).isNull(); - } + PageReadStore pages = reader.readFilteredRowGroup(0, RowRanges.createSingle(1))) { + MessageColumnIO columns = new ColumnIOFactory() + .getColumnIO(vector, reader.getFileMetaData().getSchema()); + RecordReader records = columns.getRecordReader(pages, new GroupRecordConverter(vector)); + assertThatThrownBy(records::read) + .isInstanceOf(ParquetDecodingException.class) + .hasMessage("Invalid VECTOR data for [v, list, element]: expected 5 elements, got 4"); } - Path copy = new Path(tempDir.resolve(UUID.randomUUID() + ".parquet").toUri()); - Files.copy(java.nio.file.Path.of(path.toUri()), java.nio.file.Path.of(copy.toUri())); - rewriteFooter(copy, footer -> footer.getSchema().stream() - .filter(element -> - element.isSetLogicalType() && element.getLogicalType().isSetVECTOR()) - .forEach(org.apache.parquet.format.SchemaElement::unsetLogicalType)); - List actual = readGroups(copy, schema); - List expected = VectorInteropFileGenerator.invalidRows(); - assertThat(actual).hasSameSizeAs(expected); - for (int i = 0; i < expected.size(); i++) assertRow(actual.get(i), expected.get(i)); } @ParameterizedTest @CsvSource( value = { - "short_v|expected 5 elements, got 4", - "long_v|expected 5 elements, got 6", - "empty_v|empty vector", - "nested|expected 5 elements, got 4", - "partial|expected 5 elements, got 3", - "nf_f|non-finite element", - "nf_d|non-finite element", - "nf_h|non-finite element" + "short_v|all|expected 5 elements, got 4", + "long_v|all|expected 5 elements, got 6", + "empty_v|all|empty vector", + "nested|all|expected 5 elements, got 4", + "partial|all|expected 5 elements, got 3", + "nf_f|all|non-finite element", + "nf_d|all|non-finite element", + "nf_h|all|non-finite element", + "short_v|filter2|expected 5 elements, got 4", + "short_v|legacy|expected 5 elements, got 4" }, delimiter = '|') - public void testInvalidVectorReferenceFile(String field, String reason) throws Exception { - Path path = new Path(java.nio.file.Path.of(TestVectorReadWrite.class - .getResource("/vector/vector_invalid_v1_dictionary.parquet") - .toURI()) - .toUri()); - MessageType file; + public void testInvalidVectorReferenceFile(String field, String mode, String reason) throws Exception { + Path path = referenceFile("vector_invalid_v1_dictionary.parquet"); try (ParquetFileReader reader = ParquetFileReader.open(new LocalInputFile(java.nio.file.Path.of(path.toUri())))) { - file = reader.getFileMetaData().getSchema(); - } - MessageType projected = new MessageType("m", file.getType("id"), file.getType(field)); - String name = field.equals("nested") || field.equals("partial") ? field + ", v" : field; - assertThatThrownBy(() -> readGroups(path, projected)) - .isInstanceOf(ParquetDecodingException.class) - .hasMessage("Invalid VECTOR data for [" + name + ", list, element]: " + reason); - } - - @ParameterizedTest - @org.junit.jupiter.params.provider.ValueSource(strings = {"filter2", "legacy", "indexed"}) - public void testInvalidFilteredVector(String mode) throws Exception { - Path path; - MessageType requested; - if (mode.equals("indexed")) { - MessageType list = MessageTypeParser.parseMessageType( - schema("required", 5, false).toString().replace("VECTOR(5)", "LIST")); - path = writeVectors(list, WriterVersion.PARQUET_1_0, false, listRows(list, 4, 6)); - rewriteFooter(path, footer -> footer.getSchema().get(1).setLogicalType(LogicalTypes.VECTOR(5))); - requested = schema("required", 5, false); - } else { - path = new Path(java.nio.file.Path.of(TestVectorReadWrite.class - .getResource("/vector/vector_invalid_v1_dictionary.parquet") - .toURI()) - .toUri()); - MessageType file; - try (ParquetFileReader reader = - ParquetFileReader.open(new LocalInputFile(java.nio.file.Path.of(path.toUri())))) { - file = reader.getFileMetaData().getSchema(); + MessageType file = reader.getFileMetaData().getSchema(); + MessageType projected = new MessageType("m", file.getType("id"), file.getType(field)); + reader.setRequestedSchema(projected); + try (PageReadStore pages = reader.readRowGroup(0)) { + MessageColumnIO columns = new ColumnIOFactory().getColumnIO(projected, file); + FilterCompat.Filter filter = mode.equals("filter2") + ? FilterCompat.get(eq(intColumn("id"), 1)) + : mode.equals("legacy") + ? FilterCompat.get( + org.apache.parquet.filter.ColumnRecordFilter.column("id", equalTo(1))) + : FilterCompat.NOOP; + RecordReader records = + columns.getRecordReader(pages, new GroupRecordConverter(projected), filter); + String name = field.equals("nested") || field.equals("partial") ? field + ", v" : field; + assertThatThrownBy(() -> { + for (long i = 0; i < pages.getRowCount(); i++) records.read(); + }) + .isInstanceOf(ParquetDecodingException.class) + .hasMessage("Invalid VECTOR data for [" + name + ", list, element]: " + reason); } - requested = new MessageType("m", file.getType("id"), file.getType("short_v")); - } - try (ParquetFileReader reader = - ParquetFileReader.open(new LocalInputFile(java.nio.file.Path.of(path.toUri()))); - PageReadStore pages = mode.equals("indexed") - ? reader.readFilteredRowGroup(0, RowRanges.createSingle(1)) - : reader.readRowGroup(0)) { - MessageColumnIO columns = new ColumnIOFactory() - .getColumnIO(requested, reader.getFileMetaData().getSchema()); - RecordReader records = mode.equals("indexed") - ? columns.getRecordReader(pages, new GroupRecordConverter(requested)) - : columns.getRecordReader( - pages, - new GroupRecordConverter(requested), - mode.equals("filter2") - ? FilterCompat.get(eq(intColumn("id"), 1)) - : FilterCompat.get( - org.apache.parquet.filter.ColumnRecordFilter.column("id", equalTo(1)))); - String name = mode.equals("indexed") ? "v" : "short_v"; - assertThatThrownBy(records::read) - .isInstanceOf(ParquetDecodingException.class) - .hasMessage("Invalid VECTOR data for [" + name + ", list, element]: expected 5 elements, got 4"); } } @@ -544,70 +416,23 @@ private static org.apache.parquet.format.ColumnMetaData column(org.apache.parque @CsvSource({"vector_mixed_v1_plain.parquet,PARQUET_1_0,false", "vector_mixed_v2_dictionary.parquet,PARQUET_2_0,true" }) public void testVectorReferenceFile(String name, WriterVersion version, boolean dictionary) throws Exception { - java.nio.file.Path local = java.nio.file.Path.of( - TestVectorReadWrite.class.getResource("/vector/" + name).toURI()); - verifyMixedFile(new Path(local.toUri()), version, dictionary); + verifyMixedFile(referenceFile(name), version, dictionary); } @org.junit.jupiter.api.Test public void testSplitVectorFile() throws Exception { - Path generated = new Path(tempDir.resolve("split.parquet").toUri()); - VectorInteropFileGenerator.writeSplit(generated); - Path reference = new Path(java.nio.file.Path.of(TestVectorReadWrite.class - .getResource("/vector/vector_split_v1.parquet") - .toURI()) - .toUri()); - for (Path path : List.of(generated, reference)) verifySplitFile(path); - } - - private static void verifySplitFile(Path path) throws IOException { + Path path = referenceFile("vector_split_v1.parquet"); MessageType schema = schema("required", 5, false); - try (ParquetFileReader reader = - ParquetFileReader.open(new LocalInputFile(java.nio.file.Path.of(path.toUri())))) { - assertThat(reader.getFileMetaData().getSchema()).isEqualTo(schema); - assertThat(reader.getFooter().getBlocks()).hasSize(1); - assertThat(reader.getFooter().getBlocks().get(0).getRowCount()).isEqualTo(2); - ColumnChunkMetaData chunk = - reader.getFooter().getBlocks().get(0).getColumns().get(0); - assertThat(chunk.getValueCount()).isEqualTo(10); - assertThat(chunk.getCodec()).isEqualTo(CompressionCodecName.UNCOMPRESSED); - assertThat(chunk.getColumnIndexReference()).isNull(); - assertThat(chunk.getOffsetIndexReference()).isNull(); - try (PageReadStore pages = reader.readRowGroup(0)) { - PageReader column = pages.getPageReader(schema.getColumns().get(0)); - assertThat(column.readDictionaryPage()).isNull(); - int[] counts = {3, 4, 3}; - for (int i = 0; i < counts.length; i++) { - DataPageV1 page = (DataPageV1) column.readPage(); - assertThat(page.getValueCount()).isEqualTo(counts[i]); - assertThat(page.getValueEncoding()).isEqualTo(PLAIN); - assertThat(page.getRlEncoding()).isEqualTo(i == 1 ? BIT_PACKED : RLE); - assertThat(page.getDlEncoding()).isEqualTo(i == 1 ? BIT_PACKED : RLE); - } - assertThat(column.readPage()).isNull(); - } - } assertVectorRows(readGroups(path, schema), 5, 5); - assertStoredLevels(path, 5); - } - - private static void assertStoredLevels(Path path, int secondStart) throws IOException { try (ParquetFileReader reader = ParquetFileReader.open(new LocalInputFile(java.nio.file.Path.of(path.toUri()))); PageReadStore pages = reader.readRowGroup(0)) { - MessageType schema = reader.getFileMetaData().getSchema(); - ColumnReadStoreImpl store = new ColumnReadStoreImpl( - pages, - new GroupRecordConverter(schema).getRootConverter(), - schema, - reader.getFileMetaData().getCreatedBy()); - ColumnReader column = store.getColumnReader(schema.getColumns().get(0)); - for (int i = 0; i < 10; i++) { - assertThat(column.getFloat()).isEqualTo((float) i); - assertThat(column.getCurrentRepetitionLevel()).isEqualTo(i == 0 || i == secondStart ? 0 : 1); - assertThat(column.getCurrentDefinitionLevel()).isEqualTo(1); - column.consume(); + PageReader column = pages.getPageReader(schema.getColumns().get(0)); + for (int count : new int[] {3, 4, 3}) { + DataPageV1 page = (DataPageV1) column.readPage(); + assertThat(page.getValueCount()).isEqualTo(count); } + assertThat(column.readPage()).isNull(); } } diff --git a/parquet-hadoop/src/test/resources/vector/README.md b/parquet-hadoop/src/test/resources/vector/README.md index 01be352d34..6c06cce3f9 100644 --- a/parquet-hadoop/src/test/resources/vector/README.md +++ b/parquet-hadoop/src/test/resources/vector/README.md @@ -34,30 +34,6 @@ and Thrift 0.25.0. ## Mixed files -Both mixed files use this schema: - -```text -message m { - required int32 id; - required group f (VECTOR(5)) { repeated group list { required float element; } } - optional group o (VECTOR(2)) { repeated group list { required int32 element; } } - optional group a { required group h (VECTOR(2)) { - repeated group list { required fixed_len_byte_array(2) element (FLOAT16); } } } - repeated group outer { required group d (VECTOR(2)) { - repeated group list { required double element; } } } - required group b (VECTOR(2)) { repeated group list { required boolean element; } } - required group l (VECTOR(1)) { repeated group list { required int64 element; } } - required group s (VECTOR(1)) { repeated group list { - required int32 element (INTEGER(16,true)); } } - required group u (VECTOR(1)) { repeated group list { - required int64 element (INTEGER(64,false)); } } - required group dec (VECTOR(1)) { repeated group list { - required int32 element (DECIMAL(9,2)); } } - required group bytes (VECTOR(1)) { repeated group list { - required fixed_len_byte_array(4) element (DECIMAL(9,2)); } } -} -``` - For each row `i=0..5`, `id=i`, `f=[i+0.5f,-0.0f,Float.MIN_VALUE,-0.25f,100.0f]`, `o` is absent for even `i` and `[7,8]` for odd `i`, and `a` is absent for `i=1,4`. When present, `a.h=[0080,0100]` in hex. There are `i%3` `outer` instances, @@ -65,24 +41,8 @@ each with `d=[-0.0d,Double.MIN_VALUE]`. Every row has `b=[true,false]`, `l=[9L]`, `s=[-7]`, `u=[9L]`, `dec=[125]` (logical 1.25), and `bytes=[00007c00]` in hex (logical 317.44). -The first `f` scalar in rows 0..5 has raw bits `3f000000/3fc00000/40200000/40600000/40900000/40b00000`. -The other four `f` scalars have `80000000/00000001/be800000/42c80000`; -`d` scalars have `8000000000000000/0000000000000001`. Both files are UNCOMPRESSED. -The `f` column has three pages of ten values. V1/plain uses RLE/RLE levels and -PLAIN data, without a dictionary. V2/dictionary uses RLE levels, RLE_DICTIONARY -data, and a ten-entry PLAIN dictionary; its pages each declare rowCount=2 and -nullCount=0. The V1 dictionary form exercised by runtime generation uses -PLAIN_DICTIONARY data and dictionary encodings. The `id` column has a column -index and an offset index with first-row indexes `[0,2,4]`. - ## Split file -```text -message m { - required group v (VECTOR(5)) { repeated group list { required float element; } } -} -``` - The two rows are `[0f,1f,2f,3f,4f]` and `[5f,6f,7f,8f,9f]`. Their stored RLs are `[0,1,1,1,1,0,1,1,1,1]`, with DL=1 throughout. Three unindexed V1 pages contain 3/4/3 values. The first and last pages use RLE/RLE levels; the middle @@ -106,9 +66,8 @@ values use little-endian bytes `00fc`, `0000`, and `003c` for negative infinity, zero, and one. The file is UNCOMPRESSED with a page row limit of two. `nf_f` and `nf_d` each have a dictionary and two V1 PLAIN_DICTIONARY pages of 16 values; `nf_h` has no dictionary and two V1 PLAIN pages of 16 values. All column-chunk -null counts are unset, and column and offset index references are absent. The -file tests require the malformed VECTOR fields to be rejected and verify every -scalar by reading a temporary copy with only the VECTOR footer annotations removed. +null counts are unset, and column and offset index references are absent. +Each projected malformed VECTOR field must be rejected. ## SHA-256 From 5565d64885f5a4352f0209485ad68d150b6bda37 Mon Sep 17 00:00:00 2001 From: Divjot Arora Date: Mon, 2 Nov 2026 14:48:54 +0000 Subject: [PATCH 13/15] GH-3877: Align vector support with FINITE_VECTOR proposal Co-authored-by: Isaac --- .../parquet/arrow/schema/List3Levels.java | 2 +- .../parquet/arrow/schema/SchemaConverter.java | 4 +- .../arrow/schema/TestSchemaConverter.java | 2 +- .../apache/parquet/avro/AvroReadSupport.java | 3 +- .../parquet/avro/AvroSchemaConverter.java | 6 +-- .../parquet/avro/TestArrayCompatibility.java | 4 +- .../apache/parquet/io/ColumnIOFactory.java | 2 +- .../apache/parquet/io/MessageColumnIO.java | 2 +- .../io/RecordReaderImplementation.java | 10 ++-- .../parquet/io/ValidatingRecordConsumer.java | 24 +++++----- .../parquet/schema/LogicalTypeAnnotation.java | 24 +++++----- .../org/apache/parquet/schema/TypeUtil.java | 30 ++++++------ .../org/apache/parquet/io/TestColumnIO.java | 2 +- .../io/ValidatingRecordConsumerTest.java | 4 +- .../TestTypeBuildersWithLogicalTypes.java | 47 +++++++++++-------- .../apache/parquet/format/LogicalTypes.java | 4 +- .../src/main/thrift/parquet.thrift | 12 +++-- .../converter/ParquetMetadataConverter.java | 27 ++++++----- .../parquet/hadoop/ParquetFileReader.java | 11 +++-- .../TestParquetMetadataConverter.java | 34 +++++++------- .../parquet/hadoop/TestVectorReadWrite.java | 47 +++++++++++-------- .../hadoop/VectorInteropFileGenerator.java | 26 +++++----- .../src/test/resources/vector/README.md | 23 ++++----- .../parquet/proto/ProtoMessageConverter.java | 9 ++-- .../proto/ProtoRecordConverterTest.java | 6 +-- 25 files changed, 194 insertions(+), 171 deletions(-) diff --git a/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/List3Levels.java b/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/List3Levels.java index 701b63e733..74b6acfc58 100644 --- a/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/List3Levels.java +++ b/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/List3Levels.java @@ -44,7 +44,7 @@ class List3Levels { public List3Levels(GroupType list) { if (list.getLogicalTypeAnnotation() != LogicalTypeAnnotation.listType() && !(list.getLogicalTypeAnnotation() - instanceof LogicalTypeAnnotation.VectorLogicalTypeAnnotation) + instanceof LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation) || list.getFields().size() != 1) { throw new IllegalArgumentException("invalid list type: " + list); } diff --git a/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/SchemaConverter.java b/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/SchemaConverter.java index d8985eeebd..e30ee96566 100644 --- a/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/SchemaConverter.java +++ b/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/SchemaConverter.java @@ -489,8 +489,8 @@ public Optional visit( @Override public Optional visit( - LogicalTypeAnnotation.VectorLogicalTypeAnnotation vectorLogicalType) { - TypeUtil.checkValidVectorSchema(type); + LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation vectorLogicalType) { + TypeUtil.checkValidFiniteVectorSchema(type); return visit(LogicalTypeAnnotation.listType()); } diff --git a/parquet-arrow/src/test/java/org/apache/parquet/arrow/schema/TestSchemaConverter.java b/parquet-arrow/src/test/java/org/apache/parquet/arrow/schema/TestSchemaConverter.java index a8d517feaf..a513adfdd7 100644 --- a/parquet-arrow/src/test/java/org/apache/parquet/arrow/schema/TestSchemaConverter.java +++ b/parquet-arrow/src/test/java/org/apache/parquet/arrow/schema/TestSchemaConverter.java @@ -70,7 +70,7 @@ public class TestSchemaConverter { public void testVectorAsList(String repetition) { String children = "repeated group list { required float element; }"; MessageType vector = MessageTypeParser.parseMessageType( - "message m { " + repetition + " group v (VECTOR(5)) { " + children + " } }"); + "message m { " + repetition + " group v (FINITE_VECTOR(5)) { " + children + " } }"); MessageType list = MessageTypeParser.parseMessageType( "message m { " + repetition + " group v (LIST) { " + children + " } }"); SchemaMapping mapping = converter.fromParquet(vector); diff --git a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroReadSupport.java b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroReadSupport.java index 62332b197e..ff66932ec6 100644 --- a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroReadSupport.java +++ b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroReadSupport.java @@ -282,7 +282,8 @@ private static Boolean allListStructuresAreThreeLevel(Type type) { } GroupType group = type.asGroupType(); if (group.getLogicalTypeAnnotation() instanceof LogicalTypeAnnotation.ListLogicalTypeAnnotation - || group.getLogicalTypeAnnotation() instanceof LogicalTypeAnnotation.VectorLogicalTypeAnnotation) { + || group.getLogicalTypeAnnotation() + instanceof LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation) { if (group.isRepetition(Type.Repetition.REPEATED) || group.getFieldCount() != 1) { return false; } diff --git a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroSchemaConverter.java b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroSchemaConverter.java index 8a395a2f2e..221f9dbc5a 100644 --- a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroSchemaConverter.java +++ b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroSchemaConverter.java @@ -472,7 +472,7 @@ public Optional visit( throw new UnsupportedOperationException("Invalid list type " + parquetGroupType); } if (!(logicalTypeAnnotation - instanceof LogicalTypeAnnotation.VectorLogicalTypeAnnotation) + instanceof LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation) && isElementType(repeatedType, parquetGroupType.getName())) { // repeated element types are always required return of(Schema.createArray(convertField(repeatedType, names))); @@ -489,8 +489,8 @@ && isElementType(repeatedType, parquetGroupType.getName())) { @Override public Optional visit( - LogicalTypeAnnotation.VectorLogicalTypeAnnotation vectorLogicalType) { - TypeUtil.checkValidVectorSchema(parquetGroupType); + LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation vectorLogicalType) { + TypeUtil.checkValidFiniteVectorSchema(parquetGroupType); return visit(LogicalTypeAnnotation.listType()); } diff --git a/parquet-avro/src/test/java/org/apache/parquet/avro/TestArrayCompatibility.java b/parquet-avro/src/test/java/org/apache/parquet/avro/TestArrayCompatibility.java index 61c93362f2..790f35d244 100644 --- a/parquet-avro/src/test/java/org/apache/parquet/avro/TestArrayCompatibility.java +++ b/parquet-avro/src/test/java/org/apache/parquet/avro/TestArrayCompatibility.java @@ -1620,8 +1620,8 @@ public void testAutoDetectTwoLevelRepeatedPrimitive() throws Exception { @Test public void testVectorWithoutAvroSchema(@TempDir java.nio.file.Path dir) throws IOException { MessageType schema = MessageTypeParser.parseMessageType("message VectorWithoutAvroSchema {" - + " required group v (VECTOR(2)) { repeated group list { required float element; } }" - + " optional group o (VECTOR(1)) { repeated group list { required float element; } } }"); + + " required group v (FINITE_VECTOR(2)) { repeated group list { required float element; } }" + + " optional group o (FINITE_VECTOR(1)) { repeated group list { required float element; } } }"); Path path = new Path(dir.resolve("vector.parquet").toUri()); SimpleGroupFactory factory = new SimpleGroupFactory(schema); Group first = factory.newGroup(); diff --git a/parquet-column/src/main/java/org/apache/parquet/io/ColumnIOFactory.java b/parquet-column/src/main/java/org/apache/parquet/io/ColumnIOFactory.java index a28d481cbf..ba9a805ffd 100644 --- a/parquet-column/src/main/java/org/apache/parquet/io/ColumnIOFactory.java +++ b/parquet-column/src/main/java/org/apache/parquet/io/ColumnIOFactory.java @@ -54,7 +54,7 @@ private ColumnIOCreatorVisitor( @Override public void visit(MessageType messageType) { - TypeUtil.checkValidVectorSchema(messageType); + TypeUtil.checkValidFiniteVectorSchema(messageType); columnIO = new MessageColumnIO(requestedSchema, validating, createdBy); visitChildren(columnIO, messageType, requestedSchema); columnIO.setLevels(); diff --git a/parquet-column/src/main/java/org/apache/parquet/io/MessageColumnIO.java b/parquet-column/src/main/java/org/apache/parquet/io/MessageColumnIO.java index 7150182abb..0c9fabec34 100644 --- a/parquet-column/src/main/java/org/apache/parquet/io/MessageColumnIO.java +++ b/parquet-column/src/main/java/org/apache/parquet/io/MessageColumnIO.java @@ -509,7 +509,7 @@ public void flush() { public RecordConsumer getRecordWriter(ColumnWriteStore columns) { RecordConsumer recordWriter = new MessageColumnIORecordConsumer(columns); if (DEBUG) recordWriter = new RecordConsumerLoggingWrapper(recordWriter); - return validating || TypeUtil.checkValidVectorSchema(getType()) + return validating || TypeUtil.checkValidFiniteVectorSchema(getType()) ? new ValidatingRecordConsumer(recordWriter, getType()) : recordWriter; } diff --git a/parquet-column/src/main/java/org/apache/parquet/io/RecordReaderImplementation.java b/parquet-column/src/main/java/org/apache/parquet/io/RecordReaderImplementation.java index e05578c1fe..df1501ae3f 100644 --- a/parquet-column/src/main/java/org/apache/parquet/io/RecordReaderImplementation.java +++ b/parquet-column/src/main/java/org/apache/parquet/io/RecordReaderImplementation.java @@ -34,8 +34,8 @@ import org.apache.parquet.io.api.RecordConsumer; import org.apache.parquet.io.api.RecordMaterializer; import org.apache.parquet.schema.LogicalTypeAnnotation; +import org.apache.parquet.schema.LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation; import org.apache.parquet.schema.LogicalTypeAnnotation.Float16LogicalTypeAnnotation; -import org.apache.parquet.schema.LogicalTypeAnnotation.VectorLogicalTypeAnnotation; import org.apache.parquet.schema.MessageType; import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName; import org.slf4j.Logger; @@ -220,12 +220,12 @@ private State( this.primitiveField = fieldPath[fieldPath.length - 1]; this.indexFieldPath = primitiveColumnIO.getIndexFieldPath(); this.primitiveFieldIndex = indexFieldPath[indexFieldPath.length - 1]; - VectorLogicalTypeAnnotation vector = null; + FiniteVectorLogicalTypeAnnotation vector = null; if (fieldPath.length >= 3) { LogicalTypeAnnotation logical = primitiveColumnIO.getParent().getParent().getType().getLogicalTypeAnnotation(); - if (logical instanceof VectorLogicalTypeAnnotation) { - vector = (VectorLogicalTypeAnnotation) logical; + if (logical instanceof FiniteVectorLogicalTypeAnnotation) { + vector = (FiniteVectorLogicalTypeAnnotation) logical; } } this.vectorLength = vector == null ? 0 : vector.getNumElements(); @@ -282,7 +282,7 @@ void endVector(int nextR) { private ParquetDecodingException invalidVector(String reason) { return new ParquetDecodingException( - "Invalid VECTOR data for " + Arrays.toString(fieldPath) + ": " + reason); + "Invalid FINITE_VECTOR data for " + Arrays.toString(fieldPath) + ": " + reason); } public int getDepth(int definitionLevel) { diff --git a/parquet-column/src/main/java/org/apache/parquet/io/ValidatingRecordConsumer.java b/parquet-column/src/main/java/org/apache/parquet/io/ValidatingRecordConsumer.java index 2e49f8cc25..cf34785e0e 100644 --- a/parquet-column/src/main/java/org/apache/parquet/io/ValidatingRecordConsumer.java +++ b/parquet-column/src/main/java/org/apache/parquet/io/ValidatingRecordConsumer.java @@ -32,8 +32,8 @@ import java.util.Deque; import org.apache.parquet.io.api.Binary; import org.apache.parquet.io.api.RecordConsumer; +import org.apache.parquet.schema.LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation; import org.apache.parquet.schema.LogicalTypeAnnotation.Float16LogicalTypeAnnotation; -import org.apache.parquet.schema.LogicalTypeAnnotation.VectorLogicalTypeAnnotation; import org.apache.parquet.schema.MessageType; import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName; import org.apache.parquet.schema.Type; @@ -55,7 +55,7 @@ public class ValidatingRecordConsumer extends RecordConsumer { private Deque fields = new ArrayDeque<>(); private Deque previousField = new ArrayDeque<>(); private Deque fieldValueCount = new ArrayDeque<>(); - private VectorLogicalTypeAnnotation vectorType; + private FiniteVectorLogicalTypeAnnotation vectorType; private String vectorName; private long vectorCount; private int vectorDepth; @@ -65,7 +65,7 @@ public class ValidatingRecordConsumer extends RecordConsumer { * @param schema the schema to validate against */ public ValidatingRecordConsumer(RecordConsumer delegate, MessageType schema) { - TypeUtil.checkValidVectorSchema(schema); + TypeUtil.checkValidFiniteVectorSchema(schema); this.delegate = delegate; this.types.push(schema); } @@ -121,7 +121,7 @@ public void endField(String field, int index) { Type currentType = types.peek().asGroupType().getType(fields.peek()); if (fieldValueCount.peek() == 0 && currentType.isRepetition(Repetition.REQUIRED) - && (currentType.getLogicalTypeAnnotation() instanceof VectorLogicalTypeAnnotation + && (currentType.getLogicalTypeAnnotation() instanceof FiniteVectorLogicalTypeAnnotation || vectorType != null && types.size() == vectorDepth + 1)) { throw new InvalidRecordException("required field is missing " + currentType); } @@ -137,20 +137,20 @@ public void endField(String field, int index) { @Override public void startGroup() { Type child = types.peek().asGroupType().getType(fields.peek()); - if (child.getLogicalTypeAnnotation() instanceof VectorLogicalTypeAnnotation) { + if (child.getLogicalTypeAnnotation() instanceof FiniteVectorLogicalTypeAnnotation) { int count = fieldValueCount.pop() + 1; fieldValueCount.push(count); if (count > 1) { throw new InvalidRecordException("repeated value when the type is not repeated in " + child); } - vectorType = (VectorLogicalTypeAnnotation) child.getLogicalTypeAnnotation(); + vectorType = (FiniteVectorLogicalTypeAnnotation) child.getLogicalTypeAnnotation(); vectorName = child.getName(); vectorCount = 0; vectorDepth = types.size() + 1; } else if (vectorType != null && types.size() == vectorDepth) { vectorCount++; if (vectorCount > vectorType.getNumElements()) { - throw new InvalidRecordException("Invalid VECTOR length for " + vectorName + ": expected " + throw new InvalidRecordException("Invalid FINITE_VECTOR length for " + vectorName + ": expected " + vectorType.getNumElements() + ", got " + vectorCount); } } @@ -166,7 +166,7 @@ public void startGroup() { public void endGroup() { boolean endingVector = vectorType != null && types.size() == vectorDepth; if (endingVector && vectorCount != vectorType.getNumElements()) { - throw new InvalidRecordException("Invalid VECTOR length for " + vectorName + ": expected " + throw new InvalidRecordException("Invalid FINITE_VECTOR length for " + vectorName + ": expected " + vectorType.getNumElements() + ", got " + vectorCount); } delegate.endGroup(); @@ -278,10 +278,10 @@ public void addBinary(Binary value) { && types.peek().asGroupType().getType(fields.peek()).getLogicalTypeAnnotation() instanceof Float16LogicalTypeAnnotation) { if (value.length() != 2) { - throw new InvalidRecordException("Invalid FLOAT16 VECTOR element length: " + value.length()); + throw new InvalidRecordException("Invalid FLOAT16 FINITE_VECTOR element length: " + value.length()); } if ((value.get2BytesLittleEndian() & 0x7c00) == 0x7c00) { - throw new InvalidRecordException("Non-finite VECTOR element in " + vectorName); + throw new InvalidRecordException("Non-finite FINITE_VECTOR element in " + vectorName); } } delegate.addBinary(value); @@ -294,7 +294,7 @@ public void addBinary(Binary value) { public void addFloat(float value) { validate(FLOAT); if (vectorType != null && !Float.isFinite(value)) { - throw new InvalidRecordException("Non-finite VECTOR element in " + vectorName); + throw new InvalidRecordException("Non-finite FINITE_VECTOR element in " + vectorName); } delegate.addFloat(value); } @@ -306,7 +306,7 @@ public void addFloat(float value) { public void addDouble(double value) { validate(DOUBLE); if (vectorType != null && !Double.isFinite(value)) { - throw new InvalidRecordException("Non-finite VECTOR element in " + vectorName); + throw new InvalidRecordException("Non-finite FINITE_VECTOR element in " + vectorName); } delegate.addDouble(value); } diff --git a/parquet-column/src/main/java/org/apache/parquet/schema/LogicalTypeAnnotation.java b/parquet-column/src/main/java/org/apache/parquet/schema/LogicalTypeAnnotation.java index 0a7c4f130b..beb159d327 100644 --- a/parquet-column/src/main/java/org/apache/parquet/schema/LogicalTypeAnnotation.java +++ b/parquet-column/src/main/java/org/apache/parquet/schema/LogicalTypeAnnotation.java @@ -62,11 +62,11 @@ protected LogicalTypeAnnotation fromString(List params) { return listType(); } }, - VECTOR { + FINITE_VECTOR { @Override protected LogicalTypeAnnotation fromString(List params) { - Preconditions.checkArgument(params.size() == 1, "Expecting 1 parameter for VECTOR: %s", params); - return vectorType(Integer.parseInt(params.get(0))); + Preconditions.checkArgument(params.size() == 1, "Expecting 1 parameter for FINITE_VECTOR: %s", params); + return finiteVectorType(Integer.parseInt(params.get(0))); } }, VARIANT { @@ -321,8 +321,8 @@ public static ListLogicalTypeAnnotation listType() { return ListLogicalTypeAnnotation.INSTANCE; } - public static VectorLogicalTypeAnnotation vectorType(int numElements) { - return new VectorLogicalTypeAnnotation(numElements); + public static FiniteVectorLogicalTypeAnnotation finiteVectorType(int numElements) { + return new FiniteVectorLogicalTypeAnnotation(numElements); } public static VariantLogicalTypeAnnotation variantType(byte specVersion) { @@ -524,11 +524,11 @@ public int hashCode() { } } - public static class VectorLogicalTypeAnnotation extends LogicalTypeAnnotation { + public static class FiniteVectorLogicalTypeAnnotation extends LogicalTypeAnnotation { private final int numElements; - private VectorLogicalTypeAnnotation(int numElements) { - Preconditions.checkArgument(numElements > 0, "Invalid VECTOR length: %s", numElements); + private FiniteVectorLogicalTypeAnnotation(int numElements) { + Preconditions.checkArgument(numElements > 0, "Invalid FINITE_VECTOR length: %s", numElements); this.numElements = numElements; } @@ -548,7 +548,7 @@ public Optional accept(LogicalTypeAnnotationVisitor visitor) { @Override LogicalTypeToken getType() { - return LogicalTypeToken.VECTOR; + return LogicalTypeToken.FINITE_VECTOR; } @Override @@ -558,8 +558,8 @@ protected String typeParametersAsString() { @Override public boolean equals(Object obj) { - return obj instanceof VectorLogicalTypeAnnotation - && numElements == ((VectorLogicalTypeAnnotation) obj).numElements; + return obj instanceof FiniteVectorLogicalTypeAnnotation + && numElements == ((FiniteVectorLogicalTypeAnnotation) obj).numElements; } @Override @@ -1591,7 +1591,7 @@ default Optional visit(ListLogicalTypeAnnotation listLogicalType) { return empty(); } - default Optional visit(VectorLogicalTypeAnnotation vectorLogicalType) { + default Optional visit(FiniteVectorLogicalTypeAnnotation vectorLogicalType) { return empty(); } diff --git a/parquet-column/src/main/java/org/apache/parquet/schema/TypeUtil.java b/parquet-column/src/main/java/org/apache/parquet/schema/TypeUtil.java index b30e39cf8d..b307bcf7d8 100644 --- a/parquet-column/src/main/java/org/apache/parquet/schema/TypeUtil.java +++ b/parquet-column/src/main/java/org/apache/parquet/schema/TypeUtil.java @@ -19,23 +19,23 @@ package org.apache.parquet.schema; import org.apache.parquet.schema.LogicalTypeAnnotation.DecimalLogicalTypeAnnotation; +import org.apache.parquet.schema.LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation; import org.apache.parquet.schema.LogicalTypeAnnotation.Float16LogicalTypeAnnotation; import org.apache.parquet.schema.LogicalTypeAnnotation.IntLogicalTypeAnnotation; -import org.apache.parquet.schema.LogicalTypeAnnotation.VectorLogicalTypeAnnotation; import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName; import org.apache.parquet.schema.Type.Repetition; public class TypeUtil { - public static boolean checkValidVectorSchema(Type type) { - boolean found = type.getLogicalTypeAnnotation() instanceof VectorLogicalTypeAnnotation; + public static boolean checkValidFiniteVectorSchema(Type type) { + boolean found = type.getLogicalTypeAnnotation() instanceof FiniteVectorLogicalTypeAnnotation; if (found) { if (type.isPrimitive()) { - throw new InvalidSchemaException("Invalid VECTOR schema: " + type); + throw new InvalidSchemaException("Invalid FINITE_VECTOR schema: " + type); } checkVector(type.asGroupType()); } else if (!type.isPrimitive()) { for (Type child : type.asGroupType().getFields()) { - found |= checkValidVectorSchema(child); + found |= checkValidFiniteVectorSchema(child); } } return found; @@ -43,24 +43,24 @@ public static boolean checkValidVectorSchema(Type type) { private static void checkVector(GroupType vector) { if (vector.getRepetition() == Repetition.REPEATED || vector.getFieldCount() != 1) { - throw new InvalidSchemaException("Invalid VECTOR schema: " + vector); + throw new InvalidSchemaException("Invalid FINITE_VECTOR schema: " + vector); } Type listType = vector.getType(0); if (listType.isPrimitive() || !listType.getName().equals("list") || listType.getRepetition() != Repetition.REPEATED || listType.getLogicalTypeAnnotation() != null) { - throw new InvalidSchemaException("Invalid VECTOR schema: " + vector); + throw new InvalidSchemaException("Invalid FINITE_VECTOR schema: " + vector); } GroupType list = listType.asGroupType(); if (list.getFieldCount() != 1) { - throw new InvalidSchemaException("Invalid VECTOR schema: " + vector); + throw new InvalidSchemaException("Invalid FINITE_VECTOR schema: " + vector); } Type elementType = list.getType(0); if (!elementType.isPrimitive() || !elementType.getName().equals("element") || elementType.getRepetition() != Repetition.REQUIRED) { - throw new InvalidSchemaException("Invalid VECTOR schema: " + vector); + throw new InvalidSchemaException("Invalid FINITE_VECTOR schema: " + vector); } PrimitiveType element = elementType.asPrimitiveType(); PrimitiveTypeName physical = element.getPrimitiveTypeName(); @@ -86,7 +86,7 @@ private static void checkVector(GroupType vector) { allowed = false; } if (!allowed) { - throw new InvalidSchemaException("Invalid VECTOR schema: " + vector); + throw new InvalidSchemaException("Invalid FINITE_VECTOR schema: " + vector); } try { Types.PrimitiveBuilder builder = Types.primitive(physical, element.getRepetition()); @@ -98,11 +98,11 @@ private static void checkVector(GroupType vector) { } builder.named(element.getName()); } catch (IllegalArgumentException | IllegalStateException e) { - throw new InvalidSchemaException("Invalid VECTOR schema: " + vector, e); + throw new InvalidSchemaException("Invalid FINITE_VECTOR schema: " + vector, e); } } - public static VectorLogicalTypeAnnotation getVectorType(GroupType schema, String[] path) { + public static FiniteVectorLogicalTypeAnnotation getFiniteVectorType(GroupType schema, String[] path) { if (path.length < 3) { return null; } @@ -111,11 +111,13 @@ public static VectorLogicalTypeAnnotation getVectorType(GroupType schema, String group = group.getType(path[i]).asGroupType(); } LogicalTypeAnnotation logical = group.getLogicalTypeAnnotation(); - return logical instanceof VectorLogicalTypeAnnotation ? (VectorLogicalTypeAnnotation) logical : null; + return logical instanceof FiniteVectorLogicalTypeAnnotation + ? (FiniteVectorLogicalTypeAnnotation) logical + : null; } public static void checkValidWriteSchema(GroupType schema) { - checkValidVectorSchema(schema); + checkValidFiniteVectorSchema(schema); schema.accept(new TypeVisitor() { @Override public void visit(GroupType groupType) { diff --git a/parquet-column/src/test/java/org/apache/parquet/io/TestColumnIO.java b/parquet-column/src/test/java/org/apache/parquet/io/TestColumnIO.java index cd11ba9c85..775e7112df 100644 --- a/parquet-column/src/test/java/org/apache/parquet/io/TestColumnIO.java +++ b/parquet-column/src/test/java/org/apache/parquet/io/TestColumnIO.java @@ -92,7 +92,7 @@ private static Stream invalidVectorLevels() { @MethodSource("invalidVectorLevels") public void testInvalidVectorLevels(int[] repetition, int[] definition, String reason) throws IOException { MessageType schema = MessageTypeParser.parseMessageType("message m { repeated group outer {" - + " required group v (VECTOR(2)) { repeated group list { required float element; } } } }"); + + " required group v (FINITE_VECTOR(2)) { repeated group list { required float element; } } } }"); ColumnDescriptor descriptor = schema.getColumnDescription(new String[] {"outer", "v", "list", "element"}); HeapByteBufferAllocator allocator = new HeapByteBufferAllocator(); try (MemPageStore pages = new MemPageStore(1); diff --git a/parquet-column/src/test/java/org/apache/parquet/io/ValidatingRecordConsumerTest.java b/parquet-column/src/test/java/org/apache/parquet/io/ValidatingRecordConsumerTest.java index 729e4104b8..91367d5a61 100644 --- a/parquet-column/src/test/java/org/apache/parquet/io/ValidatingRecordConsumerTest.java +++ b/parquet-column/src/test/java/org/apache/parquet/io/ValidatingRecordConsumerTest.java @@ -41,8 +41,8 @@ public class ValidatingRecordConsumerTest { @ParameterizedTest @ValueSource(strings = {"v", "element"}) public void testEmptyRequiredVectorField(String field) { - MessageType schema = MessageTypeParser.parseMessageType( - "message m { required group v (VECTOR(2)) {" + " repeated group list { required float element; } } }"); + MessageType schema = MessageTypeParser.parseMessageType("message m { required group v (FINITE_VECTOR(2)) {" + + " repeated group list { required float element; } } }"); RecordConsumer delegate = mock(RecordConsumer.class); ValidatingRecordConsumer c = new ValidatingRecordConsumer(delegate, schema); c.startMessage(); diff --git a/parquet-column/src/test/java/org/apache/parquet/schema/TestTypeBuildersWithLogicalTypes.java b/parquet-column/src/test/java/org/apache/parquet/schema/TestTypeBuildersWithLogicalTypes.java index ef860b222b..0885bfa445 100644 --- a/parquet-column/src/test/java/org/apache/parquet/schema/TestTypeBuildersWithLogicalTypes.java +++ b/parquet-column/src/test/java/org/apache/parquet/schema/TestTypeBuildersWithLogicalTypes.java @@ -24,6 +24,7 @@ import static org.apache.parquet.schema.LogicalTypeAnnotation.bsonType; import static org.apache.parquet.schema.LogicalTypeAnnotation.dateType; import static org.apache.parquet.schema.LogicalTypeAnnotation.decimalType; +import static org.apache.parquet.schema.LogicalTypeAnnotation.finiteVectorType; import static org.apache.parquet.schema.LogicalTypeAnnotation.float16Type; import static org.apache.parquet.schema.LogicalTypeAnnotation.intType; import static org.apache.parquet.schema.LogicalTypeAnnotation.jsonType; @@ -31,7 +32,6 @@ import static org.apache.parquet.schema.LogicalTypeAnnotation.timeType; import static org.apache.parquet.schema.LogicalTypeAnnotation.timestampType; import static org.apache.parquet.schema.LogicalTypeAnnotation.uuidType; -import static org.apache.parquet.schema.LogicalTypeAnnotation.vectorType; import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.BINARY; import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.BOOLEAN; import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.DOUBLE; @@ -58,7 +58,7 @@ public class TestTypeBuildersWithLogicalTypes { private static GroupType vector(Type element) { - return new GroupType(REQUIRED, "v", vectorType(5), new GroupType(Repetition.REPEATED, "list", element)); + return new GroupType(REQUIRED, "v", finiteVectorType(5), new GroupType(Repetition.REPEATED, "list", element)); } @ParameterizedTest @@ -67,42 +67,49 @@ public void testVectorAnnotation(int length) { GroupType vector = new GroupType( REQUIRED, "v", - vectorType(length), + finiteVectorType(length), new GroupType(Repetition.REPEATED, "list", Types.required(FLOAT).named("element"))); MessageType schema = Types.buildMessage().addField(vector).named("m"); TypeUtil.checkValidWriteSchema(schema); assertThat(MessageTypeParser.parseMessageType(schema.toString())).isEqualTo(schema); - assertThat(vectorType(length).getNumElements()).isEqualTo(length); - assertThat(vectorType(length).toOriginalType()).isEqualTo(OriginalType.LIST); - assertThat(vectorType(length)).isEqualTo(vectorType(length)).hasSameHashCodeAs(vectorType(length)); - assertThat(vectorType(length)).isNotEqualTo(vectorType(length == 1 ? 5 : 1)); - assertThat(vectorType(length)).isNotEqualTo(LogicalTypeAnnotation.listType()); + assertThat(finiteVectorType(length)).asString().isEqualTo("FINITE_VECTOR(" + length + ")"); + assertThat(finiteVectorType(length).getNumElements()).isEqualTo(length); + assertThat(finiteVectorType(length).toOriginalType()).isEqualTo(OriginalType.LIST); + assertThat(finiteVectorType(length)) + .isEqualTo(finiteVectorType(length)) + .hasSameHashCodeAs(finiteVectorType(length)); + assertThat(finiteVectorType(length)).isNotEqualTo(finiteVectorType(length == 1 ? 5 : 1)); + assertThat(finiteVectorType(length)).isNotEqualTo(LogicalTypeAnnotation.listType()); } @ParameterizedTest @ValueSource(ints = {0, -1}) public void testInvalidVectorLength(int length) { - assertThatThrownBy(() -> vectorType(length)) + assertThatThrownBy(() -> finiteVectorType(length)) .isInstanceOf(IllegalArgumentException.class) - .hasMessage("Invalid VECTOR length: " + length); + .hasMessage("Invalid FINITE_VECTOR length: " + length); } private static Stream invalidVectors() { PrimitiveType element = Types.required(FLOAT).named("element"); GroupType list = new GroupType(Repetition.REPEATED, "list", element); return Stream.of( - Arguments.of(new GroupType(Repetition.REPEATED, "v", vectorType(5), list)), + Arguments.of(new GroupType(Repetition.REPEATED, "v", finiteVectorType(5), list)), Arguments.of(new GroupType( - REQUIRED, "v", vectorType(5), new GroupType(Repetition.REPEATED, "items", element))), - Arguments.of(new GroupType(REQUIRED, "v", vectorType(5), list, list)), - Arguments.of(new GroupType(REQUIRED, "v", vectorType(5), new GroupType(REQUIRED, "list", element))), + REQUIRED, "v", finiteVectorType(5), new GroupType(Repetition.REPEATED, "items", element))), + Arguments.of(new GroupType(REQUIRED, "v", finiteVectorType(5), list, list)), + Arguments.of( + new GroupType(REQUIRED, "v", finiteVectorType(5), new GroupType(REQUIRED, "list", element))), Arguments.of(new GroupType( REQUIRED, "v", - vectorType(5), + finiteVectorType(5), new GroupType(Repetition.REPEATED, "list", LogicalTypeAnnotation.listType(), element))), Arguments.of(new GroupType( - REQUIRED, "v", vectorType(5), new GroupType(Repetition.REPEATED, "list", element, element))), + REQUIRED, + "v", + finiteVectorType(5), + new GroupType(Repetition.REPEATED, "list", element, element))), Arguments.of(vector(Types.required(FLOAT).named("item"))), Arguments.of(vector(Types.optional(FLOAT).named("element"))), Arguments.of(vector(Types.repeated(FLOAT).named("element"))), @@ -120,16 +127,16 @@ private static Stream invalidVectors() { @ParameterizedTest @MethodSource("invalidVectors") public void testInvalidVectorSchema(GroupType vector) { - assertThatThrownBy(() -> TypeUtil.checkValidVectorSchema(new MessageType("m", vector))) + assertThatThrownBy(() -> TypeUtil.checkValidFiniteVectorSchema(new MessageType("m", vector))) .isInstanceOf(InvalidSchemaException.class) - .hasMessage("Invalid VECTOR schema: " + vector); + .hasMessage("Invalid FINITE_VECTOR schema: " + vector); } @Test public void testVectorOnPrimitive() { - assertThatThrownBy(() -> Types.required(FLOAT).as(vectorType(5)).named("v")) + assertThatThrownBy(() -> Types.required(FLOAT).as(finiteVectorType(5)).named("v")) .isInstanceOf(IllegalStateException.class) - .hasMessage("VECTOR(5) can not be applied to a primitive type"); + .hasMessage("FINITE_VECTOR(5) can not be applied to a primitive type"); } @Test diff --git a/parquet-format-structures/src/main/java/org/apache/parquet/format/LogicalTypes.java b/parquet-format-structures/src/main/java/org/apache/parquet/format/LogicalTypes.java index d2d5026614..953d97d2b3 100644 --- a/parquet-format-structures/src/main/java/org/apache/parquet/format/LogicalTypes.java +++ b/parquet-format-structures/src/main/java/org/apache/parquet/format/LogicalTypes.java @@ -38,8 +38,8 @@ public static LogicalType VARIANT(byte specificationVersion) { return LogicalType.VARIANT(type); } - public static LogicalType VECTOR(int numElements) { - return LogicalType.VECTOR(new VectorType(numElements)); + public static LogicalType FINITE_VECTOR(int numElements) { + return LogicalType.FINITE_VECTOR(new FiniteVectorType(numElements)); } public static final LogicalType UTF8 = LogicalType.STRING(new StringType()); diff --git a/parquet-format-structures/src/main/thrift/parquet.thrift b/parquet-format-structures/src/main/thrift/parquet.thrift index bcb32c4034..54759691bc 100644 --- a/parquet-format-structures/src/main/thrift/parquet.thrift +++ b/parquet-format-structures/src/main/thrift/parquet.thrift @@ -323,10 +323,6 @@ struct StringType {} // allowed for BYTE_ARRAY, must be encoded with UTF-8 struct UUIDType {} // allowed for FIXED[16], must be encoded as raw UUID bytes struct MapType {} // see LogicalTypes.md struct ListType {} // see LogicalTypes.md -// A fixed-length LIST with exactly num_elements required primitive elements. -struct VectorType { - 1: required i32 num_elements -} struct EnumType {} // allowed for BYTE_ARRAY, must be encoded with UTF-8 struct DateType {} // allowed for INT32 struct Float16Type {} // allowed for FIXED[2], must be encoded as raw FLOAT16 bytes (see LogicalTypes.md) @@ -483,6 +479,11 @@ struct GeographyType { struct FileType { } +// A fixed-length LIST with exactly num_elements required, finite primitive elements. +struct FiniteVectorType { + 1: required i32 num_elements +} + /** * LogicalType annotations to replace ConvertedType. * @@ -517,7 +518,7 @@ union LogicalType { 17: GeometryType GEOMETRY // no compatible ConvertedType 18: GeographyType GEOGRAPHY // no compatible ConvertedType 19: FileType FILE // no compatible ConvertedType - 20: VectorType VECTOR // use ConvertedType LIST + 20: FiniteVectorType FINITE_VECTOR // use ConvertedType LIST } /** @@ -1134,6 +1135,7 @@ union ColumnOrder { * GEOMETRY - undefined * GEOGRAPHY - undefined * FILE - undefined + * FINITE_VECTOR - undefined * * In the absence of logical types, the sort order is determined by the physical type: * BOOLEAN - false, true diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java b/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java index 7b1baf6087..4e94edf5b8 100644 --- a/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java +++ b/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java @@ -134,8 +134,8 @@ import org.apache.parquet.schema.GroupType; import org.apache.parquet.schema.InvalidSchemaException; import org.apache.parquet.schema.LogicalTypeAnnotation; +import org.apache.parquet.schema.LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation; import org.apache.parquet.schema.LogicalTypeAnnotation.UUIDLogicalTypeAnnotation; -import org.apache.parquet.schema.LogicalTypeAnnotation.VectorLogicalTypeAnnotation; import org.apache.parquet.schema.MessageType; import org.apache.parquet.schema.OriginalType; import org.apache.parquet.schema.PrimitiveType; @@ -420,7 +420,7 @@ public Optional visit(LogicalTypeAnnotation.ListLogicalTypeAnnota } @Override - public Optional visit(VectorLogicalTypeAnnotation vectorLogicalType) { + public Optional visit(FiniteVectorLogicalTypeAnnotation vectorLogicalType) { return of(ConvertedType.LIST); } @@ -512,8 +512,8 @@ public Optional visit(LogicalTypeAnnotation.ListLogicalTypeAnnotati } @Override - public Optional visit(VectorLogicalTypeAnnotation vectorLogicalType) { - return of(LogicalTypes.VECTOR(vectorLogicalType.getNumElements())); + public Optional visit(FiniteVectorLogicalTypeAnnotation vectorLogicalType) { + return of(LogicalTypes.FINITE_VECTOR(vectorLogicalType.getNumElements())); } @Override @@ -1346,7 +1346,8 @@ LogicalTypeAnnotation getLogicalTypeAnnotation(LogicalType type) { case ENUM -> LogicalTypeAnnotation.enumType(); case JSON -> LogicalTypeAnnotation.jsonType(); case LIST -> LogicalTypeAnnotation.listType(); - case VECTOR -> LogicalTypeAnnotation.vectorType(type.getVECTOR().getNum_elements()); + case FINITE__VECTOR -> LogicalTypeAnnotation.finiteVectorType( + type.getFINITE_VECTOR().getNum_elements()); case TIME -> { TimeType time = type.getTIME(); yield LogicalTypeAnnotation.timeType(time.isAdjustedToUTC, convertTimeUnit(time.unit)); @@ -2031,8 +2032,8 @@ private static ColumnPath getPath(ColumnMetaData metaData) { MessageType fromParquetSchema(List schema, List columnOrders) { Iterator iterator = schema.iterator(); SchemaElement root = iterator.next(); - if (root.isSetLogicalType() && root.logicalType.isSetVECTOR()) { - throw new ParquetDecodingException("Invalid VECTOR metadata for " + root.name); + if (root.isSetLogicalType() && root.logicalType.isSetFINITE_VECTOR()) { + throw new ParquetDecodingException("Invalid FINITE_VECTOR metadata for " + root.name); } Types.MessageTypeBuilder builder = Types.buildMessage(); if (root.isSetField_id()) { @@ -2042,9 +2043,9 @@ MessageType fromParquetSchema(List schema, List colu buildChildren(builder, iterator, root.getNum_children(), columnOrderIterator); MessageType messageType = builder.named(root.name); try { - TypeUtil.checkValidVectorSchema(messageType); + TypeUtil.checkValidFiniteVectorSchema(messageType); } catch (InvalidSchemaException e) { - throw new ParquetDecodingException("Invalid VECTOR schema in file metadata", e); + throw new ParquetDecodingException("Invalid FINITE_VECTOR schema in file metadata", e); } return messageType; } @@ -2057,12 +2058,12 @@ private void buildChildren( for (int i = 0; i < childrenCount; i++) { SchemaElement schemaElement = schema.next(); if (schemaElement.isSetLogicalType() - && schemaElement.logicalType.isSetVECTOR() + && schemaElement.logicalType.isSetFINITE_VECTOR() && (schemaElement.type != null || schemaElement.converted_type != ConvertedType.LIST - || !schemaElement.logicalType.getVECTOR().isSetNum_elements() - || schemaElement.logicalType.getVECTOR().getNum_elements() <= 0)) { - throw new ParquetDecodingException("Invalid VECTOR metadata for " + schemaElement.name); + || !schemaElement.logicalType.getFINITE_VECTOR().isSetNum_elements() + || schemaElement.logicalType.getFINITE_VECTOR().getNum_elements() <= 0)) { + throw new ParquetDecodingException("Invalid FINITE_VECTOR metadata for " + schemaElement.name); } // Create Parquet Type. diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java index d71d60983d..145ad4a4fd 100644 --- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java +++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java @@ -117,7 +117,7 @@ import org.apache.parquet.io.ParquetDecodingException; import org.apache.parquet.io.ParquetFileRange; import org.apache.parquet.io.SeekableInputStream; -import org.apache.parquet.schema.LogicalTypeAnnotation.VectorLogicalTypeAnnotation; +import org.apache.parquet.schema.LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation; import org.apache.parquet.schema.MessageType; import org.apache.parquet.schema.PrimitiveType; import org.apache.parquet.schema.TypeUtil; @@ -1182,7 +1182,7 @@ private static void checkVectorCounts(ColumnDescriptor path, int numElements, lo invalid = (values - nulls) % numElements != 0; } if (invalid) { - throw new ParquetDecodingException("Invalid VECTOR counts for " + Arrays.toString(path.getPath()) + throw new ParquetDecodingException("Invalid FINITE_VECTOR counts for " + Arrays.toString(path.getPath()) + ": rows=" + rows + ", values=" + values + ", nulls=" + declaredNulls + ", length=" + numElements); } @@ -1191,7 +1191,7 @@ private static void checkVectorCounts(ColumnDescriptor path, int numElements, lo private void checkVectorColumnCounts(ColumnChunkMetaData column, long rows) { MessageType fileSchema = getFileMetaData().getSchema(); String[] path = column.getPath().toArray(); - VectorLogicalTypeAnnotation vector = TypeUtil.getVectorType(fileSchema, path); + FiniteVectorLogicalTypeAnnotation vector = TypeUtil.getFiniteVectorType(fileSchema, path); if (vector == null) return; ColumnDescriptor descriptor = fileSchema.getColumnDescription(path); org.apache.parquet.column.statistics.Statistics stats = column.getStatistics(); @@ -2180,7 +2180,7 @@ public ColumnChunkPageReader readAllPages( .asPrimitiveType(); MessageType fileSchema = getFileMetaData().getSchema(); String[] path = descriptor.col.getPath(); - VectorLogicalTypeAnnotation vector = TypeUtil.getVectorType(fileSchema, path); + FiniteVectorLogicalTypeAnnotation vector = TypeUtil.getFiniteVectorType(fileSchema, path); ColumnDescriptor fileDescriptor = vector == null ? null : fileSchema.getColumnDescription(path); long valuesCountReadSoFar = 0L; int dataPageCountReadSoFar = 0; @@ -2273,7 +2273,8 @@ public ColumnChunkPageReader readAllPages( DataPageHeaderV2 dataHeaderV2 = pageHeader.getData_page_header_v2(); if (vector != null) { if (dataHeaderV2.getNum_nulls() < 0) { - throw new ParquetDecodingException("Invalid VECTOR counts for " + Arrays.toString(path) + throw new ParquetDecodingException("Invalid FINITE_VECTOR counts for " + + Arrays.toString(path) + ": rows=" + dataHeaderV2.getNum_rows() + ", values=" + dataHeaderV2.getNum_values() + ", nulls=" + dataHeaderV2.getNum_nulls() + ", length=" + vector.getNumElements()); diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java b/parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java index 76d4900188..3108e8d5fe 100644 --- a/parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java +++ b/parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java @@ -153,7 +153,7 @@ public class TestParquetMetadataConverter { private static MessageType vectorSchema() { - return parseMessageType("message m { required group v (VECTOR(5)) { repeated group list {" + return parseMessageType("message m { required group v (FINITE_VECTOR(5)) { repeated group list {" + " required float element columnorder(TYPE_DEFINED_ORDER); } } }"); } @@ -161,40 +161,40 @@ private static Stream invalidVectorMetadata() { return Stream.of( Arguments.of( "missing length", - (Consumer>) - wire -> wire.get(1).getLogicalType().getVECTOR().unsetNum_elements(), - "Invalid VECTOR metadata for v"), + (Consumer>) wire -> + wire.get(1).getLogicalType().getFINITE_VECTOR().unsetNum_elements(), + "Invalid FINITE_VECTOR metadata for v"), Arguments.of( "zero length", - (Consumer>) - wire -> wire.get(1).getLogicalType().getVECTOR().setNum_elements(0), - "Invalid VECTOR metadata for v"), + (Consumer>) wire -> + wire.get(1).getLogicalType().getFINITE_VECTOR().setNum_elements(0), + "Invalid FINITE_VECTOR metadata for v"), Arguments.of( "negative length", - (Consumer>) - wire -> wire.get(1).getLogicalType().getVECTOR().setNum_elements(-1), - "Invalid VECTOR metadata for v"), + (Consumer>) wire -> + wire.get(1).getLogicalType().getFINITE_VECTOR().setNum_elements(-1), + "Invalid FINITE_VECTOR metadata for v"), Arguments.of( "missing converted", (Consumer>) wire -> wire.get(1).unsetConverted_type(), - "Invalid VECTOR metadata for v"), + "Invalid FINITE_VECTOR metadata for v"), Arguments.of( "wrong converted", (Consumer>) wire -> wire.get(1).setConverted_type(ConvertedType.MAP), - "Invalid VECTOR metadata for v"), + "Invalid FINITE_VECTOR metadata for v"), Arguments.of( "primitive outer", (Consumer>) wire -> wire.get(1).setType(Type.FLOAT), - "Invalid VECTOR metadata for v"), + "Invalid FINITE_VECTOR metadata for v"), Arguments.of( "root", - (Consumer>) - wire -> wire.get(0).setLogicalType(org.apache.parquet.format.LogicalTypes.VECTOR(5)), - "Invalid VECTOR metadata for m"), + (Consumer>) wire -> + wire.get(0).setLogicalType(org.apache.parquet.format.LogicalTypes.FINITE_VECTOR(5)), + "Invalid FINITE_VECTOR metadata for m"), Arguments.of( "element name", (Consumer>) wire -> wire.get(3).setName("item"), - "Invalid VECTOR schema in file metadata")); + "Invalid FINITE_VECTOR schema in file metadata")); } @ParameterizedTest(name = "{0}") diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestVectorReadWrite.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestVectorReadWrite.java index b18549f854..abe8350cef 100644 --- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestVectorReadWrite.java +++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestVectorReadWrite.java @@ -86,7 +86,8 @@ public class TestVectorReadWrite { private java.nio.file.Path tempDir; private static MessageType schema(String outer, int length, boolean nested) { - String vector = outer + " group v (VECTOR(" + length + ")) { repeated group list { required float element; } }"; + String vector = + outer + " group v (FINITE_VECTOR(" + length + ")) { repeated group list { required float element; } }"; return MessageTypeParser.parseMessageType( nested ? "message m { repeated group outer { " + vector + " } }" : "message m { " + vector + " }"); } @@ -160,7 +161,7 @@ public void testVectorRoundTrip(WriterVersion version, boolean dictionary) throw Files.copy(java.nio.file.Path.of(path.toUri()), java.nio.file.Path.of(legacy.toUri())); rewriteFooter(legacy, footer -> footer.getSchema().stream() .filter(element -> element.isSetLogicalType() - && element.getLogicalType().isSetVECTOR()) + && element.getLogicalType().isSetFINITE_VECTOR()) .forEach(org.apache.parquet.format.SchemaElement::unsetLogicalType)); List vectors = readFooter(legacy).getSchema().stream() .filter(element -> element.getConverted_type() == org.apache.parquet.format.ConvertedType.LIST) @@ -219,7 +220,7 @@ private static void verifyMixedFile(Path path, WriterVersion version, boolean di } List vectors = readFooter(path).getSchema().stream() .filter(element -> - element.isSetLogicalType() && element.getLogicalType().isSetVECTOR()) + element.isSetLogicalType() && element.getLogicalType().isSetFINITE_VECTOR()) .toList(); assertThat(vectors) .hasSize(10) @@ -265,25 +266,30 @@ private static void verifyFilteredRows(Path path) throws IOException { private static Stream invalidVectorWrites() { return Stream.of( - Arguments.of("float element", 2, List.of(), "Invalid VECTOR length for v: expected 2, got 0"), - Arguments.of("float element", 2, List.of(1.0f), "Invalid VECTOR length for v: expected 2, got 1"), + Arguments.of("float element", 2, List.of(), "Invalid FINITE_VECTOR length for v: expected 2, got 0"), + Arguments.of( + "float element", 2, List.of(1.0f), "Invalid FINITE_VECTOR length for v: expected 2, got 1"), Arguments.of( "float element", 2, List.of(1.0f, 2.0f, 3.0f), - "Invalid VECTOR length for v: expected 2, got 3"), - Arguments.of("float element", 1, List.of(Float.NaN), "Non-finite VECTOR element in v"), - Arguments.of("double element", 1, List.of(Double.POSITIVE_INFINITY), "Non-finite VECTOR element in v"), + "Invalid FINITE_VECTOR length for v: expected 2, got 3"), + Arguments.of("float element", 1, List.of(Float.NaN), "Non-finite FINITE_VECTOR element in v"), + Arguments.of( + "double element", + 1, + List.of(Double.POSITIVE_INFINITY), + "Non-finite FINITE_VECTOR element in v"), Arguments.of( "fixed_len_byte_array(2) element (FLOAT16)", 1, List.of(Binary.fromConstantByteArray(new byte[] {0, (byte) 0xfc})), - "Non-finite VECTOR element in v"), + "Non-finite FINITE_VECTOR element in v"), Arguments.of( "fixed_len_byte_array(2) element (FLOAT16)", 1, List.of(Binary.fromConstantByteArray(new byte[] {0})), - "Invalid FLOAT16 VECTOR element length: 1")); + "Invalid FLOAT16 FINITE_VECTOR element length: 1")); } private void assertInvalidWrite(MessageType schema, Group row, String message) throws IOException { @@ -301,7 +307,7 @@ private void assertInvalidWrite(MessageType schema, Group row, String message) t @ParameterizedTest @MethodSource("invalidVectorWrites") public void testInvalidVectorWrite(String element, int length, List values, String message) throws IOException { - MessageType schema = MessageTypeParser.parseMessageType("message m { required group v (VECTOR(" + length + MessageType schema = MessageTypeParser.parseMessageType("message m { required group v (FINITE_VECTOR(" + length + ")) { repeated group list { required " + element + "; } } }"); Group row = new SimpleGroupFactory(schema).newGroup(); Group vector = row.addGroup("v"); @@ -321,7 +327,7 @@ public void testInvalidVectorWrite(String element, int length, List values, S @org.junit.jupiter.api.Test public void testMandatoryVectorValidation() throws IOException { MessageType missingId = MessageTypeParser.parseMessageType("message m { required int32 id;" - + " required group v (VECTOR(2)) { repeated group list { required float element; } } }"); + + " required group v (FINITE_VECTOR(2)) { repeated group list { required float element; } } }"); Group missingRow = new SimpleGroupFactory(missingId).newGroup(); Group v = missingRow.addGroup("v"); v.addGroup("list").append("element", 1.0f); @@ -342,16 +348,16 @@ public void testMandatoryVectorValidation() throws IOException { @org.junit.jupiter.api.Test public void testVectorReadProjection() throws Exception { MessageType list = MessageTypeParser.parseMessageType( - schema("required", 5, false).toString().replace("VECTOR(5)", "LIST")); + schema("required", 5, false).toString().replace("FINITE_VECTOR(5)", "LIST")); MessageType vector = schema("required", 5, false); Path path = writeVectors(list, WriterVersion.PARQUET_1_0, false, listRows(list, 4, 6)); assertVectorRows(readGroups(path, vector), 4, 6); - rewriteFooter(path, footer -> footer.getSchema().get(1).setLogicalType(LogicalTypes.VECTOR(5))); + rewriteFooter(path, footer -> footer.getSchema().get(1).setLogicalType(LogicalTypes.FINITE_VECTOR(5))); for (MessageType requested : List.of(vector, list)) { assertThatThrownBy(() -> readGroups(path, requested)) .isInstanceOf(ParquetDecodingException.class) - .hasMessage("Invalid VECTOR data for [v, list, element]: expected 5 elements, got 4"); + .hasMessage("Invalid FINITE_VECTOR data for [v, list, element]: expected 5 elements, got 4"); } try (ParquetFileReader reader = @@ -362,7 +368,7 @@ public void testVectorReadProjection() throws Exception { RecordReader records = columns.getRecordReader(pages, new GroupRecordConverter(vector)); assertThatThrownBy(records::read) .isInstanceOf(ParquetDecodingException.class) - .hasMessage("Invalid VECTOR data for [v, list, element]: expected 5 elements, got 4"); + .hasMessage("Invalid FINITE_VECTOR data for [v, list, element]: expected 5 elements, got 4"); } } @@ -403,7 +409,7 @@ public void testInvalidVectorReferenceFile(String field, String mode, String rea for (long i = 0; i < pages.getRowCount(); i++) records.read(); }) .isInstanceOf(ParquetDecodingException.class) - .hasMessage("Invalid VECTOR data for [" + name + ", list, element]: " + reason); + .hasMessage("Invalid FINITE_VECTOR data for [" + name + ", list, element]: " + reason); } } } @@ -497,7 +503,7 @@ public void testInvalidVectorFooter( } }) .isInstanceOf(ParquetDecodingException.class) - .hasMessageContaining("Invalid VECTOR counts for " + expected); + .hasMessageContaining("Invalid FINITE_VECTOR counts for " + expected); } } @@ -543,7 +549,7 @@ public void testInvalidVectorPageHeader(boolean nested, int headerRows, int head } }) .isInstanceOf(ParquetDecodingException.class) - .hasMessage("Invalid VECTOR counts for " + .hasMessage("Invalid FINITE_VECTOR counts for " + (nested ? "[outer, v, list, element]" : "[v, list, element]") + ": rows=" + headerRows + ", values=" + headerValues + ", nulls=" + headerNulls + ", length=" + (nested ? 2 : 5)); @@ -586,6 +592,7 @@ public void testInvalidIndexedVectorPage() throws IOException { } }) .isInstanceOf(ParquetDecodingException.class) - .hasMessage("Invalid VECTOR counts for [v, list, element]: rows=2, values=9, nulls=-1, length=5"); + .hasMessage( + "Invalid FINITE_VECTOR counts for [v, list, element]: rows=2, values=9, nulls=-1, length=5"); } } diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/VectorInteropFileGenerator.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/VectorInteropFileGenerator.java index f5217bb32e..f2e0f0c400 100644 --- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/VectorInteropFileGenerator.java +++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/VectorInteropFileGenerator.java @@ -64,21 +64,21 @@ private VectorInteropFileGenerator() {} static MessageType mixedSchema() { return MessageTypeParser.parseMessageType("message m {" + " required int32 id;" - + " required group f (VECTOR(5)) { repeated group list { required float element; } }" - + " optional group o (VECTOR(2)) { repeated group list { required int32 element; } }" - + " optional group a { required group h (VECTOR(2)) { repeated group list {" + + " required group f (FINITE_VECTOR(5)) { repeated group list { required float element; } }" + + " optional group o (FINITE_VECTOR(2)) { repeated group list { required int32 element; } }" + + " optional group a { required group h (FINITE_VECTOR(2)) { repeated group list {" + " required fixed_len_byte_array(2) element (FLOAT16); } } }" - + " repeated group outer { required group d (VECTOR(2)) { repeated group list {" + + " repeated group outer { required group d (FINITE_VECTOR(2)) { repeated group list {" + " required double element; } } }" - + " required group b (VECTOR(2)) { repeated group list { required boolean element; } }" - + " required group l (VECTOR(1)) { repeated group list { required int64 element; } }" - + " required group s (VECTOR(1)) { repeated group list {" + + " required group b (FINITE_VECTOR(2)) { repeated group list { required boolean element; } }" + + " required group l (FINITE_VECTOR(1)) { repeated group list { required int64 element; } }" + + " required group s (FINITE_VECTOR(1)) { repeated group list {" + " required int32 element (INTEGER(16,true)); } }" - + " required group u (VECTOR(1)) { repeated group list {" + + " required group u (FINITE_VECTOR(1)) { repeated group list {" + " required int64 element (INTEGER(64,false)); } }" - + " required group dec (VECTOR(1)) { repeated group list {" + + " required group dec (FINITE_VECTOR(1)) { repeated group list {" + " required int32 element (DECIMAL(9,2)); } }" - + " required group bytes (VECTOR(1)) { repeated group list {" + + " required group bytes (FINITE_VECTOR(1)) { repeated group list {" + " required fixed_len_byte_array(4) element (DECIMAL(9,2)); } } }"); } @@ -212,7 +212,7 @@ static void writeInvalid(Path path) throws IOException { footer.getSchema().stream() .filter(element -> element.getConverted_type() == ConvertedType.LIST) .forEach(element -> element.setLogicalType( - LogicalTypes.VECTOR(element.getName().startsWith("nf_") ? 8 : 5))); + LogicalTypes.FINITE_VECTOR(element.getName().startsWith("nf_") ? 8 : 5))); for (org.apache.parquet.format.ColumnChunk chunk : footer.getRow_groups().get(0).getColumns()) { chunk.getMeta_data().getStatistics().unsetNull_count(); @@ -250,8 +250,8 @@ static void rewriteFooter(Path path, Consumer -# VECTOR reference files +# FINITE_VECTOR reference files -These files use the draft [VECTOR proposal](https://github.com/apache/parquet-format/pull/624) -at revision `3573b3e1357f6546f3710d8cb48103e61ad40350`. They are +These files use the draft [FINITE_VECTOR proposal](https://github.com/apache/parquet-format/pull/624) +at revision `8ad956d543e3074e1d9c8d4faa194199e06a8be4`. They are parquet-java-generated examples, not independent interoperability evidence. Runtime mixed-file tests exercise the writer; these fixed bytes exercise reader compatibility. The valid files are intended for a later parquet-testing/data export. Malformed 4/6, content, and count cases and Java exception policy are excluded from portable conformance. -The current `VectorInteropFileGenerator` source blob is +These bytes were generated before VECTOR was renamed to FINITE_VECTOR. The rename +preserves Thrift field 20 and its parameter, so the files and hashes are unchanged. +The malformed file's `VectorInteropFileGenerator` source blob was `f5217bb32e86abfac965a3eebab9709adbaa549d`. The three valid files came from the Round 2 generator source `2d496dad2213216ca6e75f1ab0b4249822829421`. -The malformed file came from the current source. Both used Java 17, Maven 3.9.16, -and Thrift 0.25.0. +Both used Java 17, Maven 3.9.16, and Thrift 0.25.0. ## Mixed files @@ -51,15 +52,15 @@ and column and offset indexes are absent. ## Malformed file -`vector_invalid_v1_dictionary.parquet` is deliberately invalid VECTOR data. Its +`vector_invalid_v1_dictionary.parquet` is deliberately invalid FINITE_VECTOR data. Its ordinary V1 writer used a canonical LIST schema with `id=0..3`, then changed only -the footer to annotate eight LIST groups as VECTOR. `short_v` has lengths +the footer to annotate eight LIST groups as FINITE_VECTOR. `short_v` has lengths `[4,6,5,5]`, `long_v` has `[6,4,5,5]`, `empty_v` has `[0,5,5,5]`, nested `v` has per-row instance lengths `[[4,6],[],[5],[5]]`, and partial `v` has -`[[5],[5],[5],[3]]`. These groups declare VECTOR(5). Their finite element `k` +`[[5],[5],[5],[3]]`. These groups declare FINITE_VECTOR(5). Their finite element `k` in instance `j` of row `i` is `100*i+10*j+k` as FLOAT. -`nf_f`, `nf_d`, and `nf_h` declare VECTOR(8). Each row contains seven ones; +`nf_f`, `nf_d`, and `nf_h` declare FINITE_VECTOR(8). Each row contains seven ones; element zero is zero except in row zero, where the fields contain FLOAT NaN, DOUBLE positive infinity, and FLOAT16 negative infinity respectively. The FLOAT16 values use little-endian bytes `00fc`, `0000`, and `003c` for negative infinity, @@ -67,7 +68,7 @@ zero, and one. The file is UNCOMPRESSED with a page row limit of two. `nf_f` and `nf_d` each have a dictionary and two V1 PLAIN_DICTIONARY pages of 16 values; `nf_h` has no dictionary and two V1 PLAIN pages of 16 values. All column-chunk null counts are unset, and column and offset index references are absent. -Each projected malformed VECTOR field must be rejected. +Each projected malformed FINITE_VECTOR field must be rejected. ## SHA-256 diff --git a/parquet-protobuf/src/main/java/org/apache/parquet/proto/ProtoMessageConverter.java b/parquet-protobuf/src/main/java/org/apache/parquet/proto/ProtoMessageConverter.java index c5a01352c2..48c076fcac 100644 --- a/parquet-protobuf/src/main/java/org/apache/parquet/proto/ProtoMessageConverter.java +++ b/parquet-protobuf/src/main/java/org/apache/parquet/proto/ProtoMessageConverter.java @@ -271,10 +271,10 @@ public Optional visit(LogicalTypeAnnotation.ListLogicalTypeAnnotation @Override public Optional visit( - LogicalTypeAnnotation.VectorLogicalTypeAnnotation vectorLogicalType) { - TypeUtil.checkValidVectorSchema(parquetType); + LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation vectorLogicalType) { + TypeUtil.checkValidFiniteVectorSchema(parquetType); if (!fieldDescriptor.isRepeated()) { - throw new IncompatibleSchemaModificationException("VECTOR field " + throw new IncompatibleSchemaModificationException("FINITE_VECTOR field " + fieldDescriptor.getName() + " requires a repeated protobuf field"); } return visit(LogicalTypeAnnotation.listType()); @@ -897,7 +897,8 @@ public ListConverter( Message.Builder parentBuilder, Descriptors.FieldDescriptor fieldDescriptor, Type parquetType) { LogicalTypeAnnotation logicalTypeAnnotation = parquetType.getLogicalTypeAnnotation(); if (!(logicalTypeAnnotation instanceof LogicalTypeAnnotation.ListLogicalTypeAnnotation) - && !(logicalTypeAnnotation instanceof LogicalTypeAnnotation.VectorLogicalTypeAnnotation) + && !(logicalTypeAnnotation + instanceof LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation) || parquetType.isPrimitive()) { throw new ParquetDecodingException( "Expected LIST wrapper. Found: " + logicalTypeAnnotation + " instead."); diff --git a/parquet-protobuf/src/test/java/org/apache/parquet/proto/ProtoRecordConverterTest.java b/parquet-protobuf/src/test/java/org/apache/parquet/proto/ProtoRecordConverterTest.java index b7eb09dd16..12d161c396 100644 --- a/parquet-protobuf/src/test/java/org/apache/parquet/proto/ProtoRecordConverterTest.java +++ b/parquet-protobuf/src/test/java/org/apache/parquet/proto/ProtoRecordConverterTest.java @@ -48,7 +48,7 @@ public class ProtoRecordConverterTest { @Test public void testVectorRepeatedPrimitive(@TempDir java.nio.file.Path dir) throws IOException { MessageType schema = MessageTypeParser.parseMessageType("message m { required group repeatedInt" - + " (VECTOR(3)) { repeated group list { required int32 element; } } }"); + + " (FINITE_VECTOR(3)) { repeated group list { required int32 element; } } }"); Path path = new Path(dir.resolve("vector.parquet").toUri()); try (ParquetWriter writer = ExampleParquetWriter.builder(path) .withType(schema) @@ -74,11 +74,11 @@ public void testVectorRepeatedPrimitive(@TempDir java.nio.file.Path dir) throws @Test public void testVectorRejectsScalarTarget() { MessageType schema = MessageTypeParser.parseMessageType("message m { required group optionalInt32" - + " (VECTOR(3)) { repeated group list { required int32 element; } } }"); + + " (FINITE_VECTOR(3)) { repeated group list { required int32 element; } } }"); assertThatThrownBy(() -> new ProtoRecordConverter<>( new Configuration(), SchemaConverterAllDatatypes.class, schema, Collections.emptyMap())) .isInstanceOf(IncompatibleSchemaModificationException.class) - .hasMessageContaining("VECTOR field optionalInt32 requires a repeated protobuf field"); + .hasMessageContaining("FINITE_VECTOR field optionalInt32 requires a repeated protobuf field"); } @Test From 974f3fb0d5a880509a21da6302581944918d9961 Mon Sep 17 00:00:00 2001 From: Divjot Arora Date: Mon, 2 Nov 2026 20:21:54 +0000 Subject: [PATCH 14/15] GH-3877: Address FINITE_VECTOR schema and adapter review Co-authored-by: Isaac --- .../parquet/arrow/schema/List3Levels.java | 5 +- .../parquet/arrow/schema/SchemaConverter.java | 13 ++- .../arrow/schema/TestSchemaConverter.java | 13 +-- .../apache/parquet/avro/AvroReadSupport.java | 5 +- .../parquet/avro/AvroRecordConverter.java | 2 +- .../parquet/avro/AvroSchemaConverter.java | 12 +-- .../parquet/avro/TestArrayCompatibility.java | 4 + .../apache/parquet/io/ColumnIOFactory.java | 2 - .../parquet/io/FilteredRecordReader.java | 6 +- .../parquet/io/FiniteVectorValidator.java | 102 ++++++++++++++++++ .../apache/parquet/io/MessageColumnIO.java | 2 +- .../io/RecordReaderImplementation.java | 58 +--------- .../parquet/io/ValidatingRecordConsumer.java | 2 - .../parquet/schema/LogicalTypeAnnotation.java | 4 +- .../apache/parquet/schema/MessageType.java | 2 + .../org/apache/parquet/schema/TypeUtil.java | 37 ++++--- .../TestTypeBuildersWithLogicalTypes.java | 71 +++++++++++- .../converter/ParquetMetadataConverter.java | 9 +- .../parquet/hadoop/TestVectorReadWrite.java | 17 ++- .../parquet/proto/ProtoMessageConverter.java | 4 - 20 files changed, 249 insertions(+), 121 deletions(-) create mode 100644 parquet-column/src/main/java/org/apache/parquet/io/FiniteVectorValidator.java diff --git a/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/List3Levels.java b/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/List3Levels.java index 74b6acfc58..f1286d5a6f 100644 --- a/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/List3Levels.java +++ b/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/List3Levels.java @@ -42,9 +42,8 @@ class List3Levels { * @param list the Parquet List */ public List3Levels(GroupType list) { - if (list.getLogicalTypeAnnotation() != LogicalTypeAnnotation.listType() - && !(list.getLogicalTypeAnnotation() - instanceof LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation) + LogicalTypeAnnotation logicalType = list.getLogicalTypeAnnotation(); + if (!(logicalType instanceof LogicalTypeAnnotation.ListLogicalTypeAnnotation) || list.getFields().size() != 1) { throw new IllegalArgumentException("invalid list type: " + list); } diff --git a/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/SchemaConverter.java b/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/SchemaConverter.java index e30ee96566..561001b850 100644 --- a/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/SchemaConverter.java +++ b/parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/SchemaConverter.java @@ -79,7 +79,6 @@ import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName; import org.apache.parquet.schema.Type; import org.apache.parquet.schema.Type.Repetition; -import org.apache.parquet.schema.TypeUtil; import org.apache.parquet.schema.Types; import org.apache.parquet.schema.Types.GroupBuilder; @@ -490,8 +489,16 @@ public Optional visit( @Override public Optional visit( LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation vectorLogicalType) { - TypeUtil.checkValidFiniteVectorSchema(type); - return visit(LogicalTypeAnnotation.listType()); + List3Levels list3Levels = new List3Levels(type); + Type element = list3Levels.getElement(); + TypeMapping child = fromParquet(element, null, element.getRepetition()); + ArrowType.FixedSizeList fixedSizeList = + new ArrowType.FixedSizeList(vectorLogicalType.getNumElements()); + Field arrowField = new Field( + name, + new FieldType(type.isRepetition(OPTIONAL), fixedSizeList, null), + Collections.singletonList(child.getArrowField())); + return of(new ListTypeMapping(arrowField, list3Levels, child)); } @Override diff --git a/parquet-arrow/src/test/java/org/apache/parquet/arrow/schema/TestSchemaConverter.java b/parquet-arrow/src/test/java/org/apache/parquet/arrow/schema/TestSchemaConverter.java index a513adfdd7..f697b53a29 100644 --- a/parquet-arrow/src/test/java/org/apache/parquet/arrow/schema/TestSchemaConverter.java +++ b/parquet-arrow/src/test/java/org/apache/parquet/arrow/schema/TestSchemaConverter.java @@ -67,20 +67,21 @@ public class TestSchemaConverter { @ParameterizedTest @ValueSource(strings = {"required", "optional"}) - public void testVectorAsList(String repetition) { + public void testVectorAsFixedSizeList(String repetition) { String children = "repeated group list { required float element; }"; MessageType vector = MessageTypeParser.parseMessageType( "message m { " + repetition + " group v (FINITE_VECTOR(5)) { " + children + " } }"); - MessageType list = MessageTypeParser.parseMessageType( - "message m { " + repetition + " group v (LIST) { " + children + " } }"); SchemaMapping mapping = converter.fromParquet(vector); - assertThat(mapping.getArrowSchema()) - .isEqualTo(converter.fromParquet(list).getArrowSchema()); Field field = mapping.getArrowSchema().findField("v"); - assertThat(field.getType()).isEqualTo(new ArrowType.List()); + assertThat(field.getType()).isEqualTo(new ArrowType.FixedSizeList(5)); + assertThat(field.isNullable()).isEqualTo(repetition.equals("optional")); assertThat(field.getChildren()).hasSize(1); assertThat(field.getChildren().get(0).getType()) .isEqualTo(new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)); + assertThat(field.getChildren().get(0).isNullable()).isFalse(); + assertThat(mapping.getParquetSchema()).isEqualTo(vector); + assertThat(converter.map(mapping.getArrowSchema(), vector).getParquetSchema()) + .isEqualTo(vector); } private static Field field(String name, boolean nullable, ArrowType type, Field... children) { diff --git a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroReadSupport.java b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroReadSupport.java index ff66932ec6..9823fe4c4c 100644 --- a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroReadSupport.java +++ b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroReadSupport.java @@ -281,9 +281,8 @@ private static Boolean allListStructuresAreThreeLevel(Type type) { return null; } GroupType group = type.asGroupType(); - if (group.getLogicalTypeAnnotation() instanceof LogicalTypeAnnotation.ListLogicalTypeAnnotation - || group.getLogicalTypeAnnotation() - instanceof LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation) { + LogicalTypeAnnotation logicalType = group.getLogicalTypeAnnotation(); + if (logicalType instanceof LogicalTypeAnnotation.ListLogicalTypeAnnotation) { if (group.isRepetition(Type.Repetition.REPEATED) || group.getFieldCount() != 1) { return false; } diff --git a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroRecordConverter.java b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroRecordConverter.java index 9f1c012624..f3d3d53c95 100644 --- a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroRecordConverter.java +++ b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroRecordConverter.java @@ -1000,7 +1000,7 @@ public void end() { * determined by checking whether the type can be a synthetic group and by * checking whether a potential synthetic group matches the expected schema. *

- * Unlike {@link AvroSchemaConverter#isElementType(Type, String)}, this + * Unlike AvroSchemaConverter.isElementType, this * method never guesses because the expected schema is known. * * @param repeatedType a type that may be the element type diff --git a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroSchemaConverter.java b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroSchemaConverter.java index 221f9dbc5a..fe4f2bb98f 100644 --- a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroSchemaConverter.java +++ b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroSchemaConverter.java @@ -71,7 +71,6 @@ import org.apache.parquet.schema.PrimitiveType; import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName; import org.apache.parquet.schema.Type; -import org.apache.parquet.schema.TypeUtil; import org.apache.parquet.schema.Types; /** @@ -471,9 +470,7 @@ public Optional visit( if (!repeatedType.isRepetition(REPEATED)) { throw new UnsupportedOperationException("Invalid list type " + parquetGroupType); } - if (!(logicalTypeAnnotation - instanceof LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation) - && isElementType(repeatedType, parquetGroupType.getName())) { + if (isElementType(repeatedType, parquetGroupType)) { // repeated element types are always required return of(Schema.createArray(convertField(repeatedType, names))); } else { @@ -490,7 +487,6 @@ && isElementType(repeatedType, parquetGroupType.getName())) { @Override public Optional visit( LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation vectorLogicalType) { - TypeUtil.checkValidFiniteVectorSchema(parquetGroupType); return visit(LogicalTypeAnnotation.listType()); } @@ -664,7 +660,9 @@ public Optional visit(UUIDLogicalTypeAnnotation uuidLogicalType) { * the same. This ensures that the LIST rules are followed when there is no * schema and that a schema can be provided to override the default behavior. */ - private boolean isElementType(Type repeatedType, String parentName) { + private boolean isElementType(Type repeatedType, GroupType parent) { + if (parent.getLogicalTypeAnnotation() instanceof LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation) + return false; return ( // can't be a synthetic layer because it would be invalid repeatedType.isPrimitive() @@ -673,7 +671,7 @@ private boolean isElementType(Type repeatedType, String parentName) { || // known patterns without the synthetic layer repeatedType.getName().equals("array") - || repeatedType.getName().equals(parentName + "_tuple") + || repeatedType.getName().equals(parent.getName() + "_tuple") || // default assumption assumeRepeatedIsListElement); diff --git a/parquet-avro/src/test/java/org/apache/parquet/avro/TestArrayCompatibility.java b/parquet-avro/src/test/java/org/apache/parquet/avro/TestArrayCompatibility.java index 790f35d244..60bf7315fa 100644 --- a/parquet-avro/src/test/java/org/apache/parquet/avro/TestArrayCompatibility.java +++ b/parquet-avro/src/test/java/org/apache/parquet/avro/TestArrayCompatibility.java @@ -1651,6 +1651,10 @@ public void testVectorWithoutAvroSchema(@TempDir java.nio.file.Path dir) throws field("v", array(primitive(Schema.Type.FLOAT))), optionalField("o", array(primitive(Schema.Type.FLOAT)))); assertThat(new AvroSchemaConverter().convert(schema)).isEqualTo(expectedSchema); + for (boolean assumeRepeatedIsListElement : new boolean[] {true, false}) { + assertThat(new AvroSchemaConverter(assumeRepeatedIsListElement, false).convert(schema)) + .isEqualTo(expectedSchema); + } try (AvroParquetReader reader = autoDetectReader(path)) { assertReaderContains( reader, diff --git a/parquet-column/src/main/java/org/apache/parquet/io/ColumnIOFactory.java b/parquet-column/src/main/java/org/apache/parquet/io/ColumnIOFactory.java index ba9a805ffd..24868acaf1 100644 --- a/parquet-column/src/main/java/org/apache/parquet/io/ColumnIOFactory.java +++ b/parquet-column/src/main/java/org/apache/parquet/io/ColumnIOFactory.java @@ -24,7 +24,6 @@ import org.apache.parquet.schema.MessageType; import org.apache.parquet.schema.PrimitiveType; import org.apache.parquet.schema.Type; -import org.apache.parquet.schema.TypeUtil; import org.apache.parquet.schema.TypeVisitor; /** @@ -54,7 +53,6 @@ private ColumnIOCreatorVisitor( @Override public void visit(MessageType messageType) { - TypeUtil.checkValidFiniteVectorSchema(messageType); columnIO = new MessageColumnIO(requestedSchema, validating, createdBy); visitChildren(columnIO, messageType, requestedSchema); columnIO.setLevels(); diff --git a/parquet-column/src/main/java/org/apache/parquet/io/FilteredRecordReader.java b/parquet-column/src/main/java/org/apache/parquet/io/FilteredRecordReader.java index 3c52368c9b..9658c76fcd 100644 --- a/parquet-column/src/main/java/org/apache/parquet/io/FilteredRecordReader.java +++ b/parquet-column/src/main/java/org/apache/parquet/io/FilteredRecordReader.java @@ -84,12 +84,12 @@ private void skipToMatch() { State currentState = getState(0); do { ColumnReader columnReader = currentState.column; - int d = columnReader.getCurrentDefinitionLevel(); - currentState.validateVector(d); + int depth = columnReader.getCurrentDefinitionLevel(); + currentState.validateVector(depth); // currentLevel = depth + 1 at this point // set the current value - if (d >= currentState.maxDefinitionLevel) { + if (depth >= currentState.maxDefinitionLevel) { columnReader.skip(); } columnReader.consume(); diff --git a/parquet-column/src/main/java/org/apache/parquet/io/FiniteVectorValidator.java b/parquet-column/src/main/java/org/apache/parquet/io/FiniteVectorValidator.java new file mode 100644 index 0000000000..f1c2108ebd --- /dev/null +++ b/parquet-column/src/main/java/org/apache/parquet/io/FiniteVectorValidator.java @@ -0,0 +1,102 @@ +/* + * 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.parquet.io; + +import java.util.Arrays; +import org.apache.parquet.column.ColumnReader; +import org.apache.parquet.io.api.Binary; +import org.apache.parquet.schema.LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation; +import org.apache.parquet.schema.LogicalTypeAnnotation.Float16LogicalTypeAnnotation; +import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName; + +final class FiniteVectorValidator { + private final ColumnReader column; + private final String[] fieldPath; + private final PrimitiveTypeName primitive; + private final int maxDefinitionLevel; + private final int maxRepetitionLevel; + private final int length; + private final boolean float16; + private long count; + + FiniteVectorValidator(PrimitiveColumnIO columnIO, ColumnReader column, FiniteVectorLogicalTypeAnnotation vector) { + this.column = column; + this.fieldPath = columnIO.getFieldPath(); + this.primitive = columnIO.getType().asPrimitiveType().getPrimitiveTypeName(); + this.maxDefinitionLevel = columnIO.getDefinitionLevel(); + this.maxRepetitionLevel = columnIO.getRepetitionLevel(); + this.length = vector.getNumElements(); + this.float16 = columnIO.getType().getLogicalTypeAnnotation() instanceof Float16LogicalTypeAnnotation; + } + + void validate(int definitionLevel) { + int repetitionLevel = column.getCurrentRepetitionLevel(); + if (definitionLevel < 0 + || definitionLevel > maxDefinitionLevel + || repetitionLevel < 0 + || repetitionLevel > maxRepetitionLevel) { + throw invalidVector("invalid levels"); + } + if (count == 0 && repetitionLevel == maxRepetitionLevel) { + throw invalidVector("invalid continuation"); + } + if (definitionLevel < maxDefinitionLevel) { + if (count > 0) throw invalidVector("null within vector"); + if (definitionLevel == maxDefinitionLevel - 1) throw invalidVector("empty vector"); + return; + } + count++; + if (count > length) { + throw invalidVector("expected " + length + " elements, got " + count); + } + if (primitive == PrimitiveTypeName.FLOAT && !Float.isFinite(column.getFloat()) + || primitive == PrimitiveTypeName.DOUBLE && !Double.isFinite(column.getDouble())) { + throw invalidVector("non-finite element"); + } + if (float16) { + Binary value = column.getBinary(); + if (value.length() != 2) { + throw invalidVector("invalid FLOAT16 element length: " + value.length()); + } + if ((value.get2BytesLittleEndian() & 0x7c00) == 0x7c00) { + throw invalidVector("non-finite element"); + } + } + } + + void end(int nextRepetitionLevel) { + if (nextRepetitionLevel < 0 || nextRepetitionLevel > maxRepetitionLevel) { + throw invalidVector("invalid levels"); + } + if (nextRepetitionLevel == maxRepetitionLevel && count == 0) { + throw invalidVector("null within vector"); + } + if (nextRepetitionLevel < maxRepetitionLevel && count > 0) { + if (count != length) { + throw invalidVector("expected " + length + " elements, got " + count); + } + count = 0; + } + } + + private ParquetDecodingException invalidVector(String reason) { + return new ParquetDecodingException( + "Invalid FINITE_VECTOR data for " + Arrays.toString(fieldPath) + ": " + reason); + } +} diff --git a/parquet-column/src/main/java/org/apache/parquet/io/MessageColumnIO.java b/parquet-column/src/main/java/org/apache/parquet/io/MessageColumnIO.java index 0c9fabec34..2428a279ee 100644 --- a/parquet-column/src/main/java/org/apache/parquet/io/MessageColumnIO.java +++ b/parquet-column/src/main/java/org/apache/parquet/io/MessageColumnIO.java @@ -509,7 +509,7 @@ public void flush() { public RecordConsumer getRecordWriter(ColumnWriteStore columns) { RecordConsumer recordWriter = new MessageColumnIORecordConsumer(columns); if (DEBUG) recordWriter = new RecordConsumerLoggingWrapper(recordWriter); - return validating || TypeUtil.checkValidFiniteVectorSchema(getType()) + return validating || TypeUtil.hasFiniteVector(getType()) ? new ValidatingRecordConsumer(recordWriter, getType()) : recordWriter; } diff --git a/parquet-column/src/main/java/org/apache/parquet/io/RecordReaderImplementation.java b/parquet-column/src/main/java/org/apache/parquet/io/RecordReaderImplementation.java index df1501ae3f..dd98a6d98a 100644 --- a/parquet-column/src/main/java/org/apache/parquet/io/RecordReaderImplementation.java +++ b/parquet-column/src/main/java/org/apache/parquet/io/RecordReaderImplementation.java @@ -27,7 +27,6 @@ import java.util.Map; import org.apache.parquet.column.ColumnReader; import org.apache.parquet.column.impl.ColumnReadStoreImpl; -import org.apache.parquet.io.api.Binary; import org.apache.parquet.io.api.Converter; import org.apache.parquet.io.api.GroupConverter; import org.apache.parquet.io.api.PrimitiveConverter; @@ -35,7 +34,6 @@ import org.apache.parquet.io.api.RecordMaterializer; import org.apache.parquet.schema.LogicalTypeAnnotation; import org.apache.parquet.schema.LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation; -import org.apache.parquet.schema.LogicalTypeAnnotation.Float16LogicalTypeAnnotation; import org.apache.parquet.schema.MessageType; import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName; import org.slf4j.Logger; @@ -196,9 +194,7 @@ public static class State { private Case[][][] caseLookup; private List definedCases; private List undefinedCases; - private final int vectorLength; - private final boolean vectorFloat16; - private long vectorCount; + private final FiniteVectorValidator vectorValidator; private State( int id, @@ -228,61 +224,15 @@ private State( vector = (FiniteVectorLogicalTypeAnnotation) logical; } } - this.vectorLength = vector == null ? 0 : vector.getNumElements(); - this.vectorFloat16 = vector != null - && primitiveColumnIO.getType().getLogicalTypeAnnotation() instanceof Float16LogicalTypeAnnotation; + this.vectorValidator = vector == null ? null : new FiniteVectorValidator(primitiveColumnIO, column, vector); } void validateVector(int d) { - if (vectorLength == 0) return; - int r = column.getCurrentRepetitionLevel(); - if (d < 0 || d > maxDefinitionLevel || r < 0 || r > maxRepetitionLevel) { - throw invalidVector("invalid levels"); - } - if (vectorCount == 0 && r == maxRepetitionLevel) { - throw invalidVector("invalid continuation"); - } - if (d < maxDefinitionLevel) { - if (vectorCount > 0) throw invalidVector("null within vector"); - if (d == maxDefinitionLevel - 1) throw invalidVector("empty vector"); - return; - } - vectorCount++; - if (vectorCount > vectorLength) { - throw invalidVector("expected " + vectorLength + " elements, got " + vectorCount); - } - if (primitive == PrimitiveTypeName.FLOAT && !Float.isFinite(column.getFloat()) - || primitive == PrimitiveTypeName.DOUBLE && !Double.isFinite(column.getDouble())) { - throw invalidVector("non-finite element"); - } - if (vectorFloat16) { - Binary value = column.getBinary(); - if (value.length() != 2) { - throw invalidVector("invalid FLOAT16 element length: " + value.length()); - } - if ((value.get2BytesLittleEndian() & 0x7c00) == 0x7c00) { - throw invalidVector("non-finite element"); - } - } + if (vectorValidator != null) vectorValidator.validate(d); } void endVector(int nextR) { - if (vectorLength == 0) return; - if (nextR < 0 || nextR > maxRepetitionLevel) throw invalidVector("invalid levels"); - if (nextR == maxRepetitionLevel && vectorCount == 0) { - throw invalidVector("null within vector"); - } - if (nextR < maxRepetitionLevel && vectorCount > 0) { - if (vectorCount != vectorLength) { - throw invalidVector("expected " + vectorLength + " elements, got " + vectorCount); - } - vectorCount = 0; - } - } - - private ParquetDecodingException invalidVector(String reason) { - return new ParquetDecodingException( - "Invalid FINITE_VECTOR data for " + Arrays.toString(fieldPath) + ": " + reason); + if (vectorValidator != null) vectorValidator.end(nextR); } public int getDepth(int definitionLevel) { diff --git a/parquet-column/src/main/java/org/apache/parquet/io/ValidatingRecordConsumer.java b/parquet-column/src/main/java/org/apache/parquet/io/ValidatingRecordConsumer.java index cf34785e0e..e49cbcd802 100644 --- a/parquet-column/src/main/java/org/apache/parquet/io/ValidatingRecordConsumer.java +++ b/parquet-column/src/main/java/org/apache/parquet/io/ValidatingRecordConsumer.java @@ -38,7 +38,6 @@ import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName; import org.apache.parquet.schema.Type; import org.apache.parquet.schema.Type.Repetition; -import org.apache.parquet.schema.TypeUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -65,7 +64,6 @@ public class ValidatingRecordConsumer extends RecordConsumer { * @param schema the schema to validate against */ public ValidatingRecordConsumer(RecordConsumer delegate, MessageType schema) { - TypeUtil.checkValidFiniteVectorSchema(schema); this.delegate = delegate; this.types.push(schema); } diff --git a/parquet-column/src/main/java/org/apache/parquet/schema/LogicalTypeAnnotation.java b/parquet-column/src/main/java/org/apache/parquet/schema/LogicalTypeAnnotation.java index beb159d327..5dadfb7b36 100644 --- a/parquet-column/src/main/java/org/apache/parquet/schema/LogicalTypeAnnotation.java +++ b/parquet-column/src/main/java/org/apache/parquet/schema/LogicalTypeAnnotation.java @@ -514,7 +514,7 @@ LogicalTypeToken getType() { @Override public boolean equals(Object obj) { - return obj instanceof ListLogicalTypeAnnotation; + return obj != null && getClass() == obj.getClass(); } @Override @@ -524,7 +524,7 @@ public int hashCode() { } } - public static class FiniteVectorLogicalTypeAnnotation extends LogicalTypeAnnotation { + public static class FiniteVectorLogicalTypeAnnotation extends ListLogicalTypeAnnotation { private final int numElements; private FiniteVectorLogicalTypeAnnotation(int numElements) { diff --git a/parquet-column/src/main/java/org/apache/parquet/schema/MessageType.java b/parquet-column/src/main/java/org/apache/parquet/schema/MessageType.java index 1aba0cc6af..7901745574 100644 --- a/parquet-column/src/main/java/org/apache/parquet/schema/MessageType.java +++ b/parquet-column/src/main/java/org/apache/parquet/schema/MessageType.java @@ -34,6 +34,7 @@ public final class MessageType extends GroupType { */ public MessageType(String name, Type... fields) { super(Repetition.REPEATED, name, fields); + TypeUtil.checkValidFiniteVectorSchema(this); } /** @@ -42,6 +43,7 @@ public MessageType(String name, Type... fields) { */ public MessageType(String name, List fields) { super(Repetition.REPEATED, name, fields); + TypeUtil.checkValidFiniteVectorSchema(this); } /** diff --git a/parquet-column/src/main/java/org/apache/parquet/schema/TypeUtil.java b/parquet-column/src/main/java/org/apache/parquet/schema/TypeUtil.java index b307bcf7d8..c18a5cef79 100644 --- a/parquet-column/src/main/java/org/apache/parquet/schema/TypeUtil.java +++ b/parquet-column/src/main/java/org/apache/parquet/schema/TypeUtil.java @@ -41,6 +41,16 @@ public static boolean checkValidFiniteVectorSchema(Type type) { return found; } + public static boolean hasFiniteVector(Type type) { + if (type.getLogicalTypeAnnotation() instanceof FiniteVectorLogicalTypeAnnotation) return true; + if (!type.isPrimitive()) { + for (Type child : type.asGroupType().getFields()) { + if (hasFiniteVector(child)) return true; + } + } + return false; + } + private static void checkVector(GroupType vector) { if (vector.getRepetition() == Repetition.REPEATED || vector.getFieldCount() != 1) { throw new InvalidSchemaException("Invalid FINITE_VECTOR schema: " + vector); @@ -65,26 +75,16 @@ private static void checkVector(GroupType vector) { PrimitiveType element = elementType.asPrimitiveType(); PrimitiveTypeName physical = element.getPrimitiveTypeName(); LogicalTypeAnnotation logical = element.getLogicalTypeAnnotation(); - boolean allowed; - switch (physical) { - case BOOLEAN: - case FLOAT: - case DOUBLE: - allowed = logical == null; - break; - case INT32: - case INT64: - allowed = logical == null + boolean allowed = switch (physical) { + case BOOLEAN, FLOAT, DOUBLE -> logical == null; + case INT32, INT64 -> + logical == null || logical instanceof IntLogicalTypeAnnotation || logical instanceof DecimalLogicalTypeAnnotation; - break; - case FIXED_LEN_BYTE_ARRAY: - allowed = logical instanceof Float16LogicalTypeAnnotation - || logical instanceof DecimalLogicalTypeAnnotation; - break; - default: - allowed = false; - } + case FIXED_LEN_BYTE_ARRAY -> + logical instanceof Float16LogicalTypeAnnotation || logical instanceof DecimalLogicalTypeAnnotation; + default -> false; + }; if (!allowed) { throw new InvalidSchemaException("Invalid FINITE_VECTOR schema: " + vector); } @@ -117,7 +117,6 @@ public static FiniteVectorLogicalTypeAnnotation getFiniteVectorType(GroupType sc } public static void checkValidWriteSchema(GroupType schema) { - checkValidFiniteVectorSchema(schema); schema.accept(new TypeVisitor() { @Override public void visit(GroupType groupType) { diff --git a/parquet-column/src/test/java/org/apache/parquet/schema/TestTypeBuildersWithLogicalTypes.java b/parquet-column/src/test/java/org/apache/parquet/schema/TestTypeBuildersWithLogicalTypes.java index 0885bfa445..e6b8d74112 100644 --- a/parquet-column/src/test/java/org/apache/parquet/schema/TestTypeBuildersWithLogicalTypes.java +++ b/parquet-column/src/test/java/org/apache/parquet/schema/TestTypeBuildersWithLogicalTypes.java @@ -28,6 +28,7 @@ import static org.apache.parquet.schema.LogicalTypeAnnotation.float16Type; import static org.apache.parquet.schema.LogicalTypeAnnotation.intType; import static org.apache.parquet.schema.LogicalTypeAnnotation.jsonType; +import static org.apache.parquet.schema.LogicalTypeAnnotation.listType; import static org.apache.parquet.schema.LogicalTypeAnnotation.stringType; import static org.apache.parquet.schema.LogicalTypeAnnotation.timeType; import static org.apache.parquet.schema.LogicalTypeAnnotation.timestampType; @@ -46,11 +47,14 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; +import java.util.Optional; import java.util.stream.Stream; import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName; import org.apache.parquet.schema.Type.Repetition; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.function.Executable; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; @@ -75,11 +79,35 @@ public void testVectorAnnotation(int length) { assertThat(finiteVectorType(length)).asString().isEqualTo("FINITE_VECTOR(" + length + ")"); assertThat(finiteVectorType(length).getNumElements()).isEqualTo(length); assertThat(finiteVectorType(length).toOriginalType()).isEqualTo(OriginalType.LIST); + assertThat(finiteVectorType(length)).isInstanceOf(LogicalTypeAnnotation.ListLogicalTypeAnnotation.class); assertThat(finiteVectorType(length)) .isEqualTo(finiteVectorType(length)) .hasSameHashCodeAs(finiteVectorType(length)); assertThat(finiteVectorType(length)).isNotEqualTo(finiteVectorType(length == 1 ? 5 : 1)); assertThat(finiteVectorType(length)).isNotEqualTo(LogicalTypeAnnotation.listType()); + assertThat(listType()).isNotEqualTo(finiteVectorType(length)); + } + + @Test + public void testVectorVisitorDispatch() { + LogicalTypeAnnotation.LogicalTypeAnnotationVisitor listVisitor = + new LogicalTypeAnnotation.LogicalTypeAnnotationVisitor() { + @Override + public Optional visit(LogicalTypeAnnotation.ListLogicalTypeAnnotation list) { + return Optional.of("list"); + } + }; + assertThat(listType().accept(listVisitor)).contains("list"); + assertThat(finiteVectorType(5).accept(listVisitor)).isEmpty(); + + LogicalTypeAnnotation.LogicalTypeAnnotationVisitor vectorVisitor = + new LogicalTypeAnnotation.LogicalTypeAnnotationVisitor() { + @Override + public Optional visit(LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation vector) { + return Optional.of(vector.getNumElements()); + } + }; + assertThat(finiteVectorType(5).accept(vectorVisitor)).contains(5); } @ParameterizedTest @@ -127,11 +155,52 @@ private static Stream invalidVectors() { @ParameterizedTest @MethodSource("invalidVectors") public void testInvalidVectorSchema(GroupType vector) { - assertThatThrownBy(() -> TypeUtil.checkValidFiniteVectorSchema(new MessageType("m", vector))) + assertThatThrownBy(() -> new MessageType("m", vector)) .isInstanceOf(InvalidSchemaException.class) .hasMessage("Invalid FINITE_VECTOR schema: " + vector); } + private static Stream vectorConstructionBoundaries() { + Type element = Types.optional(FLOAT).named("element"); + GroupType invalid = vector(element); + GroupType bad = new GroupType( + REQUIRED, "bad", finiteVectorType(5), new GroupType(Repetition.REPEATED, "list", element)); + return Stream.of( + () -> new MessageType("m", Collections.singletonList(invalid)), + () -> Types.buildMessage().addField(invalid).named("m"), + () -> MessageTypeParser.parseMessageType("message m { required group v (FINITE_VECTOR(5)) { " + + "repeated group list { optional float element; } } }"), + () -> new MessageType( + "m", + new GroupType( + REQUIRED, "parent", vector(Types.required(FLOAT).named("element")), bad))); + } + + @ParameterizedTest + @MethodSource("vectorConstructionBoundaries") + public void testVectorConstructionBoundaries(Executable construction) { + assertThatThrownBy(construction::execute) + .isInstanceOf(InvalidSchemaException.class) + .hasMessageContaining("Invalid FINITE_VECTOR schema"); + } + + @ParameterizedTest + @ValueSource(booleans = {true, false}) + public void testHasFiniteVector(boolean hasVector) { + GroupType field = hasVector + ? vector(Types.required(FLOAT).named("element")) + : new GroupType( + REQUIRED, + "v", + listType(), + new GroupType( + Repetition.REPEATED, + "list", + Types.required(FLOAT).named("element"))); + MessageType schema = new MessageType("m", new GroupType(REQUIRED, "parent", field)); + assertThat(TypeUtil.hasFiniteVector(schema)).isEqualTo(hasVector); + } + @Test public void testVectorOnPrimitive() { assertThatThrownBy(() -> Types.required(FLOAT).as(finiteVectorType(5)).named("v")) diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java b/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java index 4e94edf5b8..88801d5175 100644 --- a/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java +++ b/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java @@ -141,7 +141,6 @@ import org.apache.parquet.schema.PrimitiveType; import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName; import org.apache.parquet.schema.Type.Repetition; -import org.apache.parquet.schema.TypeUtil; import org.apache.parquet.schema.TypeVisitor; import org.apache.parquet.schema.Types; import org.slf4j.Logger; @@ -1346,8 +1345,8 @@ LogicalTypeAnnotation getLogicalTypeAnnotation(LogicalType type) { case ENUM -> LogicalTypeAnnotation.enumType(); case JSON -> LogicalTypeAnnotation.jsonType(); case LIST -> LogicalTypeAnnotation.listType(); - case FINITE__VECTOR -> LogicalTypeAnnotation.finiteVectorType( - type.getFINITE_VECTOR().getNum_elements()); + case FINITE__VECTOR -> + LogicalTypeAnnotation.finiteVectorType(type.getFINITE_VECTOR().getNum_elements()); case TIME -> { TimeType time = type.getTIME(); yield LogicalTypeAnnotation.timeType(time.isAdjustedToUTC, convertTimeUnit(time.unit)); @@ -2041,13 +2040,11 @@ MessageType fromParquetSchema(List schema, List colu } Iterator columnOrderIterator = columnOrders == null ? null : columnOrders.iterator(); buildChildren(builder, iterator, root.getNum_children(), columnOrderIterator); - MessageType messageType = builder.named(root.name); try { - TypeUtil.checkValidFiniteVectorSchema(messageType); + return builder.named(root.name); } catch (InvalidSchemaException e) { throw new ParquetDecodingException("Invalid FINITE_VECTOR schema in file metadata", e); } - return messageType; } private void buildChildren( diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestVectorReadWrite.java b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestVectorReadWrite.java index abe8350cef..6e70f81be0 100644 --- a/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestVectorReadWrite.java +++ b/parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestVectorReadWrite.java @@ -159,10 +159,12 @@ public void testVectorRoundTrip(WriterVersion version, boolean dictionary) throw if (version == WriterVersion.PARQUET_1_0 && !dictionary) { Path legacy = new Path(tempDir.resolve("legacy-list.parquet").toUri()); Files.copy(java.nio.file.Path.of(path.toUri()), java.nio.file.Path.of(legacy.toUri())); - rewriteFooter(legacy, footer -> footer.getSchema().stream() - .filter(element -> element.isSetLogicalType() - && element.getLogicalType().isSetFINITE_VECTOR()) - .forEach(org.apache.parquet.format.SchemaElement::unsetLogicalType)); + rewriteFooter( + legacy, + footer -> footer.getSchema().stream() + .filter(element -> element.isSetLogicalType() + && element.getLogicalType().isSetFINITE_VECTOR()) + .forEach(org.apache.parquet.format.SchemaElement::unsetLogicalType)); List vectors = readFooter(legacy).getSchema().stream() .filter(element -> element.getConverted_type() == org.apache.parquet.format.ConvertedType.LIST) .toList(); @@ -334,6 +336,13 @@ public void testMandatoryVectorValidation() throws IOException { v.addGroup("list").append("element", 2.0f); assertInvalidWrite(missingId, missingRow, "required field is missing required int32 id"); + MessageType missingElement = schema("required", 2, false); + Group missingElementRow = new SimpleGroupFactory(missingElement).newGroup(); + Group missingElementVector = missingElementRow.addGroup("v"); + missingElementVector.addGroup("list").append("element", 1.0f); + missingElementVector.addGroup("list"); + assertInvalidWrite(missingElement, missingElementRow, "required field is missing required float element"); + MessageType duplicate = schema("required", 2, false); Group duplicateRow = new SimpleGroupFactory(duplicate).newGroup(); for (int i = 0; i < 2; i++) { diff --git a/parquet-protobuf/src/main/java/org/apache/parquet/proto/ProtoMessageConverter.java b/parquet-protobuf/src/main/java/org/apache/parquet/proto/ProtoMessageConverter.java index 48c076fcac..a3cf08ec3f 100644 --- a/parquet-protobuf/src/main/java/org/apache/parquet/proto/ProtoMessageConverter.java +++ b/parquet-protobuf/src/main/java/org/apache/parquet/proto/ProtoMessageConverter.java @@ -67,7 +67,6 @@ import org.apache.parquet.schema.LogicalTypeAnnotation; import org.apache.parquet.schema.PrimitiveType; import org.apache.parquet.schema.Type; -import org.apache.parquet.schema.TypeUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -272,7 +271,6 @@ public Optional visit(LogicalTypeAnnotation.ListLogicalTypeAnnotation @Override public Optional visit( LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation vectorLogicalType) { - TypeUtil.checkValidFiniteVectorSchema(parquetType); if (!fieldDescriptor.isRepeated()) { throw new IncompatibleSchemaModificationException("FINITE_VECTOR field " + fieldDescriptor.getName() + " requires a repeated protobuf field"); @@ -897,8 +895,6 @@ public ListConverter( Message.Builder parentBuilder, Descriptors.FieldDescriptor fieldDescriptor, Type parquetType) { LogicalTypeAnnotation logicalTypeAnnotation = parquetType.getLogicalTypeAnnotation(); if (!(logicalTypeAnnotation instanceof LogicalTypeAnnotation.ListLogicalTypeAnnotation) - && !(logicalTypeAnnotation - instanceof LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation) || parquetType.isPrimitive()) { throw new ParquetDecodingException( "Expected LIST wrapper. Found: " + logicalTypeAnnotation + " instead."); From 869eb6ce98d45b563fe2478d2a2fe860e6cc349c Mon Sep 17 00:00:00 2001 From: Divjot Arora Date: Wed, 4 Nov 2026 13:33:38 +0000 Subject: [PATCH 15/15] GH-3877: Validate FINITE_VECTOR schemas in the group builder Co-authored-by: Isaac --- .../apache/parquet/schema/MessageType.java | 2 - .../org/apache/parquet/schema/TypeUtil.java | 71 ------------------- .../java/org/apache/parquet/schema/Types.java | 48 +++++++++++-- .../TestTypeBuildersWithLogicalTypes.java | 46 +++++++----- .../converter/ParquetMetadataConverter.java | 2 +- 5 files changed, 75 insertions(+), 94 deletions(-) diff --git a/parquet-column/src/main/java/org/apache/parquet/schema/MessageType.java b/parquet-column/src/main/java/org/apache/parquet/schema/MessageType.java index 7901745574..1aba0cc6af 100644 --- a/parquet-column/src/main/java/org/apache/parquet/schema/MessageType.java +++ b/parquet-column/src/main/java/org/apache/parquet/schema/MessageType.java @@ -34,7 +34,6 @@ public final class MessageType extends GroupType { */ public MessageType(String name, Type... fields) { super(Repetition.REPEATED, name, fields); - TypeUtil.checkValidFiniteVectorSchema(this); } /** @@ -43,7 +42,6 @@ public MessageType(String name, Type... fields) { */ public MessageType(String name, List fields) { super(Repetition.REPEATED, name, fields); - TypeUtil.checkValidFiniteVectorSchema(this); } /** diff --git a/parquet-column/src/main/java/org/apache/parquet/schema/TypeUtil.java b/parquet-column/src/main/java/org/apache/parquet/schema/TypeUtil.java index c18a5cef79..b32efce395 100644 --- a/parquet-column/src/main/java/org/apache/parquet/schema/TypeUtil.java +++ b/parquet-column/src/main/java/org/apache/parquet/schema/TypeUtil.java @@ -18,29 +18,9 @@ */ package org.apache.parquet.schema; -import org.apache.parquet.schema.LogicalTypeAnnotation.DecimalLogicalTypeAnnotation; import org.apache.parquet.schema.LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation; -import org.apache.parquet.schema.LogicalTypeAnnotation.Float16LogicalTypeAnnotation; -import org.apache.parquet.schema.LogicalTypeAnnotation.IntLogicalTypeAnnotation; -import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName; -import org.apache.parquet.schema.Type.Repetition; public class TypeUtil { - public static boolean checkValidFiniteVectorSchema(Type type) { - boolean found = type.getLogicalTypeAnnotation() instanceof FiniteVectorLogicalTypeAnnotation; - if (found) { - if (type.isPrimitive()) { - throw new InvalidSchemaException("Invalid FINITE_VECTOR schema: " + type); - } - checkVector(type.asGroupType()); - } else if (!type.isPrimitive()) { - for (Type child : type.asGroupType().getFields()) { - found |= checkValidFiniteVectorSchema(child); - } - } - return found; - } - public static boolean hasFiniteVector(Type type) { if (type.getLogicalTypeAnnotation() instanceof FiniteVectorLogicalTypeAnnotation) return true; if (!type.isPrimitive()) { @@ -51,57 +31,6 @@ public static boolean hasFiniteVector(Type type) { return false; } - private static void checkVector(GroupType vector) { - if (vector.getRepetition() == Repetition.REPEATED || vector.getFieldCount() != 1) { - throw new InvalidSchemaException("Invalid FINITE_VECTOR schema: " + vector); - } - Type listType = vector.getType(0); - if (listType.isPrimitive() - || !listType.getName().equals("list") - || listType.getRepetition() != Repetition.REPEATED - || listType.getLogicalTypeAnnotation() != null) { - throw new InvalidSchemaException("Invalid FINITE_VECTOR schema: " + vector); - } - GroupType list = listType.asGroupType(); - if (list.getFieldCount() != 1) { - throw new InvalidSchemaException("Invalid FINITE_VECTOR schema: " + vector); - } - Type elementType = list.getType(0); - if (!elementType.isPrimitive() - || !elementType.getName().equals("element") - || elementType.getRepetition() != Repetition.REQUIRED) { - throw new InvalidSchemaException("Invalid FINITE_VECTOR schema: " + vector); - } - PrimitiveType element = elementType.asPrimitiveType(); - PrimitiveTypeName physical = element.getPrimitiveTypeName(); - LogicalTypeAnnotation logical = element.getLogicalTypeAnnotation(); - boolean allowed = switch (physical) { - case BOOLEAN, FLOAT, DOUBLE -> logical == null; - case INT32, INT64 -> - logical == null - || logical instanceof IntLogicalTypeAnnotation - || logical instanceof DecimalLogicalTypeAnnotation; - case FIXED_LEN_BYTE_ARRAY -> - logical instanceof Float16LogicalTypeAnnotation || logical instanceof DecimalLogicalTypeAnnotation; - default -> false; - }; - if (!allowed) { - throw new InvalidSchemaException("Invalid FINITE_VECTOR schema: " + vector); - } - try { - Types.PrimitiveBuilder builder = Types.primitive(physical, element.getRepetition()); - if (physical == PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY) { - builder.length(element.getTypeLength()); - } - if (logical != null) { - builder.as(logical); - } - builder.named(element.getName()); - } catch (IllegalArgumentException | IllegalStateException e) { - throw new InvalidSchemaException("Invalid FINITE_VECTOR schema: " + vector, e); - } - } - public static FiniteVectorLogicalTypeAnnotation getFiniteVectorType(GroupType schema, String[] path) { if (path.length < 3) { return null; diff --git a/parquet-column/src/main/java/org/apache/parquet/schema/Types.java b/parquet-column/src/main/java/org/apache/parquet/schema/Types.java index 2d6f0cbf8f..90205fe569 100644 --- a/parquet-column/src/main/java/org/apache/parquet/schema/Types.java +++ b/parquet-column/src/main/java/org/apache/parquet/schema/Types.java @@ -29,6 +29,10 @@ import java.util.stream.Collectors; import org.apache.parquet.Preconditions; import org.apache.parquet.schema.ColumnOrder.ColumnOrderName; +import org.apache.parquet.schema.LogicalTypeAnnotation.DecimalLogicalTypeAnnotation; +import org.apache.parquet.schema.LogicalTypeAnnotation.FiniteVectorLogicalTypeAnnotation; +import org.apache.parquet.schema.LogicalTypeAnnotation.Float16LogicalTypeAnnotation; +import org.apache.parquet.schema.LogicalTypeAnnotation.IntLogicalTypeAnnotation; import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName; import org.apache.parquet.schema.Type.ID; import org.slf4j.Logger; @@ -846,10 +850,46 @@ public THIS addFields(Type... types) { @Override protected GroupType build(String name) { - if (newLogicalTypeSet) { - return new GroupType(repetition, name, logicalTypeAnnotation, fields, id); - } else { - return new GroupType(repetition, name, getOriginalType(), fields, id); + GroupType group = newLogicalTypeSet + ? new GroupType(repetition, name, logicalTypeAnnotation, fields, id) + : new GroupType(repetition, name, getOriginalType(), fields, id); + if (logicalTypeAnnotation instanceof FiniteVectorLogicalTypeAnnotation) { + checkFiniteVector(group); + } + return group; + } + + private static void checkFiniteVector(GroupType vector) { + if (vector.isRepetition(Type.Repetition.REPEATED) || vector.getFieldCount() != 1) { + throw new InvalidSchemaException("Invalid FINITE_VECTOR schema: " + vector); + } + Type list = vector.getType(0); + if (list.isPrimitive() + || !list.getName().equals("list") + || !list.isRepetition(Type.Repetition.REPEATED) + || list.getLogicalTypeAnnotation() != null + || list.asGroupType().getFieldCount() != 1) { + throw new InvalidSchemaException("Invalid FINITE_VECTOR schema: " + vector); + } + Type element = list.asGroupType().getType(0); + if (!element.isPrimitive() + || !element.getName().equals("element") + || !element.isRepetition(Type.Repetition.REQUIRED)) { + throw new InvalidSchemaException("Invalid FINITE_VECTOR schema: " + vector); + } + LogicalTypeAnnotation logical = element.getLogicalTypeAnnotation(); + boolean allowed = switch (element.asPrimitiveType().getPrimitiveTypeName()) { + case BOOLEAN, FLOAT, DOUBLE -> logical == null; + case INT32, INT64 -> + logical == null + || logical instanceof IntLogicalTypeAnnotation + || logical instanceof DecimalLogicalTypeAnnotation; + case FIXED_LEN_BYTE_ARRAY -> + logical instanceof Float16LogicalTypeAnnotation || logical instanceof DecimalLogicalTypeAnnotation; + default -> false; + }; + if (!allowed) { + throw new InvalidSchemaException("Invalid FINITE_VECTOR schema: " + vector); } } diff --git a/parquet-column/src/test/java/org/apache/parquet/schema/TestTypeBuildersWithLogicalTypes.java b/parquet-column/src/test/java/org/apache/parquet/schema/TestTypeBuildersWithLogicalTypes.java index e6b8d74112..4bc47f3c48 100644 --- a/parquet-column/src/test/java/org/apache/parquet/schema/TestTypeBuildersWithLogicalTypes.java +++ b/parquet-column/src/test/java/org/apache/parquet/schema/TestTypeBuildersWithLogicalTypes.java @@ -47,7 +47,6 @@ import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.stream.Stream; @@ -147,33 +146,48 @@ private static Stream invalidVectors() { vector(Types.required(FIXED_LEN_BYTE_ARRAY).length(2).named("element"))), Arguments.of(vector(Types.required(INT96).named("element"))), Arguments.of(vector(Types.required(BINARY).as(stringType()).named("element"))), - Arguments.of(vector(Types.required(INT32).as(dateType()).named("element"))), - Arguments.of( - vector(Types.required(INT32).named("element").withLogicalTypeAnnotation(intType(64, true))))); + Arguments.of(vector(Types.required(INT32).as(dateType()).named("element")))); } @ParameterizedTest @MethodSource("invalidVectors") public void testInvalidVectorSchema(GroupType vector) { - assertThatThrownBy(() -> new MessageType("m", vector)) + assertThatThrownBy(() -> Types.buildGroup(vector.getRepetition()) + .as(vector.getLogicalTypeAnnotation()) + .addFields(vector.getFields().toArray(new Type[0])) + .named(vector.getName())) .isInstanceOf(InvalidSchemaException.class) .hasMessage("Invalid FINITE_VECTOR schema: " + vector); } private static Stream vectorConstructionBoundaries() { - Type element = Types.optional(FLOAT).named("element"); - GroupType invalid = vector(element); - GroupType bad = new GroupType( - REQUIRED, "bad", finiteVectorType(5), new GroupType(Repetition.REPEATED, "list", element)); + GroupType list = + new GroupType(Repetition.REPEATED, "list", Types.optional(FLOAT).named("element")); return Stream.of( - () -> new MessageType("m", Collections.singletonList(invalid)), - () -> Types.buildMessage().addField(invalid).named("m"), + () -> Types.requiredGroup() + .as(finiteVectorType(5)) + .addField(list) + .named("v"), + () -> Types.buildMessage() + .requiredGroup() + .as(finiteVectorType(5)) + .repeatedGroup() + .optional(FLOAT) + .named("element") + .named("list") + .named("v") + .named("m"), + () -> Types.buildMessage() + .requiredGroup() + .addField(vector(Types.required(FLOAT).named("element"))) + .requiredGroup() + .as(finiteVectorType(5)) + .addField(list) + .named("bad") + .named("parent") + .named("m"), () -> MessageTypeParser.parseMessageType("message m { required group v (FINITE_VECTOR(5)) { " - + "repeated group list { optional float element; } } }"), - () -> new MessageType( - "m", - new GroupType( - REQUIRED, "parent", vector(Types.required(FLOAT).named("element")), bad))); + + "repeated group list { optional float element; } } }")); } @ParameterizedTest diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java b/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java index 88801d5175..0dc348ec2d 100644 --- a/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java +++ b/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java @@ -2039,8 +2039,8 @@ MessageType fromParquetSchema(List schema, List colu builder.id(root.field_id); } Iterator columnOrderIterator = columnOrders == null ? null : columnOrders.iterator(); - buildChildren(builder, iterator, root.getNum_children(), columnOrderIterator); try { + buildChildren(builder, iterator, root.getNum_children(), columnOrderIterator); return builder.named(root.name); } catch (InvalidSchemaException e) { throw new ParquetDecodingException("Invalid FINITE_VECTOR schema in file metadata", e);