NoSQL: add persistence to polaris-quarkus-admin

Author: snazy

quarkus/admin/build.gradle.kts

@@ -36,6 +36,9 @@ dependencies {
 
   runtimeOnly(project(":polaris-eclipselink"))
 
+  runtimeOnly(project(":polaris-persistence-bridge"))
+  runtimeOnly(project(":polaris-persistence-cdi-quarkus"))
+
   implementation(enforcedPlatform(libs.quarkus.bom))
   implementation("io.quarkus:quarkus-picocli")
   implementation("io.quarkus:quarkus-container-image-docker")
@@ -50,6 +53,7 @@ dependencies {
   testFixturesApi(platform(libs.testcontainers.bom))
   testFixturesApi("org.testcontainers:testcontainers")
   testFixturesApi("org.testcontainers:postgresql")
+  testFixturesImplementation(testFixtures(project(":polaris-persistence-mongodb")))
 
   testRuntimeOnly(project(":polaris-eclipselink"))
   testRuntimeOnly("org.postgresql:postgresql")

quarkus/admin/src/main/java/org/apache/polaris/admintool/config/QuarkusPersistenceConfiguration.java

@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.polaris.admintool.config;
+
+import io.quarkus.runtime.annotations.StaticInitSafe;
+import io.smallrye.config.ConfigMapping;
+
+@StaticInitSafe
+@ConfigMapping(prefix = "polaris.persistence")
+public interface QuarkusPersistenceConfiguration {
+
+  /**
+   * The type of the persistence to use. Must be a registered {@link
+   * org.apache.polaris.core.persistence.MetaStoreManagerFactory} identifier.
+   */
+  String type();
+}

quarkus/admin/src/main/java/org/apache/polaris/admintool/config/QuarkusProducers.java

@@ -32,15 +32,16 @@
 import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo;
 import org.apache.polaris.core.storage.PolarisStorageIntegration;
 import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 public class QuarkusProducers {
 
   @Produces
   public MetaStoreManagerFactory metaStoreManagerFactory(
-      @ConfigProperty(name = "polaris.persistence.type") String persistenceType,
+      QuarkusPersistenceConfiguration persistenceConfiguration,
       @Any Instance<MetaStoreManagerFactory> metaStoreManagerFactories) {
-    return metaStoreManagerFactories.select(Identifier.Literal.of(persistenceType)).get();
+    return metaStoreManagerFactories
+        .select(Identifier.Literal.of(persistenceConfiguration.type()))
+        .get();
   }
 
   // CDI dependencies of EclipseLink's MetaStoreManagerFactory:

quarkus/admin/src/main/resources/application.properties

@@ -35,7 +35,23 @@ quarkus.container-image.additional-tags=latest
 # ---- Runtime Configuration ----
 # Below are default values for properties that can be changed in runtime.
 
+# Available types:
+# - in-memory - InMemoryPolarisMetaStoreManagerFactory
+# - in-memory-atomic - InMemoryAtomicOperationMetaStoreManagerFactory
+# - eclipse-link - EclipseLinkPolarisMetaStoreManagerFactory
+# - persistence - generic persistence backend
 polaris.persistence.type=eclipse-link
+# Database backend for 'persistence' persistence-type
+# Available backends:
+# - InMemory - for testing purposes
+# - MongoDb - configure the via the Quarkus extension
+polaris.backend.name=MongoDb
+
+## MongoDB version store specific configuration
+quarkus.mongodb.database=polaris
+quarkus.mongodb.metrics.enabled=true
+#quarkus.mongodb.connection-string=mongodb://localhost:27017
+quarkus.mongodb.devservices.enabled=false
 
 quarkus.arc.ignored-split-packages=\
   org.apache.polaris.admintool.config,\

quarkus/admin/src/test/java/org/apache/polaris/admintool/persistence/PersistenceInMemoryBootstrapCommandTest.java

@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.polaris.admintool.persistence;
+
+import io.quarkus.test.junit.TestProfile;
+import org.apache.polaris.admintool.BootstrapCommandTestBase;
+
+@TestProfile(PersistenceInMemoryProfile.class)
+class PersistenceInMemoryBootstrapCommandTest extends BootstrapCommandTestBase {}

quarkus/admin/src/test/java/org/apache/polaris/admintool/persistence/PersistenceInMemoryProfile.java

@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.polaris.admintool.persistence;
+
+import io.quarkus.test.junit.QuarkusTestProfile;
+import java.util.Map;
+
+public class PersistenceInMemoryProfile implements QuarkusTestProfile {
+  @Override
+  public Map<String, String> getConfigOverrides() {
+    return Map.of("polaris.persistence.type", "persistence", "polaris.backend.name", "InMemory");
+  }
+}

quarkus/admin/src/test/java/org/apache/polaris/admintool/persistence/PersistenceInMemoryPurgeCommandTest.java

@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.polaris.admintool.persistence;
+
+import io.quarkus.test.junit.TestProfile;
+import java.util.Map;
+import org.apache.polaris.admintool.PurgeCommandTestBase;
+import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
+
+@TestProfile(PersistenceInMemoryPurgeCommandTest.Profile.class)
+class PersistenceInMemoryPurgeCommandTest extends PurgeCommandTestBase {
+
+  public static class Profile extends PersistenceInMemoryProfile {
+    @Override
+    public Map<String, String> getConfigOverrides() {
+      return ImmutableMap.<String, String>builder()
+          .putAll(super.getConfigOverrides())
+          .put("pre-bootstrap", "true")
+          .build();
+    }
+  }
+}

quarkus/admin/src/test/java/org/apache/polaris/admintool/persistence/PersistenceMongoBootstrapCommandTest.java

@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.polaris.admintool.persistence;
+
+import io.quarkus.test.junit.TestProfile;
+import org.apache.polaris.admintool.BootstrapCommandTestBase;
+
+@TestProfile(PersistenceMongoProfile.class)
+class PersistenceMongoBootstrapCommandTest extends BootstrapCommandTestBase {}

quarkus/admin/src/test/java/org/apache/polaris/admintool/persistence/PersistenceMongoProfile.java

@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.polaris.admintool.persistence;
+
+import io.quarkus.test.junit.QuarkusTestProfile;
+import java.util.List;
+import java.util.Map;
+import org.apache.polaris.admintool.MongoTestResourceLifecycleManager;
+
+public class PersistenceMongoProfile implements QuarkusTestProfile {
+  @Override
+  public Map<String, String> getConfigOverrides() {
+    return Map.of("polaris.persistence.type", "persistence", "polaris.backend.name", "MongoDb");
+  }
+
+  @Override
+  public List<TestResourceEntry> testResources() {
+    return List.of(new TestResourceEntry(MongoTestResourceLifecycleManager.class));
+  }
+}

quarkus/admin/src/test/java/org/apache/polaris/admintool/persistence/PersistenceMongoPurgeCommandTest.java

@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.polaris.admintool.persistence;
+
+import io.quarkus.test.junit.TestProfile;
+import java.util.Map;
+import org.apache.polaris.admintool.PurgeCommandTestBase;
+import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
+
+@TestProfile(PersistenceMongoPurgeCommandTest.Profile.class)
+class PersistenceMongoPurgeCommandTest extends PurgeCommandTestBase {
+
+  public static class Profile extends PersistenceMongoProfile {
+    @Override
+    public Map<String, String> getConfigOverrides() {
+      return ImmutableMap.<String, String>builder()
+          .putAll(super.getConfigOverrides())
+          .put("pre-bootstrap", "true")
+          .build();
+    }
+  }
+}

quarkus/admin/src/testFixtures/java/org/apache/polaris/admintool/MongoTestResourceLifecycleManager.java

@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.polaris.admintool;
+
+import io.quarkus.test.common.DevServicesContext;
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import java.util.Map;
+import org.apache.polaris.persistence.mongodb.MongoDbBackendTestFactory;
+
+public class MongoTestResourceLifecycleManager
+    implements QuarkusTestResourceLifecycleManager, DevServicesContext.ContextAware {
+
+  private MongoDbBackendTestFactory mongoDbBackendTestFactory;
+  private DevServicesContext context;
+
+  @Override
+  public void setIntegrationTestContext(DevServicesContext context) {
+    this.context = context;
+  }
+
+  @Override
+  @SuppressWarnings("resource")
+  public Map<String, String> start() {
+    mongoDbBackendTestFactory = new MongoDbBackendTestFactory();
+    mongoDbBackendTestFactory.start(context.containerNetworkId());
+    return Map.of(
+        "quarkus.mongodb.connection-string", mongoDbBackendTestFactory.connectionString());
+  }
+
+  @Override
+  public void stop() {
+    if (mongoDbBackendTestFactory != null) {
+      try {
+        mongoDbBackendTestFactory.stop();
+      } finally {
+        mongoDbBackendTestFactory = null;
+      }
+    }
+  }
+}