Skip to content

Ignore Hive system schema when listing views/materialized views #16047

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
ebyhr merged 2 commits into from
Feb 13, 2023
Merged

Ignore Hive system schema when listing views/materialized views #16047

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
07ed9f2
Ignore Hive system schema when listing views/materialized views
findinpath Feb 9, 2023
3af7138
Add TODO for handling information_schema queries in the engine
findinpath Feb 9, 2023
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
18 changes: 15 additions & 3 deletions ...in/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/TrinoGlueCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,18 @@ public List<String> listNamespaces(ConnectorSession session)
}
}

private List<String> listNamespaces(ConnectorSession session, Optional<String> namespace)
{
if (namespace.isPresent()) {
if (isHiveSystemSchema(namespace.get())) {
// TODO https://github.com/trinodb/trino/issues/1559 information_schema should be handled by the engine fully
return ImmutableList.of();
}
return ImmutableList.of(namespace.get());
}
return listNamespaces(session);
}

@Override
public void dropNamespace(ConnectorSession session, String namespace)
{
Expand Down Expand Up @@ -289,7 +301,7 @@ public List<SchemaTableName> listTables(ConnectorSession session, Optional<Strin
{
ImmutableList.Builder<SchemaTableName> tables = ImmutableList.builder();
try {
List<String> namespaces = namespace.map(List::of).orElseGet(() -> listNamespaces(session));
List<String> namespaces = listNamespaces(session, namespace);
for (String glueNamespace : namespaces) {
try {
// Add all tables from a namespace together, in case it is removed while fetching paginated results
Expand Down Expand Up @@ -663,7 +675,7 @@ public List<SchemaTableName> listViews(ConnectorSession session, Optional<String
{
ImmutableList.Builder<SchemaTableName> views = ImmutableList.builder();
try {
List<String> namespaces = namespace.map(List::of).orElseGet(() -> listNamespaces(session));
List<String> namespaces = listNamespaces(session, namespace);
for (String glueNamespace : namespaces) {
try {
views.addAll(getPaginatedResults(
Expand Down Expand Up @@ -775,7 +787,7 @@ public List<SchemaTableName> listMaterializedViews(ConnectorSession session, Opt
{
ImmutableList.Builder<SchemaTableName> materializedViews = ImmutableList.builder();
try {
List<String> namespaces = namespace.map(List::of).orElseGet(() -> listNamespaces(session));
List<String> namespaces = listNamespaces(session, namespace);
for (String glueNamespace : namespaces) {
try {
materializedViews.addAll(getPaginatedResults(
Expand Down
1 change: 1 addition & 0 deletions plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/TrinoHiveCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,7 @@ private List<String> listNamespaces(ConnectorSession session, Optional<String> n
{
if (namespace.isPresent()) {
if (isHiveSystemSchema(namespace.get())) {
// TODO https://github.com/trinodb/trino/issues/1559 information_schema should be handled by the engine fully
return ImmutableList.of();
}
return ImmutableList.of(namespace.get());
Expand Down
13 changes: 13 additions & 0 deletions testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,19 @@ public void testRenameTableAcrossSchemas()
assertUpdate("DROP SCHEMA " + schemaName);
}

/**
* This seemingly duplicate test of {@link BaseConnectorTest#testShowInformationSchemaTables()}
* is used in the context of this class in order to be able to test
* against a wider range of connector configurations.
*/
@Test
public void testShowInformationSchemaTables()
{
assertThat(query("SHOW TABLES FROM information_schema"))
.skippingTypesCheck()
.containsAll("VALUES 'applicable_roles', 'columns', 'enabled_roles', 'roles', 'schemata', 'table_privileges', 'tables', 'views'");
}

@Test
public void testSelectInformationSchemaTables()
{
Expand Down
8 changes: 8 additions & 0 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 @@ -775,6 +775,14 @@ public void testDescribeTable()
assertEquals(actualColumns, expectedColumns);
}

@Test
public void testShowInformationSchemaTables()
{
assertThat(query("SHOW TABLES FROM information_schema"))
.skippingTypesCheck()
.containsAll("VALUES 'applicable_roles', 'columns', 'enabled_roles', 'roles', 'schemata', 'table_privileges', 'tables', 'views'");
}

@Test
public void testView()
{
Expand Down