Add parsing logical type for GroupType

Author: aihuaxu

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

@@ -118,12 +118,23 @@ private static void addGroupType(Tokenizer st, Repetition r, GroupBuilder<?> bui
     String name = st.nextToken();
 
     // Read annotation, if any.
+    String annotation = null;
     t = st.nextToken();
-    OriginalType originalType = null;
     if (t.equalsIgnoreCase("(")) {
-      originalType = OriginalType.valueOf(st.nextToken());
-      childBuilder.as(originalType);
-      check(st.nextToken(), ")", "original type ended by )", st);
+      t = st.nextToken();
+      if (isLogicalType(t)) {
+        LogicalTypeAnnotation.LogicalTypeToken logicalType = LogicalTypeAnnotation.LogicalTypeToken.valueOf(t);
+        LogicalTypeAnnotation logicalTypeAnnotation = logicalType.fromString(new ArrayList<>());
+        childBuilder.as(logicalTypeAnnotation);
+        annotation = logicalTypeAnnotation.toString();
+      } else {
+        // Try to parse as OriginalType
+        OriginalType originalType = OriginalType.valueOf(t);
+        childBuilder.as(originalType);
+        annotation = originalType.toString();
+      }
+
+      check(st.nextToken(), ")", "logical type ended by )", st);
       t = st.nextToken();
     }
     if (t.equals("=")) {
@@ -134,7 +145,7 @@ private static void addGroupType(Tokenizer st, Repetition r, GroupBuilder<?> bui
       addGroupTypeFields(t, st, childBuilder);
     } catch (IllegalArgumentException e) {
       throw new IllegalArgumentException(
-          "problem reading type: type = group, name = " + name + ", original type = " + originalType, e);
+          "problem reading type: type = group, name = " + name + ", annotation = " + annotation, e);
     }
 
     childBuilder.named(name);

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

@@ -18,7 +18,6 @@
  */
 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;
@@ -452,12 +451,12 @@ public void testEmbeddedAnnotations() {
 
   @Test
   public void testVARIANTAnnotation() {
-      String message = "message Message {\n"
-          + "  required group aVariant (VARIANT) {\n"
-          + "     required binary metadata;\n"
-          + "     required binary value;\n"
-          + "  }\n"
-          + "}\n";
+    String message = "message Message {\n"
+        + "  required group aVariant (VARIANT) {\n"
+        + "     required binary metadata;\n"
+        + "     required binary value;\n"
+        + "  }\n"
+        + "}\n";
 
     MessageType expected = buildMessage()
         .requiredGroup()
@@ -469,10 +468,10 @@ public void testVARIANTAnnotation() {
         .named("aVariant")
         .named("Message");
 
-      MessageType parsed = parseMessageType(message);
+    MessageType parsed = parseMessageType(message);
 
-      assertEquals(expected, parsed);
-      MessageType reparsed = parseMessageType(parsed.toString());
-      assertEquals(expected, reparsed);
+    assertEquals(expected, parsed);
+    MessageType reparsed = parseMessageType(parsed.toString());
+    assertEquals(expected, reparsed);
   }
 }