Cleanup

apache · Nov 28, 2023 · a9950e7 · a9950e7
1 parent 9fd776a
commit a9950e7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
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
@@ -435,10 +435,14 @@ public THIS columnOrder(ColumnOrder columnOrder) {
 
     @Override
     protected PrimitiveType build(String name) {
-//      if (PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY == primitiveType) {
-//        Preconditions.checkArgument(length > 0,
-//            "Invalid FIXED_LEN_BYTE_ARRAY length: %s", length);
-//      }
+      if (length == 0 && logicalTypeAnnotation instanceof LogicalTypeAnnotation.UUIDLogicalTypeAnnotation) {
+        length = LogicalTypeAnnotation.UUIDLogicalTypeAnnotation.BYTES;
+      }
+
+      if (PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY == primitiveType) {
+        Preconditions.checkArgument(length > 0,
+            "Invalid FIXED_LEN_BYTE_ARRAY length: %s", length);
+      }
 
       DecimalMetadata meta = decimalMetadata();
 
@@ -554,7 +558,7 @@ public Optional<Boolean> visit(LogicalTypeAnnotation.EnumLogicalTypeAnnotation e
 
           private Optional<Boolean> checkFixedPrimitiveType(int l, LogicalTypeAnnotation logicalTypeAnnotation) {
             Preconditions.checkState(
-                primitiveType == PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY,// && length == l,
+                primitiveType == PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY && length == l,
               "%s can only annotate FIXED_LEN_BYTE_ARRAY(%s)", logicalTypeAnnotation, l);
             return Optional.of(true);
           }

diff --git a/parquet-thrift/src/main/java/org/apache/parquet/thrift/ThriftSchemaConverter.java b/parquet-thrift/src/main/java/org/apache/parquet/thrift/ThriftSchemaConverter.java
@@ -222,16 +222,18 @@ private static ThriftField toThriftField(String name, Field field, ThriftField.R
         final Field listElemField = field.getListElemField();
         type = new ThriftType.ListType(toThriftField(listElemField.getName(), listElemField, requirement));
         break;
+      case UUID:
       case ENUM:
-        Collection<TEnum> enumValues = field.getEnumValues();
-        List<EnumValue> values = new ArrayList<ThriftType.EnumValue>();
-        for (TEnum tEnum : enumValues) {
-          values.add(new EnumValue(tEnum.getValue(), tEnum.toString()));
+        if (field.isEnum()) {
+          Collection<TEnum> enumValues = field.getEnumValues();
+          List<EnumValue> values = new ArrayList<ThriftType.EnumValue>();
+          for (TEnum tEnum : enumValues) {
+            values.add(new EnumValue(tEnum.getValue(), tEnum.toString()));
+          }
+          type = new EnumType(values);
+        } else {
+          type = new UUIDType();
         }
-        type = new EnumType(values);
-        break;
-      case UUID:
-        type = new UUIDType();
         break;
     }
     return new ThriftField(name, field.getId(), requirement, type);