From ecafc8062fe768d2a3900a51331272734a536d18 Mon Sep 17 00:00:00 2001
From: Teddy Choi <pudidic@gmail.com>
Date: Fri, 29 Jun 2018 18:04:40 +0900
Subject: [PATCH] HIVE-20033: Backport HIVE-19432 to branch-2, branch-3 (Teddy
 Choi)

---
 .../cli/operation/GetTablesOperation.java     | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

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 c9233d02c963..c596d2a9c779 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
@@ -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) {