(polaris) branch main updated: Fix purgeRealms in LocalPolarisMetaStoreManagerFactory does not clear entityCacheMap (#4803)

[di...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dimas-b 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 0aae2c172e Fix purgeRealms in LocalPolarisMetaStoreManagerFactory does not clear entityCacheMap (#4803)
0aae2c172e is described below

commit 0aae2c172e87de21166648d507843646af3501f7
Author: Ayush Saxena <ay...@apache.org>
AuthorDate: Tue Jul 21 03:58:46 2026 +0530

    Fix purgeRealms in LocalPolarisMetaStoreManagerFactory does not clear entityCacheMap (#4803)
---
 .../LocalPolarisMetaStoreManagerFactory.java       |  3 +-
 .../LocalPolarisMetaStoreManagerFactoryTest.java   | 99 ++++++++++++++++++++++
 2 files changed, 101 insertions(+), 1 deletion(-)

diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java
index 68de954717..9c2b98fbf9 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java
@@ -122,7 +122,7 @@ public abstract class LocalPolarisMetaStoreManagerFactory<StoreType>
   }
 
   @Override
-  public Map<String, BaseResult> purgeRealms(Iterable<String> realms) {
+  public synchronized Map<String, BaseResult> purgeRealms(Iterable<String> realms) {
     Map<String, BaseResult> results = new HashMap<>();
 
     for (String realm : realms) {
@@ -136,6 +136,7 @@ public abstract class LocalPolarisMetaStoreManagerFactory<StoreType>
 
       sessionSupplierMap.remove(realm);
       metaStoreManagerMap.remove(realm);
+      entityCacheMap.remove(realm);
     }
 
     return Map.copyOf(results);
diff --git a/polaris-core/src/test/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactoryTest.java b/polaris-core/src/test/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactoryTest.java
new file mode 100644
index 0000000000..d1b4c4fc65
--- /dev/null
+++ b/polaris-core/src/test/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactoryTest.java
@@ -0,0 +1,99 @@
+/*
+ * 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;
+
+import static org.apache.polaris.core.persistence.PrincipalSecretsGenerator.RANDOM_SECRETS;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.Clock;
+import java.util.List;
+import org.apache.polaris.core.PolarisDefaultDiagServiceImpl;
+import org.apache.polaris.core.PolarisDiagnostics;
+import org.apache.polaris.core.config.BehaviorChangeConfiguration;
+import org.apache.polaris.core.config.FeatureConfiguration;
+import org.apache.polaris.core.config.RealmConfig;
+import org.apache.polaris.core.context.RealmContext;
+import org.apache.polaris.core.persistence.bootstrap.RootCredentialsSet;
+import org.apache.polaris.core.persistence.cache.EntityCache;
+import org.apache.polaris.core.persistence.transactional.TransactionalPersistence;
+import org.apache.polaris.core.persistence.transactional.TreeMapMetaStore;
+import org.apache.polaris.core.persistence.transactional.TreeMapTransactionalPersistenceImpl;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+class LocalPolarisMetaStoreManagerFactoryTest {
+
+  private static final PolarisDiagnostics DIAG = new PolarisDefaultDiagServiceImpl();
+
+  static class TestFactory extends LocalPolarisMetaStoreManagerFactory<TreeMapMetaStore> {
+
+    TestFactory() {
+      super(Clock.systemDefaultZone(), DIAG);
+    }
+
+    @Override
+    protected TreeMapMetaStore createBackingStore(@NonNull PolarisDiagnostics diagnostics) {
+      return new TreeMapMetaStore(diagnostics);
+    }
+
+    @Override
+    protected TransactionalPersistence createMetaStoreSession(
+        @NonNull TreeMapMetaStore store,
+        @NonNull RealmContext realmContext,
+        @Nullable RootCredentialsSet rootCredentialsSet,
+        @NonNull PolarisDiagnostics diagnostics) {
+      return new TreeMapTransactionalPersistenceImpl(
+          diagnostics, store, Mockito.mock(), RANDOM_SECRETS);
+    }
+  }
+
+  @Test
+  void purgeRealmsClearsEntityCache() {
+    TestFactory factory = new TestFactory();
+    String realm = "test-realm";
+    RootCredentialsSet creds =
+        RootCredentialsSet.fromList(List.of(realm + ",clientId,clientSecret"));
+
+    factory.bootstrapRealms(List.of(realm), creds);
+
+    RealmContext realmContext = () -> realm;
+    RealmConfig realmConfig = Mockito.mock(RealmConfig.class);
+    Mockito.when(realmConfig.getConfig(FeatureConfiguration.ENTITY_CACHE_WEIGHER_TARGET))
+        .thenReturn(100_000L);
+    Mockito.when(realmConfig.getConfig(BehaviorChangeConfiguration.ENTITY_CACHE_SOFT_VALUES))
+        .thenReturn(false);
+
+    // Get the entity cache — this populates entityCacheMap
+    EntityCache cacheBeforePurge = factory.getOrCreateEntityCache(realmContext, realmConfig);
+    assertThat(cacheBeforePurge).isNotNull();
+
+    // Purge the realm
+    factory.purgeRealms(List.of(realm));
+
+    // Re-bootstrap the realm
+    factory.bootstrapRealms(List.of(realm), creds);
+
+    // Get entity cache again — should be a fresh instance, not the stale one
+    EntityCache cacheAfterPurge = factory.getOrCreateEntityCache(realmContext, realmConfig);
+    assertThat(cacheAfterPurge).isNotNull();
+    assertThat(cacheAfterPurge).isNotSameAs(cacheBeforePurge);
+  }
+}