Add config option to skip system schemas in JDBC connectors

presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/BaseJdbcClient.java

@@ -117,6 +117,7 @@ public class BaseJdbcClient
     protected final boolean caseInsensitiveNameMatching;
     protected final Cache<JdbcIdentity, Map<String, String>> remoteSchemaNames;
     protected final Cache<RemoteTableNameCacheKey, Map<String, String>> remoteTableNames;
+    protected final Set<String> listSchemasIgnoredSchemas;
 
     public BaseJdbcClient(JdbcConnectorId connectorId, BaseJdbcConfig config, String identifierQuote, ConnectionFactory connectionFactory)
     {
@@ -130,6 +131,7 @@ public BaseJdbcClient(JdbcConnectorId connectorId, BaseJdbcConfig config, String
                 .expireAfterWrite(config.getCaseInsensitiveNameMatchingCacheTtl().toMillis(), MILLISECONDS);
         this.remoteSchemaNames = remoteNamesCacheBuilder.build();
         this.remoteTableNames = remoteNamesCacheBuilder.build();
+        this.listSchemasIgnoredSchemas = config.getlistSchemasIgnoredSchemas();
     }
 
     @PreDestroy
@@ -165,7 +167,7 @@ protected Collection<String> listSchemas(Connection connection)
             while (resultSet.next()) {
                 String schemaName = resultSet.getString("TABLE_SCHEM");
                 // skip internal schemas
-                if (!schemaName.equalsIgnoreCase("information_schema")) {
+                if (!listSchemasIgnoredSchemas.contains(schemaName.toLowerCase(ENGLISH))) {
                     schemaNames.add(schemaName);
                 }
             }

presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/BaseJdbcConfig.java

@@ -15,12 +15,17 @@
 
 import com.facebook.airlift.configuration.Config;
 import com.facebook.airlift.configuration.ConfigSecuritySensitive;
+import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableSet;
 import io.airlift.units.Duration;
 import io.airlift.units.MinDuration;
 
 import javax.annotation.Nullable;
 import javax.validation.constraints.NotNull;
 
+import java.util.Set;
+
+import static java.util.Locale.ENGLISH;
 import static java.util.concurrent.TimeUnit.MINUTES;
 
 public class BaseJdbcConfig
@@ -32,6 +37,7 @@ public class BaseJdbcConfig
     private String passwordCredentialName;
     private boolean caseInsensitiveNameMatching;
     private Duration caseInsensitiveNameMatchingCacheTtl = new Duration(1, MINUTES);
+    private Set<String> listSchemasIgnoredSchemas = ImmutableSet.of("information_schema");
 
     @NotNull
     public String getConnectionUrl()
@@ -124,4 +130,16 @@ public BaseJdbcConfig setCaseInsensitiveNameMatchingCacheTtl(Duration caseInsens
         this.caseInsensitiveNameMatchingCacheTtl = caseInsensitiveNameMatchingCacheTtl;
         return this;
     }
+
+    public Set<String> getlistSchemasIgnoredSchemas()
+    {
+        return listSchemasIgnoredSchemas;
+    }
+
+    @Config("list-schemas-ignored-schemas")
+    public BaseJdbcConfig setlistSchemasIgnoredSchemas(String listSchemasIgnoredSchemas)
+    {
+        this.listSchemasIgnoredSchemas = ImmutableSet.copyOf(Splitter.on(",").trimResults().omitEmptyStrings().split(listSchemasIgnoredSchemas.toLowerCase(ENGLISH)));
+        return this;
+    }
 }

presto-base-jdbc/src/test/java/com/facebook/presto/plugin/jdbc/TestBaseJdbcConfig.java

@@ -35,7 +35,8 @@ public void testDefaults()
                 .setUserCredentialName(null)
                 .setPasswordCredentialName(null)
                 .setCaseInsensitiveNameMatching(false)
-                .setCaseInsensitiveNameMatchingCacheTtl(new Duration(1, MINUTES)));
+                .setCaseInsensitiveNameMatchingCacheTtl(new Duration(1, MINUTES))
+                .setlistSchemasIgnoredSchemas("information_schema"));
     }
 
     @Test
