Fixes for review comments

deephaven · Nov 10, 2023 · 9932f33 · 9932f33
1 parent a48ea8d
commit 9932f33
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/engine/time/src/main/java/io/deephaven/time/DateTimeUtils.java b/engine/time/src/main/java/io/deephaven/time/DateTimeUtils.java
@@ -21,6 +21,7 @@
 import java.time.zone.ZoneRulesException;
 import java.util.Date;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -992,7 +993,8 @@ public static long epochNanosUTC(@Nullable final LocalDateTime localDateTime) {
         if (localDateTime == null) {
             return NULL_LONG;
         }
-        return epochNanos(localDateTime.toInstant(ZoneOffset.UTC));
+        return TimeUnit.SECONDS.toNanos(localDateTime.toEpochSecond(ZoneOffset.UTC))
+                + localDateTime.toLocalTime().getNano();
     }
 
     /**
@@ -1438,9 +1440,7 @@ public static ZonedDateTime excelToZonedDateTime(final double excel, @Nullable f
         if (micros == QueryConstants.NULL_LONG) {
             return null;
         }
-        final long microsPerSecond = 1_000_000;
-        return LocalDateTime.ofEpochSecond(micros / microsPerSecond, (int) ((micros % microsPerSecond) * MICRO),
-                ZoneOffset.UTC);
+        return epochNanosToLocalDateTimeUTC(micros * MICRO);
     }
 
     /**
@@ -1454,9 +1454,7 @@ public static ZonedDateTime excelToZonedDateTime(final double excel, @Nullable f
         if (millis == QueryConstants.NULL_LONG) {
             return null;
         }
-        final long millisPerSecond = 1_000;
-        return LocalDateTime.ofEpochSecond(millis / millisPerSecond, (int) ((millis % millisPerSecond) * MILLI),
-                ZoneOffset.UTC);
+        return epochNanosToLocalDateTimeUTC(millis * MILLI);
     }
 
     // endregion

diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ParquetFileReader.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ParquetFileReader.java
@@ -364,7 +364,7 @@ private static LogicalTypeAnnotation getLogicalTypeAnnotation(final ConvertedTyp
             case DATE:
                 return LogicalTypeAnnotation.dateType();
             case TIME_MILLIS:
-                // isAdjustedToUTC parameter is ignored while reading Parquet TIME type, so assume it whatever
+                // isAdjustedToUTC parameter is ignored while reading Parquet TIME type, so disregard it here
                 return LogicalTypeAnnotation.timeType(true, LogicalTypeAnnotation.TimeUnit.MILLIS);
             case TIME_MICROS:
                 return LogicalTypeAnnotation.timeType(true, LogicalTypeAnnotation.TimeUnit.MICROS);

diff --git a/...arquet/table/src/main/java/io/deephaven/parquet/table/transfer/LocalDateTimeTransfer.java b/...arquet/table/src/main/java/io/deephaven/parquet/table/transfer/LocalDateTimeTransfer.java
@@ -18,8 +18,7 @@
 import java.nio.LongBuffer;
 import java.time.LocalDateTime;
 
-final class LocalDateTimeTransfer
-        extends GettingPrimitiveTransfer<ObjectChunk<LocalDateTime, Values>, LongBuffer> {
+final class LocalDateTimeTransfer extends GettingPrimitiveTransfer<ObjectChunk<LocalDateTime, Values>, LongBuffer> {
 
     LocalDateTimeTransfer(@NotNull final ColumnSource<?> columnSource, @NotNull final RowSequence tableRowSet,
             final int targetPageSizeInBytes) {

diff --git a/...ons/parquet/table/src/test/java/io/deephaven/parquet/table/ParquetTableReadWriteTest.java b/...ons/parquet/table/src/test/java/io/deephaven/parquet/table/ParquetTableReadWriteTest.java
@@ -507,10 +507,10 @@ public void testArrayColumns() {
                         "someByteArrayColumn = new byte[] {i % 10 == 0 ? null : (byte)i}",
                         "someCharArrayColumn = new char[] {i % 10 == 0 ? null : (char)i}",
                         "someTimeArrayColumn = new Instant[] {i % 10 == 0 ? null : (Instant)DateTimeUtils.now() + i}",
-                        "someBiColumn = new java.math.BigInteger[] {i % 10 == 0 ? null : java.math.BigInteger.valueOf(i)}",
-                        "someDateColumn = new java.time.LocalDate[] {i % 10 == 0 ? null : java.time.LocalDate.ofEpochDay(i)}",
-                        "someTimeColumn = new java.time.LocalTime[] {i % 10 == 0 ? null : java.time.LocalTime.of(i%24, i%60, (i+10)%60)}",
-                        "someDateTimeColumn = new java.time.LocalDateTime[] {i % 10 == 0 ? null : java.time.LocalDateTime.of(2000+i%10, i%12+1, i%30+1, (i+4)%24, (i+5)%60, (i+6)%60, i)}",
+                        "someBiArrayColumn = new java.math.BigInteger[] {i % 10 == 0 ? null : java.math.BigInteger.valueOf(i)}",
+                        "someDateArrayColumn = new java.time.LocalDate[] {i % 10 == 0 ? null : java.time.LocalDate.ofEpochDay(i)}",
+                        "someTimeArrayColumn = new java.time.LocalTime[] {i % 10 == 0 ? null : java.time.LocalTime.of(i%24, i%60, (i+10)%60)}",
+                        "someDateTimeArrayColumn = new java.time.LocalDateTime[] {i % 10 == 0 ? null : java.time.LocalDateTime.of(2000+i%10, i%12+1, i%30+1, (i+4)%24, (i+5)%60, (i+6)%60, i)}",
                         "nullStringArrayColumn = new String[] {(String)null}",
                         "nullIntArrayColumn = new int[] {(int)null}",
                         "nullLongArrayColumn = new long[] {(long)null}",