Skip to content

Extract methods to add system table entries #18857

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
losipiuk merged 2 commits into from
Aug 31, 2023
+66 −56
Merged

Extract methods to add system table entries #18857

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
411ea52
Extract addMaterializedViewForCatalog() method for clarity
Randgalt Aug 30, 2023
4fba3b2
Extract addTableCommentForCatalog() method for clarity
Randgalt Aug 30, 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
35 changes: 20 additions & 15 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 @@ -103,26 +103,31 @@ public RecordCursor cursor(
listCatalogNames(session, metadata, accessControl, catalogFilter).forEach(catalogName -> {
QualifiedTablePrefix tablePrefix = tablePrefix(catalogName, schemaFilter, tableFilter);

getMaterializedViews(session, metadata, accessControl, tablePrefix).forEach((tableName, definition) -> {
QualifiedObjectName name = new QualifiedObjectName(tablePrefix.getCatalogName(), tableName.getSchemaName(), tableName.getTableName());
MaterializedViewFreshness freshness;

try {
freshness = metadata.getMaterializedViewFreshness(session, name);
}
catch (MaterializedViewNotFoundException e) {
// Ignore materialized view that was dropped during query execution (race condition)
return;
}

Object[] materializedViewRow = createMaterializedViewRow(name, freshness, definition);
displayTable.addRow(materializedViewRow);
});
addMaterializedViewForCatalog(session, displayTable, tablePrefix);
});

return displayTable.build().cursor();
}

private void addMaterializedViewForCatalog(Session session, InMemoryRecordSet.Builder displayTable, QualifiedTablePrefix tablePrefix)
{
getMaterializedViews(session, metadata, accessControl, tablePrefix).forEach((tableName, definition) -> {
QualifiedObjectName name = new QualifiedObjectName(tablePrefix.getCatalogName(), tableName.getSchemaName(), tableName.getTableName());
MaterializedViewFreshness freshness;

try {
freshness = metadata.getMaterializedViewFreshness(session, name);
}
catch (MaterializedViewNotFoundException e) {
// Ignore materialized view that was dropped during query execution (race condition)
return;
}

Object[] materializedViewRow = createMaterializedViewRow(name, freshness, definition);
displayTable.addRow(materializedViewRow);
});
}

private static Object[] createMaterializedViewRow(
QualifiedObjectName name,
MaterializedViewFreshness freshness,
Expand Down
87 changes: 46 additions & 41 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 @@ -97,54 +97,59 @@ public RecordCursor cursor(ConnectorTransactionHandle transactionHandle, Connect
for (String catalog : listCatalogNames(session, metadata, accessControl, catalogFilter)) {
QualifiedTablePrefix prefix = tablePrefix(catalog, schemaFilter, tableFilter);

if (prefix.getTableName().isPresent()) {
QualifiedObjectName relationName = new QualifiedObjectName(catalog, prefix.getSchemaName().orElseThrow(), prefix.getTableName().get());
RelationComment relationComment;
try {
relationComment = getRelationComment(session, relationName);
}
catch (RuntimeException e) {
LOG.warn(e, "Failed to get comment for relation: %s", relationName);
relationComment = new RelationComment(false, Optional.empty());
}
if (relationComment.found()) {
SchemaTableName schemaTableName = relationName.asSchemaTableName();
// Consulting accessControl first would be simpler but some AccessControl implementations may have issues when asked for a relation that does not exist.
if (accessControl.filterTables(session.toSecurityContext(), catalog, ImmutableSet.of(schemaTableName)).contains(schemaTableName)) {
table.addRow(catalog, schemaTableName.getSchemaName(), schemaTableName.getTableName(), relationComment.comment().orElse(null));
}
addTableCommentForCatalog(session, table, catalog, prefix);
}

return table.build().cursor();
}

private void addTableCommentForCatalog(Session session, Builder table, String catalog, QualifiedTablePrefix prefix)
{
if (prefix.getTableName().isPresent()) {
QualifiedObjectName relationName = new QualifiedObjectName(catalog, prefix.getSchemaName().orElseThrow(), prefix.getTableName().get());
RelationComment relationComment;
try {
relationComment = getRelationComment(session, relationName);
}
catch (RuntimeException e) {
LOG.warn(e, "Failed to get comment for relation: %s", relationName);
relationComment = new RelationComment(false, Optional.empty());
}
if (relationComment.found()) {
SchemaTableName schemaTableName = relationName.asSchemaTableName();
// Consulting accessControl first would be simpler but some AccessControl implementations may have issues when asked for a relation that does not exist.
if (accessControl.filterTables(session.toSecurityContext(), catalog, ImmutableSet.of(schemaTableName)).contains(schemaTableName)) {
table.addRow(catalog, schemaTableName.getSchemaName(), schemaTableName.getTableName(), relationComment.comment().orElse(null));
}
}
else {
List<RelationCommentMetadata> relationComments = metadata.listRelationComments(
session,
prefix.getCatalogName(),
prefix.getSchemaName(),
relationNames -> accessControl.filterTables(session.toSecurityContext(), catalog, relationNames));

for (RelationCommentMetadata commentMetadata : relationComments) {
SchemaTableName name = commentMetadata.name();
if (!commentMetadata.tableRedirected()) {
table.addRow(catalog, name.getSchemaName(), name.getTableName(), commentMetadata.comment().orElse(null));
}
else {
List<RelationCommentMetadata> relationComments = metadata.listRelationComments(
session,
prefix.getCatalogName(),
prefix.getSchemaName(),
relationNames -> accessControl.filterTables(session.toSecurityContext(), catalog, relationNames));

for (RelationCommentMetadata commentMetadata : relationComments) {
SchemaTableName name = commentMetadata.name();
if (!commentMetadata.tableRedirected()) {
table.addRow(catalog, name.getSchemaName(), name.getTableName(), commentMetadata.comment().orElse(null));
}
else {
try {
// TODO (https://github.com/trinodb/trino/issues/18514) this should consult accessControl on redirected name. Leaving for now as-is.
metadata.getRedirectionAwareTableHandle(session, new QualifiedObjectName(catalog, name.getSchemaName(), name.getTableName()))
.tableHandle().ifPresent(tableHandle -> {
Optional<String> comment = metadata.getTableMetadata(session, tableHandle).getMetadata().getComment();
table.addRow(catalog, name.getSchemaName(), name.getTableName(), comment.orElse(null));
});
}
else {
try {
// TODO (https://github.com/trinodb/trino/issues/18514) this should consult accessControl on redirected name. Leaving for now as-is.
metadata.getRedirectionAwareTableHandle(session, new QualifiedObjectName(catalog, name.getSchemaName(), name.getTableName()))
.tableHandle().ifPresent(tableHandle -> {
Optional<String> comment = metadata.getTableMetadata(session, tableHandle).getMetadata().getComment();
table.addRow(catalog, name.getSchemaName(), name.getTableName(), comment.orElse(null));
});
}
catch (RuntimeException e) {
LOG.warn(e, "Failed to get metadata for table: %s", name);
}
catch (RuntimeException e) {
LOG.warn(e, "Failed to get metadata for table: %s", name);
}
}
}
}

return table.build().cursor();
}

private RelationComment getRelationComment(Session session, QualifiedObjectName relationName)
Expand Down