Skip to content

Implement streamRelationColumns in ElasticSearch #26428

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 1 commit into from
Aug 17, 2025
Merged

Implement streamRelationColumns in ElasticSearch #26428

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 23 additions & 8 deletions ...rino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
import io.trino.spi.connector.ConstraintApplicationResult;
import io.trino.spi.connector.LimitApplicationResult;
import io.trino.spi.connector.ProjectionApplicationResult;
import io.trino.spi.connector.RelationColumnsMetadata;
import io.trino.spi.connector.SchemaTableName;
import io.trino.spi.connector.SchemaTablePrefix;
import io.trino.spi.connector.TableColumnsMetadata;
Expand Down Expand Up @@ -93,6 +94,7 @@
import java.util.Optional;
import java.util.OptionalLong;
import java.util.Set;
import java.util.function.UnaryOperator;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;
Expand All @@ -103,7 +105,6 @@
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableMap.toImmutableMap;
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static com.google.common.collect.Iterators.singletonIterator;
import static io.airlift.slice.SliceUtf8.getCodePointAt;
import static io.airlift.slice.SliceUtf8.lengthOfCodePoint;
import static io.trino.plugin.base.projection.ApplyProjectionUtil.extractSupportedProjectedColumns;
Expand Down Expand Up @@ -440,16 +441,21 @@ public Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(ConnectorSess
@Override
public Iterator<TableColumnsMetadata> streamTableColumns(ConnectorSession session, SchemaTablePrefix prefix)
{
if (prefix.getSchema().isPresent() && !prefix.getSchema().get().equals(schemaName)) {
return emptyIterator();
}
throw new UnsupportedOperationException("The deprecated streamTableColumns is not supported because streamRelationColumns is implemented instead");
}

if (prefix.getSchema().isPresent() && prefix.getTable().isPresent()) {
ConnectorTableMetadata metadata = getTableMetadata(prefix.getSchema().get(), prefix.getTable().get());
return singletonIterator(TableColumnsMetadata.forTable(metadata.getTable(), metadata.getColumns()));
@Override
public Iterator<RelationColumnsMetadata> streamRelationColumns(
ConnectorSession session,
Optional<String> schemaName,
UnaryOperator<Set<SchemaTableName>> relationFilter)
{
if (schemaName.isPresent() && !schemaName.get().equals(this.schemaName)) {
return emptyIterator();
}

return listTables(session, prefix.getSchema()).stream()
Map<SchemaTableName, RelationColumnsMetadata> relationColumns = new HashMap<>();
listTables(session, schemaName).stream()
.flatMap(name -> {
try {
ConnectorTableMetadata tableMetadata = getTableMetadata(name.getSchemaName(), name.getTableName());
Expand All @@ -463,6 +469,15 @@ public Iterator<TableColumnsMetadata> streamTableColumns(ConnectorSession sessio
throw e;
}
})
.forEach(columnsMetadata -> {
SchemaTableName name = columnsMetadata.getTable();
relationColumns.put(name, columnsMetadata.getColumns()
.map(columns -> RelationColumnsMetadata.forTable(name, columns))
.orElseGet(() -> RelationColumnsMetadata.forRedirectedTable(name)));
});

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

Expand Down