Filter views by schemaName in listViews and getViews in BlackHole

Author: chenjian2664

plugin/trino-blackhole/src/main/java/io/trino/plugin/blackhole/BlackHoleMetadata.java

@@ -438,13 +438,19 @@ public void dropView(ConnectorSession session, SchemaTableName viewName)
     @Override
     public List<SchemaTableName> listViews(ConnectorSession session, Optional<String> schemaName)
     {
-        return ImmutableList.copyOf(views.keySet());
+        return schemaName.map(schema -> views.keySet().stream()
+                        .filter(view -> view.getSchemaName().equals(schema))
+                        .collect(toImmutableList()))
+                .orElseGet(() -> ImmutableList.copyOf(views.keySet()));
     }
 
     @Override
     public Map<SchemaTableName, ConnectorViewDefinition> getViews(ConnectorSession session, Optional<String> schemaName)
     {
-        return ImmutableMap.copyOf(views);
+        return schemaName.map(schema -> views.entrySet().stream()
+                        .filter(view -> view.getKey().getSchemaName().equals(schema))
+                        .collect(toImmutableMap(Map.Entry::getKey, Map.Entry::getValue)))
+                .orElseGet(() -> ImmutableMap.copyOf(views));
     }
 
     @Override

plugin/trino-blackhole/src/test/java/io/trino/plugin/blackhole/TestBlackHoleMetadata.java

@@ -18,6 +18,7 @@
 import io.airlift.units.Duration;
 import io.trino.spi.connector.ConnectorOutputTableHandle;
 import io.trino.spi.connector.ConnectorTableMetadata;
+import io.trino.spi.connector.ConnectorViewDefinition;
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.security.TrinoPrincipal;
 import org.junit.jupiter.api.Test;
@@ -29,8 +30,10 @@
 import static io.trino.spi.StandardErrorCode.NOT_FOUND;
 import static io.trino.spi.connector.RetryMode.NO_RETRIES;
 import static io.trino.spi.security.PrincipalType.USER;
+import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.testing.TestingConnectorSession.SESSION;
 import static io.trino.testing.assertions.TrinoExceptionAssert.assertTrinoExceptionThrownBy;
+import static java.util.Map.entry;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -84,6 +87,44 @@ void testCreateTableInNotExistSchema()
                 .hasMessage("Schema schema1 not found");
     }
 
+    @Test
+    void testGetView()
+    {
+        ConnectorViewDefinition viewDefinition = createViewDefinition();
+        Map<SchemaTableName, ConnectorViewDefinition> views = ImmutableMap.<SchemaTableName, ConnectorViewDefinition>builder()
+                .put(new SchemaTableName("default", "test_view"), viewDefinition)
+                .put(new SchemaTableName("default", "test_view2"), viewDefinition)
+                .put(new SchemaTableName("default2", "test_view2"), viewDefinition)
+                .buildOrThrow();
+
+        for (Map.Entry<SchemaTableName, ConnectorViewDefinition> entry : views.entrySet()) {
+            metadata.createView(SESSION, entry.getKey(), entry.getValue(), ImmutableMap.of(), false);
+        }
+
+        assertThat(metadata.listViews(SESSION, Optional.empty()))
+                .containsExactlyElementsOf(views.keySet());
+        assertThat(metadata.listViews(SESSION, Optional.of("default")))
+                .containsExactly(new SchemaTableName("default", "test_view"), new SchemaTableName("default", "test_view2"));
+
+        assertThat(metadata.getViews(SESSION, Optional.empty()))
+                .containsExactlyEntriesOf(views);
+        assertThat(metadata.getViews(SESSION, Optional.of("default2")))
+                .containsExactly(entry(new SchemaTableName("default2", "test_view2"), viewDefinition));
+    }
+
+    private static ConnectorViewDefinition createViewDefinition()
+    {
+        return new ConnectorViewDefinition(
+                "SELECT * FROM test_table",
+                Optional.of("blackhole"),
+                Optional.of("default"),
+                ImmutableList.of(new ConnectorViewDefinition.ViewColumn("col1", BIGINT.getTypeId(), Optional.empty())),
+                Optional.empty(),
+                Optional.empty(),
+                true,
+                ImmutableList.of());
+    }
+
     private void assertThatNoTableIsCreated()
     {
         assertThat(metadata.listTables(SESSION, Optional.empty())).isEmpty();