fixup! Core: Fix numeric overflow of timestamp nano literal

apache · Dec 16, 2024 · 2a9c8b7 · 2a9c8b7
1 parent efe1d14
commit 2a9c8b7
Showing 1 changed file with 32 additions and 0 deletions.
diff --git a/api/src/test/java/org/apache/iceberg/expressions/TestTimestampLiteralConversions.java b/api/src/test/java/org/apache/iceberg/expressions/TestTimestampLiteralConversions.java
@@ -126,8 +126,13 @@ public void testTimestampNanoWithLongLiteral() {
     assertThat(longLiteral.to(Types.TimestampType.withoutZone()).value())
         .isEqualTo(1510842668000000L);
 
+    assertThat(longLiteral.to(Types.TimestampType.withZone()).value()).isEqualTo(1510842668000000L);
+
     assertThat(longLiteral.to(Types.TimestampNanoType.withoutZone()).value())
         .isEqualTo(1510842668000000001L);
+
+    assertThat(longLiteral.to(Types.TimestampNanoType.withZone()).value())
+        .isEqualTo(1510842668000000001L);
   }
 
   @Test
@@ -181,6 +186,33 @@ public void testTimestampNanosToDateConversion() {
     assertThat(dateOrdinal).isEqualTo(-1);
   }
 
+  @Test
+  public void testTimestampNanoWithZoneWithLongLiteral() {
+    // verify round-trip between timestamptz_ns and long
+    Literal<Long> timestampNanoWithZone =
+        Literal.of("2017-11-16T14:31:08.000000001+01:00").to(Types.TimestampNanoType.withZone());
+    assertThat(timestampNanoWithZone.value()).isEqualTo(1510839068000000001L);
+
+    Literal<Long> longLiteral =
+        Literal.of(1510839068000000001L).to(Types.TimestampNanoType.withZone());
+    assertThat(longLiteral).isEqualTo(timestampNanoWithZone);
+
+    // 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(1510839068000000L);
+
+    assertThat(longLiteral.to(Types.TimestampType.withZone()).value()).isEqualTo(1510839068000000L);
+
+    assertThat(longLiteral.to(Types.TimestampNanoType.withoutZone()).value())
+        .isEqualTo(1510839068000000001L);
+
+    assertThat(longLiteral.to(Types.TimestampNanoType.withoutZone()).value())
+        .isEqualTo(1510839068000000001L);
+  }
+
   @Test
   public void testTimestampNanosWithZoneConversion() {
     Literal<CharSequence> isoTimestampNanosWithZoneOffset =