This is an automated email from the ASF dual-hosted git repository.
yufei 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 8e5e66d0 Rename classes in transactional persistence package (#1197)
8e5e66d0 is described below
commit 8e5e66d061a7fa87ed1fd9f7faae504ac2f2ba48
Author: Yufei Gu <[email protected]>
AuthorDate: Wed Mar 19 10:49:51 2025 -0700
Rename classes in transactional persistence package (#1197)
---
.../PolarisEclipseLinkMetaStoreManagerTest.java | 4 ++--
.../LocalPolarisMetaStoreManagerFactory.java | 4 ++--
...mpl.java => TransactionalMetaStoreManagerImpl.java} | 5 +++--
...{PolarisTreeMapStore.java => TreeMapMetaStore.java} | 18 +++++++++---------
...l.java => TreeMapTransactionalPersistenceImpl.java} | 8 ++++----
.../polaris/core/persistence/EntityCacheTest.java | 14 +++++++-------
...arisTreeMapAtomicOperationMetaStoreManagerTest.java | 8 ++++----
.../PolarisTreeMapMetaStoreManagerTest.java | 12 ++++++------
.../apache/polaris/core/persistence/ResolverTest.java | 14 +++++++-------
.../core/storage/cache/StorageCredentialCacheTest.java | 8 ++++----
.../InMemoryPolarisMetaStoreManagerFactory.java | 14 +++++++-------
11 files changed, 55 insertions(+), 54 deletions(-)
diff --git
a/extension/persistence/eclipselink/src/test/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreManagerTest.java
b/extension/persistence/eclipselink/src/test/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreManagerTest.java
index 8e63a77d..2dc4a3ae 100644
---
a/extension/persistence/eclipselink/src/test/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreManagerTest.java
+++
b/extension/persistence/eclipselink/src/test/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreManagerTest.java
@@ -42,7 +42,7 @@ import
org.apache.polaris.core.config.PolarisConfigurationStore;
import org.apache.polaris.core.entity.PolarisPrincipalSecrets;
import org.apache.polaris.core.persistence.BasePolarisMetaStoreManagerTest;
import org.apache.polaris.core.persistence.PolarisTestMetaStoreManager;
-import
org.apache.polaris.core.persistence.transactional.PolarisMetaStoreManagerImpl;
+import
org.apache.polaris.core.persistence.transactional.TransactionalMetaStoreManagerImpl;
import org.apache.polaris.jpa.models.ModelPrincipalSecrets;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
@@ -104,7 +104,7 @@ public class PolarisEclipseLinkMetaStoreManagerTest extends
BasePolarisMetaStore
new PolarisEclipseLinkMetaStoreSessionImpl(
store, Mockito.mock(), () -> "realm", null, "polaris",
RANDOM_SECRETS);
return new PolarisTestMetaStoreManager(
- new PolarisMetaStoreManagerImpl(),
+ new TransactionalMetaStoreManagerImpl(),
new PolarisCallContext(
session,
diagServices,
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 104306c8..429cbb5e 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
@@ -38,7 +38,7 @@ import org.apache.polaris.core.persistence.cache.EntityCache;
import org.apache.polaris.core.persistence.dao.entity.BaseResult;
import org.apache.polaris.core.persistence.dao.entity.EntityResult;
import org.apache.polaris.core.persistence.dao.entity.PrincipalSecretsResult;
-import
org.apache.polaris.core.persistence.transactional.PolarisMetaStoreManagerImpl;
+import
org.apache.polaris.core.persistence.transactional.TransactionalMetaStoreManagerImpl;
import
org.apache.polaris.core.persistence.transactional.TransactionalPersistence;
import org.apache.polaris.core.storage.cache.StorageCredentialCache;
import org.slf4j.Logger;
@@ -92,7 +92,7 @@ public abstract class
LocalPolarisMetaStoreManagerFactory<StoreType>
* into the existing realm-based setup flow.
*/
protected PolarisMetaStoreManager createNewMetaStoreManager() {
- return new PolarisMetaStoreManagerImpl();
+ return new TransactionalMetaStoreManagerImpl();
}
private void initializeForRealm(
diff --git
a/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/PolarisMetaStoreManagerImpl.java
b/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/TransactionalMetaStoreManagerImpl.java
similarity index 99%
rename from
polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/PolarisMetaStoreManagerImpl.java
rename to
polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/TransactionalMetaStoreManagerImpl.java
index 89e5c7b8..cf1e54b5 100644
---
a/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/PolarisMetaStoreManagerImpl.java
+++
b/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/TransactionalMetaStoreManagerImpl.java
@@ -74,8 +74,9 @@ import org.slf4j.LoggerFactory;
* and retrieve all Polaris metadata
*/
@SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
-public class PolarisMetaStoreManagerImpl extends BaseMetaStoreManager {
- private static final Logger LOGGER =
LoggerFactory.getLogger(PolarisMetaStoreManagerImpl.class);
+public class TransactionalMetaStoreManagerImpl extends BaseMetaStoreManager {
+ private static final Logger LOGGER =
+ LoggerFactory.getLogger(TransactionalMetaStoreManagerImpl.class);
/**
* A version of BaseMetaStoreManager::persistNewEntity but instead of
calling the one-shot
diff --git
a/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/PolarisTreeMapStore.java
b/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/TreeMapMetaStore.java
similarity index 97%
rename from
polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/PolarisTreeMapStore.java
rename to
polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/TreeMapMetaStore.java
index 89784fd8..b37f6e84 100644
---
a/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/PolarisTreeMapStore.java
+++
b/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/TreeMapMetaStore.java
@@ -33,7 +33,7 @@ import org.apache.polaris.core.entity.PolarisGrantRecord;
import org.apache.polaris.core.entity.PolarisPrincipalSecrets;
/** Implements a simple in-memory store for Polaris, using tree-map */
-public class PolarisTreeMapStore {
+public class TreeMapMetaStore {
/** Slice of data, simple KV store. */
public class Slice<T> {
@@ -68,7 +68,7 @@ public class PolarisTreeMapStore {
* @param key key for that value
*/
public T read(String key) {
- PolarisTreeMapStore.this.ensureReadTr();
+ TreeMapMetaStore.this.ensureReadTr();
T value = this.slice.getOrDefault(key, null);
return (value != null) ? this.copyRecord.apply(value) : null;
}
@@ -79,7 +79,7 @@ public class PolarisTreeMapStore {
* @param prefix key prefix
*/
public List<T> readRange(String prefix) {
- PolarisTreeMapStore.this.ensureReadTr();
+ TreeMapMetaStore.this.ensureReadTr();
// end of the key
String endKey =
prefix.substring(0, prefix.length() - 1)
@@ -95,7 +95,7 @@ public class PolarisTreeMapStore {
* @param value value to write
*/
public void write(T value) {
- PolarisTreeMapStore.this.ensureReadWriteTr();
+ TreeMapMetaStore.this.ensureReadWriteTr();
T valueToWrite = (value != null) ? this.copyRecord.apply(value) : null;
String key = this.buildKey(valueToWrite);
// write undo if needs be
@@ -111,7 +111,7 @@ public class PolarisTreeMapStore {
* @param key key for the record to remove
*/
public void delete(String key) {
- PolarisTreeMapStore.this.ensureReadWriteTr();
+ TreeMapMetaStore.this.ensureReadWriteTr();
if (slice.containsKey(key)) {
// write undo if needs be
if (!this.undoSlice.containsKey(key)) {
@@ -127,7 +127,7 @@ public class PolarisTreeMapStore {
* @param prefix key prefix for the record to remove
*/
public void deleteRange(String prefix) {
- PolarisTreeMapStore.this.ensureReadWriteTr();
+ TreeMapMetaStore.this.ensureReadWriteTr();
List<T> elements = this.readRange(prefix);
for (T element : elements) {
this.delete(element);
@@ -135,7 +135,7 @@ public class PolarisTreeMapStore {
}
void deleteAll() {
- PolarisTreeMapStore.this.ensureReadWriteTr();
+ TreeMapMetaStore.this.ensureReadWriteTr();
slice.clear();
undoSlice.clear();
}
@@ -151,7 +151,7 @@ public class PolarisTreeMapStore {
/** Rollback all changes made to this slice since transaction started */
private void rollback() {
- PolarisTreeMapStore.this.ensureReadWriteTr();
+ TreeMapMetaStore.this.ensureReadWriteTr();
undoSlice.forEach(
(key, value) -> {
if (value == null) {
@@ -217,7 +217,7 @@ public class PolarisTreeMapStore {
*
* @param diagnostics diagnostic services
*/
- public PolarisTreeMapStore(@Nonnull PolarisDiagnostics diagnostics) {
+ public TreeMapMetaStore(@Nonnull PolarisDiagnostics diagnostics) {
// the entities slice
this.sliceEntities =
diff --git
a/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/PolarisTreeMapMetaStoreSessionImpl.java
b/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/TreeMapTransactionalPersistenceImpl.java
similarity index 98%
rename from
polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/PolarisTreeMapMetaStoreSessionImpl.java
rename to
polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/TreeMapTransactionalPersistenceImpl.java
index 521c5dfb..8d2e59c9 100644
---
a/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/PolarisTreeMapMetaStoreSessionImpl.java
+++
b/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/TreeMapTransactionalPersistenceImpl.java
@@ -42,15 +42,15 @@ import
org.apache.polaris.core.storage.PolarisStorageConfigurationInfo;
import org.apache.polaris.core.storage.PolarisStorageIntegration;
import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider;
-public class PolarisTreeMapMetaStoreSessionImpl extends
AbstractTransactionalPersistence {
+public class TreeMapTransactionalPersistenceImpl extends
AbstractTransactionalPersistence {
// the TreeMap store to use
- private final PolarisTreeMapStore store;
+ private final TreeMapMetaStore store;
private final PolarisStorageIntegrationProvider storageIntegrationProvider;
private final PrincipalSecretsGenerator secretsGenerator;
- public PolarisTreeMapMetaStoreSessionImpl(
- @Nonnull PolarisTreeMapStore store,
+ public TreeMapTransactionalPersistenceImpl(
+ @Nonnull TreeMapMetaStore store,
@Nonnull PolarisStorageIntegrationProvider storageIntegrationProvider,
@Nonnull PrincipalSecretsGenerator secretsGenerator) {
diff --git
a/polaris-core/src/test/java/org/apache/polaris/core/persistence/EntityCacheTest.java
b/polaris-core/src/test/java/org/apache/polaris/core/persistence/EntityCacheTest.java
index 0a398635..35854397 100644
---
a/polaris-core/src/test/java/org/apache/polaris/core/persistence/EntityCacheTest.java
+++
b/polaris-core/src/test/java/org/apache/polaris/core/persistence/EntityCacheTest.java
@@ -33,10 +33,10 @@ import org.apache.polaris.core.entity.PolarisPrivilege;
import org.apache.polaris.core.persistence.cache.EntityCache;
import org.apache.polaris.core.persistence.cache.EntityCacheByNameKey;
import org.apache.polaris.core.persistence.cache.EntityCacheLookupResult;
-import
org.apache.polaris.core.persistence.transactional.PolarisMetaStoreManagerImpl;
-import
org.apache.polaris.core.persistence.transactional.PolarisTreeMapMetaStoreSessionImpl;
-import org.apache.polaris.core.persistence.transactional.PolarisTreeMapStore;
+import
org.apache.polaris.core.persistence.transactional.TransactionalMetaStoreManagerImpl;
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.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -48,7 +48,7 @@ public class EntityCacheTest {
private final PolarisDiagnostics diagServices;
// the entity store, use treemap implementation
- private final PolarisTreeMapStore store;
+ private final TreeMapMetaStore store;
// to interact with the metastore
private final TransactionalPersistence metaStore;
@@ -86,10 +86,10 @@ public class EntityCacheTest {
*/
public EntityCacheTest() {
diagServices = new PolarisDefaultDiagServiceImpl();
- store = new PolarisTreeMapStore(diagServices);
- metaStore = new PolarisTreeMapMetaStoreSessionImpl(store, Mockito.mock(),
RANDOM_SECRETS);
+ store = new TreeMapMetaStore(diagServices);
+ metaStore = new TreeMapTransactionalPersistenceImpl(store, Mockito.mock(),
RANDOM_SECRETS);
callCtx = new PolarisCallContext(metaStore, diagServices);
- metaStoreManager = new PolarisMetaStoreManagerImpl();
+ metaStoreManager = new TransactionalMetaStoreManagerImpl();
// bootstrap the mata store with our test schema
tm = new PolarisTestMetaStoreManager(metaStoreManager, callCtx);
diff --git
a/polaris-core/src/test/java/org/apache/polaris/core/persistence/PolarisTreeMapAtomicOperationMetaStoreManagerTest.java
b/polaris-core/src/test/java/org/apache/polaris/core/persistence/PolarisTreeMapAtomicOperationMetaStoreManagerTest.java
index 274841c5..d3fd3e28 100644
---
a/polaris-core/src/test/java/org/apache/polaris/core/persistence/PolarisTreeMapAtomicOperationMetaStoreManagerTest.java
+++
b/polaris-core/src/test/java/org/apache/polaris/core/persistence/PolarisTreeMapAtomicOperationMetaStoreManagerTest.java
@@ -25,8 +25,8 @@ import org.apache.polaris.core.PolarisCallContext;
import org.apache.polaris.core.PolarisDefaultDiagServiceImpl;
import org.apache.polaris.core.PolarisDiagnostics;
import org.apache.polaris.core.config.PolarisConfigurationStore;
-import
org.apache.polaris.core.persistence.transactional.PolarisTreeMapMetaStoreSessionImpl;
-import org.apache.polaris.core.persistence.transactional.PolarisTreeMapStore;
+import org.apache.polaris.core.persistence.transactional.TreeMapMetaStore;
+import
org.apache.polaris.core.persistence.transactional.TreeMapTransactionalPersistenceImpl;
import org.mockito.Mockito;
public class PolarisTreeMapAtomicOperationMetaStoreManagerTest
@@ -34,10 +34,10 @@ public class
PolarisTreeMapAtomicOperationMetaStoreManagerTest
@Override
public PolarisTestMetaStoreManager createPolarisTestMetaStoreManager() {
PolarisDiagnostics diagServices = new PolarisDefaultDiagServiceImpl();
- PolarisTreeMapStore store = new PolarisTreeMapStore(diagServices);
+ TreeMapMetaStore store = new TreeMapMetaStore(diagServices);
PolarisCallContext callCtx =
new PolarisCallContext(
- new PolarisTreeMapMetaStoreSessionImpl(store, Mockito.mock(),
RANDOM_SECRETS),
+ new TreeMapTransactionalPersistenceImpl(store, Mockito.mock(),
RANDOM_SECRETS),
diagServices,
new PolarisConfigurationStore() {},
timeSource.withZone(ZoneId.systemDefault()));
diff --git
a/polaris-core/src/test/java/org/apache/polaris/core/persistence/PolarisTreeMapMetaStoreManagerTest.java
b/polaris-core/src/test/java/org/apache/polaris/core/persistence/PolarisTreeMapMetaStoreManagerTest.java
index d7491e03..baca459f 100644
---
a/polaris-core/src/test/java/org/apache/polaris/core/persistence/PolarisTreeMapMetaStoreManagerTest.java
+++
b/polaris-core/src/test/java/org/apache/polaris/core/persistence/PolarisTreeMapMetaStoreManagerTest.java
@@ -25,23 +25,23 @@ import org.apache.polaris.core.PolarisCallContext;
import org.apache.polaris.core.PolarisDefaultDiagServiceImpl;
import org.apache.polaris.core.PolarisDiagnostics;
import org.apache.polaris.core.config.PolarisConfigurationStore;
-import
org.apache.polaris.core.persistence.transactional.PolarisMetaStoreManagerImpl;
-import
org.apache.polaris.core.persistence.transactional.PolarisTreeMapMetaStoreSessionImpl;
-import org.apache.polaris.core.persistence.transactional.PolarisTreeMapStore;
+import
org.apache.polaris.core.persistence.transactional.TransactionalMetaStoreManagerImpl;
+import org.apache.polaris.core.persistence.transactional.TreeMapMetaStore;
+import
org.apache.polaris.core.persistence.transactional.TreeMapTransactionalPersistenceImpl;
import org.mockito.Mockito;
public class PolarisTreeMapMetaStoreManagerTest extends
BasePolarisMetaStoreManagerTest {
@Override
public PolarisTestMetaStoreManager createPolarisTestMetaStoreManager() {
PolarisDiagnostics diagServices = new PolarisDefaultDiagServiceImpl();
- PolarisTreeMapStore store = new PolarisTreeMapStore(diagServices);
+ TreeMapMetaStore store = new TreeMapMetaStore(diagServices);
PolarisCallContext callCtx =
new PolarisCallContext(
- new PolarisTreeMapMetaStoreSessionImpl(store, Mockito.mock(),
RANDOM_SECRETS),
+ new TreeMapTransactionalPersistenceImpl(store, Mockito.mock(),
RANDOM_SECRETS),
diagServices,
new PolarisConfigurationStore() {},
timeSource.withZone(ZoneId.systemDefault()));
- return new PolarisTestMetaStoreManager(new PolarisMetaStoreManagerImpl(),
callCtx);
+ return new PolarisTestMetaStoreManager(new
TransactionalMetaStoreManagerImpl(), callCtx);
}
}
diff --git
a/polaris-core/src/test/java/org/apache/polaris/core/persistence/ResolverTest.java
b/polaris-core/src/test/java/org/apache/polaris/core/persistence/ResolverTest.java
index dd21a16f..51ec06a0 100644
---
a/polaris-core/src/test/java/org/apache/polaris/core/persistence/ResolverTest.java
+++
b/polaris-core/src/test/java/org/apache/polaris/core/persistence/ResolverTest.java
@@ -50,10 +50,10 @@ import
org.apache.polaris.core.persistence.dao.entity.ResolvedEntityResult;
import org.apache.polaris.core.persistence.resolver.Resolver;
import org.apache.polaris.core.persistence.resolver.ResolverPath;
import org.apache.polaris.core.persistence.resolver.ResolverStatus;
-import
org.apache.polaris.core.persistence.transactional.PolarisMetaStoreManagerImpl;
-import
org.apache.polaris.core.persistence.transactional.PolarisTreeMapMetaStoreSessionImpl;
-import org.apache.polaris.core.persistence.transactional.PolarisTreeMapStore;
+import
org.apache.polaris.core.persistence.transactional.TransactionalMetaStoreManagerImpl;
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.assertj.core.api.Assertions;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
@@ -65,7 +65,7 @@ public class ResolverTest {
private final PolarisDiagnostics diagServices;
// the entity store, use treemap implementation
- private final PolarisTreeMapStore store;
+ private final TreeMapMetaStore store;
// to interact with the metastore
private final TransactionalPersistence metaStore;
@@ -118,10 +118,10 @@ public class ResolverTest {
*/
public ResolverTest() {
diagServices = new PolarisDefaultDiagServiceImpl();
- store = new PolarisTreeMapStore(diagServices);
- metaStore = new PolarisTreeMapMetaStoreSessionImpl(store, Mockito.mock(),
RANDOM_SECRETS);
+ store = new TreeMapMetaStore(diagServices);
+ metaStore = new TreeMapTransactionalPersistenceImpl(store, Mockito.mock(),
RANDOM_SECRETS);
callCtx = new PolarisCallContext(metaStore, diagServices);
- metaStoreManager = new PolarisMetaStoreManagerImpl();
+ metaStoreManager = new TransactionalMetaStoreManagerImpl();
// bootstrap the mata store with our test schema
tm = new PolarisTestMetaStoreManager(metaStoreManager, callCtx);
diff --git
a/polaris-core/src/test/java/org/apache/polaris/core/storage/cache/StorageCredentialCacheTest.java
b/polaris-core/src/test/java/org/apache/polaris/core/storage/cache/StorageCredentialCacheTest.java
index ee00860f..f3b4fc2f 100644
---
a/polaris-core/src/test/java/org/apache/polaris/core/storage/cache/StorageCredentialCacheTest.java
+++
b/polaris-core/src/test/java/org/apache/polaris/core/storage/cache/StorageCredentialCacheTest.java
@@ -41,9 +41,9 @@ import
org.apache.polaris.core.persistence.PolarisMetaStoreManager;
import org.apache.polaris.core.persistence.PolarisObjectMapperUtil;
import org.apache.polaris.core.persistence.dao.entity.BaseResult;
import org.apache.polaris.core.persistence.dao.entity.ScopedCredentialsResult;
-import
org.apache.polaris.core.persistence.transactional.PolarisTreeMapMetaStoreSessionImpl;
-import org.apache.polaris.core.persistence.transactional.PolarisTreeMapStore;
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.apache.polaris.core.storage.PolarisCredentialProperty;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.RepeatedTest;
@@ -64,10 +64,10 @@ public class StorageCredentialCacheTest {
// diag services
PolarisDiagnostics diagServices = new PolarisDefaultDiagServiceImpl();
// the entity store, use treemap implementation
- PolarisTreeMapStore store = new PolarisTreeMapStore(diagServices);
+ TreeMapMetaStore store = new TreeMapMetaStore(diagServices);
// to interact with the metastore
TransactionalPersistence metaStore =
- new PolarisTreeMapMetaStoreSessionImpl(store, Mockito.mock(),
RANDOM_SECRETS);
+ new TreeMapTransactionalPersistenceImpl(store, Mockito.mock(),
RANDOM_SECRETS);
callCtx = new PolarisCallContext(metaStore, diagServices);
metaStoreManager = Mockito.mock(PolarisMetaStoreManager.class);
storageCredentialCache = new StorageCredentialCache();
diff --git
a/service/common/src/main/java/org/apache/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java
b/service/common/src/main/java/org/apache/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java
index 932e882f..c65c84d1 100644
---
a/service/common/src/main/java/org/apache/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java
+++
b/service/common/src/main/java/org/apache/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java
@@ -34,16 +34,16 @@ import
org.apache.polaris.core.persistence.LocalPolarisMetaStoreManagerFactory;
import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
import org.apache.polaris.core.persistence.bootstrap.RootCredentialsSet;
import org.apache.polaris.core.persistence.dao.entity.PrincipalSecretsResult;
-import
org.apache.polaris.core.persistence.transactional.PolarisTreeMapMetaStoreSessionImpl;
-import org.apache.polaris.core.persistence.transactional.PolarisTreeMapStore;
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.apache.polaris.core.storage.PolarisStorageIntegrationProvider;
import org.apache.polaris.service.context.RealmContextConfiguration;
@ApplicationScoped
@Identifier("in-memory")
public class InMemoryPolarisMetaStoreManagerFactory
- extends LocalPolarisMetaStoreManagerFactory<PolarisTreeMapStore> {
+ extends LocalPolarisMetaStoreManagerFactory<TreeMapMetaStore> {
private final PolarisStorageIntegrationProvider storageIntegration;
private final Set<String> bootstrappedRealms = new HashSet<>();
@@ -64,17 +64,17 @@ public class InMemoryPolarisMetaStoreManagerFactory
}
@Override
- protected PolarisTreeMapStore createBackingStore(@Nonnull PolarisDiagnostics
diagnostics) {
- return new PolarisTreeMapStore(diagnostics);
+ protected TreeMapMetaStore createBackingStore(@Nonnull PolarisDiagnostics
diagnostics) {
+ return new TreeMapMetaStore(diagnostics);
}
@Override
protected TransactionalPersistence createMetaStoreSession(
- @Nonnull PolarisTreeMapStore store,
+ @Nonnull TreeMapMetaStore store,
@Nonnull RealmContext realmContext,
@Nullable RootCredentialsSet rootCredentialsSet,
@Nonnull PolarisDiagnostics diagnostics) {
- return new PolarisTreeMapMetaStoreSessionImpl(
+ return new TreeMapTransactionalPersistenceImpl(
store, storageIntegration, secretsGenerator(realmContext,
rootCredentialsSet));
}
