Reducing the number of temporary mongo executables. Closes #159
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/4765aa0c Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/4765aa0c Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/4765aa0c Branch: refs/heads/master Commit: 4765aa0c037717c176f0a282ef0b32cea951fae0 Parents: d3ba442 Author: Jonathan Wonders <[email protected]> Authored: Thu May 18 20:22:31 2017 -0400 Committer: Aaron Mihalik <[email protected]> Committed: Fri Jun 2 18:53:09 2017 -0400 ---------------------------------------------------------------------- .../rya/mongodb/MongoDBQueryEngineTest.java | 2 +- .../org/apache/rya/mongodb/MongoDBRyaDAOIT.java | 2 +- .../apache/rya/mongodb/MongoDBRyaDAOTest.java | 3 ++- .../apache/rya/mongodb/MongoRyaTestBase.java | 26 +++++++++++++++++--- .../mongo/MongoFreeTextIndexerTest.java | 2 +- .../mongo/MongoTemporalIndexerTest.java | 4 +-- extras/rya.geoindexing/pom.xml | 3 +++ .../indexing/mongo/MongoGeoIndexerSfTest.java | 2 +- .../rya/indexing/mongo/MongoGeoIndexerTest.java | 2 +- 9 files changed, 35 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/4765aa0c/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineTest.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineTest.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineTest.java index 98fdace..d843d22 100644 --- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineTest.java +++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBQueryEngineTest.java @@ -52,7 +52,7 @@ public class MongoDBQueryEngineTest extends MongoRyaTestBase { public void setUp() throws Exception { // Set up Mongo/Rya final Configuration conf = new Configuration(); - conf.set(MongoDBRdfConfiguration.MONGO_DB_NAME, "test"); + conf.set(MongoDBRdfConfiguration.MONGO_DB_NAME, getDbName()); conf.set(MongoDBRdfConfiguration.MONGO_COLLECTION_PREFIX, "rya_"); conf.set(RdfCloudTripleStoreConfiguration.CONF_TBL_PREFIX, "rya_"); configuration = new MongoDBRdfConfiguration(conf); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/4765aa0c/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java index c862815..dc3e026 100644 --- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java +++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOIT.java @@ -53,7 +53,7 @@ public class MongoDBRyaDAOIT extends MongoRyaTestBase { @Before public void setUp() throws IOException, RyaDAOException{ final Configuration conf = new Configuration(); - conf.set(MongoDBRdfConfiguration.MONGO_DB_NAME, "test"); + conf.set(MongoDBRdfConfiguration.MONGO_DB_NAME, getDbName()); conf.set(MongoDBRdfConfiguration.MONGO_COLLECTION_PREFIX, "rya_"); conf.set(RdfCloudTripleStoreConfiguration.CONF_TBL_PREFIX, "rya_"); configuration = new MongoDBRdfConfiguration(conf); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/4765aa0c/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOTest.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOTest.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOTest.java index 980a2ff..c7efbf1 100644 --- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOTest.java +++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAOTest.java @@ -21,6 +21,7 @@ package org.apache.rya.mongodb; import static org.junit.Assert.assertEquals; import java.io.IOException; +import java.util.concurrent.atomic.AtomicInteger; import org.apache.hadoop.conf.Configuration; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; @@ -44,7 +45,7 @@ public class MongoDBRyaDAOTest extends MongoRyaTestBase { @Before public void setUp() throws IOException, RyaDAOException{ final Configuration conf = new Configuration(); - conf.set(MongoDBRdfConfiguration.MONGO_DB_NAME, "test"); + conf.set(MongoDBRdfConfiguration.MONGO_DB_NAME, getDbName()); conf.set(MongoDBRdfConfiguration.MONGO_COLLECTION_PREFIX, "rya_"); conf.set(RdfCloudTripleStoreConfiguration.CONF_TBL_PREFIX, "rya_"); configuration = new MongoDBRdfConfiguration(conf); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/4765aa0c/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoRyaTestBase.java ---------------------------------------------------------------------- diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoRyaTestBase.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoRyaTestBase.java index cc69e76..272767a 100644 --- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoRyaTestBase.java +++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoRyaTestBase.java @@ -19,24 +19,35 @@ package org.apache.rya.mongodb; import java.io.IOException; +import java.util.concurrent.atomic.AtomicInteger; import org.apache.rya.api.persist.RyaDAOException; import org.junit.After; +import org.junit.AfterClass; import org.junit.Before; import com.mongodb.MongoClient; import de.flapdoodle.embed.mongo.distribution.Version; +import org.junit.BeforeClass; public class MongoRyaTestBase { - protected MockMongoFactory testsFactory; + private static final AtomicInteger db = new AtomicInteger(1); + + protected static MockMongoFactory testsFactory; protected MongoClient mongoClient; + private int currentTestDb = -1; + + @BeforeClass() + public static void beforeClass() throws Exception { + testsFactory = MockMongoFactory.with(Version.Main.PRODUCTION); + } @Before public void MongoRyaTestBaseSetUp() throws IOException, RyaDAOException { - testsFactory = MockMongoFactory.with(Version.Main.PRODUCTION); mongoClient = testsFactory.newMongoClient(); + currentTestDb = db.getAndIncrement(); } @After @@ -44,10 +55,19 @@ public class MongoRyaTestBase { if (mongoClient != null) { mongoClient.close(); } + currentTestDb = -1; + MongoConnectorFactory.closeMongoClient(); + } + + @AfterClass() + public static void afterClass() throws Exception { if (testsFactory != null) { testsFactory.shutdown(); } - MongoConnectorFactory.closeMongoClient(); + } + + public String getDbName() { + return "rya_" + currentTestDb; } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/4765aa0c/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerTest.java index bfea4ae..4ac7707 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerTest.java @@ -55,7 +55,7 @@ public class MongoFreeTextIndexerTest extends MongoRyaTestBase { public void before() throws Exception { conf = new MongoDBRdfConfiguration(); conf.set(ConfigUtils.USE_MONGO, "true"); - conf.setMongoDBName("test"); + conf.setMongoDBName(getDbName()); conf.setCollectionName("rya_"); conf.setTablePrefix("another_"); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/4765aa0c/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerTest.java index 2b4c91c..9069fdc 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerTest.java @@ -176,8 +176,8 @@ public final class MongoTemporalIndexerTest extends MongoRyaTestBase { @Before public void before() throws Exception { conf = new MongoDBRdfConfiguration(); - conf.set(ConfigUtils.USE_MONGO, "true"); - conf.set(MongoDBRdfConfiguration.MONGO_DB_NAME, "test"); + conf.set(ConfigUtils.USE_MONGO, getDbName()); + conf.set(MongoDBRdfConfiguration.MONGO_DB_NAME, getDbName()); conf.set(MongoDBRdfConfiguration.MONGO_COLLECTION_PREFIX, "rya_"); conf.setTablePrefix("isthisused_"); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/4765aa0c/extras/rya.geoindexing/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/pom.xml b/extras/rya.geoindexing/pom.xml index b2574be..c528aea 100644 --- a/extras/rya.geoindexing/pom.xml +++ b/extras/rya.geoindexing/pom.xml @@ -170,6 +170,9 @@ <artifactId>maven-shade-plugin</artifactId> <executions> <execution> + <goals> + <goal>shade</goal> + </goals> <configuration> <shadedArtifactAttached>true</shadedArtifactAttached> <shadedClassifierName>map-reduce</shadedClassifierName> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/4765aa0c/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerSfTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerSfTest.java b/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerSfTest.java index 2edc006..0eefd3f 100644 --- a/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerSfTest.java +++ b/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerSfTest.java @@ -110,7 +110,7 @@ public class MongoGeoIndexerSfTest extends MongoRyaTestBase { System.out.println(UUID.randomUUID().toString()); conf = new MongoDBRdfConfiguration(); conf.set(ConfigUtils.USE_MONGO, "true"); - conf.set(MongoDBRdfConfiguration.MONGO_DB_NAME, "test"); + conf.set(MongoDBRdfConfiguration.MONGO_DB_NAME, getDbName()); conf.set(MongoDBRdfConfiguration.MONGO_COLLECTION_PREFIX, "rya_"); conf.set(ConfigUtils.GEO_PREDICATES_LIST, "http://www.opengis.net/ont/geosparql#asWKT";); conf.set(OptionalConfigUtils.USE_GEO, "true"); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/4765aa0c/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerTest.java b/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerTest.java index 6ec6c4d..024c126 100644 --- a/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerTest.java +++ b/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerTest.java @@ -66,7 +66,7 @@ public class MongoGeoIndexerTest extends MongoRyaTestBase { public void before() throws Exception { conf = new MongoDBRdfConfiguration(); conf.set(ConfigUtils.USE_MONGO, "true"); - conf.set(MongoDBRdfConfiguration.MONGO_DB_NAME, "test"); + conf.set(MongoDBRdfConfiguration.MONGO_DB_NAME, getDbName()); conf.set(MongoDBRdfConfiguration.MONGO_COLLECTION_PREFIX, "rya_"); conf.set(ConfigUtils.GEO_PREDICATES_LIST, "http://www.opengis.net/ont/geosparql#asWKT";); conf.set(OptionalConfigUtils.USE_GEO, "true");
