Skip to content

Static import MetadataListing.listCatalogNames #12780

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
dain merged 1 commit into from
Jun 10, 2022
Merged

Static import MetadataListing.listCatalogNames #12780

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions core/trino-main/src/main/java/io/trino/connector/system/MaterializedViewSystemTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import io.trino.FullConnectorSession;
import io.trino.Session;
import io.trino.metadata.Metadata;
import io.trino.metadata.MetadataListing;
import io.trino.metadata.QualifiedObjectName;
import io.trino.metadata.QualifiedTablePrefix;
import io.trino.metadata.ViewInfo;
Expand All @@ -40,6 +39,7 @@
import static io.trino.connector.system.jdbc.FilterUtil.tablePrefix;
import static io.trino.connector.system.jdbc.FilterUtil.tryGetSingleVarcharValue;
import static io.trino.metadata.MetadataListing.getMaterializedViews;
import static io.trino.metadata.MetadataListing.listCatalogNames;
import static io.trino.metadata.MetadataUtil.TableMetadataBuilder.tableMetadataBuilder;
import static io.trino.spi.connector.SystemTable.Distribution.SINGLE_COORDINATOR;
import static io.trino.spi.type.BooleanType.BOOLEAN;
Expand Down Expand Up @@ -97,7 +97,7 @@ public RecordCursor cursor(
Optional<String> schemaFilter = tryGetSingleVarcharValue(constraint, 1);
Optional<String> tableFilter = tryGetSingleVarcharValue(constraint, 2);

MetadataListing.listCatalogNames(session, metadata, accessControl, catalogFilter).forEach(catalogName -> {
listCatalogNames(session, metadata, accessControl, catalogFilter).forEach(catalogName -> {
QualifiedTablePrefix tablePrefix = tablePrefix(catalogName, schemaFilter, tableFilter);

getMaterializedViews(session, metadata, accessControl, tablePrefix).forEach((tableName, definition) -> {
Expand Down
4 changes: 2 additions & 2 deletions core/trino-main/src/main/java/io/trino/connector/system/TableCommentSystemTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import io.trino.FullConnectorSession;
import io.trino.Session;
import io.trino.metadata.Metadata;
import io.trino.metadata.MetadataListing;
import io.trino.metadata.QualifiedObjectName;
import io.trino.metadata.QualifiedTablePrefix;
import io.trino.metadata.ViewInfo;
Expand All @@ -46,6 +45,7 @@
import static io.trino.connector.system.jdbc.FilterUtil.tryGetSingleVarcharValue;
import static io.trino.metadata.MetadataListing.getMaterializedViews;
import static io.trino.metadata.MetadataListing.getViews;
import static io.trino.metadata.MetadataListing.listCatalogNames;
import static io.trino.metadata.MetadataListing.listTables;
import static io.trino.metadata.MetadataUtil.TableMetadataBuilder.tableMetadataBuilder;
import static io.trino.spi.connector.SystemTable.Distribution.SINGLE_COORDINATOR;
Expand Down Expand Up @@ -98,7 +98,7 @@ public RecordCursor cursor(ConnectorTransactionHandle transactionHandle, Connect
Session session = ((FullConnectorSession) connectorSession).getSession();
Builder table = InMemoryRecordSet.builder(COMMENT_TABLE);

for (String catalog : MetadataListing.listCatalogNames(session, metadata, accessControl, catalogFilter)) {
for (String catalog : listCatalogNames(session, metadata, accessControl, catalogFilter)) {
QualifiedTablePrefix prefix = tablePrefix(catalog, schemaFilter, tableFilter);

Set<SchemaTableName> names = ImmutableSet.of();
Expand Down
4 changes: 2 additions & 2 deletions core/trino-main/src/main/java/io/trino/connector/system/jdbc/CatalogJdbcTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import io.trino.FullConnectorSession;
import io.trino.Session;
import io.trino.metadata.Metadata;
import io.trino.metadata.MetadataListing;
import io.trino.security.AccessControl;
import io.trino.spi.connector.ConnectorSession;
import io.trino.spi.connector.ConnectorTableMetadata;
Expand All @@ -29,6 +28,7 @@

import javax.inject.Inject;

import static io.trino.metadata.MetadataListing.listCatalogNames;
import static io.trino.metadata.MetadataUtil.TableMetadataBuilder.tableMetadataBuilder;
import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
import static java.util.Objects.requireNonNull;
Expand Down Expand Up @@ -63,7 +63,7 @@ public RecordCursor cursor(ConnectorTransactionHandle transactionHandle, Connect
{
Session session = ((FullConnectorSession) connectorSession).getSession();
Builder table = InMemoryRecordSet.builder(METADATA);
for (String name : MetadataListing.listCatalogNames(session, metadata, accessControl)) {
for (String name : listCatalogNames(session, metadata, accessControl)) {
table.addRow(name);
}
return table.build().cursor();
Expand Down
7 changes: 4 additions & 3 deletions core/trino-main/src/main/java/io/trino/sql/rewrite/ShowQueriesRewrite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import io.trino.metadata.MaterializedViewDefinition;
import io.trino.metadata.MaterializedViewPropertyManager;
import io.trino.metadata.Metadata;
import io.trino.metadata.MetadataListing;
import io.trino.metadata.MetadataUtil;
import io.trino.metadata.QualifiedObjectName;
import io.trino.metadata.RedirectionAwareTableHandle;
Expand Down Expand Up @@ -107,6 +106,8 @@
import static io.trino.connector.informationschema.InformationSchemaTable.SCHEMATA;
import static io.trino.connector.informationschema.InformationSchemaTable.TABLES;
import static io.trino.connector.informationschema.InformationSchemaTable.TABLE_PRIVILEGES;
import static io.trino.metadata.MetadataListing.listCatalogNames;
import static io.trino.metadata.MetadataListing.listCatalogs;
import static io.trino.metadata.MetadataListing.listSchemas;
import static io.trino.metadata.MetadataUtil.createCatalogSchemaName;
import static io.trino.metadata.MetadataUtil.createQualifiedObjectName;
Expand Down Expand Up @@ -442,7 +443,7 @@ protected Node visitShowSchemas(ShowSchemas node, Void context)
@Override
protected Node visitShowCatalogs(ShowCatalogs node, Void context)
{
List<Expression> rows = MetadataListing.listCatalogNames(session, metadata, accessControl).stream()
List<Expression> rows = listCatalogNames(session, metadata, accessControl).stream()
.map(name -> row(new StringLiteral(name)))
.collect(toImmutableList());

Expand Down Expand Up @@ -830,7 +831,7 @@ private static String getFunctionType(FunctionMetadata function)
protected Node visitShowSession(ShowSession node, Void context)
{
ImmutableList.Builder<Expression> rows = ImmutableList.builder();
List<CatalogInfo> catalogInfos = MetadataListing.listCatalogs(session, metadata, accessControl);
List<CatalogInfo> catalogInfos = listCatalogs(session, metadata, accessControl);
List<SessionPropertyValue> sessionProperties = sessionPropertyManager.getAllSessionProperties(session, catalogInfos);
for (SessionPropertyValue sessionProperty : sessionProperties) {
if (sessionProperty.isHidden()) {
Expand Down