Resolving review comments

deephaven · Jun 17, 2024 · e53a4b5 · e53a4b5
1 parent 732e907
commit e53a4b5
Show file tree

Hide file tree

Showing 17 changed files with 304 additions and 165 deletions.
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PageMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PageMaterializer.java
@@ -57,9 +57,9 @@ static PageMaterializerFactory factoryForType(@NotNull final PrimitiveType primi
                         // The column will store nanoseconds elapsed since epoch as long values
                         switch (timestampLogicalType.getUnit()) {
                             case MILLIS:
-                                return TimestampNanosFromMillisMaterializer.Factory;
+                                return InstantNanosFromMillisMaterializer.Factory;
                             case MICROS:
-                                return TimestampNanosFromMicrosMaterializer.Factory;
+                                return InstantNanosFromMicrosMaterializer.Factory;
                             case NANOS:
                                 return LongMaterializer.Factory;
                         }
@@ -68,11 +68,11 @@ static PageMaterializerFactory factoryForType(@NotNull final PrimitiveType primi
                         // Ref:https://github.com/apache/parquet-format/blob/master/LogicalTypes.md#local-semantics-timestamps-not-normalized-to-utc
                         switch (timestampLogicalType.getUnit()) {
                             case MILLIS:
-                                return LocalDateTimeMaterializer.FromMillisFactory;
+                                return LocalDateTimeFromMillisMaterializer.Factory;
                             case MICROS:
-                                return LocalDateTimeMaterializer.FromMicrosFactory;
+                                return LocalDateTimeFromMicrosMaterializer.Factory;
                             case NANOS:
-                                return LocalDateTimeMaterializer.FromNanosFactory;
+                                return LocalDateTimeFromNanosMaterializer.Factory;
                         }
                     }
                 } else if (logicalTypeAnnotation instanceof LogicalTypeAnnotation.TimeLogicalTypeAnnotation) {
@@ -101,7 +101,7 @@ static PageMaterializerFactory factoryForType(@NotNull final PrimitiveType primi
                 if (logicalTypeAnnotation instanceof LogicalTypeAnnotation.StringLogicalTypeAnnotation) {
                     return StringMaterializer.Factory;
                 }
-            case FIXED_LEN_BYTE_ARRAY:
+            case FIXED_LEN_BYTE_ARRAY: // fall through
                 return BlobMaterializer.Factory;
             default:
                 throw new RuntimeException("Unexpected type name:" + primitiveTypeName);

diff --git a/...e/src/main/java/io/deephaven/parquet/base/materializers/InstantFromInt96Materializer.java b/...e/src/main/java/io/deephaven/parquet/base/materializers/InstantFromInt96Materializer.java
@@ -29,8 +29,8 @@ public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int num
     };
 
     /**
-     * {@link PageMaterializer} implementation for {@link Instant}s stored as Int96s representing an Impala format
-     * Timestamp (nanoseconds of day and Julian date encoded as 8 bytes and 4 bytes, respectively)
+     * {@link PageMaterializer} implementation for {@link Instant Instants} stored as Int96s representing an Impala
+     * format Timestamp (nanoseconds of day and Julian date encoded as 8 bytes and 4 bytes, respectively)
      */
     private static final class InstantFromInt96PageMaterializer extends LongPageMaterializerBase
             implements PageMaterializer {
@@ -68,11 +68,17 @@ private InstantFromInt96PageMaterializer(ValuesReader dataReader, long nullValue
          */
         private static void setReferenceTimeZone(@NotNull final String timeZone) {
             offset = DateTimeUtils.nanosOfDay(DateTimeUtils.parseInstant("1970-01-01T00:00:00 " + timeZone),
-                    ZoneId.of("UTC"));
+                    ZoneId.of("UTC"), false);
         }
 
         @Override
-        long readLong() {
+        public void fillValues(int startIndex, int endIndex) {
+            for (int ii = startIndex; ii < endIndex; ii++) {
+                data[ii] = readInstantNanos();
+            }
+        }
+
+        long readInstantNanos() {
             final ByteBuffer resultBuffer = ByteBuffer.wrap(dataReader.readBytes().getBytesUnsafe());
             resultBuffer.order(java.nio.ByteOrder.LITTLE_ENDIAN);
             final long nanos = resultBuffer.getLong();

diff --git a/...TimestampNanosFromMicrosMaterializer.java → ...s/InstantNanosFromMicrosMaterializer.java b/...TimestampNanosFromMicrosMaterializer.java → ...s/InstantNanosFromMicrosMaterializer.java
@@ -8,37 +8,39 @@
 import io.deephaven.time.DateTimeUtils;
 import org.apache.parquet.column.values.ValuesReader;
 
-public class TimestampNanosFromMicrosMaterializer {
+public class InstantNanosFromMicrosMaterializer {
 
     public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
-            return new TimestampNanosFromMicrosPageMaterializer(dataReader, (long) nullValue, numValues);
+            return new InstantNanosFromMicrosPageMaterializer(dataReader, (long) nullValue, numValues);
         }
 
         @Override
         public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues) {
-            return new TimestampNanosFromMicrosPageMaterializer(dataReader, numValues);
+            return new InstantNanosFromMicrosPageMaterializer(dataReader, numValues);
         }
     };
 
-    private static final class TimestampNanosFromMicrosPageMaterializer extends LongPageMaterializerBase
+    private static final class InstantNanosFromMicrosPageMaterializer extends LongPageMaterializerBase
             implements PageMaterializer {
 
         final ValuesReader dataReader;
 
-        private TimestampNanosFromMicrosPageMaterializer(ValuesReader dataReader, int numValues) {
+        private InstantNanosFromMicrosPageMaterializer(ValuesReader dataReader, int numValues) {
             this(dataReader, 0, numValues);
         }
 
-        private TimestampNanosFromMicrosPageMaterializer(ValuesReader dataReader, long nullValue, int numValues) {
+        private InstantNanosFromMicrosPageMaterializer(ValuesReader dataReader, long nullValue, int numValues) {
             super(nullValue, numValues);
             this.dataReader = dataReader;
         }
 
         @Override
-        long readLong() {
-            return DateTimeUtils.microsToNanos(dataReader.readLong());
+        public void fillValues(int startIndex, int endIndex) {
+            for (int ii = startIndex; ii < endIndex; ii++) {
+                data[ii] = DateTimeUtils.microsToNanos(dataReader.readLong());
+            }
         }
     }
 }
diff --git a/...TimestampNanosFromMillisMaterializer.java → ...s/InstantNanosFromMillisMaterializer.java b/...TimestampNanosFromMillisMaterializer.java → ...s/InstantNanosFromMillisMaterializer.java
@@ -2,7 +2,7 @@
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
 // ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit TimestampNanosFromMicrosMaterializer and run "./gradlew replicatePageMaterializers" to regenerate
+// ****** Edit InstantNanosFromMicrosMaterializer and run "./gradlew replicatePageMaterializers" to regenerate
 //
 // @formatter:off
 package io.deephaven.parquet.base.materializers;
@@ -12,37 +12,39 @@
 import io.deephaven.time.DateTimeUtils;
 import org.apache.parquet.column.values.ValuesReader;
 
-public class TimestampNanosFromMillisMaterializer {
+public class InstantNanosFromMillisMaterializer {
 
     public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
-            return new TimestampNanosFromMillisPageMaterializer(dataReader, (long) nullValue, numValues);
+            return new InstantNanosFromMillisPageMaterializer(dataReader, (long) nullValue, numValues);
         }
 
         @Override
         public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues) {
-            return new TimestampNanosFromMillisPageMaterializer(dataReader, numValues);
+            return new InstantNanosFromMillisPageMaterializer(dataReader, numValues);
         }
     };
 
-    private static final class TimestampNanosFromMillisPageMaterializer extends LongPageMaterializerBase
+    private static final class InstantNanosFromMillisPageMaterializer extends LongPageMaterializerBase
             implements PageMaterializer {
 
         final ValuesReader dataReader;
 
-        private TimestampNanosFromMillisPageMaterializer(ValuesReader dataReader, int numValues) {
+        private InstantNanosFromMillisPageMaterializer(ValuesReader dataReader, int numValues) {
             this(dataReader, 0, numValues);
         }
 
-        private TimestampNanosFromMillisPageMaterializer(ValuesReader dataReader, long nullValue, int numValues) {
+        private InstantNanosFromMillisPageMaterializer(ValuesReader dataReader, long nullValue, int numValues) {
             super(nullValue, numValues);
             this.dataReader = dataReader;
         }
 
         @Override
-        long readLong() {
-            return DateTimeUtils.millisToNanos(dataReader.readLong());
+        public void fillValues(int startIndex, int endIndex) {
+            for (int ii = startIndex; ii < endIndex; ii++) {
+                data[ii] = DateTimeUtils.millisToNanos(dataReader.readLong());
+            }
         }
     }
 }
diff --git a/...ain/java/io/deephaven/parquet/base/materializers/LocalDateTimeFromMicrosMaterializer.java b/...ain/java/io/deephaven/parquet/base/materializers/LocalDateTimeFromMicrosMaterializer.java
@@ -0,0 +1,49 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.parquet.base.materializers;
+
+import io.deephaven.parquet.base.PageMaterializer;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import io.deephaven.parquet.base.ParquetTimeUtils;
+import org.apache.parquet.column.values.ValuesReader;
+
+import java.time.LocalDateTime;
+
+public class LocalDateTimeFromMicrosMaterializer {
+
+    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
+        @Override
+        public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
+            return new LocalDateTimeFromMicrosPageMaterializer(dataReader, (LocalDateTime) nullValue, numValues);
+        }
+
+        @Override
+        public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues) {
+            return new LocalDateTimeFromMicrosPageMaterializer(dataReader, numValues);
+        }
+    };
+
+    private static final class LocalDateTimeFromMicrosPageMaterializer extends LocalDateTimePageMaterializerBase
+            implements PageMaterializer {
+
+        final ValuesReader dataReader;
+
+        private LocalDateTimeFromMicrosPageMaterializer(ValuesReader dataReader, int numValues) {
+            this(dataReader, null, numValues);
+        }
+
+        private LocalDateTimeFromMicrosPageMaterializer(ValuesReader dataReader, LocalDateTime nullValue,
+                int numValues) {
+            super(nullValue, numValues);
+            this.dataReader = dataReader;
+        }
+
+        @Override
+        public void fillValues(int startIndex, int endIndex) {
+            for (int ii = startIndex; ii < endIndex; ii++) {
+                data[ii] = ParquetTimeUtils.epochMicrosToLocalDateTimeUTC(dataReader.readLong());
+            }
+        }
+    }
+}
diff --git a/...ain/java/io/deephaven/parquet/base/materializers/LocalDateTimeFromMillisMaterializer.java b/...ain/java/io/deephaven/parquet/base/materializers/LocalDateTimeFromMillisMaterializer.java
@@ -0,0 +1,53 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit LocalDateTimeFromMicrosMaterializer and run "./gradlew replicatePageMaterializers" to regenerate
+//
+// @formatter:off
+package io.deephaven.parquet.base.materializers;
+
+import io.deephaven.parquet.base.PageMaterializer;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import io.deephaven.parquet.base.ParquetTimeUtils;
+import org.apache.parquet.column.values.ValuesReader;
+
+import java.time.LocalDateTime;
+
+public class LocalDateTimeFromMillisMaterializer {
+
+    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
+        @Override
+        public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
+            return new LocalDateTimeFromMillisPageMaterializer(dataReader, (LocalDateTime) nullValue, numValues);
+        }
+
+        @Override
+        public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues) {
+            return new LocalDateTimeFromMillisPageMaterializer(dataReader, numValues);
+        }
+    };
+
+    private static final class LocalDateTimeFromMillisPageMaterializer extends LocalDateTimePageMaterializerBase
+            implements PageMaterializer {
+
+        final ValuesReader dataReader;
+
+        private LocalDateTimeFromMillisPageMaterializer(ValuesReader dataReader, int numValues) {
+            this(dataReader, null, numValues);
+        }
+
+        private LocalDateTimeFromMillisPageMaterializer(ValuesReader dataReader, LocalDateTime nullValue,
+                int numValues) {
+            super(nullValue, numValues);
+            this.dataReader = dataReader;
+        }
+
+        @Override
+        public void fillValues(int startIndex, int endIndex) {
+            for (int ii = startIndex; ii < endIndex; ii++) {
+                data[ii] = ParquetTimeUtils.epochMillisToLocalDateTimeUTC(dataReader.readLong());
+            }
+        }
+    }
+}
diff --git a/...main/java/io/deephaven/parquet/base/materializers/LocalDateTimeFromNanosMaterializer.java b/...main/java/io/deephaven/parquet/base/materializers/LocalDateTimeFromNanosMaterializer.java
@@ -0,0 +1,53 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit LocalDateTimeFromMicrosMaterializer and run "./gradlew replicatePageMaterializers" to regenerate
+//
+// @formatter:off
+package io.deephaven.parquet.base.materializers;
+
+import io.deephaven.parquet.base.PageMaterializer;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import io.deephaven.parquet.base.ParquetTimeUtils;
+import org.apache.parquet.column.values.ValuesReader;
+
+import java.time.LocalDateTime;
+
+public class LocalDateTimeFromNanosMaterializer {
+
+    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
+        @Override
+        public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
+            return new LocalDateTimeFromNanosPageMaterializer(dataReader, (LocalDateTime) nullValue, numValues);
+        }
+
+        @Override
+        public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues) {
+            return new LocalDateTimeFromNanosPageMaterializer(dataReader, numValues);
+        }
+    };
+
+    private static final class LocalDateTimeFromNanosPageMaterializer extends LocalDateTimePageMaterializerBase
+            implements PageMaterializer {
+
+        final ValuesReader dataReader;
+
+        private LocalDateTimeFromNanosPageMaterializer(ValuesReader dataReader, int numValues) {
+            this(dataReader, null, numValues);
+        }
+
+        private LocalDateTimeFromNanosPageMaterializer(ValuesReader dataReader, LocalDateTime nullValue,
+                int numValues) {
+            super(nullValue, numValues);
+            this.dataReader = dataReader;
+        }
+
+        @Override
+        public void fillValues(int startIndex, int endIndex) {
+            for (int ii = startIndex; ii < endIndex; ii++) {
+                data[ii] = ParquetTimeUtils.epochNanosToLocalDateTimeUTC(dataReader.readLong());
+            }
+        }
+    }
+}