Skip to content

Add PolarisResolutionManifestCatalogView.getResolvedCatalogEntity helper #2750

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
Oct 3, 2025
Merged

Add PolarisResolutionManifestCatalogView.getResolvedCatalogEntity helper #2750

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
10 changes: 10 additions & 0 deletions ...va/org/apache/polaris/core/persistence/resolver/PolarisResolutionManifestCatalogView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
*/
package org.apache.polaris.core.persistence.resolver;

import jakarta.annotation.Nullable;
import java.util.Optional;
import org.apache.polaris.core.entity.CatalogEntity;
import org.apache.polaris.core.entity.PolarisEntitySubType;
import org.apache.polaris.core.entity.PolarisEntityType;
import org.apache.polaris.core.persistence.PolarisResolvedPathWrapper;
Expand All @@ -29,6 +32,13 @@
public interface PolarisResolutionManifestCatalogView {
PolarisResolvedPathWrapper getResolvedReferenceCatalogEntity();

default @Nullable CatalogEntity getResolvedCatalogEntity() {
return Optional.ofNullable(getResolvedReferenceCatalogEntity())
.map(PolarisResolvedPathWrapper::getRawLeafEntity)
.map(CatalogEntity::of)
.orElse(null);
}

PolarisResolvedPathWrapper getResolvedPath(Object key);

PolarisResolvedPathWrapper getResolvedPath(
Expand Down
3 changes: 1 addition & 2 deletions runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,7 @@ private PolarisResolutionManifest newResolutionManifest(@Nullable String catalog
}

private Optional<CatalogEntity> currentCatalog() {
return Optional.ofNullable(resolutionManifest.getResolvedReferenceCatalogEntity())
.map(path -> CatalogEntity.of(path.getRawLeafEntity()));
return Optional.ofNullable(resolutionManifest.getResolvedCatalogEntity());
}

private Optional<PrincipalEntity> findPrincipalByName(String name) {
Expand Down
3 changes: 1 addition & 2 deletions .../src/main/java/org/apache/polaris/service/catalog/generic/GenericTableCatalogHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,7 @@ public GenericTableCatalogHandler(

@Override
protected void initializeCatalog() {
CatalogEntity resolvedCatalogEntity =
CatalogEntity.of(resolutionManifest.getResolvedReferenceCatalogEntity().getRawLeafEntity());
CatalogEntity resolvedCatalogEntity = resolutionManifest.getResolvedCatalogEntity();
ConnectionConfigInfoDpo connectionConfigInfoDpo =
resolvedCatalogEntity.getConnectionConfigInfoDpo();
if (connectionConfigInfoDpo != null) {
Expand Down
3 changes: 1 addition & 2 deletions .../src/main/java/org/apache/polaris/service/catalog/generic/PolarisGenericTableCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ public PolarisGenericTableCatalog(
PolarisResolutionManifestCatalogView resolvedEntityView) {
this.callContext = callContext;
this.resolvedEntityView = resolvedEntityView;
this.catalogEntity =
CatalogEntity.of(resolvedEntityView.getResolvedReferenceCatalogEntity().getRawLeafEntity());
this.catalogEntity = resolvedEntityView.getResolvedCatalogEntity();
this.catalogId = catalogEntity.getId();
this.metaStoreManager = metaStoreManager;
}
Expand Down
5 changes: 2 additions & 3 deletions runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,7 @@ public IcebergCatalog(
this.callContext = callContext;
this.realmConfig = callContext.getRealmConfig();
this.resolvedEntityView = resolvedEntityView;
this.catalogEntity =
CatalogEntity.of(resolvedEntityView.getResolvedReferenceCatalogEntity().getRawLeafEntity());
this.catalogEntity = resolvedEntityView.getResolvedCatalogEntity();
this.securityContext = securityContext;
this.taskExecutor = taskExecutor;
this.catalogId = catalogEntity.getId();
Expand Down Expand Up @@ -534,7 +533,7 @@ private String resolveNamespaceLocation(Namespace namespace, Map<String, String>
List<PolarisEntity> parentPath =
namespace.length() > 1
? getResolvedParentNamespace(namespace).getRawFullPath()
: List.of(resolvedEntityView.getResolvedReferenceCatalogEntity().getRawLeafEntity());
: List.of(resolvedEntityView.getResolvedCatalogEntity());

String parentLocation = resolveLocationForPath(diagnostics, parentPath);

Expand Down
6 changes: 3 additions & 3 deletions ...rvice/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,9 @@ public IcebergCatalogHandler(
}

private CatalogEntity getResolvedCatalogEntity() {
PolarisResolvedPathWrapper catalogPath = resolutionManifest.getResolvedReferenceCatalogEntity();
diagnostics.checkNotNull(catalogPath, "No catalog available");
return CatalogEntity.of(catalogPath.getRawLeafEntity());
CatalogEntity catalogEntity = resolutionManifest.getResolvedCatalogEntity();
diagnostics.checkNotNull(catalogEntity, "No catalog available");
return catalogEntity;
}

/**
Expand Down
3 changes: 1 addition & 2 deletions runtime/service/src/main/java/org/apache/polaris/service/catalog/policy/PolicyCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,7 @@ public PolicyCatalog(
PolarisResolutionManifestCatalogView resolvedEntityView) {
this.callContext = callContext;
this.resolvedEntityView = resolvedEntityView;
this.catalogEntity =
CatalogEntity.of(resolvedEntityView.getResolvedReferenceCatalogEntity().getRawLeafEntity());
this.catalogEntity = resolvedEntityView.getResolvedCatalogEntity();
this.catalogId = catalogEntity.getId();
this.metaStoreManager = metaStoreManager;
}
Expand Down
7 changes: 2 additions & 5 deletions ...ain/java/org/apache/polaris/service/context/catalog/PolarisCallContextCatalogFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import org.apache.polaris.core.auth.PolarisPrincipal;
import org.apache.polaris.core.context.CallContext;
import org.apache.polaris.core.entity.CatalogEntity;
import org.apache.polaris.core.entity.PolarisBaseEntity;
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
import org.apache.polaris.core.persistence.resolver.PolarisResolutionManifest;
import org.apache.polaris.core.persistence.resolver.ResolverFactory;
Expand Down Expand Up @@ -78,9 +77,8 @@ public Catalog createCallContextCatalog(
PolarisPrincipal polarisPrincipal,
SecurityContext securityContext,
final PolarisResolutionManifest resolvedManifest) {
PolarisBaseEntity baseCatalogEntity =
resolvedManifest.getResolvedReferenceCatalogEntity().getRawLeafEntity();
String catalogName = baseCatalogEntity.getName();
CatalogEntity catalog = resolvedManifest.getResolvedCatalogEntity();
String catalogName = catalog.getName();

String realm = context.getRealmContext().getRealmIdentifier();
String catalogKey = realm + "/" + catalogName;
Expand All @@ -99,7 +97,6 @@ public Catalog createCallContextCatalog(
fileIOFactory,
polarisEventListener);

CatalogEntity catalog = CatalogEntity.of(baseCatalogEntity);
Map<String, String> catalogProperties = new HashMap<>(catalog.getPropertiesAsMap());
String defaultBaseLocation = catalog.getBaseLocation();
LOGGER.debug(
Expand Down
36 changes: 10 additions & 26 deletions runtime/service/src/test/java/org/apache/polaris/service/admin/PolarisAdminServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.apache.polaris.core.config.FeatureConfiguration;
import org.apache.polaris.core.config.RealmConfig;
import org.apache.polaris.core.context.CallContext;
import org.apache.polaris.core.entity.CatalogEntity;
import org.apache.polaris.core.entity.NamespaceEntity;
import org.apache.polaris.core.entity.PolarisEntity;
import org.apache.polaris.core.entity.PolarisEntitySubType;
Expand Down Expand Up @@ -149,9 +150,7 @@ void testGrantPrivilegeOnNamespaceToRole_ThrowsNamespaceNotFoundException() {
when(resolutionManifest.resolveAll()).thenReturn(createSuccessfulResolverStatus());

PolarisEntity catalogEntity = createEntity(catalogName, PolarisEntityType.CATALOG);
PolarisResolvedPathWrapper catalogWrapper = mock(PolarisResolvedPathWrapper.class);
when(catalogWrapper.getRawLeafEntity()).thenReturn(catalogEntity);
when(resolutionManifest.getResolvedReferenceCatalogEntity()).thenReturn(catalogWrapper);
when(resolutionManifest.getResolvedCatalogEntity()).thenReturn(CatalogEntity.of(catalogEntity));

PolarisResolvedPathWrapper catalogRoleWrapper = mock(PolarisResolvedPathWrapper.class);
PolarisEntity catalogRoleEntity =
Expand Down Expand Up @@ -182,9 +181,7 @@ void testGrantPrivilegeOnNamespaceToRole_IncompleteNamespaceThrowsNamespaceNotFo
when(resolutionManifest.resolveAll()).thenReturn(createSuccessfulResolverStatus());

PolarisEntity catalogEntity = createEntity(catalogName, PolarisEntityType.CATALOG, 1L);
PolarisResolvedPathWrapper catalogWrapper = mock(PolarisResolvedPathWrapper.class);
when(catalogWrapper.getRawLeafEntity()).thenReturn(catalogEntity);
when(resolutionManifest.getResolvedReferenceCatalogEntity()).thenReturn(catalogWrapper);
when(resolutionManifest.getResolvedCatalogEntity()).thenReturn(CatalogEntity.of(catalogEntity));

PolarisResolvedPathWrapper catalogRoleWrapper = mock(PolarisResolvedPathWrapper.class);
PolarisEntity catalogRoleEntity =
Expand Down Expand Up @@ -297,10 +294,7 @@ void testGrantPrivilegeOnNamespaceToRole_PassthroughFacade() throws Exception {
PolarisPrivilege privilege = PolarisPrivilege.NAMESPACE_FULL_METADATA;

PolarisEntity catalogEntity = createEntity(catalogName, PolarisEntityType.CATALOG);
PolarisResolvedPathWrapper catalogWrapper = mock(PolarisResolvedPathWrapper.class);
when(catalogWrapper.getRawLeafEntity()).thenReturn(catalogEntity);
when(resolutionManifest.getResolvedReferenceCatalogEntity()).thenReturn(catalogWrapper);
when(resolutionManifest.getIsPassthroughFacade()).thenReturn(true);
when(resolutionManifest.getResolvedCatalogEntity()).thenReturn(CatalogEntity.of(catalogEntity));

PolarisResolvedPathWrapper catalogRoleWrapper = mock(PolarisResolvedPathWrapper.class);
PolarisEntity catalogRoleEntity =
Expand Down Expand Up @@ -367,10 +361,7 @@ void testGrantPrivilegeOnNamespaceToRole_PassthroughFacade_FeatureDisabled() thr
.thenReturn(false);

PolarisEntity catalogEntity = createEntity(catalogName, PolarisEntityType.CATALOG);
PolarisResolvedPathWrapper catalogWrapper = mock(PolarisResolvedPathWrapper.class);
when(catalogWrapper.getRawLeafEntity()).thenReturn(catalogEntity);
when(resolutionManifest.getResolvedReferenceCatalogEntity()).thenReturn(catalogWrapper);
when(resolutionManifest.getIsPassthroughFacade()).thenReturn(true);
when(resolutionManifest.getResolvedCatalogEntity()).thenReturn(CatalogEntity.of(catalogEntity));

PolarisResolvedPathWrapper catalogRoleWrapper = mock(PolarisResolvedPathWrapper.class);
PolarisEntity catalogRoleEntity =
Expand Down Expand Up @@ -404,6 +395,7 @@ void testGrantPrivilegeOnNamespaceToRole_SyntheticEntityCreationFails() throws E
PolarisResolvedPathWrapper catalogWrapper = mock(PolarisResolvedPathWrapper.class);
when(catalogWrapper.getRawLeafEntity()).thenReturn(catalogEntity);
when(resolutionManifest.getResolvedReferenceCatalogEntity()).thenReturn(catalogWrapper);
when(resolutionManifest.getResolvedCatalogEntity()).thenCallRealMethod();
when(resolutionManifest.getIsPassthroughFacade()).thenReturn(true);

PolarisResolvedPathWrapper catalogRoleWrapper = mock(PolarisResolvedPathWrapper.class);
Expand Down Expand Up @@ -451,9 +443,7 @@ void testGrantPrivilegeOnTableLikeToRole_PassthroughFacade() throws Exception {
PolarisPrivilege privilege = PolarisPrivilege.TABLE_WRITE_DATA;

PolarisEntity catalogEntity = createEntity(catalogName, PolarisEntityType.CATALOG);
PolarisResolvedPathWrapper catalogWrapper = mock(PolarisResolvedPathWrapper.class);
when(catalogWrapper.getRawLeafEntity()).thenReturn(catalogEntity);
when(resolutionManifest.getResolvedReferenceCatalogEntity()).thenReturn(catalogWrapper);
when(resolutionManifest.getResolvedCatalogEntity()).thenReturn(CatalogEntity.of(catalogEntity));
when(resolutionManifest.getIsPassthroughFacade()).thenReturn(true);

PolarisResolvedPathWrapper catalogRoleWrapper = mock(PolarisResolvedPathWrapper.class);
Expand Down Expand Up @@ -534,9 +524,7 @@ void testGrantPrivilegeOnTableLikeToRole_PassthroughFacade_FeatureDisabled() thr
.thenReturn(false);

PolarisEntity catalogEntity = createEntity(catalogName, PolarisEntityType.CATALOG);
PolarisResolvedPathWrapper catalogWrapper = mock(PolarisResolvedPathWrapper.class);
when(catalogWrapper.getRawLeafEntity()).thenReturn(catalogEntity);
when(resolutionManifest.getResolvedReferenceCatalogEntity()).thenReturn(catalogWrapper);
when(resolutionManifest.getResolvedCatalogEntity()).thenReturn(CatalogEntity.of(catalogEntity));
when(resolutionManifest.getIsPassthroughFacade()).thenReturn(true);

PolarisResolvedPathWrapper catalogRoleWrapper = mock(PolarisResolvedPathWrapper.class);
Expand Down Expand Up @@ -581,9 +569,7 @@ void testGrantPrivilegeOnTableLikeToRole_SyntheticEntityCreationFails() throws E
PolarisPrivilege privilege = PolarisPrivilege.TABLE_WRITE_DATA;

PolarisEntity catalogEntity = createEntity(catalogName, PolarisEntityType.CATALOG);
PolarisResolvedPathWrapper catalogWrapper = mock(PolarisResolvedPathWrapper.class);
when(catalogWrapper.getRawLeafEntity()).thenReturn(catalogEntity);
when(resolutionManifest.getResolvedReferenceCatalogEntity()).thenReturn(catalogWrapper);
when(resolutionManifest.getResolvedCatalogEntity()).thenReturn(CatalogEntity.of(catalogEntity));
when(resolutionManifest.getIsPassthroughFacade()).thenReturn(true);

PolarisResolvedPathWrapper catalogRoleWrapper = mock(PolarisResolvedPathWrapper.class);
Expand Down Expand Up @@ -695,9 +681,7 @@ private void setupSuccessfulNamespaceResolution(
when(resolutionManifest.getResolvedPath(eq(namespace))).thenReturn(resolvedPathWrapper);

PolarisEntity catalogEntity = createEntity(catalogName, PolarisEntityType.CATALOG);
PolarisResolvedPathWrapper catalogWrapper = mock(PolarisResolvedPathWrapper.class);
when(catalogWrapper.getRawLeafEntity()).thenReturn(catalogEntity);
when(resolutionManifest.getResolvedReferenceCatalogEntity()).thenReturn(catalogWrapper);
when(resolutionManifest.getResolvedCatalogEntity()).thenReturn(CatalogEntity.of(catalogEntity));

PolarisResolvedPathWrapper catalogRoleWrapper = mock(PolarisResolvedPathWrapper.class);
PolarisEntity catalogRoleEntity =
Expand Down