Subsume non-identity partition date predicate in Iceberg

trinodb · Jun 20, 2022 · 9afe194 · 9afe194
1 parent d4a743c
commit 9afe194
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/TrinoTypes.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/TrinoTypes.java
@@ -18,7 +18,9 @@
 
 import java.util.Optional;
 
+import static com.google.common.base.Verify.verify;
 import static io.trino.spi.type.BigintType.BIGINT;
+import static io.trino.spi.type.DateType.DATE;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.spi.type.SmallintType.SMALLINT;
 import static io.trino.spi.type.TinyintType.TINYINT;
@@ -47,6 +49,12 @@ public static Optional<Object> getPreviousValue(Type type, Object value)
             return getAdjacentValue((long) typeRange.getMin(), (long) typeRange.getMax(), (long) value, Direction.PREV);
         }
 
+        if (type == DATE) {
+            // TODO update the code here when type implements getRange
+            verify(type.getRange().isEmpty(), "Type %s unexpectedly returned a range", type);
+            return getAdjacentValue(Integer.MIN_VALUE, Integer.MAX_VALUE, (long) value, Direction.PREV);
+        }
+
         return Optional.empty();
     }
 
@@ -69,6 +77,12 @@ public static Optional<Object> getNextValue(Type type, Object value)
             return getAdjacentValue((long) typeRange.getMin(), (long) typeRange.getMax(), (long) value, Direction.NEXT);
         }
 
+        if (type == DATE) {
+            // TODO update the code here when type implements getRange
+            verify(type.getRange().isEmpty(), "Type %s unexpectedly returned a range", type);
+            return getAdjacentValue(Integer.MIN_VALUE, Integer.MAX_VALUE, (long) value, Direction.NEXT);
+        }
+
         return Optional.empty();
     }
 

diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorTest.java
@@ -1290,13 +1290,13 @@ public void testDayTransformDate()
                 .isFullyPushedDown();
 
         assertThat(query("SELECT * FROM test_day_transform_date WHERE d >= DATE '2015-01-13'"))
-                .isNotFullyPushedDown(FilterNode.class); // TODO subsume partition boundary filters on date
+                .isFullyPushedDown();
 
         // d comparison with TIMESTAMP can be unwrapped
         assertThat(query("SELECT * FROM test_day_transform_date WHERE d >= TIMESTAMP '2015-01-13 00:00:00'"))
-                .isNotFullyPushedDown(FilterNode.class); // TODO subsume partition boundary filters on date
+                .isFullyPushedDown();
         assertThat(query("SELECT * FROM test_day_transform_date WHERE d >= TIMESTAMP '2015-01-13 00:00:00.000001'"))
-                .isNotFullyPushedDown(FilterNode.class); // TODO subsume partition boundary filters on date
+                .isFullyPushedDown();
 
         dropTable("test_day_transform_date");
     }
@@ -1508,13 +1508,13 @@ public void testMonthTransformDate()
                 .isFullyPushedDown();
 
         assertThat(query("SELECT * FROM test_month_transform_date WHERE d >= DATE '2020-06-01'"))
-                .isNotFullyPushedDown(FilterNode.class); // TODO subsume partition boundary filters on date
+                .isFullyPushedDown();
         assertThat(query("SELECT * FROM test_month_transform_date WHERE d >= DATE '2020-06-02'"))
                 .isNotFullyPushedDown(FilterNode.class);
 
         // d comparison with TIMESTAMP can be unwrapped
         assertThat(query("SELECT * FROM test_month_transform_date WHERE d >= TIMESTAMP '2015-06-01 00:00:00'"))
-                .isNotFullyPushedDown(FilterNode.class); // TODO subsume partition boundary filters on date
+                .isFullyPushedDown();
         assertThat(query("SELECT * FROM test_month_transform_date WHERE d >= TIMESTAMP '2015-05-01 00:00:00.000001'"))
                 .isNotFullyPushedDown(FilterNode.class);
 
@@ -1723,13 +1723,13 @@ public void testYearTransformDate()
                 .isFullyPushedDown();
 
         assertThat(query("SELECT * FROM test_year_transform_date WHERE d >= DATE '2015-01-01'"))
-                .isNotFullyPushedDown(FilterNode.class); // TODO subsume partition boundary filters on date
+                .isFullyPushedDown();
         assertThat(query("SELECT * FROM test_year_transform_date WHERE d >= DATE '2015-01-02'"))
                 .isNotFullyPushedDown(FilterNode.class);
 
         // d comparison with TIMESTAMP can be unwrapped
         assertThat(query("SELECT * FROM test_year_transform_date WHERE d >= TIMESTAMP '2015-01-01 00:00:00'"))
-                .isNotFullyPushedDown(FilterNode.class); // TODO subsume partition boundary filters on date
+                .isFullyPushedDown();
         assertThat(query("SELECT * FROM test_year_transform_date WHERE d >= TIMESTAMP '2015-01-01 00:00:00.000001'"))
                 .isNotFullyPushedDown(FilterNode.class);
 
@@ -3699,6 +3699,8 @@ public static Object[][] testOptimizeTimePartitionedTableDataProvider()
     {
         return new Object[][] {
                 {"date", "%s", 15},
+                {"date", "day(%s)", 15},
+                {"date", "month(%s)", 3},
         };
     }