Skip to content

Don't call Iceberg view endpoints if disabled #26318

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
merged 1 commit into from
Aug 3, 2025
Merged

Don't call Iceberg view endpoints if disabled #26318

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
3 changes: 2 additions & 1 deletion ...rg/src/main/java/io/trino/plugin/iceberg/catalog/rest/TrinoIcebergRestCatalogFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ public synchronized TrinoCatalog create(ConnectorIdentity identity)
uniqueTableLocation,
caseInsensitiveNameMatching,
remoteNamespaceMappingCache,
remoteTableMappingCache);
remoteTableMappingCache,
viewEndpointsEnabled);
}
}
39 changes: 28 additions & 11 deletions ...in/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/TrinoRestCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ public class TrinoRestCatalog
private final boolean caseInsensitiveNameMatching;
private final Cache<Namespace, Namespace> remoteNamespaceMappingCache;
private final Cache<TableIdentifier, TableIdentifier> remoteTableMappingCache;
private final boolean viewEndpointsEnabled;

private final Cache<SchemaTableName, BaseTable> tableCache = EvictableCacheBuilder.newBuilder()
.maximumSize(PER_QUERY_CACHE_SIZE)
Expand All @@ -134,7 +135,8 @@ public TrinoRestCatalog(
boolean useUniqueTableLocation,
boolean caseInsensitiveNameMatching,
Cache<Namespace, Namespace> remoteNamespaceMappingCache,
Cache<TableIdentifier, TableIdentifier> remoteTableMappingCache)
Cache<TableIdentifier, TableIdentifier> remoteTableMappingCache,
boolean viewEndpointsEnabled)
{
this.restSessionCatalog = requireNonNull(restSessionCatalog, "restSessionCatalog is null");
this.catalogName = requireNonNull(catalogName, "catalogName is null");
Expand All @@ -147,6 +149,7 @@ public TrinoRestCatalog(
this.caseInsensitiveNameMatching = caseInsensitiveNameMatching;
this.remoteNamespaceMappingCache = requireNonNull(remoteNamespaceMappingCache, "remoteNamespaceMappingCache is null");
this.remoteTableMappingCache = requireNonNull(remoteTableMappingCache, "remoteTableMappingCache is null");
this.viewEndpointsEnabled = viewEndpointsEnabled;
}

@Override
Expand Down Expand Up @@ -284,16 +287,18 @@ public List<TableInfo> listTables(ConnectorSession session, Optional<String> nam
}).stream()
.map(id -> new TableInfo(SchemaTableName.schemaTableName(toSchemaName(id.namespace()), id.name()), TableInfo.ExtendedRelationType.TABLE))
.forEach(tables::add);
listTableIdentifiers(restNamespace, () -> {
try {
return restSessionCatalog.listViews(sessionContext, toRemoteNamespace(session, restNamespace));
}
catch (RESTException e) {
throw new TrinoException(ICEBERG_CATALOG_ERROR, "Failed to list views", e);
}
}).stream()
.map(id -> new TableInfo(SchemaTableName.schemaTableName(toSchemaName(id.namespace()), id.name()), TableInfo.ExtendedRelationType.OTHER_VIEW))
.forEach(tables::add);
if (viewEndpointsEnabled) {
listTableIdentifiers(restNamespace, () -> {
try {
return restSessionCatalog.listViews(sessionContext, toRemoteNamespace(session, restNamespace));
}
catch (RESTException e) {
throw new TrinoException(ICEBERG_CATALOG_ERROR, "Failed to list views", e);
}
}).stream()
.map(id -> new TableInfo(SchemaTableName.schemaTableName(toSchemaName(id.namespace()), id.name()), TableInfo.ExtendedRelationType.OTHER_VIEW))
.forEach(tables::add);
}
}
return tables.build();
}
Expand Down Expand Up @@ -323,6 +328,10 @@ public List<SchemaTableName> listIcebergTables(ConnectorSession session, Optiona
@Override
public List<SchemaTableName> listViews(ConnectorSession session, Optional<String> namespace)
{
if (!viewEndpointsEnabled) {
return ImmutableList.of();
}

SessionContext sessionContext = convert(session);
List<Namespace> namespaces = listNamespaces(session, namespace);

Expand Down Expand Up @@ -705,6 +714,10 @@ public Optional<ConnectorViewDefinition> getView(ConnectorSession session, Schem

private Optional<View> getIcebergView(ConnectorSession session, SchemaTableName viewName, boolean getCached)
{
if (!viewEndpointsEnabled) {
return Optional.empty();
}

try {
return Optional.of(restSessionCatalog.loadView(convert(session), toRemoteView(session, viewName, getCached)));
}
Expand Down Expand Up @@ -926,6 +939,10 @@ private TableIdentifier toRemoteView(ConnectorSession session, SchemaTableName s

private TableIdentifier findRemoteView(ConnectorSession session, TableIdentifier tableIdentifier)
{
if (!viewEndpointsEnabled) {
return tableIdentifier;
}

Namespace remoteNamespace = toRemoteNamespace(session, tableIdentifier.namespace());
List<TableIdentifier> tableIdentifiers;
try {
Expand Down
3 changes: 2 additions & 1 deletion ...rino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestTrinoRestCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ private static TrinoRestCatalog createTrinoRestCatalog(boolean useUniqueTableLoc
useUniqueTableLocations,
false,
EvictableCacheBuilder.newBuilder().expireAfterWrite(1000, MILLISECONDS).shareNothingWhenDisabled().build(),
EvictableCacheBuilder.newBuilder().expireAfterWrite(1000, MILLISECONDS).shareNothingWhenDisabled().build());
EvictableCacheBuilder.newBuilder().expireAfterWrite(1000, MILLISECONDS).shareNothingWhenDisabled().build(),
true);
}

@Test
Expand Down