@@ -49,6 +50,7 @@ public void testExplicitPropertyMappings()
                 .put("password-credential-name", "bar")
                 .put("case-insensitive-name-matching", "true")
                 .put("case-insensitive-name-matching.cache-ttl", "1s")
+                .put("list-schemas-ignored-schemas", "test,test2")
                 .build();
 
         BaseJdbcConfig expected = new BaseJdbcConfig()
@@ -58,6 +60,7 @@ public void testExplicitPropertyMappings()
                 .setUserCredentialName("foo")
                 .setPasswordCredentialName("bar")
                 .setCaseInsensitiveNameMatching(true)
+                .setlistSchemasIgnoredSchemas("test,test2")
                 .setCaseInsensitiveNameMatchingCacheTtl(new Duration(1, SECONDS));
 
         ConfigAssertions.assertFullMapping(properties, expected);

presto-docs/src/main/sphinx/connector/hana.rst

@@ -89,6 +89,8 @@ Property Name                                      Description
 
 ``case-insensitive-name-matching.cache-ttl``       Duration for which remote dataset and table names will be
                                                    cached. Set to ``0ms`` to disable the cache.                         ``1m``
+
+``list-schemas-ignored-schemas``                   List of schemas to ignore when listing schemas.                      ``information_schema``
 ================================================== ==================================================================== ===========
 
 Querying HANA

presto-docs/src/main/sphinx/connector/mysql.rst

@@ -66,6 +66,8 @@ Property Name                                      Description
 
 ``case-insensitive-name-matching.cache-ttl``       Duration for which remote dataset and table names will be
                                                    cached. Set to ``0ms`` to disable the cache.                         ``1m``
+
+``list-schemas-ignored-schemas``                   List of schemas to ignore when listing schemas.                      ``information_schema,mysql``
 ================================================== ==================================================================== ===========
 
 Querying MySQL

presto-docs/src/main/sphinx/connector/oracle.rst

@@ -68,6 +68,8 @@ Property Name                                      Description
 
 ``case-insensitive-name-matching.cache-ttl``       Duration for which remote dataset and table names will be
                                                    cached. Set to ``0ms`` to disable the cache.                         ``1m``
+
+``list-schemas-ignored-schemas``                   List of schemas to ignore when listing schemas.                      ``information_schema``
 ================================================== ==================================================================== ===========
 
 Querying Oracle

presto-docs/src/main/sphinx/connector/postgresql.rst

@@ -54,6 +54,8 @@ Property Name                                      Description
 
 ``case-insensitive-name-matching.cache-ttl``       Duration for which remote dataset and table names will be
                                                    cached. Set to ``0ms`` to disable the cache.                         ``1m``
+
+``list-schemas-ignored-schemas``                   List of schemas to ignore when listing schemas.                      ``information_schema``
 ================================================== ==================================================================== ===========
 
 Querying PostgreSQL

presto-docs/src/main/sphinx/connector/redshift.rst

@@ -54,6 +54,8 @@ Property Name                                      Description
 
 ``case-insensitive-name-matching.cache-ttl``       Duration for which remote dataset and table names will be
                                                    cached. Set to ``0ms`` to disable the cache.                         ``1m``
+
+``list-schemas-ignored-schemas``                   List of schemas to ignore when listing schemas.                      ``information_schema``
 ================================================== ==================================================================== ===========
 
 Querying Redshift

presto-docs/src/main/sphinx/connector/singlestore.rst

