Skip to content

Implement streamRelationColumns in BlackHole #26427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 18, 2025
Merged

Implement streamRelationColumns in BlackHole #26427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d60f1b4
Filter views by schemaName in listViews and getViews in BlackHole
chenjian2664 Aug 18, 2025
eeb7867
Implement streamRelationColumns in BlackHole
chenjian2664 Aug 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 36 additions & 4 deletions plugin/trino-blackhole/src/main/java/io/trino/plugin/blackhole/BlackHoleMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import io.trino.spi.connector.ConnectorTableMetadata;
import io.trino.spi.connector.ConnectorTableVersion;
import io.trino.spi.connector.ConnectorViewDefinition;
import io.trino.spi.connector.RelationColumnsMetadata;
import io.trino.spi.connector.RetryMode;
import io.trino.spi.connector.RowChangeParadigm;
import io.trino.spi.connector.SaveMode;
Expand All @@ -54,6 +55,7 @@

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
Expand All @@ -62,6 +64,7 @@
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
import java.util.function.UnaryOperator;

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Verify.verify;
Expand Down Expand Up @@ -185,9 +188,32 @@ public Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(ConnectorSess
@Override
public Iterator<TableColumnsMetadata> streamTableColumns(ConnectorSession session, SchemaTablePrefix prefix)
{
return tables.values().stream()
throw new UnsupportedOperationException("The deprecated streamTableColumns is not supported because streamRelationColumns is implemented instead");
}

@Override
public Iterator<RelationColumnsMetadata> streamRelationColumns(
ConnectorSession session,
Optional<String> schemaName,
UnaryOperator<Set<SchemaTableName>> relationFilter)
{
Map<SchemaTableName, RelationColumnsMetadata> relationColumns = new HashMap<>();
SchemaTablePrefix prefix = schemaName.map(SchemaTablePrefix::new).orElseGet(SchemaTablePrefix::new);

tables.values().stream()
.filter(table -> prefix.matches(table.toSchemaTableName()))
.map(handle -> TableColumnsMetadata.forTable(handle.toSchemaTableName(), handle.toTableMetadata().getColumns()))
.map(BlackHoleTableHandle::toTableMetadata)
.forEach(columnsMetadata -> {
SchemaTableName name = columnsMetadata.getTable();
relationColumns.put(name, RelationColumnsMetadata.forTable(name, columnsMetadata.getColumns()));
});

for (Map.Entry<SchemaTableName, ConnectorViewDefinition> entry : getViews(session, schemaName).entrySet()) {
relationColumns.put(entry.getKey(), RelationColumnsMetadata.forView(entry.getKey(), entry.getValue().getColumns()));
}

return relationFilter.apply(relationColumns.keySet()).stream()
.map(relationColumns::get)
.iterator();
}

Expand Down Expand Up @@ -438,13 +464,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
Expand Down
41 changes: 41 additions & 0 deletions plugin/trino-blackhole/src/test/java/io/trino/plugin/blackhole/TestBlackHoleMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -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();
Expand Down