Avoid redundant metastore calls for non-system Iceberg tables

Cherry-pick of trinodb/trino@d29fcd9 Co-Authored-By: Piotr Findeisen <piotr.findeisen@gmail.com>
prestodb · Mar 9, 2022 · bb0ee5c · bb0ee5c
1 parent 1066c99
commit bb0ee5c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergHadoopMetadata.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergHadoopMetadata.java
@@ -130,6 +130,10 @@ public IcebergTableHandle getTableHandle(ConnectorSession session, SchemaTableNa
     public Optional<SystemTable> getSystemTable(ConnectorSession session, SchemaTableName tableName)
     {
         IcebergTableName name = IcebergTableName.from(tableName.getTableName());
+        if (name.getTableType() == DATA) {
+            return Optional.empty();
+        }
+
         TableIdentifier tableIdentifier = toIcebergTableIdentifier(tableName.getSchemaName(), name.getTableName());
         Table table;
         try {

diff --git a/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergHiveMetadata.java b/presto-iceberg/src/main/java/com/facebook/presto/iceberg/IcebergHiveMetadata.java
@@ -143,6 +143,9 @@ public Optional<SystemTable> getSystemTable(ConnectorSession session, SchemaTabl
     private Optional<SystemTable> getRawSystemTable(ConnectorSession session, SchemaTableName tableName)
     {
         IcebergTableName name = IcebergTableName.from(tableName.getTableName());
+        if (name.getTableType() == DATA) {
+            return Optional.empty();
+        }
 
         MetastoreContext metastoreContext = new MetastoreContext(session.getIdentity(), session.getQueryId(), session.getClientInfo(), session.getSource(), Optional.empty(), false, HiveColumnConverterProvider.DEFAULT_COLUMN_CONVERTER_PROVIDER);
         Optional<Table> hiveTable = metastore.getTable(metastoreContext, tableName.getSchemaName(), name.getTableName());