Skip to content

Commit 78842c1

Browse files
authored
Refactor EntityCache into an interface (#1193)
* Refactor EntityCache to an interface * fix * spotless
1 parent cfe22b7 commit 78842c1

File tree

12 files changed

+544
-446
lines changed

12 files changed

+544
-446
lines changed

extension/persistence/relational-jdbc/src/main/java/org/apache/polaris/extension/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import org.apache.polaris.core.persistence.PrincipalSecretsGenerator;
4747
import org.apache.polaris.core.persistence.bootstrap.RootCredentialsSet;
4848
import org.apache.polaris.core.persistence.cache.EntityCache;
49+
import org.apache.polaris.core.persistence.cache.InMemoryEntityCache;
4950
import org.apache.polaris.core.persistence.dao.entity.BaseResult;
5051
import org.apache.polaris.core.persistence.dao.entity.EntityResult;
5152
import org.apache.polaris.core.persistence.dao.entity.PrincipalSecretsResult;
@@ -209,7 +210,8 @@ public synchronized StorageCredentialCache getOrCreateStorageCredentialCache(
209210
public synchronized EntityCache getOrCreateEntityCache(RealmContext realmContext) {
210211
if (!entityCacheMap.containsKey(realmContext.getRealmIdentifier())) {
211212
PolarisMetaStoreManager metaStoreManager = getOrCreateMetaStoreManager(realmContext);
212-
entityCacheMap.put(realmContext.getRealmIdentifier(), new EntityCache(metaStoreManager));
213+
entityCacheMap.put(
214+
realmContext.getRealmIdentifier(), new InMemoryEntityCache(metaStoreManager));
213215
}
214216

215217
return entityCacheMap.get(realmContext.getRealmIdentifier());

polaris-core/src/main/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.apache.polaris.core.entity.PolarisEntityType;
3535
import org.apache.polaris.core.persistence.bootstrap.RootCredentialsSet;
3636
import org.apache.polaris.core.persistence.cache.EntityCache;
37+
import org.apache.polaris.core.persistence.cache.InMemoryEntityCache;
3738
import org.apache.polaris.core.persistence.dao.entity.BaseResult;
3839
import org.apache.polaris.core.persistence.dao.entity.EntityResult;
3940
import org.apache.polaris.core.persistence.dao.entity.PrincipalSecretsResult;
@@ -190,7 +191,8 @@ public synchronized StorageCredentialCache getOrCreateStorageCredentialCache(
190191
public synchronized EntityCache getOrCreateEntityCache(RealmContext realmContext) {
191192
if (!entityCacheMap.containsKey(realmContext.getRealmIdentifier())) {
192193
PolarisMetaStoreManager metaStoreManager = getOrCreateMetaStoreManager(realmContext);
193-
entityCacheMap.put(realmContext.getRealmIdentifier(), new EntityCache(metaStoreManager));
194+
entityCacheMap.put(
195+
realmContext.getRealmIdentifier(), new InMemoryEntityCache(metaStoreManager));
194196
}
195197

196198
return entityCacheMap.get(realmContext.getRealmIdentifier());

0 commit comments

Comments
 (0)