Evict session level cache when dropping Iceberg table

trinodb · Nov 16, 2023 · 4f3d778 · 4f3d778
1 parent 5a4e39e
commit 4f3d778
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 0 deletions.
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/AbstractTrinoCatalog.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/AbstractTrinoCatalog.java
@@ -149,13 +149,15 @@ public void updateTableComment(ConnectorSession session, SchemaTableName schemaT
         else {
             icebergTable.updateProperties().set(TABLE_COMMENT, comment.get()).commit();
         }
+        invalidateTableCache(schemaTableName);
     }
 
     @Override
     public void updateColumnComment(ConnectorSession session, SchemaTableName schemaTableName, ColumnIdentity columnIdentity, Optional<String> comment)
     {
         Table icebergTable = loadTable(session, schemaTableName);
         icebergTable.updateSchema().updateColumnDoc(columnIdentity.getName(), comment.orElse(null)).commit();
+        invalidateTableCache(schemaTableName);
     }
 
     @Override
@@ -471,6 +473,8 @@ protected Map<String, String> createMaterializedViewProperties(ConnectorSession
                 .buildOrThrow();
     }
 
+    protected abstract void invalidateTableCache(SchemaTableName schemaTableName);
+
     protected static class MaterializedViewMayBeBeingRemovedException
             extends RuntimeException
     {

diff --git a/...in/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/TrinoGlueCatalog.java b/...in/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/TrinoGlueCatalog.java
@@ -677,6 +677,7 @@ public void dropTable(ConnectorSession session, SchemaTableName schemaTableName)
             LOG.warn(e, "Failed to delete table data referenced by metadata");
         }
         deleteTableDirectory(fileSystemFactory.create(session), schemaTableName, table.location());
+        invalidateTableCache(schemaTableName);
     }
 
     @Override
@@ -689,6 +690,7 @@ public void dropCorruptedTable(ConnectorSession session, SchemaTableName schemaT
         }
         String tableLocation = metadataLocation.replaceFirst("/metadata/[^/]*$", "");
         deleteTableDirectory(fileSystemFactory.create(session), schemaTableName, tableLocation);
+        invalidateTableCache(schemaTableName);
     }
 
     @Override
@@ -752,6 +754,7 @@ public void registerTable(ConnectorSession session, SchemaTableName schemaTableN
     public void unregisterTable(ConnectorSession session, SchemaTableName schemaTableName)
     {
         dropTableFromMetastore(session, schemaTableName);
+        invalidateTableCache(schemaTableName);
     }
 
     private com.amazonaws.services.glue.model.Table dropTableFromMetastore(ConnectorSession session, SchemaTableName schemaTableName)
@@ -796,6 +799,7 @@ public void renameTable(ConnectorSession session, SchemaTableName from, SchemaTa
             createTable(to.getSchemaName(), tableInput);
             newTableCreated = true;
             deleteTable(from.getSchemaName(), from.getTableName());
+            invalidateTableCache(from);
         }
         catch (RuntimeException e) {
             if (newTableCreated) {
@@ -1486,6 +1490,12 @@ public Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session,
         return Optional.empty();
     }
 
+    @Override
+    protected void invalidateTableCache(SchemaTableName schemaTableName)
+    {
+        tableMetadataCache.remove(schemaTableName);
+    }
+
     com.amazonaws.services.glue.model.Table getTable(SchemaTableName tableName, boolean invalidateCaches)
     {
         if (invalidateCaches) {

diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/TrinoHiveCatalog.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/TrinoHiveCatalog.java
@@ -365,6 +365,7 @@ private static Optional<String> getQueryId(io.trino.plugin.hive.metastore.Table
     public void unregisterTable(ConnectorSession session, SchemaTableName schemaTableName)
     {
         dropTableFromMetastore(schemaTableName);
+        invalidateTableCache(schemaTableName);
     }
 
     @Override
@@ -421,13 +422,15 @@ public void dropTable(ConnectorSession session, SchemaTableName schemaTableName)
             log.warn(e, "Failed to delete table data referenced by metadata");
         }
         deleteTableDirectory(fileSystemFactory.create(session), schemaTableName, metastoreTable.getStorage().getLocation());
+        invalidateTableCache(schemaTableName);
     }
 
     @Override
     public void dropCorruptedTable(ConnectorSession session, SchemaTableName schemaTableName)
     {
         io.trino.plugin.hive.metastore.Table table = dropTableFromMetastore(schemaTableName);
         deleteTableDirectory(fileSystemFactory.create(session), schemaTableName, table.getStorage().getLocation());
+        invalidateTableCache(schemaTableName);
     }
 
     private io.trino.plugin.hive.metastore.Table dropTableFromMetastore(SchemaTableName schemaTableName)
@@ -449,6 +452,7 @@ private io.trino.plugin.hive.metastore.Table dropTableFromMetastore(SchemaTableN
     public void renameTable(ConnectorSession session, SchemaTableName from, SchemaTableName to)
     {
         metastore.renameTable(from.getSchemaName(), from.getTableName(), to.getSchemaName(), to.getTableName());
+        invalidateTableCache(from);
     }
 
     @Override
@@ -887,4 +891,10 @@ public Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session,
         }
         return Optional.empty();
     }
+
+    @Override
+    protected void invalidateTableCache(SchemaTableName schemaTableName)
+    {
+        tableMetadataCache.remove(schemaTableName);
+    }
 }
diff --git a/...in/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/jdbc/TrinoJdbcCatalog.java b/...in/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/jdbc/TrinoJdbcCatalog.java
@@ -273,6 +273,7 @@ public void dropTable(ConnectorSession session, SchemaTableName schemaTableName)
             LOG.warn(e, "Failed to delete table data referenced by metadata");
         }
         deleteTableDirectory(fileSystemFactory.create(session), schemaTableName, table.location());
