#470: use datasource instead of OSHDBDatabase

Author: mmerdes

oshdb-api-ignite/src/main/java/org/heigit/ohsome/oshdb/api/db/OSHDBIgnite.java

@@ -6,6 +6,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import javax.sql.DataSource;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.Ignition;
 import org.apache.ignite.lang.IgniteRunnable;
@@ -18,6 +19,7 @@
 import org.heigit.ohsome.oshdb.util.exceptions.OSHDBException;
 import org.heigit.ohsome.oshdb.util.exceptions.OSHDBTableNotFoundException;
 import org.heigit.ohsome.oshdb.util.mappable.OSHDBMapReducible;
+import org.heigit.ohsome.oshdb.util.tagtranslator.JdbcTagTranslator;
 import org.heigit.ohsome.oshdb.util.tagtranslator.TagTranslator;
 
 /**
@@ -41,7 +43,7 @@ public enum ComputeMode {
   }
 
   private final Ignite ignite;
-  private final OSHDBDatabase keytables;
+  private final TagTranslator tagTranslator;
   private final boolean owner;
   private ComputeMode computeMode = ComputeMode.LOCAL_PEEK;
 
@@ -52,7 +54,7 @@ public enum ComputeMode {
    *
    * @throws OSHDBException if cluster state is not active.
    */
-  public OSHDBIgnite(OSHDBDatabase keytables) {
+  public OSHDBIgnite(DataSource keytables) {
     this(new File("ignite-config.xml"), keytables);
   }
 
@@ -62,7 +64,7 @@ public OSHDBIgnite(OSHDBDatabase keytables) {
    * @param ignite Ignite instance to use.
    * @throws OSHDBException if cluster state is not active.
    */
-  public OSHDBIgnite(Ignite ignite, OSHDBDatabase keytables) {
+  public OSHDBIgnite(Ignite ignite, DataSource keytables) {
     this(ignite, false, keytables);
   }
 
@@ -72,7 +74,7 @@ public OSHDBIgnite(Ignite ignite, OSHDBDatabase keytables) {
    * @param igniteConfigFilePath ignite configuration file
    * @throws OSHDBException if cluster state is not active.
    */
-  public OSHDBIgnite(String igniteConfigFilePath, OSHDBDatabase keytables) {
+  public OSHDBIgnite(String igniteConfigFilePath, DataSource keytables) {
     this(new File(igniteConfigFilePath), keytables);
   }
 
@@ -82,14 +84,15 @@ public OSHDBIgnite(String igniteConfigFilePath, OSHDBDatabase keytables) {
    * @param igniteConfig ignite configuration file
    * @throws OSHDBException if cluster state is not active.
    */
-  public OSHDBIgnite(File igniteConfig, OSHDBDatabase keytables) {
+  public OSHDBIgnite(File igniteConfig, DataSource keytables) {
     this(startClient(igniteConfig), true, keytables);
   }
 
-  public OSHDBIgnite(Ignite ignite, boolean owner, OSHDBDatabase keytables) {
+  public OSHDBIgnite(Ignite ignite, boolean owner, DataSource keytables) {
     this.ignite = ignite;
     this.owner = owner;
-    this.keytables = keytables;
+    this.tagTranslator = new JdbcTagTranslator(keytables);
+
     checkStateActive();
   }
 
@@ -107,7 +110,7 @@ private void checkStateActive() {
 
   @Override
   public TagTranslator getTagTranslator() {
-    return keytables.getTagTranslator();
+    return tagTranslator;
   }
 
   @Override

oshdb-api-ignite/src/test/java/org/heigit/ohsome/oshdb/api/tests/MapReduceOSHDBIgniteTest.java

@@ -1,9 +1,11 @@
 package org.heigit.ohsome.oshdb.api.tests;
 
+import static org.heigit.ohsome.oshdb.api.db.H2Support.pathToUrl;
 import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
+import java.nio.file.Path;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,8 +24,8 @@
 import org.apache.ignite.logger.slf4j.Slf4jLogger;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.h2.jdbcx.JdbcConnectionPool;
 import org.heigit.ohsome.oshdb.api.db.OSHDBDatabase;
-import org.heigit.ohsome.oshdb.api.db.OSHDBH2;
 import org.heigit.ohsome.oshdb.api.db.OSHDBIgnite;
 import org.heigit.ohsome.oshdb.grid.GridOSHNodes;
 import org.heigit.ohsome.oshdb.util.CellId;
@@ -63,11 +65,14 @@ private static OSHDBDatabase initOshdb(Consumer<OSHDBIgnite> computeMode) {
     ignite.getOrCreateCache(new CacheConfiguration<>(TableNames.T_WAYS.toString(prefix)));
     ignite.getOrCreateCache(new CacheConfiguration<>(TableNames.T_RELATIONS.toString(prefix)));
 
-    OSHDBH2 oshdbH2 = new OSHDBH2("../data/test-data");
+    JdbcConnectionPool oshdbH2 = JdbcConnectionPool.create(pathToUrl(Path.of("../data/test-data")), "sa",
+        "");
+
     // load test data into ignite cache
-    try (IgniteDataStreamer<Long, GridOSHNodes> streamer = ignite.dataStreamer(cache.getName())) {
-      Connection h2Conn = oshdbH2.getConnection();
-      Statement h2Stmt = h2Conn.createStatement();
+    try (IgniteDataStreamer<Long, GridOSHNodes> streamer = ignite.dataStreamer(cache.getName());
+        Connection h2Conn = oshdbH2.getConnection();
+        Statement h2Stmt = h2Conn.createStatement();
+    ) {
 
       streamer.allowOverwrite(true);
 

oshdb-api/src/main/java/org/heigit/ohsome/oshdb/api/db/H2Support.java

@@ -0,0 +1,12 @@
+package org.heigit.ohsome.oshdb.api.db;
+
+import java.nio.file.Path;
+
+public class H2Support {
+
+  public static String pathToUrl(Path path) {
+    var absolutePath = path.toAbsolutePath().toString();
+    absolutePath = absolutePath.replaceAll("\\.mv\\.db$", "");
+    return String.format("jdbc:h2:%s;ACCESS_MODE_DATA=r", absolutePath);
+  }
+}

oshdb-api/src/main/java/org/heigit/ohsome/oshdb/api/db/OSHDBH2.java

@@ -1,6 +1,7 @@
 package org.heigit.ohsome.oshdb.api.db;
 
 import static java.util.Optional.ofNullable;
+import static org.heigit.ohsome.oshdb.api.db.H2Support.pathToUrl;
 
 import java.nio.file.Path;
 import javax.sql.DataSource;
@@ -45,12 +46,6 @@ private OSHDBH2(JdbcConnectionPool ds) {
     this.connectionPool = ds;
   }
 
-  private static String pathToUrl(Path path) {
-    var absolutePath = path.toAbsolutePath().toString();
-    absolutePath = absolutePath.replaceAll("\\.mv\\.db$", "");
-    return String.format("jdbc:h2:%s;ACCESS_MODE_DATA=r", absolutePath);
-  }
-
   @Override
   public OSHDBH2 prefix(String prefix) {
     return (OSHDBH2) super.prefix(prefix);