Skip to content

Commit 3d96588

Browse files
committed
remove RealmConfig param from getOrCreateEntityCache
1 parent 98856e0 commit 3d96588

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,11 +220,13 @@ protected synchronized BasePersistence createPersistenceSession(RealmContext rea
220220
}
221221

222222
@Override
223-
public synchronized EntityCache getOrCreateEntityCache(
224-
RealmContext realmContext, RealmConfig realmConfig) {
223+
public synchronized EntityCache getOrCreateEntityCache(RealmContext realmContext) {
225224
return entityCacheMap.computeIfAbsent(
226225
realmContext.getRealmIdentifier(),
227-
realmId -> new InMemoryEntityCache(diagnostics, realmConfig));
226+
realmId -> {
227+
RealmConfig realmConfig = new RealmConfigImpl(configurationStore, realmContext);
228+
return new InMemoryEntityCache(diagnostics, realmConfig);
229+
});
228230
}
229231

230232
/**

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,13 @@ protected synchronized TransactionalPersistence createPersistenceSession(
164164
}
165165

166166
@Override
167-
public synchronized EntityCache getOrCreateEntityCache(
168-
RealmContext realmContext, RealmConfig realmConfig) {
167+
public synchronized EntityCache getOrCreateEntityCache(RealmContext realmContext) {
169168
return entityCacheMap.computeIfAbsent(
170169
realmContext.getRealmIdentifier(),
171-
realmId -> new InMemoryEntityCache(diagnostics, realmConfig));
170+
realmId -> {
171+
RealmConfig realmConfig = new RealmConfigImpl(configurationStore, realmContext);
172+
return new InMemoryEntityCache(diagnostics, realmConfig);
173+
});
172174
}
173175

174176
/**

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
package org.apache.polaris.core.persistence;
2020

2121
import java.util.Map;
22-
import org.apache.polaris.core.config.RealmConfig;
2322
import org.apache.polaris.core.context.RealmContext;
2423
import org.apache.polaris.core.persistence.bootstrap.BootstrapOptions;
2524
import org.apache.polaris.core.persistence.bootstrap.RootCredentialsSet;
@@ -32,7 +31,7 @@ public interface MetaStoreManagerFactory {
3231

3332
PolarisMetaStoreManager createMetaStoreManager(RealmContext realmContext);
3433

35-
EntityCache getOrCreateEntityCache(RealmContext realmContext, RealmConfig realmConfig);
34+
EntityCache getOrCreateEntityCache(RealmContext realmContext);
3635

3736
Map<String, PrincipalSecretsResult> bootstrapRealms(
3837
Iterable<String> realms, RootCredentialsSet rootCredentialsSet);

runtime/service/src/main/java/org/apache/polaris/service/config/ServiceProducers.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,9 @@ public PolarisAuthorizer polarisAuthorizer(RealmConfig realmConfig) {
146146
public ResolverFactory resolverFactory(
147147
PolarisDiagnostics diagnostics,
148148
RealmContext realmContext,
149-
RealmConfig realmConfig,
150149
MetaStoreManagerFactory metaStoreManagerFactory,
151150
PolarisMetaStoreManager polarisMetaStoreManager) {
152-
EntityCache entityCache =
153-
metaStoreManagerFactory.getOrCreateEntityCache(realmContext, realmConfig);
151+
EntityCache entityCache = metaStoreManagerFactory.getOrCreateEntityCache(realmContext);
154152
return (securityContext, referenceCatalogName) ->
155153
new Resolver(
156154
diagnostics,

runtime/service/src/testFixtures/java/org/apache/polaris/service/TestServices.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,7 @@ public TestServices build() {
205205
PolarisMetaStoreManager metaStoreManager =
206206
metaStoreManagerFactory.createMetaStoreManager(realmContext);
207207

208-
EntityCache entityCache =
209-
metaStoreManagerFactory.getOrCreateEntityCache(realmContext, realmConfig);
208+
EntityCache entityCache = metaStoreManagerFactory.getOrCreateEntityCache(realmContext);
210209
ResolverFactory resolverFactory =
211210
(securityContext, referenceCatalogName) ->
212211
new Resolver(

0 commit comments

Comments
 (0)