Fix the problem of abnormality when using filter conditions when the …

…field type is TIMESTAMP_LTZ(3)
apache · Sep 26, 2023 · d38ff65 · d38ff65
1 parent 45e003a
commit d38ff65
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 0 deletions.
diff --git a/paimon-trino-common/src/main/java/org/apache/paimon/trino/TrinoFilterConverter.java b/paimon-trino-common/src/main/java/org/apache/paimon/trino/TrinoFilterConverter.java
@@ -234,6 +234,9 @@ private Object getLiteralValue(Type type, Object trinoNativeValue) {
         }
 
         if (type.equals(TIMESTAMP_TZ_MILLIS)) {
+            if (trinoNativeValue instanceof Long) {
+                return trinoNativeValue;
+            }
             return Timestamp.fromEpochMillis(
                     ((LongTimestampWithTimeZone) trinoNativeValue).getEpochMillis());
         }

diff --git a/paimon-trino-common/src/test/java/org/apache/paimon/trino/TestTrinoFilterConverter.java b/paimon-trino-common/src/test/java/org/apache/paimon/trino/TestTrinoFilterConverter.java
@@ -19,6 +19,7 @@
 package org.apache.paimon.trino;
 
 import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.Timestamp;
 import org.apache.paimon.predicate.Predicate;
 import org.apache.paimon.predicate.PredicateBuilder;
 import org.apache.paimon.shade.guava30.com.google.common.collect.ImmutableMap;
@@ -32,12 +33,16 @@
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.predicate.ValueSet;
 import io.trino.spi.type.CharType;
+import io.trino.spi.type.TimeZoneKey;
+import io.trino.spi.type.TimestampType;
 import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.Collections;
 
 import static io.trino.spi.type.IntegerType.INTEGER;
+import static io.trino.spi.type.LongTimestampWithTimeZone.fromEpochMillisAndFraction;
+import static io.trino.spi.type.TimestampWithTimeZoneType.createTimestampWithTimeZoneType;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /** Test for {@link TrinoFilterConverter}. */
@@ -144,4 +149,67 @@ public void testCharType() {
         Predicate actualEqq = converter.convert(eq).get();
         assertThat(actualEqq).isEqualTo(expectedEqq);
     }
+
+    @Test
+    public void testTimeStamp() {
+        RowType rowType =
+                new RowType(
+                        Collections.singletonList(
+                                new DataField(
+                                        0, "ts", new org.apache.paimon.types.TimestampType(3))));
+        TrinoFilterConverter converter = new TrinoFilterConverter(rowType);
+        PredicateBuilder builder = new PredicateBuilder(rowType);
+        TrinoColumnHandle tsColumn =
+                TrinoColumnHandle.of("ts", new org.apache.paimon.types.TimestampType(3));
+        TupleDomain<TrinoColumnHandle> eq =
+                TupleDomain.withColumnDomains(
+                        ImmutableMap.of(
+                                tsColumn,
+                                Domain.singleValue(
+                                        TimestampType.createTimestampType(3), 1695645403000L)));
+        Predicate expectedEqq = builder.equal(0, Timestamp.fromEpochMillis(1695645403000L / 1000));
+        Predicate actualEqq = converter.convert(eq).get();
+        assertThat(actualEqq).isEqualTo(expectedEqq);
+    }
+
+    @Test
+    public void testTimeStampWithTimeZone() {
+        RowType rowType =
+                new RowType(
+                        Collections.singletonList(
+                                new DataField(
+                                        0,
+                                        "ts",
+                                        new org.apache.paimon.types.LocalZonedTimestampType(3))));
+        TrinoFilterConverter converter = new TrinoFilterConverter(rowType);
+        PredicateBuilder builder = new PredicateBuilder(rowType);
+        TrinoColumnHandle tsColumn =
+                TrinoColumnHandle.of("ts", new org.apache.paimon.types.LocalZonedTimestampType(3));
+        TupleDomain<TrinoColumnHandle> eq =
+                TupleDomain.withColumnDomains(
+                        ImmutableMap.of(
+                                tsColumn,
+                                Domain.singleValue(
+                                        createTimestampWithTimeZoneType(6),
+                                        fromEpochMillisAndFraction(
+                                                1695645403000L, 0, TimeZoneKey.UTC_KEY))));
+        Predicate expectedEqq =
+                builder.equal(
+                        0,
+                        Timestamp.fromEpochMillis(
+                                (fromEpochMillisAndFraction(1695645403000L, 0, TimeZoneKey.UTC_KEY))
+                                        .getEpochMillis()));
+        Predicate actualEqq = converter.convert(eq).get();
+        assertThat(actualEqq).isEqualTo(expectedEqq);
+
+        eq =
+                TupleDomain.withColumnDomains(
+                        ImmutableMap.of(
+                                tsColumn,
+                                Domain.singleValue(
+                                        createTimestampWithTimeZoneType(3), 1695645403000L)));
+        expectedEqq = builder.equal(0, 1695645403000L);
+        actualEqq = converter.convert(eq).get();
+        assertThat(actualEqq).isEqualTo(expectedEqq);
+    }
 }