@@ -30,6 +30,9 @@ available in the `SingleStore Connection String Parameters
 The ``connection-user`` and ``connection-password`` are typically required and
 determine the user credentials for the connection, often a service user.
 
+An optional ``list-schemas-ignored-schemas`` config can be set to ignore certain schemas
+when listing schemas. The default value for this is ``information_schema,memsql``.
+
 Multiple SingleStore Servers
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

presto-docs/src/main/sphinx/connector/sqlserver.rst

@@ -132,6 +132,8 @@ Property Name                                      Description
 
 ``case-insensitive-name-matching.cache-ttl``       Duration for which remote dataset and table names will be
                                                    cached. Set to ``0ms`` to disable the cache.                         ``1m``
+
+``list-schemas-ignored-schemas``                   List of schemas to ignore when listing schemas.                      ``information_schema``
 ================================================== ==================================================================== ===========
 
 Querying SQL Server

presto-mysql/src/main/java/com/facebook/presto/plugin/mysql/MySqlClient.java

@@ -107,7 +107,7 @@ protected Collection<String> listSchemas(Connection connection)
             while (resultSet.next()) {
                 String schemaName = resultSet.getString("TABLE_CAT");
                 // skip internal schemas
-                if (!schemaName.equalsIgnoreCase("information_schema") && !schemaName.equalsIgnoreCase("mysql")) {
+                if (!listSchemasIgnoredSchemas.contains(schemaName.toLowerCase(ENGLISH))) {
                     schemaNames.add(schemaName);
                 }
             }

presto-mysql/src/main/java/com/facebook/presto/plugin/mysql/MySqlClientModule.java

@@ -32,6 +32,9 @@ public class MySqlClientModule
     protected void setup(Binder binder)
     {
         binder.bind(JdbcClient.class).to(MySqlClient.class).in(Scopes.SINGLETON);
+        configBinder(binder).bindConfigDefaults(BaseJdbcConfig.class, baseJdbcConfig -> {
+            baseJdbcConfig.setlistSchemasIgnoredSchemas("information_schema,mysql");
+        });
         ensureCatalogIsEmpty(buildConfigObject(BaseJdbcConfig.class).getConnectionUrl());
         configBinder(binder).bindConfig(MySqlConfig.class);
     }

presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlIntegrationSmokeTest.java

@@ -106,6 +106,13 @@ public void testDropTable()
         assertFalse(getQueryRunner().tableExists(getSession(), "test_drop"));
     }
 
+    @Test
+    public void testIgnoredSchemas()
+    {
+        MaterializedResult actual = computeActual("SHOW SCHEMAS");
+        assertFalse(actual.getMaterializedRows().stream().anyMatch(schemaResult -> schemaResult.getField(0).equals("mysql")));
+    }
+
     @Test
     public void testViews()
             throws SQLException

presto-singlestore/src/main/java/com/facebook/presto/plugin/singlestore/SingleStoreClient.java

@@ -82,8 +82,7 @@ protected Collection<String> listSchemas(Connection connection)
             while (resultSet.next()) {
                 String schemaName = resultSet.getString("TABLE_CAT");
                 // skip internal schemas
-                if (!schemaName.equalsIgnoreCase("information_schema") && !schemaName.equalsIgnoreCase("memsql")
-                        && !schemaName.equalsIgnoreCase("cluster")) {
+                if (!listSchemasIgnoredSchemas.contains(schemaName.toLowerCase(ENGLISH))) {
                     schemaNames.add(schemaName);
                 }
             }

presto-singlestore/src/main/java/com/facebook/presto/plugin/singlestore/SingleStoreClientModule.java

@@ -28,6 +28,9 @@ public class SingleStoreClientModule
     protected void setup(Binder binder)
     {
         binder.bind(JdbcClient.class).to(SingleStoreClient.class).in(Scopes.SINGLETON);
+        configBinder(binder).bindConfigDefaults(BaseJdbcConfig.class, baseJdbcConfig -> {
+            baseJdbcConfig.setlistSchemasIgnoredSchemas("information_schema,memsql");
+        });
         configBinder(binder).bindConfig(BaseJdbcConfig.class);
     }
 }

presto-singlestore/src/test/java/com/facebook/presto/plugin/singlestore/TestSingleStoreIntegrationSmokeTest.java

@@ -196,6 +196,13 @@ public void testInsertIntoNotNullColumn()
         assertUpdate("DROP TABLE test_insert_not_null");
     }
 
+    @Test
+    public void testIgnoredSchemas()
+    {
+        MaterializedResult actual = computeActual("SHOW SCHEMAS");
+        assertFalse(actual.getMaterializedRows().stream().anyMatch(schemaResult -> schemaResult.getField(0).equals("memsql")));
+    }
+
     @Test
     public void testColumnComment()
             throws Exception