diff --git a/service/src/java/org/apache/hive/service/cli/operation/GetTablesOperation.java b/service/src/java/org/apache/hive/service/cli/operation/GetTablesOperation.java index 1b5b09a96f..aaee2ced21 100644 --- a/service/src/java/org/apache/hive/service/cli/operation/GetTablesOperation.java +++ b/service/src/java/org/apache/hive/service/cli/operation/GetTablesOperation.java @@ -39,6 +39,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; + + + /** * GetTablesOperation. * @@ -110,27 +113,29 @@ public void runInternal() throws HiveSQLException { } String tablePattern = convertIdentifierPattern(tableName, true); + 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 + }); - for (TableMeta tableMeta : - metastoreClient.getTableMeta(schemaPattern, 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 - }); - - if (LOG.isDebugEnabled()) { - String debugMessage = getDebugMessage("table", RESULT_SET_SCHEMA); - LOG.debug(debugMessage, DEFAULT_HIVE_CATALOG, tableMeta.getDbName(), - tableMeta.getTableName(), tableType, tableMeta.getComments()); + if (LOG.isDebugEnabled()) { + String debugMessage = getDebugMessage("table", RESULT_SET_SCHEMA); + LOG.debug(debugMessage, DEFAULT_HIVE_CATALOG, tableMeta.getDbName(), + tableMeta.getTableName(), tableType, tableMeta.getComments()); + } + } + if (LOG.isDebugEnabled() && rowSet.numRows() == 0) { + LOG.debug("No table metadata has been returned."); } - } - if (LOG.isDebugEnabled() && rowSet.numRows() == 0) { - LOG.debug("No table metadata has been returned."); } setState(OperationState.FINISHED); LOG.info("Fetching table metadata has been successfully finished");