Handle concurrent table drop in TableCommentSystemTable

trinodb · Jul 1, 2021 · 922aac8 · 922aac8
1 parent 600963c
commit 922aac8
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/TableCommentSystemTable.java b/core/trino-main/src/main/java/io/trino/connector/system/TableCommentSystemTable.java
@@ -152,6 +152,10 @@ private Optional<String> getComment(
         return metadata.getRedirectionAwareTableHandle(session, tableName).getTableHandle()
                 .map(handle -> metadata.getTableMetadata(session, handle))
                 .map(metadata -> metadata.getMetadata().getComment())
-                .get();
+                .orElseGet(() -> {
+                    // A previously listed table might have been dropped concurrently
+                    LOG.debug("Failed to get metadata for table: %s", name);
+                    return Optional.empty();
+                });
     }
 }