Enable eclipselink with H2 database in testing. Add explict bootstrap…

… for metastore manager other than in-memory

extension/persistence/eclipselink/build.gradle.kts

@@ -44,7 +44,7 @@ tasks.register<Jar>("archiveConf") {
   archiveFileName = "conf.jar"
   destinationDirectory = layout.buildDirectory.dir("conf")
 
-  from("src/test/resources/META-INF/") { include("persistence.xml") }
+  from("src/main/resources/META-INF/") { include("persistence.xml") }
 }
 
 tasks.named("test") { dependsOn("archiveConf") }

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

@@ -111,7 +111,8 @@ public PolarisEclipseLinkMetaStoreSessionImpl(
       @NotNull RealmContext realmContext,
       @Nullable String confFile,
       @Nullable String persistenceUnitName) {
-    LOGGER.debug("Create EclipseLink Meta Store Session for {}", realmContext.getRealmIdentifier());
+    LOGGER.debug(
+        "Creating EclipseLink Meta Store Session for realm {}", realmContext.getRealmIdentifier());
     emf = createEntityManagerFactory(realmContext, confFile, persistenceUnitName);
 
     // init store
@@ -153,8 +154,8 @@ private EntityManagerFactory createEntityManagerFactory(
           prefixUrl = new File(jarPrefixPath).toURI().toURL();
         }
 
-        LOGGER.info(
-            "Created a new ClassLoader with the jar {} in classpath to load the config file",
+        LOGGER.debug(
+            "Creating a new ClassLoader with the jar {} in classpath to load the config file",
             prefixUrl);
 
         URLClassLoader currentClassLoader =

extension/persistence/eclipselink/src/main/resources/META-INF/persistence.xml

@@ -35,7 +35,7 @@
     <shared-cache-mode>NONE</shared-cache-mode>
     <properties>
       <property name="jakarta.persistence.jdbc.url"
-        value="jdbc:h2:file:/tmp/eclipseLink/{realm}"/>
+        value="jdbc:h2:file:./build/test_data/polaris/{realm}/db"/>
       <property name="jakarta.persistence.jdbc.user" value="sa"/>
       <property name="jakarta.persistence.jdbc.password" value=""/>
       <property name="jakarta.persistence.schema-generation.database.action" value="create"/>

extension/persistence/eclipselink/src/test/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreManagerTest.java

@@ -51,7 +51,7 @@ protected PolarisTestMetaStoreManager createPolarisTestMetaStoreManager() {
     PolarisEclipseLinkStore store = new PolarisEclipseLinkStore(diagServices);
     PolarisEclipseLinkMetaStoreSessionImpl session =
         new PolarisEclipseLinkMetaStoreSessionImpl(
-            store, Mockito.mock(), () -> "realm", null, "polaris-dev");
+            store, Mockito.mock(), () -> "realm", null, "polaris");
     return new PolarisTestMetaStoreManager(
         new PolarisMetaStoreManagerImpl(),
         new PolarisCallContext(
@@ -72,7 +72,7 @@ void testCreateStoreSession(String confFile, boolean success) {
     try {
       var session =
           new PolarisEclipseLinkMetaStoreSessionImpl(
-              store, Mockito.mock(), () -> "realm", confFile, "polaris-dev");
+              store, Mockito.mock(), () -> "realm", confFile, "polaris");
       assertNotNull(session);
       assertTrue(success);
     } catch (Exception e) {

polaris-service/build.gradle.kts

@@ -109,6 +109,9 @@ dependencies {
   testImplementation(libs.assertj.core)
   testImplementation(libs.mockito.core)
   testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+
+  testRuntimeOnly(project(":polaris-eclipselink"))
+  testRuntimeOnly(libs.h2)
 }
 
 if (project.properties.get("eclipseLink") == "true") {

polaris-service/src/main/java/org/apache/polaris/service/BootstrapRealmsCommand.java

@@ -48,8 +48,7 @@ public BootstrapRealmsCommand() {
   protected void run(
       Bootstrap<PolarisApplicationConfig> bootstrap,
       Namespace namespace,
-      PolarisApplicationConfig configuration)
-      throws Exception {
+      PolarisApplicationConfig configuration) {
     MetaStoreManagerFactory metaStoreManagerFactory = configuration.getMetaStoreManagerFactory();
 
     PolarisConfigurationStore configurationStore = configuration.getConfigurationStore();

polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisOverlappingCatalogTest.java

@@ -28,6 +28,7 @@
 import jakarta.ws.rs.client.Entity;
 import jakarta.ws.rs.client.Invocation;
 import jakarta.ws.rs.core.Response;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -60,9 +61,12 @@ public class PolarisOverlappingCatalogTest {
   private static String realm;
 
   @BeforeAll
-  public static void setup(PolarisConnectionExtension.PolarisToken adminToken) {
+  public static void setup(PolarisConnectionExtension.PolarisToken adminToken) throws IOException {
     userToken = adminToken.token();
-    realm = PolarisConnectionExtension.getTestRealm(PolarisServiceImplIntegrationTest.class);
+    realm = PolarisConnectionExtension.getTestRealm(PolarisOverlappingCatalogTest.class);
+
+    // Set up the database location
+    PolarisConnectionExtension.createTestDir(realm);
   }
 
   private Response createCatalog(String prefix, String defaultBaseLocation, boolean isExternal) {

polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisServiceImplIntegrationTest.java

@@ -99,9 +99,12 @@ public class PolarisServiceImplIntegrationTest {
   private static String realm;
 
   @BeforeAll
-  public static void setup(PolarisConnectionExtension.PolarisToken adminToken) {
+  public static void setup(PolarisConnectionExtension.PolarisToken adminToken) throws IOException {
     userToken = adminToken.token();
     realm = PolarisConnectionExtension.getTestRealm(PolarisServiceImplIntegrationTest.class);
+
+    // Set up test location
+    PolarisConnectionExtension.createTestDir(realm);
   }
 
   @AfterEach

polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisRestCatalogIntegrationTest.java

@@ -31,14 +31,11 @@
 import jakarta.ws.rs.client.Entity;
 import jakarta.ws.rs.core.Response;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
-import org.apache.commons.io.FileUtils;
 import org.apache.iceberg.BaseTable;
 import org.apache.iceberg.CatalogProperties;
 import org.apache.iceberg.Schema;
@@ -133,9 +130,8 @@ public class PolarisRestCatalogIntegrationTest extends CatalogTests<RESTCatalog>
   public static void setup() throws IOException {
     realm = PolarisConnectionExtension.getTestRealm(PolarisRestCatalogIntegrationTest.class);
 
-    Path testDir = Path.of("build/test_data/iceberg/" + realm);
-    FileUtils.deleteQuietly(testDir.toFile());
-    Files.createDirectories(testDir);
+    // Set up test location
+    PolarisConnectionExtension.createTestDir(realm);
   }
 
   @BeforeEach

polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisRestCatalogViewIntegrationTest.java

@@ -29,11 +29,8 @@
 import jakarta.ws.rs.client.Entity;
 import jakarta.ws.rs.core.Response;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
-import org.apache.commons.io.FileUtils;
 import org.apache.iceberg.CatalogProperties;
 import org.apache.iceberg.catalog.SessionCatalog;
 import org.apache.iceberg.rest.HTTPClient;
@@ -96,9 +93,8 @@ public class PolarisRestCatalogViewIntegrationTest extends ViewCatalogTests<REST
   public static void setup() throws IOException {
     realm = PolarisConnectionExtension.getTestRealm(PolarisRestCatalogViewIntegrationTest.class);
 
-    Path testDir = Path.of("build/test_data/iceberg/" + realm);
-    FileUtils.deleteQuietly(testDir.toFile());
-    Files.createDirectories(testDir);
+    // Set up test location
+    PolarisConnectionExtension.createTestDir(realm);
   }
 
   @BeforeEach

polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisSparkIntegrationTest.java

@@ -29,6 +29,7 @@
 import io.dropwizard.testing.junit5.DropwizardExtensionsSupport;
 import jakarta.ws.rs.client.Entity;
 import jakarta.ws.rs.core.Response;
+import java.io.IOException;
 import java.time.Instant;
 import java.util.List;
 import java.util.Map;
@@ -79,10 +80,14 @@ public class PolarisSparkIntegrationTest {
   private static String realm;
 
   @BeforeAll
-  public static void setup(PolarisConnectionExtension.PolarisToken polarisToken) {
+  public static void setup(PolarisConnectionExtension.PolarisToken polarisToken)
+      throws IOException {
     s3Container.start();
     PolarisSparkIntegrationTest.polarisToken = polarisToken;
     realm = PolarisConnectionExtension.getTestRealm(PolarisSparkIntegrationTest.class);
+
+    // Set up test location
+    PolarisConnectionExtension.createTestDir(realm);
   }
 
   @AfterAll

polaris-service/src/test/java/org/apache/polaris/service/task/ManifestFileCleanupTaskHandlerTest.java

@@ -43,15 +43,21 @@
 import org.apache.polaris.core.entity.AsyncTaskType;
 import org.apache.polaris.core.entity.TaskEntity;
 import org.apache.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 class ManifestFileCleanupTaskHandlerTest {
+  private InMemoryPolarisMetaStoreManagerFactory metaStoreManagerFactory;
+  private RealmContext realmContext;
+
+  @BeforeEach
+  void setUp() {
+    metaStoreManagerFactory = new InMemoryPolarisMetaStoreManagerFactory();
+    realmContext = () -> "realmName";
+  }
 
   @Test
   public void testCleanupFileNotExists() throws IOException {
-    InMemoryPolarisMetaStoreManagerFactory metaStoreManagerFactory =
-        new InMemoryPolarisMetaStoreManagerFactory();
-    RealmContext realmContext = () -> "realmName";
     PolarisCallContext polarisCallContext =
         new PolarisCallContext(
             metaStoreManagerFactory.getOrCreateSessionSupplier(realmContext).get(),
@@ -83,9 +89,6 @@ public void testCleanupFileNotExists() throws IOException {
 
   @Test
   public void testCleanupFileManifestExistsDataFilesDontExist() throws IOException {
-    InMemoryPolarisMetaStoreManagerFactory metaStoreManagerFactory =
-        new InMemoryPolarisMetaStoreManagerFactory();
-    RealmContext realmContext = () -> "realmName";
     PolarisCallContext polarisCallContext =
         new PolarisCallContext(
             metaStoreManagerFactory.getOrCreateSessionSupplier(realmContext).get(),
@@ -116,9 +119,6 @@ public void testCleanupFileManifestExistsDataFilesDontExist() throws IOException
 
   @Test
   public void testCleanupFiles() throws IOException {
-    InMemoryPolarisMetaStoreManagerFactory metaStoreManagerFactory =
-        new InMemoryPolarisMetaStoreManagerFactory();
-    RealmContext realmContext = () -> "realmName";
     PolarisCallContext polarisCallContext =
         new PolarisCallContext(
             metaStoreManagerFactory.getOrCreateSessionSupplier(realmContext).get(),
@@ -166,9 +166,6 @@ public void close() {
 
   @Test
   public void testCleanupFilesWithRetries() throws IOException {
-    InMemoryPolarisMetaStoreManagerFactory metaStoreManagerFactory =
-        new InMemoryPolarisMetaStoreManagerFactory();
-    RealmContext realmContext = () -> "realmName";
     PolarisCallContext polarisCallContext =
         new PolarisCallContext(
             metaStoreManagerFactory.getOrCreateSessionSupplier(realmContext).get(),

polaris-service/src/test/java/org/apache/polaris/service/task/TableCleanupTaskHandlerTest.java

@@ -41,17 +41,23 @@
 import org.apache.polaris.core.entity.TaskEntity;
 import org.apache.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory;
 import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.slf4j.LoggerFactory;
 
 class TableCleanupTaskHandlerTest {
+  private InMemoryPolarisMetaStoreManagerFactory metaStoreManagerFactory;
+  private RealmContext realmContext;
+
+  @BeforeEach
+  void setUp() {
+    metaStoreManagerFactory = new InMemoryPolarisMetaStoreManagerFactory();
+    realmContext = () -> "realmName";
+  }
 
   @Test
   public void testTableCleanup() throws IOException {
-    InMemoryPolarisMetaStoreManagerFactory metaStoreManagerFactory =
-        new InMemoryPolarisMetaStoreManagerFactory();
-    RealmContext realmContext = () -> "realmName";
     PolarisCallContext polarisCallContext =
         new PolarisCallContext(
             metaStoreManagerFactory.getOrCreateSessionSupplier(realmContext).get(),
@@ -112,9 +118,6 @@ public void testTableCleanup() throws IOException {
 
   @Test
   public void testTableCleanupHandlesAlreadyDeletedMetadata() throws IOException {
-    InMemoryPolarisMetaStoreManagerFactory metaStoreManagerFactory =
-        new InMemoryPolarisMetaStoreManagerFactory();
-    RealmContext realmContext = () -> "realmName";
     PolarisCallContext polarisCallContext =
         new PolarisCallContext(
             metaStoreManagerFactory.getOrCreateSessionSupplier(realmContext).get(),
@@ -174,9 +177,6 @@ public void close() {
 
   @Test
   public void testTableCleanupDuplicatesTasksIfFileStillExists() throws IOException {
-    InMemoryPolarisMetaStoreManagerFactory metaStoreManagerFactory =
-        new InMemoryPolarisMetaStoreManagerFactory();
-    RealmContext realmContext = () -> "realmName";
     PolarisCallContext polarisCallContext =
         new PolarisCallContext(
             metaStoreManagerFactory.getOrCreateSessionSupplier(realmContext).get(),
@@ -269,9 +269,6 @@ public void close() {
 
   @Test
   public void testTableCleanupMultipleSnapshots() throws IOException {
-    InMemoryPolarisMetaStoreManagerFactory metaStoreManagerFactory =
-        new InMemoryPolarisMetaStoreManagerFactory();
-    RealmContext realmContext = () -> "realmName";
     PolarisCallContext polarisCallContext =
         new PolarisCallContext(
             metaStoreManagerFactory.getOrCreateSessionSupplier(realmContext).get(),