Filter out Hive information_schema and sys

presto-hive/src/main/java/io/prestosql/plugin/hive/HiveMetadata.java

@@ -324,13 +324,18 @@ public SemiTransactionalHiveMetastore getMetastore()
     @Override
     public List<String> listSchemaNames(ConnectorSession session)
     {
-        return metastore.getAllDatabases();
+        return metastore.getAllDatabases().stream()
+                .filter(HiveMetadata::filterSchema)
+                .collect(toImmutableList());
     }
 
     @Override
     public HiveTableHandle getTableHandle(ConnectorSession session, SchemaTableName tableName)
     {
         requireNonNull(tableName, "tableName is null");
+        if (!filterSchema(tableName.getSchemaName())) {
+            return null;
+        }
         Optional<Table> table = metastore.getTable(new HiveIdentity(session), tableName.getSchemaName(), tableName.getTableName());
         if (!table.isPresent()) {
             return null;
@@ -646,6 +651,9 @@ public List<SchemaTableName> listTables(ConnectorSession session, Optional<Strin
     private List<String> listSchemas(ConnectorSession session, Optional<String> schemaName)
     {
         if (schemaName.isPresent()) {
+            if (!filterSchema(schemaName.get())) {
+                return ImmutableList.of();
+            }
             return ImmutableList.of(schemaName.get());
         }
         return listSchemaNames(session);
@@ -704,6 +712,9 @@ private List<SchemaTableName> listTables(ConnectorSession session, SchemaTablePr
             return listTables(session, prefix.getSchema());
         }
         SchemaTableName tableName = prefix.toSchemaTableName();
+        if (!filterSchema(tableName.getSchemaName())) {
+            return ImmutableList.of();
+        }
         try {
             if (!metastore.getTable(new HiveIdentity(session), tableName.getSchemaName(), tableName.getTableName()).isPresent()) {
                 return ImmutableList.of();
@@ -1718,6 +1729,9 @@ public List<SchemaTableName> listViews(ConnectorSession session, Optional<String
     @Override
     public Optional<ConnectorViewDefinition> getView(ConnectorSession session, SchemaTableName viewName)
     {
+        if (!filterSchema(viewName.getSchemaName())) {
+            return Optional.empty();
+        }
         return metastore.getTable(new HiveIdentity(session), viewName.getSchemaName(), viewName.getTableName())
                 .flatMap(view -> {
                     if (isPrestoView(view)) {
@@ -1748,6 +1762,21 @@ private boolean isHiveOrPrestoView(Table table)
         return table.getTableType().equals(TableType.VIRTUAL_VIEW.name());
     }
 
+    private static boolean filterSchema(String schemaName)
+    {
+        if ("information_schema".equals(schemaName)) {
+            // For things like listing columns in information_schema.columns table, we need to explicitly filter out Hive's own information_schema.
+            // TODO https://github.com/prestosql/presto/issues/1559 this should be filtered out in engine.
+            return false;
+        }
+        if ("sys".equals(schemaName)) {
+            // Hive 3's `sys` schema contains no objects we can handle, so there is no point in exposing it.
+            // Also, exposing it may require proper handling in access control.
+            return false;
+        }
+        return true;
+    }
+
     @Override
     public ConnectorTableHandle beginDelete(ConnectorSession session, ConnectorTableHandle tableHandle)
     {

presto-product-tests/bin/product-tests-suite-2.sh

@@ -11,7 +11,7 @@ presto-product-tests-launcher/bin/run-launcher test run \
 
 presto-product-tests-launcher/bin/run-launcher test run \
     --environment singlenode-kerberos-hdfs-no-impersonation \
-    -- -g hdfs_no_impersonation \
+    -- -g storage_formats,hdfs_no_impersonation \
     || suite_exit_code=1
 
 presto-product-tests-launcher/bin/run-launcher test run \