Skip to content

Add redirection awareness for SHOW GRANTS statement #11270

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
findepi merged 1 commit into from
Mar 9, 2022
Merged

Add redirection awareness for SHOW GRANTS statement #11270

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
15 changes: 10 additions & 5 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 @@ -43,6 +43,7 @@
import io.trino.spi.TrinoException;
import io.trino.spi.connector.CatalogSchemaName;
import io.trino.spi.connector.ConnectorTableMetadata;
import io.trino.spi.connector.ConnectorViewDefinition;
import io.trino.spi.connector.SchemaTableName;
import io.trino.spi.security.PrincipalType;
import io.trino.spi.security.TrinoPrincipal;
Expand Down Expand Up @@ -297,17 +298,21 @@ protected Node visitShowTables(ShowTables showTables, Void context)
@Override
protected Node visitShowGrants(ShowGrants showGrants, Void context)
{
// TODO: make this method redirection aware
Copy link
Copy Markdown
Contributor Author

@findinpath findinpath Mar 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@phd3 there is also a TODO comment here:

trino/core/trino-main/src/main/java/io/trino/metadata/MetadataManager.java

Lines 2025 to 2027 in 2e3f9d5

// TODO support table redirection
@Override
public List<GrantInfo> listTablePrivileges(Session session, QualifiedTablePrefix prefix)

Am I correct in assuming that handling the MetadataManager#listTablePrivileges is not in the scope of this PR ?

String catalogName = session.getCatalog().orElse(null);
Optional<Expression> predicate = Optional.empty();

Optional<QualifiedName> tableName = showGrants.getTableName();
if (tableName.isPresent()) {
QualifiedObjectName qualifiedTableName = createQualifiedObjectName(session, showGrants, tableName.get());

if (!metadata.isView(session, qualifiedTableName) &&
metadata.getTableHandle(session, qualifiedTableName).isEmpty()) {
throw semanticException(TABLE_NOT_FOUND, showGrants, "Table '%s' does not exist", tableName);
if (!metadata.isView(session, qualifiedTableName)) {
RedirectionAwareTableHandle redirection = metadata.getRedirectionAwareTableHandle(session, qualifiedTableName);
Optional<TableHandle> tableHandle = redirection.getTableHandle();
if (tableHandle.isEmpty()) {
throw semanticException(TABLE_NOT_FOUND, showGrants, "Table '%s' does not exist", tableName);
}
if (redirection.getRedirectedTableName().isPresent()) {
throw semanticException(NOT_SUPPORTED, showGrants, "Table %s is redirected to %s and SHOW GRANTS is not supported with table redirections", tableName.get(), redirection.getRedirectedTableName().get());
}
}

catalogName = qualifiedTableName.getCatalogName();
Expand Down
14 changes: 14 additions & 0 deletions ...product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRedirectionToIceberg.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,20 @@ public void testCommentColumn()
onTrino().executeQuery("DROP TABLE " + icebergTableName);
}

@Test(groups = {HIVE_ICEBERG_REDIRECTIONS, PROFILE_SPECIFIC_TESTS})
Comment thread
findinpath marked this conversation as resolved.
Outdated
public void testShowGrants()
{
String tableName = "iceberg_show_grants_" + randomTableSuffix();
String hiveTableName = "hive.default." + tableName;
String icebergTableName = "iceberg.default." + tableName;
createIcebergTable(icebergTableName, false);

assertQueryFailure(() -> onTrino().executeQuery(format("SHOW GRANTS ON %s", hiveTableName)))
.hasMessageMatching("\\QQuery failed (#\\E\\S+\\Q): line 1:1: Table " + hiveTableName + " is redirected to " + icebergTableName + " and SHOW GRANTS is not supported with table redirections");

onTrino().executeQuery("DROP TABLE " + icebergTableName);
}

@Test(groups = {HIVE_ICEBERG_REDIRECTIONS, PROFILE_SPECIFIC_TESTS})
public void testInformationSchemaColumns()
{
Expand Down
17 changes: 17 additions & 0 deletions ...duct-tests/src/main/java/io/trino/tests/product/iceberg/TestIcebergRedirectionToHive.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,23 @@ public void testCommentTable()
onTrino().executeQuery("DROP TABLE " + hiveTableName);
}

@Test(groups = {HIVE_ICEBERG_REDIRECTIONS, PROFILE_SPECIFIC_TESTS})
public void testShowGrants()
{
String tableName = "hive_show_grants_" + randomTableSuffix();
String hiveTableName = "hive.default." + tableName;
String icebergTableName = "iceberg.default." + tableName;

createHiveTable(hiveTableName, true);

// TODO: support redirects from Iceberg to Hive
assertQueryFailure(() -> onTrino().executeQuery("SHOW GRANTS ON " + icebergTableName))
.hasMessageMatching("\\QQuery failed (#\\E\\S+\\Q): Not an Iceberg table: default." + tableName);

onTrino().executeQuery("DROP TABLE " + hiveTableName);
}


@Test(groups = {HIVE_ICEBERG_REDIRECTIONS, PROFILE_SPECIFIC_TESTS})
public void testInformationSchemaColumns()
{
Expand Down