Fix applyFilter when an Iceberg table does not have any snapshots

Tables created by Spark may not have a snapshot committed if they are newly created, empty tables.
trinodb · Aug 10, 2022 · 7190dae · 7190dae
1 parent 57714f7
commit 7190dae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java
@@ -1790,10 +1790,12 @@ public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(C
         else {
             Table icebergTable = catalog.loadTable(session, table.getSchemaTableName());
 
-            Long snapshotId = table.getSnapshotId().orElseThrow(() -> new IllegalStateException("Snapshot id must be present"));
-            Set<Integer> partitionSpecIds = icebergTable.snapshot(snapshotId).allManifests(icebergTable.io()).stream()
-                    .map(ManifestFile::partitionSpecId)
-                    .collect(toImmutableSet());
+            Set<Integer> partitionSpecIds = table.getSnapshotId().map(
+                            snapshot -> icebergTable.snapshot(snapshot).allManifests(icebergTable.io()).stream()
+                                    .map(ManifestFile::partitionSpecId)
+                                    .collect(toImmutableSet()))
+                    // No snapshot, so no data. This case doesn't matter.
+                    .orElseGet(() -> ImmutableSet.copyOf(icebergTable.specs().keySet()));
 
             Map<IcebergColumnHandle, Domain> unsupported = new LinkedHashMap<>();
             Map<IcebergColumnHandle, Domain> newEnforced = new LinkedHashMap<>();

diff --git a/...uct-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergSparkCompatibility.java b/...uct-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergSparkCompatibility.java
@@ -117,6 +117,7 @@ public void testTrinoReadingSparkData(StorageFormat storageFormat, int specVersi
         // Validate queries on an empty table created by Spark
         assertThat(onTrino().executeQuery(format("SELECT * FROM %s", trinoTableName("\"" + baseTableName + "$snapshots\"")))).hasNoRows();
         assertThat(onTrino().executeQuery(format("SELECT * FROM %s", trinoTableName))).hasNoRows();
+        assertThat(onTrino().executeQuery(format("SELECT * FROM %s WHERE _integer > 0", trinoTableName))).hasNoRows();
 
         onSpark().executeQuery(format(
                 "INSERT INTO %s VALUES (" +