You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polaris.apache.org by di...@apache.org on 2025/11/10 17:34:13 UTC
(polaris) 02/09: Changed batch call to implement loadResolvedEntities instead
This is an automated email from the ASF dual-hosted git repository.
dimas pushed a commit to branch dmitri-tmp1
in repository https://gitbox.apache.org/repos/asf/polaris.git
commit 072bac8096a41556a91f40e7f231d93859483404
Author: Michael Collado <co...@gmail.com>
AuthorDate: Fri Sep 5 16:27:39 2025 -0700
Changed batch call to implement loadResolvedEntities instead
---
.../AtomicOperationMetaStoreManager.java | 73 +++++++++------
.../core/persistence/PolarisMetaStoreManager.java | 31 +++----
.../TransactionWorkspaceMetaStoreManager.java | 19 ++--
.../dao/entity/ResolvedEntitiesResult.java | 44 +++++++++
.../TransactionalMetaStoreManagerImpl.java | 100 ++++++++++++---------
.../persistence/PolarisTestMetaStoreManager.java | 47 +++++++---
6 files changed, 211 insertions(+), 103 deletions(-)
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/AtomicOperationMetaStoreManager.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/AtomicOperationMetaStoreManager.java
index e1628ded8..0af386dfa 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/AtomicOperationMetaStoreManager.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/AtomicOperationMetaStoreManager.java
@@ -68,6 +68,7 @@ import org.apache.polaris.core.persistence.dao.entity.LoadPolicyMappingsResult;
import org.apache.polaris.core.persistence.dao.entity.PolicyAttachmentResult;
import org.apache.polaris.core.persistence.dao.entity.PrincipalSecretsResult;
import org.apache.polaris.core.persistence.dao.entity.PrivilegeResult;
+import org.apache.polaris.core.persistence.dao.entity.ResolvedEntitiesResult;
import org.apache.polaris.core.persistence.dao.entity.ResolvedEntityResult;
import org.apache.polaris.core.persistence.dao.entity.ScopedCredentialsResult;
import org.apache.polaris.core.persistence.pagination.Page;
@@ -1517,34 +1518,6 @@ public class AtomicOperationMetaStoreManager extends BaseMetaStoreManager {
: new EntityResult(BaseResult.ReturnStatus.ENTITY_NOT_FOUND, null);
}
- @Nonnull
- @Override
- public EntitiesResult loadEntities(
- @Nonnull PolarisCallContext callCtx,
- @Nonnull List<EntityNameLookupRecord> entityLookupRecords) {
- BasePersistence ms = callCtx.getMetaStore();
- List<PolarisBaseEntity> entities =
- ms.lookupEntities(
- callCtx,
- entityLookupRecords.stream()
- .map(r -> new PolarisEntityId(r.getCatalogId(), r.getId()))
- .collect(Collectors.toList()));
- // mimic the behavior of loadEntity above, return null if not found or type mismatch
- List<PolarisBaseEntity> ret =
- IntStream.range(0, entityLookupRecords.size())
- .mapToObj(
- i -> {
- if (entities.get(i) != null
- && !entities.get(i).getType().equals(entityLookupRecords.get(i).getType())) {
- return null;
- } else {
- return entities.get(i);
- }
- })
- .collect(Collectors.toList());
- return new EntitiesResult(Page.fromItems(ret));
- }
-
@Override
public @Nonnull EntitiesResult loadTasks(
@Nonnull PolarisCallContext callCtx, String executorId, PageToken pageToken) {
@@ -1792,6 +1765,50 @@ public class AtomicOperationMetaStoreManager extends BaseMetaStoreManager {
return result;
}
+ @Nonnull
+ @Override
+ public ResolvedEntitiesResult loadResolvedEntities(
+ @Nonnull PolarisCallContext callCtx,
+ @Nonnull List<EntityNameLookupRecord> entityLookupRecords) {
+ BasePersistence ms = callCtx.getMetaStore();
+ List<PolarisBaseEntity> entities =
+ ms.lookupEntities(
+ callCtx,
+ entityLookupRecords.stream()
+ .map(r -> new PolarisEntityId(r.getCatalogId(), r.getId()))
+ .collect(Collectors.toList()));
+ // mimic the behavior of loadEntity above, return null if not found or type mismatch
+ List<ResolvedPolarisEntity> ret =
+ IntStream.range(0, entityLookupRecords.size())
+ .mapToObj(
+ i -> {
+ if (entities.get(i) != null
+ && !entities.get(i).getType().equals(entityLookupRecords.get(i).getType())) {
+ return null;
+ } else {
+ return entities.get(i);
+ }
+ })
+ .map(
+ e -> {
+ if (e == null) {
+ return null;
+ } else {
+ // load the grant records
+ final List<PolarisGrantRecord> grantRecordsAsSecurable =
+ ms.loadAllGrantRecordsOnSecurable(callCtx, e.getCatalogId(), e.getId());
+ final List<PolarisGrantRecord> grantRecordsAsGrantee =
+ e.getType().isGrantee()
+ ? ms.loadAllGrantRecordsOnGrantee(callCtx, e.getCatalogId(), e.getId())
+ : List.of();
+ return new ResolvedPolarisEntity(
+ PolarisEntity.of(e), grantRecordsAsGrantee, grantRecordsAsSecurable);
+ }
+ })
+ .collect(Collectors.toList());
+ return new ResolvedEntitiesResult(ret);
+ }
+
/** {@inheritDoc} */
@Override
public @Nonnull ResolvedEntityResult refreshResolvedEntity(
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreManager.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreManager.java
index f1b4109cf..93d2b94dc 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreManager.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreManager.java
@@ -48,6 +48,7 @@ import org.apache.polaris.core.persistence.dao.entity.EntityResult;
import org.apache.polaris.core.persistence.dao.entity.EntityWithPath;
import org.apache.polaris.core.persistence.dao.entity.GenerateEntityIdResult;
import org.apache.polaris.core.persistence.dao.entity.ListEntitiesResult;
+import org.apache.polaris.core.persistence.dao.entity.ResolvedEntitiesResult;
import org.apache.polaris.core.persistence.dao.entity.ResolvedEntityResult;
import org.apache.polaris.core.persistence.pagination.Page;
import org.apache.polaris.core.persistence.pagination.PageToken;
@@ -348,21 +349,6 @@ public interface PolarisMetaStoreManager
long entityId,
@Nonnull PolarisEntityType entityType);
- /**
- * Load a batch of entities given their {@link EntityNameLookupRecord}. Will return an empty list
- * if the input list is empty. Order in that returned list is the same as the input list. Some
- * elements might be NULL if the entity has been dropped.
- *
- * @param callCtx call context
- * @param entityLookupRecords the list of entity lookup records to load
- * @return a non-null list of entities corresponding to the lookup keys. Some elements might be
- * NULL if the entity has been dropped.
- */
- @Nonnull
- EntitiesResult loadEntities(
- @Nonnull PolarisCallContext callCtx,
- @Nonnull List<EntityNameLookupRecord> entityLookupRecords);
-
/**
* Fetch a list of tasks to be completed. Tasks
*
@@ -433,6 +419,21 @@ public interface PolarisMetaStoreManager
@Nonnull PolarisEntityType entityType,
@Nonnull String entityName);
+ /**
+ * Load a batch of resolved entities given their {@link EntityNameLookupRecord}. Will return an
+ * empty list if the input list is empty. Order in that returned list is the same as the input
+ * list. Some elements might be NULL if the entity has been dropped.
+ *
+ * @param callCtx call context
+ * @param entityLookupRecords the list of entity lookup records to load
+ * @return a non-null list of entities corresponding to the lookup keys. Some elements might be
+ * NULL if the entity has been dropped.
+ */
+ @Nonnull
+ ResolvedEntitiesResult loadResolvedEntities(
+ @Nonnull PolarisCallContext callCtx,
+ @Nonnull List<EntityNameLookupRecord> entityLookupRecords);
+
/**
* Refresh a resolved entity from the backend store. Will return NULL if the entity does not
* exist, i.e. has been purged or dropped. Else, will determine what has changed based on the
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/TransactionWorkspaceMetaStoreManager.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/TransactionWorkspaceMetaStoreManager.java
index bf16c7cb8..8914a77d9 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/TransactionWorkspaceMetaStoreManager.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/TransactionWorkspaceMetaStoreManager.java
@@ -54,6 +54,7 @@ import org.apache.polaris.core.persistence.dao.entity.LoadPolicyMappingsResult;
import org.apache.polaris.core.persistence.dao.entity.PolicyAttachmentResult;
import org.apache.polaris.core.persistence.dao.entity.PrincipalSecretsResult;
import org.apache.polaris.core.persistence.dao.entity.PrivilegeResult;
+import org.apache.polaris.core.persistence.dao.entity.ResolvedEntitiesResult;
import org.apache.polaris.core.persistence.dao.entity.ResolvedEntityResult;
import org.apache.polaris.core.persistence.dao.entity.ScopedCredentialsResult;
import org.apache.polaris.core.persistence.pagination.Page;
@@ -331,15 +332,6 @@ public class TransactionWorkspaceMetaStoreManager implements PolarisMetaStoreMan
return null;
}
- @Nonnull
- @Override
- public EntitiesResult loadEntities(
- @Nonnull PolarisCallContext callCtx,
- @Nonnull List<EntityNameLookupRecord> entityLookupRecords) {
- diagnostics.fail("illegal_method_in_transaction_workspace", "loadEntities");
- return null;
- }
-
@Override
public EntitiesResult loadTasks(
@Nonnull PolarisCallContext callCtx, String executorId, PageToken pageToken) {
@@ -389,6 +381,15 @@ public class TransactionWorkspaceMetaStoreManager implements PolarisMetaStoreMan
return null;
}
+ @Nonnull
+ @Override
+ public ResolvedEntitiesResult loadResolvedEntities(
+ @Nonnull PolarisCallContext callCtx,
+ @Nonnull List<EntityNameLookupRecord> entityLookupRecords) {
+ diagnostics.fail("illegal_method_in_transaction_workspace", "loadEntities");
+ return null;
+ }
+
@Override
public ResolvedEntityResult refreshResolvedEntity(
@Nonnull PolarisCallContext callCtx,
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/ResolvedEntitiesResult.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/ResolvedEntitiesResult.java
new file mode 100644
index 000000000..aec18414e
--- /dev/null
+++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/ResolvedEntitiesResult.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.polaris.core.persistence.dao.entity;
+
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+import java.util.List;
+import org.apache.polaris.core.persistence.ResolvedPolarisEntity;
+
+public class ResolvedEntitiesResult extends BaseResult {
+ private final List<ResolvedPolarisEntity> resolvedEntities;
+
+ public ResolvedEntitiesResult(List<ResolvedPolarisEntity> resolvedEntities) {
+ super(ReturnStatus.SUCCESS, null);
+ this.resolvedEntities = resolvedEntities;
+ }
+
+ public ResolvedEntitiesResult(
+ @Nonnull ReturnStatus returnStatus, @Nullable String extraInformation) {
+ super(returnStatus, extraInformation);
+ this.resolvedEntities = null;
+ }
+
+ public List<ResolvedPolarisEntity> getResolvedEntities() {
+ return resolvedEntities;
+ }
+}
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/TransactionalMetaStoreManagerImpl.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/TransactionalMetaStoreManagerImpl.java
index 2256a5614..11b5b5dd7 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/TransactionalMetaStoreManagerImpl.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/TransactionalMetaStoreManagerImpl.java
@@ -57,6 +57,7 @@ import org.apache.polaris.core.persistence.BaseMetaStoreManager;
import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
import org.apache.polaris.core.persistence.PolarisObjectMapperUtil;
import org.apache.polaris.core.persistence.PolicyMappingAlreadyExistsException;
+import org.apache.polaris.core.persistence.ResolvedPolarisEntity;
import org.apache.polaris.core.persistence.RetryOnConcurrencyException;
import org.apache.polaris.core.persistence.dao.entity.BaseResult;
import org.apache.polaris.core.persistence.dao.entity.ChangeTrackingResult;
@@ -72,6 +73,7 @@ import org.apache.polaris.core.persistence.dao.entity.LoadPolicyMappingsResult;
import org.apache.polaris.core.persistence.dao.entity.PolicyAttachmentResult;
import org.apache.polaris.core.persistence.dao.entity.PrincipalSecretsResult;
import org.apache.polaris.core.persistence.dao.entity.PrivilegeResult;
+import org.apache.polaris.core.persistence.dao.entity.ResolvedEntitiesResult;
import org.apache.polaris.core.persistence.dao.entity.ResolvedEntityResult;
import org.apache.polaris.core.persistence.dao.entity.ScopedCredentialsResult;
import org.apache.polaris.core.persistence.pagination.Page;
@@ -2012,46 +2014,6 @@ public class TransactionalMetaStoreManagerImpl extends BaseMetaStoreManager {
() -> this.loadEntity(callCtx, ms, entityCatalogId, entityId, entityType.getCode()));
}
- /** Refer to {@link #loadEntity(PolarisCallContext, long, long, PolarisEntityType)} */
- private @Nonnull EntitiesResult loadEntities(
- @Nonnull PolarisCallContext callCtx,
- @Nonnull TransactionalPersistence ms,
- @Nonnull List<EntityNameLookupRecord> entityLookupRecords) {
- List<PolarisBaseEntity> entities =
- ms.lookupEntitiesInCurrentTxn(
- callCtx,
- entityLookupRecords.stream()
- .map(r -> new PolarisEntityId(r.getCatalogId(), r.getId()))
- .collect(Collectors.toList()));
- // mimic the behavior of loadEntity above, return null if not found or type mismatch
- List<PolarisBaseEntity> ret =
- IntStream.range(0, entityLookupRecords.size())
- .mapToObj(
- i -> {
- if (entities.get(i) != null
- && !entities.get(i).getType().equals(entityLookupRecords.get(i).getType())) {
- return null;
- } else {
- return entities.get(i);
- }
- })
- .collect(Collectors.toList());
- return new EntitiesResult(Page.fromItems(ret));
- }
-
- @Nonnull
- @Override
- public EntitiesResult loadEntities(
- @Nonnull PolarisCallContext callCtx,
- @Nonnull List<EntityNameLookupRecord> entityLookupRecords) {
- TransactionalPersistence ms = ((TransactionalPersistence) callCtx.getMetaStore());
- return ms.runInReadTransaction(
- callCtx,
- () ->
- this.loadEntities(
- callCtx, (TransactionalPersistence) callCtx.getMetaStore(), entityLookupRecords));
- }
-
/** Refer to {@link #loadTasks(PolarisCallContext, String, PageToken)} */
private @Nonnull EntitiesResult loadTasks(
@Nonnull PolarisCallContext callCtx,
@@ -2334,6 +2296,64 @@ public class TransactionalMetaStoreManagerImpl extends BaseMetaStoreManager {
return result;
}
+ /** Refer to {@link #loadEntity(PolarisCallContext, long, long, PolarisEntityType)} */
+ private @Nonnull ResolvedEntitiesResult loadResolvedEntities(
+ @Nonnull PolarisCallContext callCtx,
+ @Nonnull TransactionalPersistence ms,
+ @Nonnull List<EntityNameLookupRecord> entityLookupRecords) {
+ List<PolarisBaseEntity> entities =
+ ms.lookupEntitiesInCurrentTxn(
+ callCtx,
+ entityLookupRecords.stream()
+ .map(r -> new PolarisEntityId(r.getCatalogId(), r.getId()))
+ .collect(Collectors.toList()));
+ // mimic the behavior of loadEntity above, return null if not found or type mismatch
+ List<ResolvedPolarisEntity> ret =
+ IntStream.range(0, entityLookupRecords.size())
+ .mapToObj(
+ i -> {
+ if (entities.get(i) != null
+ && !entities.get(i).getType().equals(entityLookupRecords.get(i).getType())) {
+ return null;
+ } else {
+ return entities.get(i);
+ }
+ })
+ .map(
+ e -> {
+ if (e == null) {
+ return null;
+ } else {
+ // load the grant records
+ final List<PolarisGrantRecord> grantRecordsAsSecurable =
+ ms.loadAllGrantRecordsOnSecurableInCurrentTxn(
+ callCtx, e.getCatalogId(), e.getId());
+ final List<PolarisGrantRecord> grantRecordsAsGrantee =
+ e.getType().isGrantee()
+ ? ms.loadAllGrantRecordsOnGranteeInCurrentTxn(
+ callCtx, e.getCatalogId(), e.getId())
+ : List.of();
+ return new ResolvedPolarisEntity(
+ PolarisEntity.of(e), grantRecordsAsGrantee, grantRecordsAsSecurable);
+ }
+ })
+ .collect(Collectors.toList());
+ return new ResolvedEntitiesResult(ret);
+ }
+
+ @Nonnull
+ @Override
+ public ResolvedEntitiesResult loadResolvedEntities(
+ @Nonnull PolarisCallContext callCtx,
+ @Nonnull List<EntityNameLookupRecord> entityLookupRecords) {
+ TransactionalPersistence ms = ((TransactionalPersistence) callCtx.getMetaStore());
+ return ms.runInReadTransaction(
+ callCtx,
+ () ->
+ this.loadResolvedEntities(
+ callCtx, (TransactionalPersistence) callCtx.getMetaStore(), entityLookupRecords));
+ }
+
/** {@inheritDoc} */
private @Nonnull ResolvedEntityResult refreshResolvedEntity(
@Nonnull PolarisCallContext callCtx,
diff --git a/polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/PolarisTestMetaStoreManager.java b/polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/PolarisTestMetaStoreManager.java
index 66bbbe82e..ca6b4248c 100644
--- a/polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/PolarisTestMetaStoreManager.java
+++ b/polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/PolarisTestMetaStoreManager.java
@@ -44,11 +44,11 @@ import org.apache.polaris.core.persistence.dao.entity.BaseResult;
import org.apache.polaris.core.persistence.dao.entity.CreateCatalogResult;
import org.apache.polaris.core.persistence.dao.entity.CreatePrincipalResult;
import org.apache.polaris.core.persistence.dao.entity.DropEntityResult;
-import org.apache.polaris.core.persistence.dao.entity.EntitiesResult;
import org.apache.polaris.core.persistence.dao.entity.EntityResult;
import org.apache.polaris.core.persistence.dao.entity.LoadGrantsResult;
import org.apache.polaris.core.persistence.dao.entity.LoadPolicyMappingsResult;
import org.apache.polaris.core.persistence.dao.entity.PolicyAttachmentResult;
+import org.apache.polaris.core.persistence.dao.entity.ResolvedEntitiesResult;
import org.apache.polaris.core.persistence.dao.entity.ResolvedEntityResult;
import org.apache.polaris.core.persistence.pagination.PageToken;
import org.apache.polaris.core.policy.PolarisPolicyMappingRecord;
@@ -2740,8 +2740,8 @@ public class PolarisTestMetaStoreManager {
"T1");
// batch load all entities. They should all be present and non-null
- EntitiesResult entitiesResult =
- polarisMetaStoreManager.loadEntities(
+ ResolvedEntitiesResult entitiesResult =
+ polarisMetaStoreManager.loadResolvedEntities(
polarisCallContext,
List.of(
new EntityNameLookupRecord(catalog),
@@ -2750,16 +2750,38 @@ public class PolarisTestMetaStoreManager {
new EntityNameLookupRecord(T1)));
Assertions.assertThat(entitiesResult)
.isNotNull()
- .returns(BaseResult.ReturnStatus.SUCCESS, EntitiesResult::getReturnStatus)
+ .returns(BaseResult.ReturnStatus.SUCCESS, ResolvedEntitiesResult::getReturnStatus)
.extracting(
- EntitiesResult::getEntities, InstanceOfAssertFactories.list(PolarisBaseEntity.class))
+ ResolvedEntitiesResult::getResolvedEntities,
+ InstanceOfAssertFactories.list(ResolvedPolarisEntity.class))
.hasSize(4)
.allSatisfy(entity -> Assertions.assertThat(entity).isNotNull())
+ .extracting(r -> (PolarisBaseEntity) r.getEntity())
.containsExactly(catalog, N1, N1_N2, T1);
+ ResolvedPolarisEntity catalogEntity = entitiesResult.getResolvedEntities().get(0);
+ Assertions.assertThat(catalogEntity)
+ .extracting(ResolvedPolarisEntity::getAllGrantRecords)
+ .isNotNull()
+ .asInstanceOf(InstanceOfAssertFactories.list(PolarisGrantRecord.class))
+ .hasSize(2)
+ .containsExactlyInAnyOrder(
+ new PolarisGrantRecord(
+ 0L,
+ catalog.getId(),
+ catalogCreated.getCatalogAdminRole().getCatalogId(),
+ catalogCreated.getCatalogAdminRole().getId(),
+ PolarisPrivilege.CATALOG_MANAGE_ACCESS.getCode()),
+ new PolarisGrantRecord(
+ 0L,
+ catalog.getId(),
+ catalogCreated.getCatalogAdminRole().getCatalogId(),
+ catalogCreated.getCatalogAdminRole().getId(),
+ PolarisPrivilege.CATALOG_MANAGE_METADATA.getCode()));
+
// try entities which do not exist
entitiesResult =
- polarisMetaStoreManager.loadEntities(
+ polarisMetaStoreManager.loadResolvedEntities(
polarisCallContext,
List.of(
new EntityNameLookupRecord(
@@ -2778,15 +2800,16 @@ public class PolarisTestMetaStoreManager {
PolarisEntitySubType.NULL_SUBTYPE.getCode())));
Assertions.assertThat(entitiesResult)
.isNotNull()
- .returns(BaseResult.ReturnStatus.SUCCESS, EntitiesResult::getReturnStatus)
+ .returns(BaseResult.ReturnStatus.SUCCESS, ResolvedEntitiesResult::getReturnStatus)
.extracting(
- EntitiesResult::getEntities, InstanceOfAssertFactories.list(PolarisBaseEntity.class))
+ ResolvedEntitiesResult::getResolvedEntities,
+ InstanceOfAssertFactories.list(ResolvedPolarisEntity.class))
.hasSize(2)
.allSatisfy(entity -> Assertions.assertThat(entity).isNull());
// mix of existing entities and entities with wrong type
entitiesResult =
- polarisMetaStoreManager.loadEntities(
+ polarisMetaStoreManager.loadResolvedEntities(
polarisCallContext,
List.of(
new EntityNameLookupRecord(
@@ -2821,12 +2844,14 @@ public class PolarisTestMetaStoreManager {
new EntityNameLookupRecord(T1)));
Assertions.assertThat(entitiesResult)
.isNotNull()
- .returns(BaseResult.ReturnStatus.SUCCESS, EntitiesResult::getReturnStatus)
+ .returns(BaseResult.ReturnStatus.SUCCESS, ResolvedEntitiesResult::getReturnStatus)
.extracting(
- EntitiesResult::getEntities, InstanceOfAssertFactories.list(PolarisBaseEntity.class))
+ ResolvedEntitiesResult::getResolvedEntities,
+ InstanceOfAssertFactories.list(ResolvedPolarisEntity.class))
.hasSize(6)
.filteredOn(e -> e != null)
.hasSize(2)
+ .extracting(r -> (PolarisBaseEntity) r.getEntity())
.containsExactly(catalog, T1);
}