Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import java.util.stream.Stream;
import org.apache.ignite.Ignite;
import org.apache.ignite.Ignition;
import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.lang.IgniteRunnable;
import org.heigit.bigspatialdata.oshdb.api.mapreducer.MapReducer;
import org.heigit.bigspatialdata.oshdb.api.mapreducer.backend.MapReducerIgniteAffinityCall;
Expand Down Expand Up @@ -39,7 +40,7 @@ public OSHDBIgnite() {

public OSHDBIgnite(Ignite ignite) {
this.ignite = ignite;
this.ignite.cluster().active(true);
this.ignite.cluster().state(ClusterState.ACTIVE_READ_ONLY);
}

public OSHDBIgnite(String igniteConfigFilePath) {
Expand All @@ -53,9 +54,8 @@ public OSHDBIgnite(String igniteConfigFilePath) {
*/
public OSHDBIgnite(File igniteConfig) {
Ignition.setClientMode(true);

this.ignite = Ignition.start(igniteConfig.toString());
this.ignite.cluster().active(true);
this.ignite.cluster().state(ClusterState.ACTIVE_READ_ONLY);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,28 +1,50 @@
package org.heigit.bigspatialdata.oshdb.api.tests;

import java.io.File;
import static org.junit.Assert.fail;

import java.io.IOException;
import java.io.ObjectInputStream;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.List;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.Ignition;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.logger.slf4j.Slf4jLogger;
import org.apache.ignite.marshaller.jdk.JdkMarshaller;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.heigit.bigspatialdata.oshdb.api.db.OSHDBH2;
import org.heigit.bigspatialdata.oshdb.api.db.OSHDBIgnite;
import org.heigit.bigspatialdata.oshdb.grid.GridOSHNodes;
import org.heigit.bigspatialdata.oshdb.util.CellId;
import org.heigit.bigspatialdata.oshdb.util.TableNames;
import static org.junit.Assert.fail;

abstract class TestMapReduceOSHDB_Ignite extends TestMapReduce {
final static Ignite ignite =
Ignition.start(new File("./src/test/resources/ignite-config.xml").toString());
final static Ignite ignite;
static {
int rndPort = 47577 + (int) (Math.random() * 1000);
Comment thread
tyrasd marked this conversation as resolved.
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setPeerClassLoadingEnabled(true);
cfg.setIgniteInstanceName("OSHDB-Unit-Tests_" + rndPort);
cfg.setBinaryConfiguration((new BinaryConfiguration()).setCompactFooter(false));
cfg.setGridLogger(new Slf4jLogger());
cfg.setWorkDirectory("/tmp");
cfg.setDiscoverySpi((new TcpDiscoverySpi())
.setLocalPort(rndPort)
.setLocalPortRange(0)
.setIpFinder((new TcpDiscoveryVmIpFinder()).setAddresses(List.of("127.0.0.1:" + rndPort)))
);
ignite = Ignition.start(cfg);
}

public TestMapReduceOSHDB_Ignite(OSHDBIgnite oshdb) throws Exception {
super(oshdb);
Expand All @@ -34,7 +56,7 @@ public TestMapReduceOSHDB_Ignite(OSHDBIgnite oshdb) throws Exception {
this.keytables = oshdb_h2;

Ignite ignite = ((OSHDBIgnite) this.oshdb).getIgnite();
ignite.cluster().active(true);
ignite.cluster().state(ClusterState.ACTIVE);

CacheConfiguration<Long, GridOSHNodes> cacheCfg =
new CacheConfiguration<>(TableNames.T_NODES.toString(prefix));
Expand Down
50 changes: 0 additions & 50 deletions oshdb-api/src/test/resources/ignite-config.xml

This file was deleted.