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 eceaadd22 Optimize PolicyCatalog.listPolicies (#2370)
eceaadd22 is described below
commit eceaadd223e70413979d53e3b17130dba4cf1258
Author: Christopher Lambert <xn...@gmx.de>
AuthorDate: Tue Aug 26 13:04:07 2025 +0200
Optimize PolicyCatalog.listPolicies (#2370)
this is a follow-up to https://github.com/apache/polaris/pull/2290
the optimization is to use `listEntities` instead of `loadEntities` when
there is `policyType` filter to apply
---
.../apache/polaris/core/policy/PolicyEntity.java | 4 +--
.../service/catalog/policy/PolicyCatalog.java | 40 ++++++++++++++++++----
.../catalog/policy/PolicyCatalogHandler.java | 2 +-
3 files changed, 35 insertions(+), 11 deletions(-)
diff --git
a/polaris-core/src/main/java/org/apache/polaris/core/policy/PolicyEntity.java
b/polaris-core/src/main/java/org/apache/polaris/core/policy/PolicyEntity.java
index 52dac8190..7b107086d 100644
---
a/polaris-core/src/main/java/org/apache/polaris/core/policy/PolicyEntity.java
+++
b/polaris-core/src/main/java/org/apache/polaris/core/policy/PolicyEntity.java
@@ -53,10 +53,8 @@ public class PolicyEntity extends PolarisEntity {
@JsonIgnore
public int getPolicyTypeCode() {
- Preconditions.checkArgument(
- getPropertiesAsMap().containsKey(POLICY_TYPE_CODE_KEY),
- "Invalid policy entity: policy type must exist");
String policyTypeCode = getPropertiesAsMap().get(POLICY_TYPE_CODE_KEY);
+ Preconditions.checkNotNull(policyTypeCode, "Invalid policy entity: policy
type must exist");
return Integer.parseInt(policyTypeCode);
}
diff --git
a/runtime/service/src/main/java/org/apache/polaris/service/catalog/policy/PolicyCatalog.java
b/runtime/service/src/main/java/org/apache/polaris/service/catalog/policy/PolicyCatalog.java
index 6cc8ba35d..d142e7c56 100644
---
a/runtime/service/src/main/java/org/apache/polaris/service/catalog/policy/PolicyCatalog.java
+++
b/runtime/service/src/main/java/org/apache/polaris/service/catalog/policy/PolicyCatalog.java
@@ -24,6 +24,7 @@ import static
org.apache.polaris.service.types.PolicyAttachmentTarget.TypeEnum.C
import com.google.common.base.Strings;
import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
@@ -43,13 +44,16 @@ import org.apache.iceberg.exceptions.NoSuchTableException;
import org.apache.polaris.core.context.CallContext;
import org.apache.polaris.core.entity.CatalogEntity;
import org.apache.polaris.core.entity.PolarisEntity;
+import org.apache.polaris.core.entity.PolarisEntityCore;
import org.apache.polaris.core.entity.PolarisEntitySubType;
import org.apache.polaris.core.entity.PolarisEntityType;
import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
import org.apache.polaris.core.persistence.PolarisResolvedPathWrapper;
import org.apache.polaris.core.persistence.PolicyMappingAlreadyExistsException;
import org.apache.polaris.core.persistence.dao.entity.EntityResult;
+import org.apache.polaris.core.persistence.dao.entity.ListEntitiesResult;
import org.apache.polaris.core.persistence.dao.entity.LoadPolicyMappingsResult;
+import org.apache.polaris.core.persistence.pagination.PageToken;
import
org.apache.polaris.core.persistence.resolver.PolarisResolutionManifestCatalogView;
import org.apache.polaris.core.policy.PolicyEntity;
import org.apache.polaris.core.policy.PolicyType;
@@ -71,8 +75,8 @@ public class PolicyCatalog {
private final CallContext callContext;
private final PolarisResolutionManifestCatalogView resolvedEntityView;
private final CatalogEntity catalogEntity;
- private long catalogId = -1;
- private PolarisMetaStoreManager metaStoreManager;
+ private final long catalogId;
+ private final PolarisMetaStoreManager metaStoreManager;
public PolicyCatalog(
PolarisMetaStoreManager metaStoreManager,
@@ -153,24 +157,46 @@ public class PolicyCatalog {
return constructPolicy(resultEntity);
}
- public List<PolicyIdentifier> listPolicies(Namespace namespace, PolicyType
policyType) {
+ public List<PolicyIdentifier> listPolicies(Namespace namespace, @Nullable
PolicyType policyType) {
PolarisResolvedPathWrapper resolvedEntities =
resolvedEntityView.getResolvedPath(namespace);
if (resolvedEntities == null) {
throw new IllegalStateException(
String.format("Failed to fetch resolved namespace '%s'", namespace));
}
- List<PolarisEntity> catalogPath = resolvedEntities.getRawFullPath();
- // TODO: when the "policyType" filter is null we should only call
"listEntities" instead
+ List<PolarisEntityCore> catalogPath =
+ PolarisEntity.toCoreList(resolvedEntities.getRawFullPath());
+ if (policyType == null) {
+ // without a policyType filter we can call listEntities to acquire the
entity names
+ ListEntitiesResult listEntitiesResult =
+ metaStoreManager.listEntities(
+ callContext.getPolarisCallContext(),
+ catalogPath,
+ PolarisEntityType.POLICY,
+ PolarisEntitySubType.NULL_SUBTYPE,
+ PageToken.readEverything());
+ if (!listEntitiesResult.isSuccess()) {
+ throw new IllegalStateException("Failed to list policies in namespace:
" + namespace);
+ }
+ return listEntitiesResult.getEntities().stream()
+ .map(
+ entity ->
+ PolicyIdentifier.builder()
+ .setNamespace(namespace)
+ .setName(entity.getName())
+ .build())
+ .toList();
+ }
+ // with a policyType filter we need to load the full PolicyEntity to apply
the filter
return metaStoreManager
.loadEntitiesAll(
callContext.getPolarisCallContext(),
- PolarisEntity.toCoreList(catalogPath),
+ catalogPath,
PolarisEntityType.POLICY,
PolarisEntitySubType.NULL_SUBTYPE)
.stream()
.map(PolicyEntity::of)
- .filter(policyEntity -> policyType == null ||
policyEntity.getPolicyType() == policyType)
+ .filter(policyEntity -> policyEntity.getPolicyType() == policyType)
.map(
entity ->
PolicyIdentifier.builder()
diff --git
a/runtime/service/src/main/java/org/apache/polaris/service/catalog/policy/PolicyCatalogHandler.java
b/runtime/service/src/main/java/org/apache/polaris/service/catalog/policy/PolicyCatalogHandler.java
index 654929522..21027a342 100644
---
a/runtime/service/src/main/java/org/apache/polaris/service/catalog/policy/PolicyCatalogHandler.java
+++
b/runtime/service/src/main/java/org/apache/polaris/service/catalog/policy/PolicyCatalogHandler.java
@@ -87,7 +87,7 @@ public class PolicyCatalogHandler extends CatalogHandler {
this.policyCatalog = new PolicyCatalog(metaStoreManager, callContext,
this.resolutionManifest);
}
- public ListPoliciesResponse listPolicies(Namespace parent, PolicyType
policyType) {
+ public ListPoliciesResponse listPolicies(Namespace parent, @Nullable
PolicyType policyType) {
PolarisAuthorizableOperation op = PolarisAuthorizableOperation.LIST_POLICY;
authorizeBasicNamespaceOperationOrThrow(op, parent);
