PR-2555 - Request-scoped PolarisMetaStoreManager

Author: XN137

persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/EclipseLinkPolarisMetaStoreManagerFactory.java

@@ -26,6 +26,7 @@
 import java.nio.file.Path;
 import java.time.Clock;
 import org.apache.polaris.core.PolarisDiagnostics;
+import org.apache.polaris.core.config.PolarisConfigurationStore;
 import org.apache.polaris.core.context.RealmContext;
 import org.apache.polaris.core.persistence.LocalPolarisMetaStoreManagerFactory;
 import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
@@ -48,12 +49,13 @@ public class EclipseLinkPolarisMetaStoreManagerFactory
 
   @SuppressWarnings("unused") // Required by CDI
   protected EclipseLinkPolarisMetaStoreManagerFactory() {
-    this(null, null);
+    this(null, null, null);
   }
 
   @Inject
-  protected EclipseLinkPolarisMetaStoreManagerFactory(Clock clock, PolarisDiagnostics diagnostics) {
-    super(clock, diagnostics);
+  protected EclipseLinkPolarisMetaStoreManagerFactory(
+      Clock clock, PolarisDiagnostics diagnostics, PolarisConfigurationStore configurationStore) {
+    super(clock, diagnostics, configurationStore);
   }
 
   @Override

persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java

@@ -32,10 +32,8 @@
 import java.nio.file.Path;
 import java.util.Objects;
 import java.util.stream.Stream;
-import org.apache.polaris.core.PolarisCallContext;
 import org.apache.polaris.core.PolarisDefaultDiagServiceImpl;
 import org.apache.polaris.core.PolarisDiagnostics;
-import org.apache.polaris.core.context.RealmContext;
 import org.apache.polaris.core.entity.PolarisPrincipalSecrets;
 import org.apache.polaris.core.persistence.BasePolarisMetaStoreManagerTest;
 import org.apache.polaris.core.persistence.PolarisTestMetaStoreManager;
@@ -83,14 +81,13 @@ static void prepareConfFiles(@TempDir Path archiveDir) throws IOException {
   protected PolarisTestMetaStoreManager createPolarisTestMetaStoreManager() {
     PolarisDiagnostics diagServices = new PolarisDefaultDiagServiceImpl();
     PolarisEclipseLinkStore store = new PolarisEclipseLinkStore(diagServices);
-    RealmContext realmContext = () -> "realm";
     PolarisEclipseLinkMetaStoreSessionImpl session =
         new PolarisEclipseLinkMetaStoreSessionImpl(
             diagServices, store, Mockito.mock(), realmContext, null, "polaris", RANDOM_SECRETS);
     TransactionalMetaStoreManagerImpl metaStoreManager =
-        new TransactionalMetaStoreManagerImpl(clock, diagServices);
-    PolarisCallContext callCtx = new PolarisCallContext(realmContext, session);
-    return new PolarisTestMetaStoreManager(metaStoreManager, callCtx);
+        new TransactionalMetaStoreManagerImpl(
+            clock, diagServices, realmContext, realmConfig, () -> session);
+    return new PolarisTestMetaStoreManager(metaStoreManager);
   }
 
   @ParameterizedTest