diff options
author | Jason Altekruse <altekrusejason@gmail.com> | 2014-07-29 17:07:34 -0500 |
---|---|---|
committer | Jacques Nadeau <jacques@apache.org> | 2014-07-29 16:49:47 -0700 |
commit | c2e32ac00e850e1ab6bee81e81070dfde4a48d9b (patch) | |
tree | f58d00d7e29e368656b6d13e9514416a45517a8c /exec/java-exec/src/main | |
parent | 5bae9c8f94da0feda0baf32b22c92826bb3067f1 (diff) |
DRILL 1221: Update for changes in Parquet-12 for new converted types. Also converted existing binary files in the test-data directory.
Diffstat (limited to 'exec/java-exec/src/main')
-rw-r--r-- | exec/java-exec/src/main/codegen/templates/ParquetTypeHelper.java | 6 | ||||
-rw-r--r-- | exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetToDrillTypeConverter.java | 25 |
2 files changed, 16 insertions, 15 deletions
diff --git a/exec/java-exec/src/main/codegen/templates/ParquetTypeHelper.java b/exec/java-exec/src/main/codegen/templates/ParquetTypeHelper.java index 15830f61c..5dbc8607d 100644 --- a/exec/java-exec/src/main/codegen/templates/ParquetTypeHelper.java +++ b/exec/java-exec/src/main/codegen/templates/ParquetTypeHelper.java @@ -110,9 +110,9 @@ public class ParquetTypeHelper { </#list> originalTypeMap.put(MinorType.VARCHAR, OriginalType.UTF8); originalTypeMap.put(MinorType.DATE, OriginalType.DATE); - originalTypeMap.put(MinorType.TIME, OriginalType.TIME); - originalTypeMap.put(MinorType.TIMESTAMP, OriginalType.TIMESTAMP); - originalTypeMap.put(MinorType.TIMESTAMPTZ, OriginalType.TIMESTAMPTZ); + originalTypeMap.put(MinorType.TIME, OriginalType.TIME_MILLIS); + originalTypeMap.put(MinorType.TIMESTAMP, OriginalType.TIMESTAMP_MILLIS); +// originalTypeMap.put(MinorType.TIMESTAMPTZ, OriginalType.TIMESTAMPTZ); } public static PrimitiveTypeName getPrimitiveTypeNameForMinorType(MinorType minorType) { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetToDrillTypeConverter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetToDrillTypeConverter.java index 7eeeeaa26..5bba6be67 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetToDrillTypeConverter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetToDrillTypeConverter.java @@ -59,9 +59,10 @@ public class ParquetToDrillTypeConverter { switch(convertedType) { case DECIMAL: return Types.withScaleAndPrecision(TypeProtos.MinorType.DECIMAL18, DataMode.OPTIONAL, schemaElement.getScale(), schemaElement.getPrecision()); - case FINETIME: - throw new UnsupportedOperationException(); - case TIMESTAMP: + // TODO - add this back if it is decided to be added upstream, was removed form our pull request July 2014 +// case TIME_MICROS: +// throw new UnsupportedOperationException(); + case TIMESTAMP_MILLIS: return Types.optional(MinorType.TIMESTAMP); default: throw new UnsupportedOperationException(String.format("unsupported type: %s %s", primitiveTypeName, convertedType)); @@ -75,7 +76,7 @@ public class ParquetToDrillTypeConverter { return Types.withScaleAndPrecision(MinorType.DECIMAL9, DataMode.OPTIONAL, schemaElement.getScale(), schemaElement.getPrecision()); case DATE: return Types.optional(MinorType.DATE); - case TIME: + case TIME_MILLIS: return Types.optional(MinorType.TIME); default: throw new UnsupportedOperationException(String.format("unsupported type: %s %s", primitiveTypeName, convertedType)); @@ -123,9 +124,9 @@ public class ParquetToDrillTypeConverter { switch(convertedType) { case DECIMAL: return Types.withScaleAndPrecision(MinorType.DECIMAL18, DataMode.REQUIRED, schemaElement.getScale(), schemaElement.getPrecision()); - case FINETIME: - throw new UnsupportedOperationException(); - case TIMESTAMP: +// case FINETIME: +// throw new UnsupportedOperationException(); + case TIMESTAMP_MILLIS: return Types.required(MinorType.TIMESTAMP); default: throw new UnsupportedOperationException(String.format("unsupported type: %s %s", primitiveTypeName, convertedType)); @@ -139,7 +140,7 @@ public class ParquetToDrillTypeConverter { return Types.withScaleAndPrecision(MinorType.DECIMAL9, DataMode.REQUIRED, schemaElement.getScale(), schemaElement.getPrecision()); case DATE: return Types.required(MinorType.DATE); - case TIME: + case TIME_MILLIS: return Types.required(MinorType.TIME); default: throw new UnsupportedOperationException(String.format("unsupported type: %s %s", primitiveTypeName, convertedType)); @@ -187,9 +188,9 @@ public class ParquetToDrillTypeConverter { switch(convertedType) { case DECIMAL: return Types.withScaleAndPrecision(MinorType.DECIMAL18, DataMode.REPEATED, schemaElement.getScale(), schemaElement.getPrecision()); - case FINETIME: - throw new UnsupportedOperationException(); - case TIMESTAMP: +// case FINETIME: +// throw new UnsupportedOperationException(); + case TIMESTAMP_MILLIS: return Types.repeated(MinorType.TIMESTAMP); default: throw new UnsupportedOperationException(String.format("unsupported type: %s %s", primitiveTypeName, convertedType)); @@ -203,7 +204,7 @@ public class ParquetToDrillTypeConverter { return Types.withScaleAndPrecision(MinorType.DECIMAL9, DataMode.REPEATED, schemaElement.getScale(), schemaElement.getPrecision()); case DATE: return Types.repeated(MinorType.DATE); - case TIME: + case TIME_MILLIS: return Types.repeated(MinorType.TIME); default: throw new UnsupportedOperationException(String.format("unsupported type: %s %s", primitiveTypeName, convertedType)); |