Fix JmxMetadata#listTables

When schemaNameOrNull is null the connector is expected to return all tables it has. Jmx was returning no tables in this case.
prestodb · Apr 12, 2018 · 508317a · 508317a
1 parent 2ccfa9b
commit 508317a
Showing 1 changed file with 17 additions and 8 deletions.
diff --git a/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxMetadata.java b/presto-jmx/src/main/java/com/facebook/presto/connector/jmx/JmxMetadata.java
@@ -30,6 +30,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList.Builder;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Streams;
 
@@ -180,17 +181,25 @@ public ConnectorTableMetadata getTableMetadata(ConnectorSession session, Connect
     @Override
     public List<SchemaTableName> listTables(ConnectorSession session, String schemaNameOrNull)
     {
-        if (JMX_SCHEMA_NAME.equals(schemaNameOrNull)) {
+        Set<String> schemaNames;
-            return listJmxTables();
+        if (schemaNameOrNull != null) {
-        }
+            schemaNames = ImmutableSet.of(schemaNameOrNull);
-        else if (HISTORY_SCHEMA_NAME.equals(schemaNameOrNull)) {
-            return jmxHistoricalData.getTables().stream()
-                    .map(tableName -> new SchemaTableName(JmxMetadata.HISTORY_SCHEMA_NAME, tableName))
-                    .collect(toList());
         }
         else {
-            return ImmutableList.of();
+            schemaNames = ImmutableSet.copyOf(listSchemaNames(session));
+        }
+        ImmutableList.Builder<SchemaTableName> schemaTableNames = ImmutableList.builder();
+        for (String schema : schemaNames) {
+            if (JMX_SCHEMA_NAME.equals(schema)) {
+                return listJmxTables();
+            }
+            else if (HISTORY_SCHEMA_NAME.equals(schema)) {
+                return jmxHistoricalData.getTables().stream()
+                        .map(tableName -> new SchemaTableName(JmxMetadata.HISTORY_SCHEMA_NAME, tableName))
+                        .collect(toList());
+            }
         }
+        return schemaTableNames.build();
     }
 
     private List<SchemaTableName> listJmxTables()