LocalTime column writing now uses MILLI precision (int32)

tlabs-data · Apr 30, 2022 · af5a5b5 · af5a5b5
1 parent b55f28e
commit af5a5b5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -200,7 +200,7 @@ Note that the `ColumnType.SKIP` column type can be used with these options to fi
 | DoubleColumn | DOUBLE |  |
 | StringColumn | BINARY (STRING) |  |
 | TextColumn | BINARY (STRING) |  |
-| TimeColumn | INT64 (TIME: NANOS, not UTC) | *Will change to INT32 MILLIS in a future release* |
+| TimeColumn | INT32 (TIME: MILLIS, not UTC) | *Changed in v0.11.0, was INT64 (TIME: NANOS, not UTC) before* |
 | DateColumn | INT32 (DATE) |  |
 | DateTimeColumn | INT64 (TIMESTAMP: MILLIS, not UTC) |  |
 | InstantColumn | INT64 (TIMESTAMP: MILLIS, UTC) |  |

diff --git a/src/main/java/net/tlabs/tablesaw/parquet/TableProxy.java b/src/main/java/net/tlabs/tablesaw/parquet/TableProxy.java
@@ -237,9 +237,8 @@ int getDateAsEpochDay(final int colIndex, final int rowIndex) {
         return (int) PackedLocalDate.toEpochDay(dateColumns[colIndex].getIntInternal(rowIndex));
     }
 
-    long getTimeAsNanoOfDay(final int colIndex, final int rowIndex) {
-//        return PackedLocalTime.getMillisecondOfDay(timeColumns[colIndex].getIntInternal(rowIndex));
-        return PackedLocalTime.toNanoOfDay(timeColumns[colIndex].getIntInternal(rowIndex));
+    int getTimeAsMilliOfDay(final int colIndex, final int rowIndex) {
+      return PackedLocalTime.getMillisecondOfDay(timeColumns[colIndex].getIntInternal(rowIndex));
     }
 
     long getInstantAsEpochMilli(final int colIndex, final int rowIndex) {

diff --git a/src/main/java/net/tlabs/tablesaw/parquet/TablesawWriteSupport.java b/src/main/java/net/tlabs/tablesaw/parquet/TablesawWriteSupport.java
@@ -109,7 +109,7 @@ public void recordValue(final RecordConsumer recordConsumer, final TableProxy ta
             @Override
             public void recordValue(final RecordConsumer recordConsumer, final TableProxy tableProxy,
                     final int colIndex, final int rowNumber) {
-                recordConsumer.addLong(tableProxy.getTimeAsNanoOfDay(colIndex, rowNumber));
+                recordConsumer.addInteger(tableProxy.getTimeAsMilliOfDay(colIndex, rowNumber));
             }
         },
         LOCAL_DATE_TIME(ColumnType.LOCAL_DATE_TIME) {
@@ -158,14 +158,14 @@ abstract public void recordValue(final RecordConsumer recordConsumer, final Tabl
         PRIMITIVE_MAPPING.put(ColumnType.LONG, PrimitiveTypeName.INT64);
         PRIMITIVE_MAPPING.put(ColumnType.INSTANT, PrimitiveTypeName.INT64);
         PRIMITIVE_MAPPING.put(ColumnType.LOCAL_DATE, PrimitiveTypeName.INT32);
-        PRIMITIVE_MAPPING.put(ColumnType.LOCAL_TIME, PrimitiveTypeName.INT64);
+        PRIMITIVE_MAPPING.put(ColumnType.LOCAL_TIME, PrimitiveTypeName.INT32);
         PRIMITIVE_MAPPING.put(ColumnType.LOCAL_DATE_TIME, PrimitiveTypeName.INT64);
         PRIMITIVE_MAPPING.put(ColumnType.STRING, PrimitiveTypeName.BINARY);
         PRIMITIVE_MAPPING.put(ColumnType.TEXT, PrimitiveTypeName.BINARY);
         ANNOTATION_MAPPING = new HashMap<>();
         ANNOTATION_MAPPING.put(ColumnType.SHORT, LogicalTypeAnnotation.intType(16, true));
         ANNOTATION_MAPPING.put(ColumnType.LOCAL_DATE, LogicalTypeAnnotation.dateType());
-        ANNOTATION_MAPPING.put(ColumnType.LOCAL_TIME, LogicalTypeAnnotation.timeType(false, TimeUnit.NANOS));
+        ANNOTATION_MAPPING.put(ColumnType.LOCAL_TIME, LogicalTypeAnnotation.timeType(false, TimeUnit.MILLIS));
         ANNOTATION_MAPPING.put(ColumnType.INSTANT, LogicalTypeAnnotation.timestampType(true, TimeUnit.MILLIS));
         ANNOTATION_MAPPING.put(ColumnType.LOCAL_DATE_TIME, LogicalTypeAnnotation.timestampType(false, TimeUnit.MILLIS));
         ANNOTATION_MAPPING.put(ColumnType.STRING, LogicalTypeAnnotation.stringType());