Ignore non-existing table when dropping Iceberg schema with cascade

ebyhr · ebyhr · commit ca9055ed036c · 2025-11-19T10:13:18.000+09:00
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
@@ -1171,7 +1171,10 @@ public void dropSchema(ConnectorSession session, String schemaName, boolean casc
                 dropView(session, viewName);
             }
             for (SchemaTableName tableName : listTables(session, Optional.of(schemaName))) {
-                dropTable(session, getTableHandle(session, tableName, Optional.empty(), Optional.empty()));
+                ConnectorTableHandle tableHandle = getTableHandle(session, tableName, Optional.empty(), Optional.empty());
+                if (tableHandle != null) {
+                    dropTable(session, tableHandle);
+                }
             }
         }
         catalog.dropNamespace(session, schemaName);

Original file line number	Diff line number	Diff line change
`@@ -1171,7 +1171,10 @@ public void dropSchema(ConnectorSession session, String schemaName, boolean casc`
`1171`	`1171`	`dropView(session, viewName);`
`1172`	`1172`	`}`
`1173`	`1173`	`for (SchemaTableName tableName : listTables(session, Optional.of(schemaName))) {`
`1174`		`- dropTable(session, getTableHandle(session, tableName, Optional.empty(), Optional.empty()));`
	`1174`	`+ ConnectorTableHandle tableHandle = getTableHandle(session, tableName, Optional.empty(), Optional.empty());`
	`1175`	`+ if (tableHandle != null) {`
	`1176`	`+ dropTable(session, tableHandle);`
	`1177`	`+ }`
`1175`	`1178`	`}`
`1176`	`1179`	`}`
`1177`	`1180`	`catalog.dropNamespace(session, schemaName);`