Remove the deprecated OriginalType

Author: Fokko

parquet-arrow/src/main/java/org/apache/parquet/arrow/schema/List3Levels.java

@@ -21,6 +21,7 @@
 import static org.apache.parquet.schema.Type.Repetition.REPEATED;
 
 import org.apache.parquet.schema.GroupType;
+import org.apache.parquet.schema.LogicalTypeAnnotation;
 import org.apache.parquet.schema.OriginalType;
 import org.apache.parquet.schema.Type;
 
@@ -41,7 +42,7 @@ class List3Levels {
    * @param list the Parquet List
    */
   public List3Levels(GroupType list) {
-    if (list.getOriginalType() != OriginalType.LIST || list.getFields().size() != 1) {
+    if (list.getLogicalTypeAnnotation() != LogicalTypeAnnotation.listType() || list.getFields().size() != 1) {
       throw new IllegalArgumentException("invalid list type: " + list);
     }
     this.list = list;

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

@@ -145,16 +145,6 @@ protected LogicalTypeAnnotation fromString(List<String> params) {
     protected abstract LogicalTypeAnnotation fromString(List<String> params);
   }
 
-  /**
-   * Convert this logical type to old logical type representation in parquet-mr (if there's any).
-   * Those logical type implementations, which don't have a corresponding mapping should return null.
-   *
-   * API should be considered private
-   *
-   * @return the OriginalType representation of the new logical type, or null if there's none
-   */
-  public abstract OriginalType toOriginalType();
-
   /**
    * Visits this logical type with the given visitor
    *
@@ -303,16 +293,6 @@ public static class StringLogicalTypeAnnotation extends LogicalTypeAnnotation {
     private StringLogicalTypeAnnotation() {
     }
 
-    /**
-     * API Should be considered private
-     *
-     * @return the original type
-     */
-    @Override
-    public OriginalType toOriginalType() {
-      return OriginalType.UTF8;
-    }
-
     @Override
     public <T> Optional<T> accept(LogicalTypeAnnotationVisitor<T> logicalTypeAnnotationVisitor) {
       return logicalTypeAnnotationVisitor.visit(this);
@@ -346,16 +326,6 @@ public static class MapLogicalTypeAnnotation extends LogicalTypeAnnotation {
     private MapLogicalTypeAnnotation() {
     }
 
-    /**
-     * API Should be considered private
-     *
-     * @return the original type
-     */
-    @Override
-    public OriginalType toOriginalType() {
-      return OriginalType.MAP;
-    }
-
     @Override
     public <T> Optional<T> accept(LogicalTypeAnnotationVisitor<T> logicalTypeAnnotationVisitor) {
       return logicalTypeAnnotationVisitor.visit(this);
@@ -384,16 +354,6 @@ public static class ListLogicalTypeAnnotation extends LogicalTypeAnnotation {
     private ListLogicalTypeAnnotation() {
     }
 
-    /**
-     * API Should be considered private
-     *
-     * @return the original type
-     */
-    @Override
-    public OriginalType toOriginalType() {
-      return OriginalType.LIST;
-    }
-
     @Override
     public <T> Optional<T> accept(LogicalTypeAnnotationVisitor<T> logicalTypeAnnotationVisitor) {
       return logicalTypeAnnotationVisitor.visit(this);
@@ -422,16 +382,6 @@ public static class EnumLogicalTypeAnnotation extends LogicalTypeAnnotation {
     private EnumLogicalTypeAnnotation() {
     }
 
-    /**
-     * API Should be considered private
-     *
-     * @return the original type
-     */
-    @Override
-    public OriginalType toOriginalType() {
-      return OriginalType.ENUM;
-    }
-
     @Override
     public <T> Optional<T> accept(LogicalTypeAnnotationVisitor<T> logicalTypeAnnotationVisitor) {
       return logicalTypeAnnotationVisitor.visit(this);
@@ -478,16 +428,6 @@ public int getScale() {
       return scale;
     }
 
-    /**
-     * API Should be considered private
-     *
-     * @return the original type
-     */
-    @Override
-    public OriginalType toOriginalType() {
-      return OriginalType.DECIMAL;
-    }
-
     @Override
     public <T> Optional<T> accept(LogicalTypeAnnotationVisitor<T> logicalTypeAnnotationVisitor) {
       return logicalTypeAnnotationVisitor.visit(this);
@@ -535,16 +475,6 @@ public static class DateLogicalTypeAnnotation extends LogicalTypeAnnotation {
     private DateLogicalTypeAnnotation() {
     }
 
-    /**
-     * API Should be considered private
-     *
-     * @return the original type
-     */
-    @Override
-    public OriginalType toOriginalType() {
-      return OriginalType.DATE;
-    }
-
     @Override
     public <T> Optional<T> accept(LogicalTypeAnnotationVisitor<T> logicalTypeAnnotationVisitor) {
       return logicalTypeAnnotationVisitor.visit(this);
@@ -587,23 +517,6 @@ private TimeLogicalTypeAnnotation(boolean isAdjustedToUTC, TimeUnit unit) {
       this.unit = unit;
     }
 
-    /**
-     * API Should be considered private
-     *
-     * @return the original type
-     */
-    @Override
-    public OriginalType toOriginalType() {
-      switch (unit) {
-        case MILLIS:
-          return OriginalType.TIME_MILLIS;
-        case MICROS:
-          return OriginalType.TIME_MICROS;
-        default:
-          return null;
-      }
-    }
-
     @Override
     public <T> Optional<T> accept(LogicalTypeAnnotationVisitor<T> logicalTypeAnnotationVisitor) {
       return logicalTypeAnnotationVisitor.visit(this);
@@ -670,23 +583,6 @@ private TimestampLogicalTypeAnnotation(boolean isAdjustedToUTC, TimeUnit unit) {
       this.unit = unit;
     }
 
-    /**
-     * API Should be considered private
-     *
-     * @return the original type
-     */
-    @Override
-    public OriginalType toOriginalType() {
-      switch (unit) {
-        case MILLIS:
-          return OriginalType.TIMESTAMP_MILLIS;
-        case MICROS:
-          return OriginalType.TIMESTAMP_MICROS;
-        default:
-          return null;
-      }
-    }
-
     @Override
     public <T> Optional<T> accept(LogicalTypeAnnotationVisitor<T> logicalTypeAnnotationVisitor) {
       return logicalTypeAnnotationVisitor.visit(this);
@@ -760,27 +656,6 @@ private IntLogicalTypeAnnotation(int bitWidth, boolean isSigned) {
       this.isSigned = isSigned;
     }
 
-    /**
-     * API Should be considered private
-     *
-     * @return the original type
-     */
-    @Override
-    public OriginalType toOriginalType() {
-      switch (bitWidth) {
-        case 8:
-          return isSigned ? OriginalType.INT_8 : OriginalType.UINT_8;
-        case 16:
-          return isSigned ? OriginalType.INT_16 : OriginalType.UINT_16;
-        case 32:
-          return isSigned ? OriginalType.INT_32 : OriginalType.UINT_32;
-        case 64:
-          return isSigned ? OriginalType.INT_64 : OriginalType.UINT_64;
-        default:
-          return null;
-      }
-    }
-
     @Override
     public <T> Optional<T> accept(LogicalTypeAnnotationVisitor<T> logicalTypeAnnotationVisitor) {
       return logicalTypeAnnotationVisitor.visit(this);
@@ -836,16 +711,6 @@ public static class JsonLogicalTypeAnnotation extends LogicalTypeAnnotation {
     private JsonLogicalTypeAnnotation() {
     }
 
-    /**
-     * API Should be considered private
-     *
-     * @return the original type
-     */
-    @Override
-    public OriginalType toOriginalType() {
-      return OriginalType.JSON;
-    }
-
     @Override
     public <T> Optional<T> accept(LogicalTypeAnnotationVisitor<T> logicalTypeAnnotationVisitor) {
       return logicalTypeAnnotationVisitor.visit(this);
@@ -879,16 +744,6 @@ public static class BsonLogicalTypeAnnotation extends LogicalTypeAnnotation {
     private BsonLogicalTypeAnnotation() {
     }
 
-    /**
-     * API Should be considered private
-     *
-     * @return the original type
-     */
-    @Override
-    public OriginalType toOriginalType() {
-      return OriginalType.BSON;
-    }
-
     @Override
     public <T> Optional<T> accept(LogicalTypeAnnotationVisitor<T> logicalTypeAnnotationVisitor) {
       return logicalTypeAnnotationVisitor.visit(this);
@@ -923,17 +778,6 @@ public static class UUIDLogicalTypeAnnotation extends LogicalTypeAnnotation {
     private UUIDLogicalTypeAnnotation() {
     }
 
-    /**
-     * API Should be considered private
-     *
-     * @return the original type
-     */
-    @Override
-    public OriginalType toOriginalType() {
-      // No OriginalType for UUID
-      return null;
-    }
-
     @Override
     public <T> Optional<T> accept(LogicalTypeAnnotationVisitor<T> logicalTypeAnnotationVisitor) {
       return logicalTypeAnnotationVisitor.visit(this);
@@ -963,16 +807,6 @@ public static LogicalTypeAnnotation getInstance() {
     private IntervalLogicalTypeAnnotation() {
     }
 
-    /**
-     * API Should be considered private
-     *
-     * @return the original type
-     */
-    @Override
-    public OriginalType toOriginalType() {
-      return OriginalType.INTERVAL;
-    }
-
     @Override
     public <T> Optional<T> accept(LogicalTypeAnnotationVisitor<T> logicalTypeAnnotationVisitor) {
       return logicalTypeAnnotationVisitor.visit(this);
@@ -1018,16 +852,6 @@ public static MapKeyValueTypeAnnotation getInstance() {
     private MapKeyValueTypeAnnotation() {
     }
 
-    /**
-     * API Should be considered private
-     *
-     * @return the original type
-     */
-    @Override
-    public OriginalType toOriginalType() {
-      return OriginalType.MAP_KEY_VALUE;
-    }
-
     @Override
     public <T> Optional<T> accept(LogicalTypeAnnotationVisitor<T> logicalTypeAnnotationVisitor) {
       return logicalTypeAnnotationVisitor.visit(this);

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

@@ -227,13 +227,6 @@ public LogicalTypeAnnotation getLogicalTypeAnnotation() {
     return logicalTypeAnnotation;
   }
 
-  /**
-   * @return the original type (LIST, MAP, ...)
-   */
-  public OriginalType getOriginalType() {
-    return logicalTypeAnnotation == null ? null : logicalTypeAnnotation.toOriginalType();
-  }
-
   /**
    * @return if this is a primitive type
    */

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

@@ -329,10 +329,6 @@ public P named(String name) {
             "[BUG] Parent and return type are null: must override named");
       }
     }
-
-    protected OriginalType getOriginalType () {
-      return logicalTypeAnnotation == null ? null : logicalTypeAnnotation.toOriginalType();
-    }
   }
 
   public abstract static class
@@ -441,6 +437,9 @@ protected PrimitiveType build(String name) {
       }
 
       DecimalMetadata meta = decimalMetadata();
+      if (logicalTypeAnnotation instanceof LogicalTypeAnnotation.DecimalLogicalTypeAnnotation) {
+        this.logicalTypeAnnotation = LogicalTypeAnnotation.fromOriginalType(OriginalType.DECIMAL, meta);
+      }
 
       // validate type annotations and required metadata
       if (logicalTypeAnnotation != null) {
@@ -580,11 +579,7 @@ private Optional<Boolean> checkInt64PrimitiveType(LogicalTypeAnnotation logicalT
         }).orElseThrow(() -> new IllegalStateException(logicalTypeAnnotation + " can not be applied to a primitive type"));
       }
 
-      if (newLogicalTypeSet) {
-        return new PrimitiveType(repetition, primitiveType, length, name, logicalTypeAnnotation, id, columnOrder);
-      } else {
-        return new PrimitiveType(repetition, primitiveType, length, name, getOriginalType(), meta, id, columnOrder);
-      }
+      return new PrimitiveType(repetition, primitiveType, length, name, logicalTypeAnnotation, id, columnOrder);
     }
 
     private static long maxPrecision(int numBytes) {
@@ -596,7 +591,6 @@ private static long maxPrecision(int numBytes) {
     }
 
     protected DecimalMetadata decimalMetadata() {
-      DecimalMetadata meta = null;
       if (logicalTypeAnnotation instanceof LogicalTypeAnnotation.DecimalLogicalTypeAnnotation) {
         LogicalTypeAnnotation.DecimalLogicalTypeAnnotation decimalType = (LogicalTypeAnnotation.DecimalLogicalTypeAnnotation) logicalTypeAnnotation;
         if (newLogicalTypeSet) {
@@ -617,9 +611,8 @@ protected DecimalMetadata decimalMetadata() {
             "Invalid DECIMAL scale: %s", this.scale);
         Preconditions.checkArgument(this.scale <= precision,
             "Invalid DECIMAL scale: cannot be greater than precision");
-        meta = new DecimalMetadata(precision, scale);
       }
-      return meta;
+      return new DecimalMetadata(precision, scale);
     }
   }
 
@@ -772,11 +765,7 @@ 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);
-      }
+      return new GroupType(repetition, name, logicalTypeAnnotation, fields, id);
     }
 
     public MapBuilder<THIS> map(