This is an automated email from the ASF dual-hosted git repository.
dimas pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris.git
The following commit(s) were added to refs/heads/main by this push:
new a3d850f94 Prefer RealmConfig fields (#2971)
a3d850f94 is described below
commit a3d850f94ca29338d578a87487d851e30b693d48
Author: Christopher Lambert <[email protected]>
AuthorDate: Wed Nov 5 14:50:52 2025 +0100
Prefer RealmConfig fields (#2971)
minor cleanup of verbose code
---
.../polaris/service/admin/PolarisAdminService.java | 20 ++++++--------------
.../catalog/generic/GenericTableCatalogHandler.java | 2 +-
.../service/catalog/iceberg/IcebergCatalog.java | 4 +---
.../service/admin/PolarisAdminServiceTest.java | 2 +-
4 files changed, 9 insertions(+), 19 deletions(-)
diff --git
a/runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java
b/runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java
index 3aaeafbaf..b64394844 100644
---
a/runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java
+++
b/runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java
@@ -518,10 +518,8 @@ public class PolarisAdminService {
resolutionManifest.getResolvedPath(
identifier, PolarisEntityType.TABLE_LIKE,
PolarisEntitySubType.ANY_SUBTYPE, true);
boolean rbacForFederatedCatalogsEnabled =
- getCurrentPolarisContext()
- .getRealmConfig()
- .getConfig(
-
FeatureConfiguration.ENABLE_SUB_CATALOG_RBAC_FOR_FEDERATED_CATALOGS,
catalogEntity);
+ realmConfig.getConfig(
+
FeatureConfiguration.ENABLE_SUB_CATALOG_RBAC_FOR_FEDERATED_CATALOGS,
catalogEntity);
if (!(resolutionManifest.getIsPassthroughFacade() &&
rbacForFederatedCatalogsEnabled)
&&
!subTypes.contains(tableLikeWrapper.getRawLeafEntity().getSubType())) {
CatalogHandler.throwNotFoundExceptionForTableLikeEntity(identifier,
subTypes);
@@ -1698,11 +1696,8 @@ public class PolarisAdminService {
if (resolvedPathWrapper == null
|| !resolvedPathWrapper.isFullyResolvedNamespace(catalogName,
namespace)) {
boolean rbacForFederatedCatalogsEnabled =
- getCurrentPolarisContext()
- .getRealmConfig()
- .getConfig(
-
FeatureConfiguration.ENABLE_SUB_CATALOG_RBAC_FOR_FEDERATED_CATALOGS,
- catalogEntity);
+ realmConfig.getConfig(
+
FeatureConfiguration.ENABLE_SUB_CATALOG_RBAC_FOR_FEDERATED_CATALOGS,
catalogEntity);
if (resolutionManifest.getIsPassthroughFacade() &&
rbacForFederatedCatalogsEnabled) {
resolvedPathWrapper =
createSyntheticNamespaceEntities(
@@ -2140,11 +2135,8 @@ public class PolarisAdminService {
if (resolvedPathWrapper == null
||
!subTypes.contains(resolvedPathWrapper.getRawLeafEntity().getSubType())) {
boolean rbacForFederatedCatalogsEnabled =
- getCurrentPolarisContext()
- .getRealmConfig()
- .getConfig(
-
FeatureConfiguration.ENABLE_SUB_CATALOG_RBAC_FOR_FEDERATED_CATALOGS,
- catalogEntity);
+ realmConfig.getConfig(
+
FeatureConfiguration.ENABLE_SUB_CATALOG_RBAC_FOR_FEDERATED_CATALOGS,
catalogEntity);
if (resolutionManifest.getIsPassthroughFacade() &&
rbacForFederatedCatalogsEnabled) {
resolvedPathWrapper =
createSyntheticTableLikeEntities(
diff --git
a/runtime/service/src/main/java/org/apache/polaris/service/catalog/generic/GenericTableCatalogHandler.java
b/runtime/service/src/main/java/org/apache/polaris/service/catalog/generic/GenericTableCatalogHandler.java
index eeb8206da..05d2d16b7 100644
---
a/runtime/service/src/main/java/org/apache/polaris/service/catalog/generic/GenericTableCatalogHandler.java
+++
b/runtime/service/src/main/java/org/apache/polaris/service/catalog/generic/GenericTableCatalogHandler.java
@@ -87,7 +87,7 @@ public class GenericTableCatalogHandler extends
CatalogHandler {
.addKeyValue("remoteUrl", connectionConfigInfoDpo.getUri())
.log("Initializing federated catalog");
FeatureConfiguration.enforceFeatureEnabledOrThrow(
- callContext.getRealmConfig(),
FeatureConfiguration.ENABLE_CATALOG_FEDERATION);
+ realmConfig, FeatureConfiguration.ENABLE_CATALOG_FEDERATION);
GenericTableCatalog federatedCatalog;
ConnectionType connectionType =
diff --git
a/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalog.java
b/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalog.java
index 1f94cde9c..75742412e 100644
---
a/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalog.java
+++
b/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalog.java
@@ -806,9 +806,7 @@ public class IcebergCatalog extends BaseMetastoreViewCatalog
@Override
public boolean dropView(TableIdentifier identifier) {
boolean purge =
- callContext
- .getRealmConfig()
- .getConfig(FeatureConfiguration.PURGE_VIEW_METADATA_ON_DROP,
catalogEntity);
+
realmConfig.getConfig(FeatureConfiguration.PURGE_VIEW_METADATA_ON_DROP,
catalogEntity);
return dropTableLike(PolarisEntitySubType.ICEBERG_VIEW, identifier,
Map.of(), purge)
.isSuccess();
diff --git
a/runtime/service/src/test/java/org/apache/polaris/service/admin/PolarisAdminServiceTest.java
b/runtime/service/src/test/java/org/apache/polaris/service/admin/PolarisAdminServiceTest.java
index d584dc0bd..9241bec85 100644
---
a/runtime/service/src/test/java/org/apache/polaris/service/admin/PolarisAdminServiceTest.java
+++
b/runtime/service/src/test/java/org/apache/polaris/service/admin/PolarisAdminServiceTest.java
@@ -83,7 +83,7 @@ public class PolarisAdminServiceTest {
void setUp() throws Exception {
MockitoAnnotations.openMocks(this);
when(callContext.getPolarisCallContext()).thenReturn(polarisCallContext);
- when(polarisCallContext.getRealmConfig()).thenReturn(realmConfig);
+ when(callContext.getRealmConfig()).thenReturn(realmConfig);
// Default feature configuration - enabled by default
when(realmConfig.getConfig(FeatureConfiguration.ENABLE_SUB_CATALOG_RBAC_FOR_FEDERATED_CATALOGS))
