Update to parquet-format 2.11.0

Author: aihuaxu

parquet-column/src/main/java/org/apache/parquet/schema/LogicalTypeAnnotation.java

@@ -59,6 +59,9 @@ protected LogicalTypeAnnotation fromString(List<String> params) {
     VARIANT {
       @Override
       protected LogicalTypeAnnotation fromString(List<String> params) {
+        Preconditions.checkArgument(
+            params.isEmpty(), "Expecting 0 parameter for variant logical type, got %d", params.size());
+
         return variantType();
       }
     },

parquet-column/src/test/java/org/apache/parquet/parser/TestParquetParser.java

@@ -18,6 +18,7 @@
  */
 package org.apache.parquet.parser;
 
+import static org.apache.parquet.format.LogicalTypes.VARIANT;
 import static org.apache.parquet.schema.LogicalTypeAnnotation.TimeUnit.MILLIS;
 import static org.apache.parquet.schema.LogicalTypeAnnotation.TimeUnit.NANOS;
 import static org.apache.parquet.schema.LogicalTypeAnnotation.intType;
@@ -55,6 +56,7 @@
 import static org.junit.Assert.assertEquals;
 
 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.OriginalType;
@@ -447,4 +449,30 @@ public void testEmbeddedAnnotations() {
     MessageType reparsed = MessageTypeParser.parseMessageType(parsed.toString());
     assertEquals(expected, reparsed);
   }
+
+  @Test
+  public void testVARIANTAnnotation() {
+      String message = "message Message {\n"
+          + "  required group aVariant (VARIANT) {\n"
+          + "     required binary metadata;\n"
+          + "     required binary value;\n"
+          + "  }\n"
+          + "}\n";
+
+    MessageType expected = buildMessage()
+        .requiredGroup()
+        .as(LogicalTypeAnnotation.variantType())
+        .required(BINARY)
+        .named("metadata")
+        .required(BINARY)
+        .named("value")
+        .named("aVariant")
+        .named("Message");
+
+      MessageType parsed = parseMessageType(message);
+
+      assertEquals(expected, parsed);
+      MessageType reparsed = parseMessageType(parsed.toString());
+      assertEquals(expected, reparsed);
+  }
 }

parquet-format-structures/src/main/java/org/apache/parquet/format/LogicalTypes.java

@@ -53,4 +53,5 @@ public static LogicalType DECIMAL(int scale, int precision) {
   public static final LogicalType JSON = LogicalType.JSON(new JsonType());
   public static final LogicalType BSON = LogicalType.BSON(new BsonType());
   public static final LogicalType FLOAT16 = LogicalType.FLOAT16(new Float16Type());
+  public static final LogicalType VARIANT = LogicalType.VARIANT(new VariantType());
 }

parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java

@@ -112,6 +112,7 @@
 import org.apache.parquet.format.TypeDefinedOrder;
 import org.apache.parquet.format.UUIDType;
 import org.apache.parquet.format.Uncompressed;
+import org.apache.parquet.format.VariantType;
 import org.apache.parquet.format.XxHash;
 import org.apache.parquet.hadoop.metadata.BlockMetaData;
 import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData;
@@ -516,14 +517,19 @@ public Optional<LogicalType> visit(LogicalTypeAnnotation.Float16LogicalTypeAnnot
     }
 
     @Override
-    public Optional<LogicalType> visit(LogicalTypeAnnotation.UnknownLogicalTypeAnnotation intervalLogicalType) {
+    public Optional<LogicalType> visit(LogicalTypeAnnotation.UnknownLogicalTypeAnnotation unknownLogicalType) {
       return of(LogicalType.UNKNOWN(new NullType()));
     }
 
     @Override
     public Optional<LogicalType> visit(LogicalTypeAnnotation.IntervalLogicalTypeAnnotation intervalLogicalType) {
       return of(LogicalType.UNKNOWN(new NullType()));
     }
+
+    @Override
+    public Optional<LogicalType> visit(LogicalTypeAnnotation.VariantLogicalTypeAnnotation variantLogicalType) {
+      return of(LogicalType.VARIANT(new VariantType()));
+    }
   }
 
   private void addRowGroup(

pom.xml

@@ -94,7 +94,7 @@
     <shade.prefix>shaded.parquet</shade.prefix>
     <!-- Guarantees no newer classes/methods/constants are used by parquet. -->
     <hadoop.version>3.3.0</hadoop.version>
-    <parquet.format.version>2.10.0</parquet.format.version>
+    <parquet.format.version>2.11.0</parquet.format.version>
     <previous.version>1.15.1</previous.version>
     <thrift.executable>thrift</thrift.executable>
     <format.thrift.executable>${thrift.executable}</format.thrift.executable>