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 8e63a77dba..2dc4a3ae85 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.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 @@ protected PolarisTestMetaStoreManager createPolarisTestMetaStoreManager() { 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 104306c858..429cbb5eb4 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.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 @@ protected PrincipalSecretsGenerator secretsGenerator( * 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 89e5c7b80f..cf1e54b535 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 @@ * 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 89784fd881..b37f6e840f 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.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 { @@ -68,7 +68,7 @@ public String buildKey(T value) { * @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 T read(String key) { * @param prefix key prefix */ public List 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 List readRange(String prefix) { * @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 void write(T value) { * @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 void delete(String key) { * @param prefix key prefix for the record to remove */ public void deleteRange(String prefix) { - PolarisTreeMapStore.this.ensureReadWriteTr(); + TreeMapMetaStore.this.ensureReadWriteTr(); List elements = this.readRange(prefix); for (T element : elements) { this.delete(element); @@ -135,7 +135,7 @@ public void deleteRange(String prefix) { } void deleteAll() { - PolarisTreeMapStore.this.ensureReadWriteTr(); + TreeMapMetaStore.this.ensureReadWriteTr(); slice.clear(); undoSlice.clear(); } @@ -151,7 +151,7 @@ public void delete(T value) { /** 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 boolean isWrite() { * * @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 521c5dfbba..8d2e59c963 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.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 0a3986357c..3585439706 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.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 274841c52a..d3fd3e2843 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.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 d7491e0384..baca459f0c 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.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 dd21a16f3b..51ec06a05d 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.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 ee00860f06..f3b4fc2f62 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.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 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 932e882f32..c65c84d196 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.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 { + extends LocalPolarisMetaStoreManagerFactory { private final PolarisStorageIntegrationProvider storageIntegration; private final Set bootstrappedRealms = new HashSet<>(); @@ -64,17 +64,17 @@ public void onStartup(RealmContextConfiguration realmContextConfiguration) { } @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)); }