Core: Fix numeric overflow of timestamp nano literal

apache · Dec 13, 2024 · efe1d14 · efe1d14
1 parent a3dcfd1
commit efe1d14
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/api/src/main/java/org/apache/iceberg/expressions/Literals.java b/api/src/main/java/org/apache/iceberg/expressions/Literals.java
@@ -300,8 +300,7 @@ public <T> Literal<T> to(Type type) {
         case TIMESTAMP:
           return (Literal<T>) new TimestampLiteral(value());
         case TIMESTAMP_NANO:
-          // assume micros and convert to nanos to match the behavior in the timestamp case above
-          return new TimestampLiteral(value()).to(type);
+          return (Literal<T>) new TimestampNanoLiteral(value());
         case DATE:
           if ((long) Integer.MAX_VALUE < value()) {
             return aboveMax();

diff --git a/api/src/test/java/org/apache/iceberg/expressions/TestTimestampLiteralConversions.java b/api/src/test/java/org/apache/iceberg/expressions/TestTimestampLiteralConversions.java
@@ -21,6 +21,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import java.time.LocalDate;
 import java.time.format.DateTimeParseException;
 import org.apache.iceberg.types.Types;
 import org.apache.iceberg.util.DateTimeUtil;
@@ -107,6 +108,28 @@ public void testTimestampMicrosToDateConversion() {
     assertThat(dateOrdinal).isEqualTo(-1);
   }
 
+  @Test
+  public void testTimestampNanoWithLongLiteral() {
+    // verify round-trip between timestamp_ns and long
+    Literal<Long> timestampNano =
+        Literal.of("2017-11-16T14:31:08.000000001").to(Types.TimestampNanoType.withoutZone());
+    assertThat(timestampNano.value()).isEqualTo(1510842668000000001L);
+
+    Literal<Long> longLiteral =
+        Literal.of(1510842668000000001L).to(Types.TimestampNanoType.withoutZone());
+    assertThat(longLiteral).isEqualTo(timestampNano);
+
+    // cast long literal to temporal types
+    assertThat(longLiteral.to(Types.DateType.get()).value())
+        .isEqualTo((int) LocalDate.of(2017, 11, 16).toEpochDay());
+
+    assertThat(longLiteral.to(Types.TimestampType.withoutZone()).value())
+        .isEqualTo(1510842668000000L);
+
+    assertThat(longLiteral.to(Types.TimestampNanoType.withoutZone()).value())
+        .isEqualTo(1510842668000000001L);
+  }
+
   @Test
   public void testTimestampNanoToTimestampConversion() {
     Literal<Long> timestamp =

diff --git a/api/src/test/java/org/apache/iceberg/types/TestConversions.java b/api/src/test/java/org/apache/iceberg/types/TestConversions.java
@@ -111,9 +111,9 @@ public void testByteBufferConversions() {
     assertConversion(
         400000000L, TimestampNanoType.withZone(), new byte[] {0, -124, -41, 23, 0, 0, 0, 0});
     assertThat(Literal.of(400000L).to(TimestampNanoType.withoutZone()).toByteBuffer().array())
-        .isEqualTo(new byte[] {0, -124, -41, 23, 0, 0, 0, 0});
+        .isEqualTo(new byte[] {-128, 26, 6, 0, 0, 0, 0, 0});
     assertThat(Literal.of(400000L).to(TimestampNanoType.withZone()).toByteBuffer().array())
-        .isEqualTo(new byte[] {0, -124, -41, 23, 0, 0, 0, 0});
+        .isEqualTo(new byte[] {-128, 26, 6, 0, 0, 0, 0, 0});
 
     // strings are stored as UTF-8 bytes (without length)
     // 'A' -> 65, 'B' -> 66, 'C' -> 67