commit 2117abcbd0ae316169e7f66655e0d202553bd290
author Gabor Szadovszky <gabor@apache.org> Tue Oct 22 15:24:20 2019 +0200
committer GitHub <noreply@github.com> Tue Oct 22 15:24:20 2019 +0200
tree e7015990d46681caee37468c946e8f7284ba96a2
parent 0c6a650a01d4075775af8aecdca14af78c5e7157

PARQUET-1682: Maintain forward compatibility for TIME/TIMESTAMP (#694)

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

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 4472376..5f61ed6 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
@@ -555,9 +555,6 @@
     @Override
     @InterfaceAudience.Private
     public OriginalType toOriginalType() {
-      if (!isAdjustedToUTC) {
-        return null;
-      }
       switch (unit) {
         case MILLIS:
           return OriginalType.TIME_MILLIS;
@@ -637,9 +634,6 @@
     @Override
     @InterfaceAudience.Private
     public OriginalType toOriginalType() {
-      if (!isAdjustedToUTC) {
-        return null;
-      }
       switch (unit) {
         case MILLIS:
           return OriginalType.TIMESTAMP_MILLIS;

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

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 deeda65..b01e73c 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
@@ -309,9 +309,6 @@
 
     @Override
     public Optional<ConvertedType> visit(LogicalTypeAnnotation.TimeLogicalTypeAnnotation timeLogicalType) {
-      if (!timeLogicalType.isAdjustedToUTC()) {
-        return empty();
-      }
       switch (timeLogicalType.getUnit()) {
         case MILLIS:
           return of(ConvertedType.TIME_MILLIS);
@@ -326,9 +323,6 @@
 
     @Override
     public Optional<ConvertedType> visit(LogicalTypeAnnotation.TimestampLogicalTypeAnnotation timestampLogicalType) {
-      if (!timestampLogicalType.isAdjustedToUTC()) {
-        return empty();
-      }
       switch (timestampLogicalType.getUnit()) {
         case MICROS:
           return of(ConvertedType.TIMESTAMP_MICROS);

parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java

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 65244f4..5da5ddf 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
@@ -269,15 +269,15 @@
     assertEquals(ConvertedType.TIMESTAMP_MILLIS, parquetMetadataConverter.convertToConvertedType(timestampType(true, MILLIS)));
     assertEquals(ConvertedType.TIMESTAMP_MICROS, parquetMetadataConverter.convertToConvertedType(timestampType(true, MICROS)));
     assertNull(parquetMetadataConverter.convertToConvertedType(timestampType(true, NANOS)));
-    assertNull(parquetMetadataConverter.convertToConvertedType(timestampType(false, MILLIS)));
-    assertNull(parquetMetadataConverter.convertToConvertedType(timestampType(false, MICROS)));
+    assertEquals(ConvertedType.TIMESTAMP_MILLIS, parquetMetadataConverter.convertToConvertedType(timestampType(false, MILLIS)));
+    assertEquals(ConvertedType.TIMESTAMP_MICROS, parquetMetadataConverter.convertToConvertedType(timestampType(false, MICROS)));
     assertNull(parquetMetadataConverter.convertToConvertedType(timestampType(false, NANOS)));
 
     assertEquals(ConvertedType.TIME_MILLIS, parquetMetadataConverter.convertToConvertedType(timeType(true, MILLIS)));
     assertEquals(ConvertedType.TIME_MICROS, parquetMetadataConverter.convertToConvertedType(timeType(true, MICROS)));
     assertNull(parquetMetadataConverter.convertToConvertedType(timeType(true, NANOS)));
-    assertNull(parquetMetadataConverter.convertToConvertedType(timeType(false, MILLIS)));
-    assertNull(parquetMetadataConverter.convertToConvertedType(timeType(false, MICROS)));
+    assertEquals(ConvertedType.TIME_MILLIS, parquetMetadataConverter.convertToConvertedType(timeType(false, MILLIS)));
+    assertEquals(ConvertedType.TIME_MICROS, parquetMetadataConverter.convertToConvertedType(timeType(false, MICROS)));
     assertNull(parquetMetadataConverter.convertToConvertedType(timeType(false, NANOS)));
 
     assertEquals(ConvertedType.DATE, parquetMetadataConverter.convertToConvertedType(dateType()));