Add redirections support to Hive streamTableColumns

trinodb · Oct 22, 2021 · f60f356 · f60f356
1 parent e43496b
commit f60f356
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMetadata.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMetadata.java
@@ -690,6 +690,9 @@ public Stream<TableColumnsMetadata> streamTableColumns(ConnectorSession session,
         requireNonNull(prefix, "prefix is null");
         return listTables(session, prefix).stream().flatMap(tableName -> {
             try {
+                if (redirectTable(session, tableName).isPresent()) {
+                    return Stream.of(TableColumnsMetadata.forRedirectedTable(tableName));
+                }
                 return Stream.of(TableColumnsMetadata.forTable(tableName, getTableMetadata(session, tableName).getColumns()));
             }
             catch (HiveViewNotSupportedException e) {

diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHive.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/AbstractTestHive.java
@@ -3098,12 +3098,12 @@ public void testIllegalStorageFormatDuringTableScan()
         }
     }
 
-    private Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(ConnectorMetadata metadata, ConnectorSession session, SchemaTablePrefix prefix)
+    private static Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(ConnectorMetadata metadata, ConnectorSession session, SchemaTablePrefix prefix)
     {
         return metadata.streamTableColumns(session, prefix)
                 .collect(toImmutableMap(
                         TableColumnsMetadata::getTable,
-                        tableColumns -> tableColumns.getColumns().orElseThrow(() -> new IllegalStateException("Table " + tableColumns.getTable() + " reported as redirect target"))));
+                        tableColumns -> tableColumns.getColumns().orElseThrow(() -> new IllegalStateException("Table " + tableColumns.getTable() + " reported as redirected"))));
     }
 
     private void createDummyTable(SchemaTableName tableName)