Skip to content

Commit 415c9c0

Browse files
authored
Core: resolveAll() must be called before reading resolution results (#3064)
1 parent e35649e commit 415c9c0

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/PolarisResolutionManifest.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,14 @@ public class PolarisResolutionManifest implements PolarisResolutionManifestCatal
6868
// Set when resolveAll is called
6969
private ResolverStatus primaryResolverStatus = null;
7070

71+
private boolean isResolveAllSucceeded() {
72+
diagnostics.checkNotNull(
73+
primaryResolverStatus,
74+
"resolver_not_run_before_access",
75+
"resolveAll() must be called before reading resolution results");
76+
return primaryResolverStatus.getStatus() == ResolverStatus.StatusEnum.SUCCESS;
77+
}
78+
7179
public PolarisResolutionManifest(
7280
PolarisDiagnostics diagnostics,
7381
RealmContext realmContext,
@@ -256,7 +264,7 @@ public Set<PolarisBaseEntity> getAllActivatedPrincipalRoleEntities() {
256264
}
257265

258266
private @Nullable ResolvedPolarisEntity getResolvedRootContainerEntity() {
259-
if (primaryResolverStatus.getStatus() != ResolverStatus.StatusEnum.SUCCESS) {
267+
if (!isResolveAllSucceeded()) {
260268
return null;
261269
}
262270
ResolvedPolarisEntity resolvedEntity =
@@ -327,7 +335,7 @@ public PolarisResolvedPathWrapper getResolvedPath(Object key, boolean prependRoo
327335
key,
328336
pathLookup);
329337

330-
if (primaryResolverStatus.getStatus() != ResolverStatus.StatusEnum.SUCCESS) {
338+
if (!isResolveAllSucceeded()) {
331339
return null;
332340
}
333341
int index = pathLookup.get(key);
@@ -394,7 +402,7 @@ public PolarisResolvedPathWrapper getResolvedTopLevelEntity(
394402
entityType,
395403
addedTopLevelNames);
396404

397-
if (primaryResolverStatus.getStatus() != ResolverStatus.StatusEnum.SUCCESS) {
405+
if (!isResolveAllSucceeded()) {
398406
return null;
399407
}
400408

0 commit comments

Comments
 (0)