+        invalidateTableCache(schemaTableName);
     }
 
     @Override
@@ -287,6 +288,7 @@ public void dropCorruptedTable(ConnectorSession session, SchemaTableName schemaT
         }
         String tableLocation = metadataLocation.get().replaceFirst("/metadata/[^/]*$", "");
         deleteTableDirectory(fileSystemFactory.create(session), schemaTableName, tableLocation);
+        invalidateTableCache(schemaTableName);
     }
 
     @Override
@@ -298,6 +300,7 @@ public void renameTable(ConnectorSession session, SchemaTableName from, SchemaTa
         catch (RuntimeException e) {
             throw new TrinoException(ICEBERG_CATALOG_ERROR, "Failed to rename table from %s to %s".formatted(from, to), e);
         }
+        invalidateTableCache(from);
     }
 
     @Override
@@ -447,6 +450,12 @@ public Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session,
         return Optional.empty();
     }
 
+    @Override
+    protected void invalidateTableCache(SchemaTableName schemaTableName)
+    {
+        tableMetadataCache.remove(schemaTableName);
+    }
+
     private static TableIdentifier toIdentifier(SchemaTableName table)
     {
         return TableIdentifier.of(table.getSchemaName(), table.getTableName());

diff --git a/...rino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/TrinoNessieCatalog.java b/...rino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/nessie/TrinoNessieCatalog.java
@@ -218,6 +218,7 @@ public void dropTable(ConnectorSession session, SchemaTableName schemaTableName)
         validateTableCanBeDropped(table);
         nessieClient.dropTable(toIdentifier(schemaTableName), true);
         deleteTableDirectory(fileSystemFactory.create(session), schemaTableName, table.location());
+        invalidateTableCache(schemaTableName);
     }
 
     @Override
@@ -230,6 +231,7 @@ public void dropCorruptedTable(ConnectorSession session, SchemaTableName schemaT
     public void renameTable(ConnectorSession session, SchemaTableName from, SchemaTableName to)
     {
         nessieClient.renameTable(toIdentifier(from), toIdentifier(to));
+        invalidateTableCache(from);
     }
 
     @Override
@@ -419,4 +421,10 @@ public Optional<CatalogSchemaTableName> redirectTable(ConnectorSession session,
     {
         return Optional.empty();
     }
+
+    @Override
+    protected void invalidateTableCache(SchemaTableName schemaTableName)
+    {
+        tableMetadataCache.remove(schemaTableName);
+    }
 }
diff --git a/...in/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/TrinoRestCatalog.java b/...in/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/TrinoRestCatalog.java
@@ -266,6 +266,7 @@ public void unregisterTable(ConnectorSession session, SchemaTableName tableName)
         if (!restSessionCatalog.dropTable(convert(session), toIdentifier(tableName))) {
             throw new TableNotFoundException(tableName);
         }
+        invalidateTableCache(tableName);
     }
 
     @Override
@@ -274,6 +275,7 @@ public void dropTable(ConnectorSession session, SchemaTableName schemaTableName)
         if (!restSessionCatalog.purgeTable(convert(session), toIdentifier(schemaTableName))) {
             throw new TrinoException(ICEBERG_CATALOG_ERROR, format("Failed to drop table: %s", schemaTableName));
         }
+        invalidateTableCache(schemaTableName);
     }
 
     @Override
@@ -293,6 +295,7 @@ public void renameTable(ConnectorSession session, SchemaTableName from, SchemaTa
         catch (RESTException e) {
             throw new TrinoException(ICEBERG_CATALOG_ERROR, format("Failed to rename table %s to %s", from, to), e);
         }
+        invalidateTableCache(from);
     }
 
     @Override
@@ -331,6 +334,7 @@ public void updateTableComment(ConnectorSession session, SchemaTableName schemaT
         else {
             icebergTable.updateProperties().set(TABLE_COMMENT, comment.get()).commit();
         }
+        invalidateTableCache(schemaTableName);
     }
 
     @Override
@@ -508,6 +512,11 @@ private SessionCatalog.SessionContext convert(ConnectorSession session)
         };
     }
 
+    private void invalidateTableCache(SchemaTableName schemaTableName)
+    {
+        tableCache.remove(schemaTableName);
+    }
+
     private static TableIdentifier toIdentifier(SchemaTableName schemaTableName)
     {
         return TableIdentifier.of(schemaTableName.getSchemaName(), schemaTableName.getTableName());