diff --git service/src/java/org/apache/hive/service/cli/operation/GetTablesOperation.java service/src/java/org/apache/hive/service/cli/operation/GetTablesOperation.java index c9233d02c9..c596d2a9c7 100644 --- service/src/java/org/apache/hive/service/cli/operation/GetTablesOperation.java +++ service/src/java/org/apache/hive/service/cli/operation/GetTablesOperation.java @@ -102,16 +102,20 @@ public void runInternal() throws HiveSQLException { String tablePattern = convertIdentifierPattern(tableName, true); - for (TableMeta tableMeta : - metastoreClient.getTableMeta(schemaPattern, tablePattern, tableTypeList)) { - rowSet.addRow(new Object[] { - DEFAULT_HIVE_CATALOG, - tableMeta.getDbName(), - tableMeta.getTableName(), - tableTypeMapping.mapToClientType(tableMeta.getTableType()), - tableMeta.getComments(), - null, null, null, null, null - }); + for (String dbName : metastoreClient.getDatabases(schemaPattern)) { + String dbNamePattern = convertIdentifierPattern(dbName, true); + for (TableMeta tableMeta : + metastoreClient.getTableMeta(dbNamePattern, tablePattern, tableTypeList)) { + String tableType = tableTypeMapping.mapToClientType(tableMeta.getTableType()); + rowSet.addRow(new Object[] { + DEFAULT_HIVE_CATALOG, + tableMeta.getDbName(), + tableMeta.getTableName(), + tableType, + tableMeta.getComments(), + null, null, null, null, null + }); + } } setState(OperationState.FINISHED); } catch (Exception e) {