Skip to content

Revert "Allow differentiating materialized views from tables efficiently" #20107

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
martint merged 1 commit into from
Dec 14, 2023
Merged

Revert "Allow differentiating materialized views from tables efficiently" #20107

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
31 changes: 11 additions & 20 deletions ...-main/src/main/java/io/trino/connector/informationschema/InformationSchemaPageSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,43 +277,34 @@ private void addColumnsRecords(QualifiedTablePrefix prefix)

private void addTablesRecords(QualifiedTablePrefix prefix)
{
boolean needsTableType = requiredColumns.contains("table_type") || requiredColumns.contains("trino_relation_type");
boolean needsTableType = requiredColumns.contains("table_type");
Set<SchemaTableName> relations;
Map<SchemaTableName, RelationType> relationTypes;
Set<SchemaTableName> views;
if (needsTableType) {
relationTypes = getRelationTypes(session, metadata, accessControl, prefix);
Map<SchemaTableName, RelationType> relationTypes = getRelationTypes(session, metadata, accessControl, prefix);
relations = relationTypes.keySet();
views = relationTypes.entrySet().stream()
.filter(entry -> entry.getValue() == RelationType.VIEW)
.map(Entry::getKey)
.collect(toImmutableSet());
}
else {
relations = listTables(session, metadata, accessControl, prefix);
relationTypes = null;
views = Set.of();
}
// TODO (https://github.com/trinodb/trino/issues/8207) define a type for materialized views

for (SchemaTableName name : relations) {
String type = null;
String trinoRelationType = null;
if (needsTableType) {
switch (relationTypes.get(name)) {
case TABLE -> {
type = "BASE TABLE";
trinoRelationType = type;
}
case VIEW -> {
type = "VIEW";
trinoRelationType = type;
}
case MATERIALIZED_VIEW -> {
type = "BASE TABLE";
trinoRelationType = "MATERIALIZED VIEW";
}
}
// if table and view names overlap, the view wins
type = views.contains(name) ? "VIEW" : "BASE TABLE";
}
addRecord(
prefix.getCatalogName(),
name.getSchemaName(),
name.getTableName(),
type,
trinoRelationType,
null);
if (isLimitExhausted()) {
return;
Expand Down
1 change: 0 additions & 1 deletion ...trino-main/src/main/java/io/trino/connector/informationschema/InformationSchemaTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ public enum InformationSchemaTable
.column("table_schema", createUnboundedVarcharType())
.column("table_name", createUnboundedVarcharType())
.column("table_type", createUnboundedVarcharType())
.hiddenColumn("trino_relation_type", createUnboundedVarcharType())
.hiddenColumn("table_comment", createUnboundedVarcharType()) // MySQL compatible
.build()),
VIEWS(table("views")
Expand Down
8 changes: 4 additions & 4 deletions testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,15 +1052,15 @@ public void testMaterializedView()
.containsAll("VALUES '" + view.getObjectName() + "'");
// information_schema.tables without table_name filter so that ConnectorMetadata.listViews is exercised
assertThat(query(
"SELECT table_name, table_type, trino_relation_type FROM information_schema.tables " +
"SELECT table_name, table_type FROM information_schema.tables " +
"WHERE table_schema = '" + view.getSchemaName() + "'"))
.skippingTypesCheck()
.containsAll("VALUES ('" + view.getObjectName() + "', 'BASE TABLE', 'MATERIALIZED VIEW')");
.containsAll("VALUES ('" + view.getObjectName() + "', 'BASE TABLE')");
// information_schema.tables with table_name filter
assertQuery(
"SELECT table_name, table_type, trino_relation_type FROM information_schema.tables " +
"SELECT table_name, table_type FROM information_schema.tables " +
"WHERE table_schema = '" + view.getSchemaName() + "' and table_name = '" + view.getObjectName() + "'",
"VALUES ('" + view.getObjectName() + "', 'BASE TABLE', 'MATERIALIZED VIEW')");
"VALUES ('" + view.getObjectName() + "', 'BASE TABLE')");

// system.jdbc.tables without filter
assertThat(query("SELECT table_schem, table_name, table_type FROM system.jdbc.tables"))
Expand Down