From 942d9d62350815a33f28a22f101cdb5c262c70ed Mon Sep 17 00:00:00 2001 From: Andrew Smith Date: Fri, 14 Sep 2018 12:33:10 -0400 Subject: [PATCH 1/3] RYA-135 Hard code triples collection There is no need for the triples collection to be configurable, as only the mongo database name will change the rya instance. --- .../rya/mongodb/MongoDBRdfConfiguration.java | 17 +++++++++-------- .../client/mongo/MongoConnectionDetails.java | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfiguration.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfiguration.java index 44dc8513a..bdb802c9e 100644 --- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfiguration.java +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfiguration.java @@ -105,7 +105,7 @@ public MongoDBRdfConfiguration clone() { * @param useMock - {@code true} to use an embedded Mongo DB instance; {@code false} to connect to a real server. */ public void setUseMock(final boolean useMock) { - this.setBoolean(USE_MOCK_MONGO, useMock); + setBoolean(USE_MOCK_MONGO, useMock); } /** @@ -197,7 +197,7 @@ public void setMongoPassword(final String password) { * @return The name of the Rya instance to connect to. (default: rya) */ public String getRyaInstanceName() { - return get(MONGO_COLLECTION_PREFIX, "rya"); + return get(MONGO_DB_NAME, "rya"); } /** @@ -205,14 +205,14 @@ public String getRyaInstanceName() { */ public void setRyaInstanceName(final String name) { requireNonNull(name); - set(MONGO_COLLECTION_PREFIX, name); + set(MONGO_DB_NAME, name); } /** - * @return The name of the MongoDB Collection that contains Rya statements. (default: rya_triples) + * @return The name of the MongoDB Collection that contains Rya statements. (rya_triples) */ public String getTriplesCollectionName() { - return getRyaInstanceName() + "_triples"; + return "rya_triples"; } /** @@ -274,16 +274,17 @@ public boolean getUseAggregationPipeline() { * on their child subtrees. * @param value whether to use aggregation pipeline optimization. */ - public void setUseAggregationPipeline(boolean value) { + public void setUseAggregationPipeline(final boolean value) { setBoolean(USE_AGGREGATION_PIPELINE, value); } @Override public List> getOptimizers() { - List> optimizers = super.getOptimizers(); + final List> optimizers = super.getOptimizers(); if (getUseAggregationPipeline()) { - Class cl = AggregationPipelineQueryOptimizer.class; + final Class cl = AggregationPipelineQueryOptimizer.class; @SuppressWarnings("unchecked") + final Class optCl = (Class) cl; optimizers.add(optCl); } diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/mongo/MongoConnectionDetails.java b/extras/indexing/src/main/java/org/apache/rya/api/client/mongo/MongoConnectionDetails.java index 192ea2089..f4f969cfc 100644 --- a/extras/indexing/src/main/java/org/apache/rya/api/client/mongo/MongoConnectionDetails.java +++ b/extras/indexing/src/main/java/org/apache/rya/api/client/mongo/MongoConnectionDetails.java @@ -78,7 +78,7 @@ public int getPort() { * @return The username that was used to establish the connection when performing administrative operations. */ public Optional getUsername() { - return this.username; + return username; } /** @@ -103,7 +103,7 @@ public MongoDBRdfConfiguration build(final String ryaInstanceName) { conf.setMongoHostname(hostname); conf.setMongoPort("" + port); conf.setMongoDBName(ryaInstanceName); - + conf.setRyaInstanceName(ryaInstanceName); if(username.isPresent()) { conf.setMongoUser(username.get()); } From 010f40de276b2152451a42e1c830a2ad88b94860 Mon Sep 17 00:00:00 2001 From: Andrew Smith Date: Fri, 14 Sep 2018 17:06:27 -0400 Subject: [PATCH 2/3] Responded to code review removed all references to mongo collection prefix --- ...bstractMongoDBRdfConfigurationBuilder.java | 34 ++++-------- .../rya/mongodb/MongoDBRdfConfiguration.java | 9 ++-- .../MongoDBRdfConfigurationBuilder.java | 12 ++--- .../mongodb/MongoDBRdfConfigurationTest.java | 12 ++--- .../mongodb/AbstractMongoIndexer.java | 9 ++-- .../mongodb/MongoIndexingConfiguration.java | 8 ++- .../freetext/MongoFreeTextIndexer.java | 10 ++-- .../temporal/MongoTemporalIndexer.java | 5 +- .../mongo/MongoIndexingConfigurationTest.java | 44 +++++++-------- .../mongo/MongoTemporalIndexerIT.java | 4 +- .../src/main/java/InferenceExamples.java | 1 - .../src/main/java/MongoRyaDirectExample.java | 1 - .../apache/rya/indexing/export/ITBase.java | 2 - .../geoExamples/RyaMongoGeoDirectExample.java | 53 +++++++++---------- 14 files changed, 83 insertions(+), 121 deletions(-) diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/AbstractMongoDBRdfConfigurationBuilder.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/AbstractMongoDBRdfConfigurationBuilder.java index 8afcb426f..ee7cb614a 100644 --- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/AbstractMongoDBRdfConfigurationBuilder.java +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/AbstractMongoDBRdfConfigurationBuilder.java @@ -41,14 +41,12 @@ public abstract class AbstractMongoDBRdfConfigurationBuilder> getOptimizers() { if (getUseAggregationPipeline()) { final Class cl = AggregationPipelineQueryOptimizer.class; @SuppressWarnings("unchecked") - final - Class optCl = (Class) cl; + final Class optCl = (Class) cl; optimizers.add(optCl); } return optimizers; diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfigurationBuilder.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfigurationBuilder.java index cbe8f455f..36e973a7e 100644 --- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfigurationBuilder.java +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfigurationBuilder.java @@ -35,7 +35,7 @@ public class MongoDBRdfConfigurationBuilder * Creates a MongoRdfConfiguration object from a Properties file. This * method assumes that all values in the Properties file are Strings and * that the Properties file uses the keys below. - * + * *
*
    *
  • "mongo.auths" - String of Mongo authorizations. Empty auths used by @@ -59,16 +59,16 @@ public class MongoDBRdfConfigurationBuilder * by default. *
*
- * + * * @param props * - Properties file containing Mongo specific configuration * parameters * @return MongoRdfConfiguration with properties set */ - public static MongoDBRdfConfiguration fromProperties(Properties props) { + public static MongoDBRdfConfiguration fromProperties(final Properties props) { try { - MongoDBRdfConfigurationBuilder builder = new MongoDBRdfConfigurationBuilder() // + final MongoDBRdfConfigurationBuilder builder = new MongoDBRdfConfigurationBuilder() // .setAuths(props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_AUTHS, "")) // .setRyaPrefix(props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_RYA_PREFIX, "rya_"))// .setVisibilities(props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_VISIBILITIES, "")) @@ -78,8 +78,6 @@ public static MongoDBRdfConfiguration fromProperties(Properties props) { props.getProperty(AbstractMongoDBRdfConfigurationBuilder.USE_DISPLAY_QUERY_PLAN, "true")))// .setMongoUser(props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_USER)) // .setMongoPassword(props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_PASSWORD))// - .setMongoCollectionPrefix( - props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_COLLECTION_PREFIX, "rya_"))// .setMongoDBName( props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_DB_NAME, "rya_triples"))// .setMongoHost(props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_HOST, "localhost"))// @@ -89,7 +87,7 @@ public static MongoDBRdfConfiguration fromProperties(Properties props) { props.getProperty(AbstractMongoDBRdfConfigurationBuilder.USE_MOCK_MONGO, "false"))); return builder.build(); - } catch (Exception e) { + } catch (final Exception e) { throw new RuntimeException(e); } } diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRdfConfigurationTest.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRdfConfigurationTest.java index c53c9f26d..01718dc05 100644 --- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRdfConfigurationTest.java +++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRdfConfigurationTest.java @@ -33,7 +33,6 @@ public class MongoDBRdfConfigurationTest { @Test public void testBuilder() { - final String prefix = "prefix_"; final String auth = "U,V,W"; final String visibility = "U,W"; final String user = "user"; @@ -42,12 +41,12 @@ public void testBuilder() { final boolean useInference = true; final boolean displayPlan = false; - final MongoDBRdfConfiguration conf = new MongoDBRdfConfiguration().getBuilder() + new MongoDBRdfConfiguration(); + final MongoDBRdfConfiguration conf = MongoDBRdfConfiguration.getBuilder() .setVisibilities(visibility) .setUseInference(useInference) .setDisplayQueryPlan(displayPlan) .setUseMockMongo(useMock) - .setMongoCollectionPrefix(prefix) .setMongoDBName("dbname") .setMongoHost("host") .setMongoPort("1000") @@ -55,7 +54,6 @@ public void testBuilder() { .setMongoUser(user) .setMongoPassword(password).build(); - assertEquals(conf.getTablePrefix(), prefix); assertTrue(Arrays.equals(conf.getAuths(), new String[] { "U", "V", "W" })); assertEquals(conf.getCv(), visibility); assertEquals(conf.isInfer(), useInference); @@ -64,7 +62,7 @@ public void testBuilder() { assertEquals(conf.getBoolean(".useMockInstance", false), useMock); assertEquals(conf.getMongoPort(), "1000"); assertEquals(conf.getMongoDBName(), "dbname"); - assertEquals(conf.getRyaInstanceName(), "prefix_"); + assertEquals(conf.getRyaInstanceName(), "dbname"); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER), user); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER_PASSWORD), password); @@ -72,7 +70,6 @@ public void testBuilder() { @Test public void testBuilderFromProperties() throws FileNotFoundException, IOException { - final String prefix = "prefix_"; final String auth = "U"; final String visibility = "U"; final String user = "user"; @@ -86,7 +83,6 @@ public void testBuilderFromProperties() throws FileNotFoundException, IOExceptio final MongoDBRdfConfiguration conf = MongoDBRdfConfiguration.fromProperties(props); - assertEquals(conf.getTablePrefix(), prefix); assertTrue(Arrays.equals(conf.getAuths(), new String[] { auth })); assertEquals(conf.getCv(), visibility); assertEquals(conf.isInfer(), useInference); @@ -95,7 +91,7 @@ public void testBuilderFromProperties() throws FileNotFoundException, IOExceptio assertEquals(conf.getBoolean(".useMockInstance", false), useMock); assertEquals(conf.getMongoPort(), "1000"); assertEquals(conf.getMongoDBName(), "dbname"); - assertEquals(conf.getRyaInstanceName(), "prefix_"); + assertEquals(conf.getRyaInstanceName(), "dbname"); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER), user); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER_PASSWORD), password); } diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/AbstractMongoIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/AbstractMongoIndexer.java index 1c4c2fa5a..253cac7a6 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/AbstractMongoIndexer.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/AbstractMongoIndexer.java @@ -60,7 +60,6 @@ public abstract class AbstractMongoIndexer implements MongoSecondaryIndex { private static final Logger LOG = Logger.getLogger(AbstractMongoIndexer.class); - private boolean isInit = false; private boolean flushEachUpdate = true; protected StatefulMongoDBRdfConfiguration conf; protected MongoDBRyaDAO dao; @@ -73,12 +72,12 @@ public abstract class AbstractMongoIndexer mongoDbBatchWriter; + protected String collectionName; protected void initCore() { dbName = conf.getMongoDBName(); this.mongoClient = conf.getMongoClient(); db = this.mongoClient.getDB(dbName); - final String collectionName = conf.get(MongoDBRdfConfiguration.MONGO_COLLECTION_PREFIX, "rya") + getCollectionName(); collection = db.getCollection(collectionName); flushEachUpdate = ((MongoDBRdfConfiguration)conf).flushEachUpdate(); @@ -171,7 +170,7 @@ private DBObject prepareStatementForStorage(final RyaStatement ryaStatement) { try { final Statement statement = RyaToRdfConversions.convertStatement(ryaStatement); final boolean isValidPredicate = predicates.isEmpty() || predicates.contains(statement.getPredicate()); - if (isValidPredicate && (statement.getObject() instanceof Literal)) { + if (isValidPredicate && statement.getObject() instanceof Literal) { final DBObject obj = storageStrategy.serialize(ryaStatement); return obj; } @@ -221,5 +220,7 @@ public void close() throws QueryEvaluationException { /** * @return The name of the {@link DBCollection} to use with the storage strategy. */ - public abstract String getCollectionName(); + public String getCollectionName() { + return collectionName; + } } diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/MongoIndexingConfiguration.java b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/MongoIndexingConfiguration.java index ebdb914c9..3c4fc5594 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/MongoIndexingConfiguration.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/MongoIndexingConfiguration.java @@ -279,8 +279,6 @@ public static MongoIndexingConfiguration fromProperties(final Properties props) .getProperty(AbstractMongoDBRdfConfigurationBuilder.USE_DISPLAY_QUERY_PLAN, "true")))// .setMongoUser(props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_USER)) // .setMongoPassword(props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_PASSWORD))// - .setMongoCollectionPrefix(props - .getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_COLLECTION_PREFIX, "rya_"))// .setMongoDBName( props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_DB_NAME, "rya_triples"))// .setMongoHost(props.getProperty(AbstractMongoDBRdfConfigurationBuilder.MONGO_HOST, "localhost"))// @@ -312,7 +310,7 @@ public static MongoIndexingConfiguration fromProperties(final Properties props) * @return MongoIndexingConfigBuilder for chaining method invocations */ public MongoDBIndexingConfigBuilder setUseMongoFreetextIndex(final boolean useFreeText) { - this.useFreetext = useFreeText; + useFreetext = useFreeText; return this; } @@ -355,7 +353,7 @@ public MongoDBIndexingConfigBuilder setUseMongoEntityIndex(final boolean useEnti * @return MongoIndexingConfigBuilder for chaining method invocations */ public MongoDBIndexingConfigBuilder setMongoFreeTextPredicates(final String... predicates) { - this.freetextPredicates = predicates; + freetextPredicates = predicates; return this; } @@ -367,7 +365,7 @@ public MongoDBIndexingConfigBuilder setMongoFreeTextPredicates(final String... p * @return MongoIndexingConfigBuilder for chaining method invocations */ public MongoDBIndexingConfigBuilder setMongoTemporalPredicates(final String... predicates) { - this.temporalPredicates = predicates; + temporalPredicates = predicates; return this; } diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/MongoFreeTextIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/MongoFreeTextIndexer.java index 913a4fd2b..77c7d15d8 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/MongoFreeTextIndexer.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/MongoFreeTextIndexer.java @@ -33,11 +33,12 @@ import info.aduna.iteration.CloseableIteration; public class MongoFreeTextIndexer extends AbstractMongoIndexer implements FreeTextIndexer { - private static final String COLLECTION_SUFFIX = "freetext"; + private static final String COLLECTION_NAME = "freetext"; private static final Logger logger = Logger.getLogger(MongoFreeTextIndexer.class); - + @Override public void init() { + collectionName = COLLECTION_NAME; initCore(); predicates = ConfigUtils.getFreeTextPredicates(conf); if(predicates.size() == 0) { @@ -53,9 +54,4 @@ public CloseableIteration queryText( final QueryBuilder qb = QueryBuilder.start().text(query); return withConstraints(constraints, qb.get()); } - - @Override - public String getCollectionName() { - return ConfigUtils.getTablePrefix(conf) + COLLECTION_SUFFIX; - } } diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/MongoTemporalIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/MongoTemporalIndexer.java index fe8a7fa47..e0bc5d71e 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/MongoTemporalIndexer.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/MongoTemporalIndexer.java @@ -42,11 +42,12 @@ * Indexes MongoDB based on time instants or intervals. */ public class MongoTemporalIndexer extends AbstractMongoIndexer implements TemporalIndexer { - private static final String COLLECTION_SUFFIX = "temporal"; + protected final String COLLECTION_NAME = "temporal"; private static final Logger LOG = Logger.getLogger(MongoTemporalIndexer.class); @Override public void init() { + collectionName = COLLECTION_NAME; initCore(); predicates = ConfigUtils.getTemporalPredicates(conf); if(predicates.size() == 0) { @@ -143,7 +144,7 @@ public CloseableIteration queryIntervalAfte @Override public String getCollectionName() { - return ConfigUtils.getTablePrefix(conf) + COLLECTION_SUFFIX; + return ConfigUtils.getTablePrefix(conf) + COLLECTION_NAME; } @VisibleForTesting diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoIndexingConfigurationTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoIndexingConfigurationTest.java index 708219ccf..50f301c0a 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoIndexingConfigurationTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoIndexingConfigurationTest.java @@ -35,21 +35,20 @@ public class MongoIndexingConfigurationTest { @Test public void testBuilder() { - String prefix = "prefix_"; - String auth = "U,V,W"; - String visibility = "U,W"; - String user = "user"; - String password = "password"; - boolean useMock = true; - boolean useInference = true; - boolean displayPlan = false; + final String prefix = "prefix_"; + final String auth = "U,V,W"; + final String visibility = "U,W"; + final String user = "user"; + final String password = "password"; + final boolean useMock = true; + final boolean useInference = true; + final boolean displayPlan = false; - MongoIndexingConfiguration conf = MongoIndexingConfiguration.builder() + final MongoIndexingConfiguration conf = MongoIndexingConfiguration.builder() .setVisibilities(visibility) .setUseInference(useInference) .setDisplayQueryPlan(displayPlan) .setUseMockMongo(useMock) - .setMongoCollectionPrefix(prefix) .setMongoDBName("dbname") .setMongoHost("host") .setMongoPort("1000") @@ -63,7 +62,6 @@ public void testBuilder() { .setMongoTemporalPredicates("http://pred3", "http://pred4") .build(); - assertEquals(conf.getTablePrefix(), prefix); assertTrue(Arrays.equals(conf.getAuths(), new String[] { "U", "V", "W" })); assertEquals(conf.getCv(), visibility); assertEquals(conf.isInfer(), useInference); @@ -72,7 +70,7 @@ public void testBuilder() { assertEquals(conf.getBoolean(".useMockInstance", false), useMock); assertEquals(conf.getMongoPort(), "1000"); assertEquals(conf.getMongoDBName(), "dbname"); - assertEquals(conf.getRyaInstanceName(), "prefix_"); + assertEquals(conf.getRyaInstanceName(), "dbname"); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER), user); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER_PASSWORD), password); assertTrue( @@ -84,21 +82,19 @@ public void testBuilder() { @Test public void testBuilderFromProperties() throws FileNotFoundException, IOException { - String prefix = "prefix_"; - String auth = "U"; - String visibility = "U"; - String user = "user"; - String password = "password"; - boolean useMock = true; - boolean useInference = true; - boolean displayPlan = false; + final String auth = "U"; + final String visibility = "U"; + final String user = "user"; + final String password = "password"; + final boolean useMock = true; + final boolean useInference = true; + final boolean displayPlan = false; - Properties props = new Properties(); + final Properties props = new Properties(); props.load(new FileInputStream("src/test/resources/mongo_rya_indexing.properties")); - MongoIndexingConfiguration conf = MongoIndexingConfiguration.fromProperties(props); + final MongoIndexingConfiguration conf = MongoIndexingConfiguration.fromProperties(props); - assertEquals(conf.getTablePrefix(), prefix); assertTrue(Arrays.equals(conf.getAuths(), new String[] { auth })); assertEquals(conf.getCv(), visibility); assertEquals(conf.isInfer(), useInference); @@ -107,7 +103,7 @@ public void testBuilderFromProperties() throws FileNotFoundException, IOExceptio assertEquals(conf.getBoolean(".useMockInstance", false), useMock); assertEquals(conf.getMongoPort(), "1000"); assertEquals(conf.getMongoDBName(), "dbname"); - assertEquals(conf.getRyaInstanceName(), "prefix_"); + assertEquals(conf.getRyaInstanceName(), "dbname"); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER), user); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER_PASSWORD), password); assertTrue( diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerIT.java index e92bcbb06..81e268a7f 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerIT.java @@ -234,7 +234,7 @@ public void testDelete() throws IOException, MongoException, TableNotFoundExcept final String dbName = conf.getMongoDBName(); final DB db = super.getMongoClient().getDB(dbName); - DBCollection collection = db.getCollection(conf.get(MongoDBRdfConfiguration.MONGO_COLLECTION_PREFIX, "rya") + tIndexer.getCollectionName()); + final DBCollection collection = db.getCollection(tIndexer.getCollectionName()); printTables(tIndexer, "junit testing: Temporal entities stored in testDelete before delete"); assertEquals("Number of rows stored.", 2, collection.count()); // 4 index entries per statement @@ -709,7 +709,7 @@ else if (s.getPredicate().equals(pred2_eventTime)) { * @return Count of entries in the index table. * @throws IOException */ - public void printTables(MongoTemporalIndexer tIndexer, final String description) throws IOException { + public void printTables(final MongoTemporalIndexer tIndexer, final String description) throws IOException { System.out.println("-- start printTables() -- " + description); System.out.println("Reading : " + tIndexer.getCollection().getFullName()); final DBCursor cursor = tIndexer.getCollection().find(); diff --git a/extras/indexingExample/src/main/java/InferenceExamples.java b/extras/indexingExample/src/main/java/InferenceExamples.java index 83c3bc0a5..cf213088d 100644 --- a/extras/indexingExample/src/main/java/InferenceExamples.java +++ b/extras/indexingExample/src/main/java/InferenceExamples.java @@ -162,7 +162,6 @@ private static Configuration getConf() throws IOException { } return builder.setMongoDBName(MONGO_DB) - .setMongoCollectionPrefix(MONGO_COLL_PREFIX) .setUseMongoFreetextIndex(true) .setMongoFreeTextPredicates(RDFS.LABEL.stringValue()).build(); diff --git a/extras/indexingExample/src/main/java/MongoRyaDirectExample.java b/extras/indexingExample/src/main/java/MongoRyaDirectExample.java index 174460694..508bd8e53 100644 --- a/extras/indexingExample/src/main/java/MongoRyaDirectExample.java +++ b/extras/indexingExample/src/main/java/MongoRyaDirectExample.java @@ -322,7 +322,6 @@ private static Configuration getConf() throws IOException { } return builder.setMongoDBName(MONGO_DB) - .setMongoCollectionPrefix(MONGO_COLL_PREFIX) .setUseMongoFreetextIndex(true) .setMongoFreeTextPredicates(RDFS.LABEL.stringValue()).build(); diff --git a/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java b/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java index 60fff56a3..491ed26ac 100644 --- a/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java +++ b/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java @@ -260,8 +260,6 @@ protected static MongoDBRdfConfiguration getConf(final String ryaInstanceName, conf.set(ConfigUtils.CLOUDBASE_PASSWORD, PASSWORD); conf.set(MongoDBRdfConfiguration.MONGO_DB_NAME, "test"); - conf.set(MongoDBRdfConfiguration.MONGO_COLLECTION_PREFIX, "rya_"); - conf.set(RdfCloudTripleStoreConfiguration.CONF_TBL_PREFIX, "rya_"); conf.setMongoPort(""+port); diff --git a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geoExamples/RyaMongoGeoDirectExample.java b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geoExamples/RyaMongoGeoDirectExample.java index 04488bba9..6a8f8e36c 100644 --- a/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geoExamples/RyaMongoGeoDirectExample.java +++ b/extras/rya.geoindexing/geo.mongo/src/main/java/org/apache/rya/indexing/geoExamples/RyaMongoGeoDirectExample.java @@ -7,9 +7,9 @@ * 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 @@ -61,21 +61,21 @@ public class RyaMongoGeoDirectExample { private static final String MONGO_INSTANCE_URL = "localhost"; private static final String MONGO_INSTANCE_PORT = "27017"; - public static void main(String[] args) throws Exception { - Configuration conf = getConf(); + public static void main(final String[] args) throws Exception { + final Configuration conf = getConf(); conf.setBoolean(ConfigUtils.DISPLAY_QUERY_PLAN, PRINT_QUERIES); conf.setBoolean(OptionalConfigUtils.USE_GEO, true); // Note also the use of "GeoRyaSailFactory" below. conf.setStrings(OptionalConfigUtils.GEO_PREDICATES_LIST, "http://www.opengis.net/ont/geosparql#asWKT"); // Note also the use of "GeoRyaSailFactory" below. - + SailRepository repository = null; SailRepositoryConnection conn = null; try { log.info("Connecting to Indexing Sail Repository."); - Sail sail = GeoRyaSailFactory.getInstance(conf); + final Sail sail = GeoRyaSailFactory.getInstance(conf); repository = new SailRepository(sail); conn = repository.getConnection(); - long start = System.currentTimeMillis(); + final long start = System.currentTimeMillis(); testAddPointAndWithinSearch(conn); // uses geospatial features log.info("TIME: " + (System.currentTimeMillis() - start) / 1000.); @@ -92,9 +92,9 @@ public static void main(String[] args) throws Exception { * Try out some geospatial data and queries * @param repository */ - private static void testAddPointAndWithinSearch(SailRepositoryConnection conn) throws Exception { + private static void testAddPointAndWithinSearch(final SailRepositoryConnection conn) throws Exception { - String update = "PREFIX geo: "// + final String update = "PREFIX geo: "// + "INSERT DATA { " // + " a geo:Feature ; " // + " geo:hasGeometry [ " // @@ -103,7 +103,7 @@ private static void testAddPointAndWithinSearch(SailRepositoryConnection conn) t + " ] . " // + "}"; - Update u = conn.prepareUpdate(QueryLanguage.SPARQL, update); + final Update u = conn.prepareUpdate(QueryLanguage.SPARQL, update); u.execute(); String queryString; @@ -147,21 +147,21 @@ private static void testAddPointAndWithinSearch(SailRepositoryConnection conn) t Validate.isTrue(tupleHandler.getCount() == 0); } - private static void closeQuietly(SailRepository repository) { + private static void closeQuietly(final SailRepository repository) { if (repository != null) { try { repository.shutDown(); - } catch (RepositoryException e) { + } catch (final RepositoryException e) { // quietly absorb this exception } } } - private static void closeQuietly(SailRepositoryConnection conn) { + private static void closeQuietly(final SailRepositoryConnection conn) { if (conn != null) { try { conn.close(); - } catch (RepositoryException e) { + } catch (final RepositoryException e) { // quietly absorb this exception } } @@ -175,10 +175,10 @@ private static Configuration getConf() throws IOException { if (USE_MOCK) { mock = EmbeddedMongoFactory.newFactory(); - MongoClient c = mock.newMongoClient(); - ServerAddress address = c.getAddress(); - String url = address.getHost(); - String port = Integer.toString(address.getPort()); + final MongoClient c = mock.newMongoClient(); + final ServerAddress address = c.getAddress(); + final String url = address.getHost(); + final String port = Integer.toString(address.getPort()); c.close(); builder.setMongoHost(url).setMongoPort(port); } else { @@ -188,12 +188,11 @@ private static Configuration getConf() throws IOException { .setMongoHost(MONGO_INSTANCE_URL) .setMongoPort(MONGO_INSTANCE_PORT); } - + return builder.setMongoDBName(MONGO_DB) - .setMongoCollectionPrefix(MONGO_COLL_PREFIX) .setUseMongoFreetextIndex(true) .setMongoFreeTextPredicates(RDFS.LABEL.stringValue()).build(); - + } @@ -205,11 +204,11 @@ public int getCount() { } @Override - public void startQueryResult(List arg0) throws TupleQueryResultHandlerException { + public void startQueryResult(final List arg0) throws TupleQueryResultHandlerException { } @Override - public void handleSolution(BindingSet arg0) throws TupleQueryResultHandlerException { + public void handleSolution(final BindingSet arg0) throws TupleQueryResultHandlerException { count++; System.out.println(arg0); } @@ -219,15 +218,15 @@ public void endQueryResult() throws TupleQueryResultHandlerException { } @Override - public void handleBoolean(boolean arg0) throws QueryResultHandlerException { + public void handleBoolean(final boolean arg0) throws QueryResultHandlerException { // TODO Auto-generated method stub - + } @Override - public void handleLinks(List arg0) throws QueryResultHandlerException { + public void handleLinks(final List arg0) throws QueryResultHandlerException { // TODO Auto-generated method stub - + } } } From 3593c535ddf387d656cde87e793be7bb8980289e Mon Sep 17 00:00:00 2001 From: Andrew Smith Date: Fri, 14 Sep 2018 18:19:56 -0400 Subject: [PATCH 3/3] More code review --- ...bstractMongoDBRdfConfigurationBuilder.java | 1 - .../rya/mongodb/MongoDBQueryEngine.java | 8 +++---- .../rya/mongodb/MongoDBRdfConfiguration.java | 21 +++------------- .../org/apache/rya/mongodb/MongoDBRyaDAO.java | 6 ++--- .../SparqlToPipelineTransformVisitor.java | 2 +- .../mongodb/MongoDBRdfConfigurationTest.java | 2 -- .../apache/rya/mongodb/MongoDBRyaDAO2IT.java | 10 ++++---- .../apache/rya/mongodb/MongoDBRyaDAOIT.java | 12 +++++----- .../org/apache/rya/mongodb/MongoITBase.java | 5 ++-- .../client/mongo/MongoConnectionDetails.java | 1 - .../mongodb/AbstractMongoIndexer.java | 12 +++------- .../freetext/MongoFreeTextIndexer.java | 6 ++++- .../temporal/MongoTemporalIndexer.java | 3 +-- .../rya/sail/config/RyaSailFactory.java | 4 ++-- .../rya/api/client/mongo/MongoInstallIT.java | 8 +++---- .../mongo/MongoIndexingConfigurationTest.java | 2 -- .../mongo/MongoPcjIntegrationTest.java | 24 +++++++++---------- .../mongo/MongoTemporalIndexerIT.java | 2 +- ...tementMetadataExternalSetProviderTest.java | 2 +- .../StatementMetadataOptimizerTest.java | 2 +- .../client/conf/MergeConfigHadoopAdapter.java | 2 +- .../apache/rya/indexing/export/ITBase.java | 6 +---- .../strategy/MongoPipelineStrategy.java | 2 +- .../rya/indexing/GeoRyaSailFactory.java | 4 ++-- .../indexing/mongo/MongoIndexerDeleteIT.java | 16 ++++++------- 25 files changed, 67 insertions(+), 96 deletions(-) diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/AbstractMongoDBRdfConfigurationBuilder.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/AbstractMongoDBRdfConfigurationBuilder.java index ee7cb614a..02032b0e7 100644 --- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/AbstractMongoDBRdfConfigurationBuilder.java +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/AbstractMongoDBRdfConfigurationBuilder.java @@ -166,7 +166,6 @@ private C getConf(final C conf) { if (pass != null) { conf.setMongoPassword(pass); } - conf.setMongoDBName(mongoDBName); conf.setRyaInstanceName(mongoDBName); conf.setMongoHostname(host); conf.setMongoPort(port); diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBQueryEngine.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBQueryEngine.java index 9ddb15a79..a526437e5 100644 --- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBQueryEngine.java +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBQueryEngine.java @@ -78,8 +78,8 @@ public CloseableIteration query( checkNotNull(stmt); checkNotNull(conf); - Entry entry = new AbstractMap.SimpleEntry<>(stmt, new MapBindingSet()); - Collection> collection = Collections.singleton(entry); + final Entry entry = new AbstractMap.SimpleEntry<>(stmt, new MapBindingSet()); + final Collection> collection = Collections.singleton(entry); return new RyaStatementCursorIterator(queryWithBindingSet(collection, conf)); } @@ -143,12 +143,12 @@ public CloseableIterable query(final BatchRyaQuery batchRyaQuery) queries.put(stmt, new MapBindingSet()); } - Iterator iterator = new RyaStatementCursorIterator(queryWithBindingSet(queries.entrySet(), getConf())); + final Iterator iterator = new RyaStatementCursorIterator(queryWithBindingSet(queries.entrySet(), getConf())); return CloseableIterables.wrap((Iterable) () -> iterator); } private MongoCollection getCollection(final StatefulMongoDBRdfConfiguration conf) { - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.getMongoDBName()); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.getRyaInstanceName()); return db.getCollection(conf.getTriplesCollectionName()); } diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfiguration.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfiguration.java index 2c7a40fa7..ae7467bd4 100644 --- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfiguration.java +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRdfConfiguration.java @@ -42,7 +42,7 @@ public class MongoDBRdfConfiguration extends RdfCloudTripleStoreConfiguration { public static final String MONGO_PORT = "mongo.db.port"; // MongoDB Database values. - public static final String MONGO_DB_NAME = "mongo.db.name"; + public static final String RYA_INSTANCE_NAME = "mongo.db.name"; public static final String MONGO_USER = "mongo.db.user"; public static final String MONGO_USER_PASSWORD = "mongo.db.userpassword"; @@ -146,21 +146,6 @@ public void setMongoPort(final String port) { set(MONGO_PORT, port); } - /** - * @return The name of the MongoDB Database to connect to. (default: rya) - */ - public String getMongoDBName() { - return get(MONGO_DB_NAME, "rya"); - } - - /** - * @param database - The name of the MongoDb Database to connect to. - */ - public void setMongoDBName(final String database) { - requireNonNull(database); - set(MONGO_DB_NAME, database); - } - /** * @param user - The user used to connect to the MongoDB Database that hosts the Rya Instance. (not null) */ @@ -195,7 +180,7 @@ public void setMongoPassword(final String password) { * @return The name of the Rya instance to connect to. (default: rya) */ public String getRyaInstanceName() { - return get(MONGO_DB_NAME, "rya"); + return get(RYA_INSTANCE_NAME, "rya"); } /** @@ -203,7 +188,7 @@ public String getRyaInstanceName() { */ public void setRyaInstanceName(final String name) { requireNonNull(name); - set(MONGO_DB_NAME, name); + set(RYA_INSTANCE_NAME, name); } /** diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRyaDAO.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRyaDAO.java index d01c2d755..b18079f01 100644 --- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRyaDAO.java +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/MongoDBRyaDAO.java @@ -82,8 +82,8 @@ public synchronized void setConf(final StatefulMongoDBRdfConfiguration conf) { auths = conf.getAuthorizations(); flushEachUpdate.set(conf.flushEachUpdate()); } - - + + public void setDB(final DB db) { this.db = db; } @@ -107,7 +107,7 @@ public void init() throws RyaDAOException { index.setConf(conf); } - db = mongoClient.getDB(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + db = mongoClient.getDB(conf.getRyaInstanceName()); coll = db.getCollection(conf.getTriplesCollectionName()); nameSpaceManager = new SimpleMongoDBNamespaceManager(db.getCollection(conf.getNameSpacesCollectionName())); queryEngine = new MongoDBQueryEngine(); diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/SparqlToPipelineTransformVisitor.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/SparqlToPipelineTransformVisitor.java index b7f5a67b8..91fd61d99 100644 --- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/SparqlToPipelineTransformVisitor.java +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/aggregation/SparqlToPipelineTransformVisitor.java @@ -91,7 +91,7 @@ public SparqlToPipelineTransformVisitor(MongoCollection inputCollectio public SparqlToPipelineTransformVisitor(StatefulMongoDBRdfConfiguration conf) { Preconditions.checkNotNull(conf); MongoClient mongo = conf.getMongoClient(); - MongoDatabase db = mongo.getDatabase(conf.getMongoDBName()); + MongoDatabase db = mongo.getDatabase(conf.getRyaInstanceName()); this.inputCollection = db.getCollection(conf.getTriplesCollectionName()); } diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRdfConfigurationTest.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRdfConfigurationTest.java index 01718dc05..e782ca47a 100644 --- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRdfConfigurationTest.java +++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRdfConfigurationTest.java @@ -61,7 +61,6 @@ public void testBuilder() { assertEquals(conf.getMongoHostname(), "host"); assertEquals(conf.getBoolean(".useMockInstance", false), useMock); assertEquals(conf.getMongoPort(), "1000"); - assertEquals(conf.getMongoDBName(), "dbname"); assertEquals(conf.getRyaInstanceName(), "dbname"); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER), user); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER_PASSWORD), password); @@ -90,7 +89,6 @@ public void testBuilderFromProperties() throws FileNotFoundException, IOExceptio assertEquals(conf.getMongoHostname(), "host"); assertEquals(conf.getBoolean(".useMockInstance", false), useMock); assertEquals(conf.getMongoPort(), "1000"); - assertEquals(conf.getMongoDBName(), "dbname"); assertEquals(conf.getRyaInstanceName(), "dbname"); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER), user); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER_PASSWORD), password); diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAO2IT.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAO2IT.java index 67002d79f..0d6922dcd 100644 --- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAO2IT.java +++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoDBRyaDAO2IT.java @@ -70,7 +70,7 @@ public void testAdd() throws RyaDAOException, MongoException, IOException { builder.setSubject(new RyaURI("http://subject.com")); builder.setObject(new RyaURI("http://object.com")); - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME)); final MongoCollection coll = db.getCollection(conf.getTriplesCollectionName()); dao.add(builder.build()); @@ -94,7 +94,7 @@ public void testDelete() throws RyaDAOException, MongoException, IOException { builder.setObject(new RyaURI("http://object.com")); final RyaStatement statement = builder.build(); - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME)); final MongoCollection coll = db.getCollection(conf.getTriplesCollectionName()); dao.add(statement); @@ -121,7 +121,7 @@ public void testDeleteWildcardSubjectWithContext() throws RyaDAOException, Mongo builder.setContext(new RyaURI("http://context.com")); final RyaStatement statement = builder.build(); - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME)); final MongoCollection coll = db.getCollection(conf.getTriplesCollectionName()); dao.add(statement); @@ -153,7 +153,7 @@ public void testReconstructDao() throws RyaDAOException, IOException { builder.setObject(new RyaURI("http://object.com")); builder.setColumnVisibility(new DocumentVisibility("B").flatten()); - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME)); final MongoCollection coll = db.getCollection(conf.getTriplesCollectionName()); dao.add(builder.build()); @@ -186,7 +186,7 @@ public void testReconstructDao() throws RyaDAOException, IOException { builder.setObject(new RyaURI("http://object.com")); builder.setColumnVisibility(new DocumentVisibility("B").flatten()); - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME)); final MongoCollection coll = db.getCollection(conf.getTriplesCollectionName()); dao.add(builder.build()); 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 c5ff223cc..13b88f82b 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 @@ -78,7 +78,7 @@ public void testAdd() throws RyaDAOException, MongoException, IOException { builder.setObject(new RyaURI("http://object.com")); builder.setColumnVisibility(new DocumentVisibility("B").flatten()); - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME)); final MongoCollection coll = db.getCollection(conf.getTriplesCollectionName()); dao.add(builder.build()); @@ -106,7 +106,7 @@ public void testDelete() throws RyaDAOException, MongoException, IOException { builder.setObject(new RyaURI("http://object.com")); builder.setColumnVisibility(new DocumentVisibility("C").flatten()); final RyaStatement statement = builder.build(); - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME)); final MongoCollection coll = db.getCollection(conf.getTriplesCollectionName()); dao.add(statement); @@ -134,7 +134,7 @@ public void testDeleteWildcardSubjectWithContext() throws RyaDAOException, Mongo builder.setColumnVisibility(new DocumentVisibility("A&B&C").flatten()); final RyaStatement statement = builder.build(); - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME)); final MongoCollection coll = db.getCollection(conf.getTriplesCollectionName()); dao.add(statement); @@ -166,7 +166,7 @@ public void testReconstructDao() throws RyaDAOException, IOException { builder.setObject(new RyaURI("http://object.com")); builder.setColumnVisibility(new DocumentVisibility("B").flatten()); - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME)); final MongoCollection coll = db.getCollection(conf.getTriplesCollectionName()); dao.add(builder.build()); @@ -199,7 +199,7 @@ public void testReconstructDao() throws RyaDAOException, IOException { builder.setObject(new RyaURI("http://object.com")); builder.setColumnVisibility(new DocumentVisibility("B").flatten()); - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME)); final MongoCollection coll = db.getCollection(conf.getTriplesCollectionName()); dao.add(builder.build()); @@ -593,7 +593,7 @@ private boolean testVisibilityStatement( final MongoDBRyaDAO dao, final String documentVisibility, final Authorizations userAuthorizations) throws RyaDAOException { - final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.MONGO_DB_NAME)); + final MongoDatabase db = conf.getMongoClient().getDatabase(conf.get(MongoDBRdfConfiguration.RYA_INSTANCE_NAME)); final MongoCollection coll = db.getCollection(conf.getTriplesCollectionName()); final RyaStatement statement = buildVisibilityTestRyaStatement(documentVisibility); diff --git a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoITBase.java b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoITBase.java index bd3870f55..1f4b62893 100644 --- a/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoITBase.java +++ b/dao/mongodb.rya/src/test/java/org/apache/rya/mongodb/MongoITBase.java @@ -43,7 +43,6 @@ public void setupTest() throws Exception { final MongoDBRdfConfiguration conf = new MongoDBRdfConfiguration( new Configuration() ); conf.setBoolean("sc.useMongo", true); conf.setTablePrefix("test_"); - conf.setMongoDBName(conf.getRyaInstanceName()); conf.setMongoHostname(EmbeddedMongoSingleton.getMongodConfig().net().getServerAddress().getHostAddress()); conf.setMongoPort(Integer.toString(EmbeddedMongoSingleton.getMongodConfig().net().getPort())); @@ -82,13 +81,13 @@ public MongoClient getMongoClient() { * @return The Rya triples {@link MongoCollection}. */ public MongoCollection getRyaCollection() { - return mongoClient.getDatabase(conf.getMongoDBName()).getCollection(conf.getTriplesCollectionName()); + return mongoClient.getDatabase(conf.getRyaInstanceName()).getCollection(conf.getTriplesCollectionName()); } /** * @return The Rya triples {@link DBCollection}. */ public DBCollection getRyaDbCollection() { - return mongoClient.getDB(conf.getMongoDBName()).getCollection(conf.getTriplesCollectionName()); + return mongoClient.getDB(conf.getRyaInstanceName()).getCollection(conf.getTriplesCollectionName()); } } \ No newline at end of file diff --git a/extras/indexing/src/main/java/org/apache/rya/api/client/mongo/MongoConnectionDetails.java b/extras/indexing/src/main/java/org/apache/rya/api/client/mongo/MongoConnectionDetails.java index f4f969cfc..2a7bb9103 100644 --- a/extras/indexing/src/main/java/org/apache/rya/api/client/mongo/MongoConnectionDetails.java +++ b/extras/indexing/src/main/java/org/apache/rya/api/client/mongo/MongoConnectionDetails.java @@ -102,7 +102,6 @@ public MongoDBRdfConfiguration build(final String ryaInstanceName) { conf.setBoolean(ConfigUtils.USE_MONGO, true); conf.setMongoHostname(hostname); conf.setMongoPort("" + port); - conf.setMongoDBName(ryaInstanceName); conf.setRyaInstanceName(ryaInstanceName); if(username.isPresent()) { conf.setMongoUser(username.get()); diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/AbstractMongoIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/AbstractMongoIndexer.java index 253cac7a6..bd14e7411 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/AbstractMongoIndexer.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/AbstractMongoIndexer.java @@ -72,13 +72,12 @@ public abstract class AbstractMongoIndexer mongoDbBatchWriter; - protected String collectionName; protected void initCore() { - dbName = conf.getMongoDBName(); + dbName = conf.getRyaInstanceName(); this.mongoClient = conf.getMongoClient(); db = this.mongoClient.getDB(dbName); - collection = db.getCollection(collectionName); + collection = db.getCollection(getCollectionName()); flushEachUpdate = ((MongoDBRdfConfiguration)conf).flushEachUpdate(); @@ -217,10 +216,5 @@ public void close() throws QueryEvaluationException { }; } - /** - * @return The name of the {@link DBCollection} to use with the storage strategy. - */ - public String getCollectionName() { - return collectionName; - } + public abstract String getCollectionName(); } diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/MongoFreeTextIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/MongoFreeTextIndexer.java index 77c7d15d8..f36c2652b 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/MongoFreeTextIndexer.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/MongoFreeTextIndexer.java @@ -38,7 +38,6 @@ public class MongoFreeTextIndexer extends AbstractMongoIndexer queryText( final QueryBuilder qb = QueryBuilder.start().text(query); return withConstraints(constraints, qb.get()); } + + @Override + public String getCollectionName() { + return COLLECTION_NAME; + } } diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/MongoTemporalIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/MongoTemporalIndexer.java index e0bc5d71e..1c2e75d9d 100644 --- a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/MongoTemporalIndexer.java +++ b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/MongoTemporalIndexer.java @@ -47,7 +47,6 @@ public class MongoTemporalIndexer extends AbstractMongoIndexer queryIntervalAfte @Override public String getCollectionName() { - return ConfigUtils.getTablePrefix(conf) + COLLECTION_NAME; + return COLLECTION_NAME; } @VisibleForTesting diff --git a/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaSailFactory.java b/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaSailFactory.java index 56af9b4bc..2660b3f15 100644 --- a/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaSailFactory.java +++ b/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaSailFactory.java @@ -129,7 +129,7 @@ private static MongoClient createMongoClient(final MongoDBRdfConfiguration mongo requireNonNull(mongoConf); requireNonNull(mongoConf.getMongoHostname()); requireNonNull(mongoConf.getMongoPort()); - requireNonNull(mongoConf.getMongoDBName()); + requireNonNull(mongoConf.getRyaInstanceName()); // Connect to a running MongoDB server. final int port; @@ -143,7 +143,7 @@ private static MongoClient createMongoClient(final MongoDBRdfConfiguration mongo // Connect to a specific MongoDB Database if that information is provided. final String username = mongoConf.getMongoUser(); - final String database = mongoConf.getMongoDBName(); + final String database = mongoConf.getRyaInstanceName(); final String password = mongoConf.getMongoPassword(); if(username != null && password != null) { final MongoCredential cred = MongoCredential.createCredential(username, database, password.toCharArray()); diff --git a/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoInstallIT.java b/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoInstallIT.java index ecca6467f..f0a11db4f 100644 --- a/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoInstallIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/api/client/mongo/MongoInstallIT.java @@ -44,7 +44,7 @@ public class MongoInstallIT extends MongoITBase { @Test public void install() throws DuplicateInstanceNameException, RyaClientException { // Install an instance of Rya. - final String ryaInstance = conf.getMongoDBName(); + final String ryaInstance = conf.getRyaInstanceName(); // Setup the connection details that were used for the embedded Mongo DB instance we are testing with. final MongoConnectionDetails connectionDetails = getConnectionDetails(); @@ -71,7 +71,7 @@ public void install() throws DuplicateInstanceNameException, RyaClientException final List expected = Arrays.asList(INSTANCE_DETAILS_COLLECTION_NAME, "rya_triples"); int count = 0; final List found = new ArrayList<>(); - for (final String collection : getMongoClient().getDatabase(conf.getMongoDBName()).listCollectionNames()) { + for (final String collection : getMongoClient().getDatabase(conf.getRyaInstanceName()).listCollectionNames()) { count += expected.contains(collection) ? 1 : 0; found.add( collection ); } @@ -82,7 +82,7 @@ public void install() throws DuplicateInstanceNameException, RyaClientException @Test public void install_withAllIndexers() throws DuplicateInstanceNameException, RyaClientException { // Install an instance of Rya. - final String ryaInstance = conf.getMongoDBName(); + final String ryaInstance = conf.getRyaInstanceName(); // Setup the connection details that were used for the embedded Mongo DB instance we are testing with. final MongoConnectionDetails connectionDetails = getConnectionDetails(); @@ -112,7 +112,7 @@ public void install_withAllIndexers() throws DuplicateInstanceNameException, Rya final List expected = Arrays.asList(INSTANCE_DETAILS_COLLECTION_NAME, "rya_triples"); int count = 0; final List found = new ArrayList<>(); - for (final String collection : getMongoClient().getDatabase(conf.getMongoDBName()).listCollectionNames()) { + for (final String collection : getMongoClient().getDatabase(conf.getRyaInstanceName()).listCollectionNames()) { count += expected.contains(collection) ? 1 : 0; found.add( collection ); } diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoIndexingConfigurationTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoIndexingConfigurationTest.java index 50f301c0a..90460b132 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoIndexingConfigurationTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoIndexingConfigurationTest.java @@ -69,7 +69,6 @@ public void testBuilder() { assertEquals(conf.getMongoHostname(), "host"); assertEquals(conf.getBoolean(".useMockInstance", false), useMock); assertEquals(conf.getMongoPort(), "1000"); - assertEquals(conf.getMongoDBName(), "dbname"); assertEquals(conf.getRyaInstanceName(), "dbname"); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER), user); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER_PASSWORD), password); @@ -102,7 +101,6 @@ public void testBuilderFromProperties() throws FileNotFoundException, IOExceptio assertEquals(conf.getMongoHostname(), "host"); assertEquals(conf.getBoolean(".useMockInstance", false), useMock); assertEquals(conf.getMongoPort(), "1000"); - assertEquals(conf.getMongoDBName(), "dbname"); assertEquals(conf.getRyaInstanceName(), "dbname"); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER), user); assertEquals(conf.get(MongoDBRdfConfiguration.MONGO_USER_PASSWORD), password); diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoPcjIntegrationTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoPcjIntegrationTest.java index af81cf6dc..d00175783 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoPcjIntegrationTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoPcjIntegrationTest.java @@ -100,7 +100,7 @@ public void testEvaluateSingleIndex() throws Exception { + " ?e ?l "// + "}";// - PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getMongoDBName() + 1, conf.getRyaInstanceName(), indexSparqlString); + PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getRyaInstanceName() + 1, conf.getRyaInstanceName(), indexSparqlString); final String queryString = ""// + "SELECT ?e ?c ?l ?o " // @@ -153,7 +153,7 @@ public void testEvaluateOneIndex() throws Exception { final CountingResultHandler crh1 = new CountingResultHandler(); final CountingResultHandler crh2 = new CountingResultHandler(); - PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getMongoDBName() + 1, conf.getRyaInstanceName(), indexSparqlString); + PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getRyaInstanceName() + 1, conf.getRyaInstanceName(), indexSparqlString); conn.prepareTupleQuery(QueryLanguage.SPARQL, indexSparqlString).evaluate(crh1); PcjIntegrationTestingUtil.deleteCoreRyaTables(getMongoClient(), conf.getRyaInstanceName(), conf.getTriplesCollectionName()); @@ -211,11 +211,11 @@ public void testEvaluateTwoIndexValidate() throws Exception { + " ?c a ?f . " // + "}";// - PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getMongoDBName() + 1, conf.getRyaInstanceName(), indexSparqlString); - final MongoPcjQueryNode ais1 = new MongoPcjQueryNode(conf, conf.getMongoDBName() + 1); + PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getRyaInstanceName() + 1, conf.getRyaInstanceName(), indexSparqlString); + final MongoPcjQueryNode ais1 = new MongoPcjQueryNode(conf, conf.getRyaInstanceName() + 1); - PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getMongoDBName() + 2, conf.getRyaInstanceName(), indexSparqlString2); - final MongoPcjQueryNode ais2 = new MongoPcjQueryNode(conf, conf.getMongoDBName() + 2); + PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getRyaInstanceName() + 2, conf.getRyaInstanceName(), indexSparqlString2); + final MongoPcjQueryNode ais2 = new MongoPcjQueryNode(conf, conf.getRyaInstanceName() + 2); final List index = new ArrayList<>(); index.add(ais1); @@ -300,14 +300,14 @@ public void testEvaluateThreeIndexValidate() throws Exception { + " ?f ?o. "// + "}";// - PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getMongoDBName() + 1, conf.getRyaInstanceName(), indexSparqlString); - final MongoPcjQueryNode ais1 = new MongoPcjQueryNode(conf, conf.getMongoDBName() + 1); + PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getRyaInstanceName() + 1, conf.getRyaInstanceName(), indexSparqlString); + final MongoPcjQueryNode ais1 = new MongoPcjQueryNode(conf, conf.getRyaInstanceName() + 1); - PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getMongoDBName() + 2, conf.getRyaInstanceName(), indexSparqlString2); - final MongoPcjQueryNode ais2 = new MongoPcjQueryNode(conf, conf.getMongoDBName() + 2); + PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getRyaInstanceName() + 2, conf.getRyaInstanceName(), indexSparqlString2); + final MongoPcjQueryNode ais2 = new MongoPcjQueryNode(conf, conf.getRyaInstanceName() + 2); - PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getMongoDBName() + 3, conf.getRyaInstanceName(), indexSparqlString3); - final MongoPcjQueryNode ais3 = new MongoPcjQueryNode(conf, conf.getMongoDBName() + 3); + PcjIntegrationTestingUtil.createAndPopulatePcj(conn, getMongoClient(), conf.getRyaInstanceName() + 3, conf.getRyaInstanceName(), indexSparqlString3); + final MongoPcjQueryNode ais3 = new MongoPcjQueryNode(conf, conf.getRyaInstanceName() + 3); final List index = new ArrayList<>(); index.add(ais1); diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerIT.java index 81e268a7f..d84a7062d 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoTemporalIndexerIT.java @@ -232,7 +232,7 @@ public void testDelete() throws IOException, MongoException, TableNotFoundExcept tIndexer.storeStatement(convertStatement(s1)); tIndexer.storeStatement(convertStatement(s2)); - final String dbName = conf.getMongoDBName(); + final String dbName = conf.getRyaInstanceName(); final DB db = super.getMongoClient().getDB(dbName); final DBCollection collection = db.getCollection(tIndexer.getCollectionName()); diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataExternalSetProviderTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataExternalSetProviderTest.java index f3d0c1e91..8f9fd99ff 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataExternalSetProviderTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataExternalSetProviderTest.java @@ -149,7 +149,7 @@ private static Configuration getConf(boolean useMongo) { conf.setBoolean("sc.useMongo", true); conf.setMongoHostname("localhost"); conf.setMongoPort("27017"); - conf.setMongoDBName("rya_"); + conf.setRyaInstanceName("rya_"); return conf; } else { diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataOptimizerTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataOptimizerTest.java index 4a65d99bc..a109f05f5 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataOptimizerTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataOptimizerTest.java @@ -134,7 +134,7 @@ private static RdfCloudTripleStoreConfiguration getConf(boolean useMongo) { mConf.setBoolean("sc.useMongo", true); mConf.setMongoHostname("localhost"); mConf.setMongoPort("27017"); - mConf.setMongoDBName("rya_"); + mConf.setRyaInstanceName("rya_"); conf = mConf; } else { conf = new AccumuloRdfConfiguration(); diff --git a/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/MergeConfigHadoopAdapter.java b/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/MergeConfigHadoopAdapter.java index 3b722f16a..5879dc4e7 100644 --- a/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/MergeConfigHadoopAdapter.java +++ b/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/MergeConfigHadoopAdapter.java @@ -30,7 +30,7 @@ public static MongoDBRdfConfiguration getMongoConfiguration(final MergeConfigura final MongoDBRdfConfiguration configuration = new MongoDBRdfConfiguration(); configuration.setMongoHostname(config.getChildHostname()); configuration.set(MongoDBRdfConfiguration.MONGO_PORT, config.getChildPort() + ""); - configuration.set(MongoDBRdfConfiguration.MONGO_DB_NAME, config.getChildRyaInstanceName()); + configuration.set(MongoDBRdfConfiguration.RYA_INSTANCE_NAME, config.getChildRyaInstanceName()); return configuration; } } diff --git a/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java b/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java index 491ed26ac..012f2705a 100644 --- a/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java +++ b/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java @@ -31,7 +31,6 @@ import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.log4j.Logger; -import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaStatement.RyaStatementBuilder; import org.apache.rya.api.domain.RyaType; @@ -259,12 +258,9 @@ protected static MongoDBRdfConfiguration getConf(final String ryaInstanceName, conf.set(ConfigUtils.CLOUDBASE_USER, USER); conf.set(ConfigUtils.CLOUDBASE_PASSWORD, PASSWORD); - conf.set(MongoDBRdfConfiguration.MONGO_DB_NAME, "test"); - conf.set(RdfCloudTripleStoreConfiguration.CONF_TBL_PREFIX, "rya_"); - + conf.setRyaInstanceName(ryaInstanceName); conf.setMongoPort(""+port); conf.setMongoHostname(hostname); - conf.setMongoDBName(ryaInstanceName); return conf; } diff --git a/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/strategy/MongoPipelineStrategy.java b/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/strategy/MongoPipelineStrategy.java index c09512250..f03755bb7 100644 --- a/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/strategy/MongoPipelineStrategy.java +++ b/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/strategy/MongoPipelineStrategy.java @@ -85,7 +85,7 @@ public class MongoPipelineStrategy extends AbstractRuleExecutionStrategy { */ public MongoPipelineStrategy(MongoDBRdfConfiguration mongoConf) throws ForwardChainException { Preconditions.checkNotNull(mongoConf); - final String mongoDBName = mongoConf.getMongoDBName(); + final String mongoDBName = mongoConf.getRyaInstanceName(); final String collectionName = mongoConf.getTriplesCollectionName(); mongoConf.setFlush(false); final StatefulMongoDBRdfConfiguration statefulConf; diff --git a/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java b/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java index c53fea1ae..8c177d929 100644 --- a/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java +++ b/extras/rya.geoindexing/geo.common/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java @@ -152,7 +152,7 @@ private static MongoClient createMongoClient(final MongoDBRdfConfiguration mongo requireNonNull(mongoConf); requireNonNull(mongoConf.getMongoHostname()); requireNonNull(mongoConf.getMongoPort()); - requireNonNull(mongoConf.getMongoDBName()); + requireNonNull(mongoConf.getRyaInstanceName()); // Connect to a running MongoDB server. final int port; @@ -166,7 +166,7 @@ private static MongoClient createMongoClient(final MongoDBRdfConfiguration mongo // Connect to a specific MongoDB Database if that information is provided. final String username = mongoConf.getMongoUser(); - final String database = mongoConf.getMongoDBName(); + final String database = mongoConf.getRyaInstanceName(); final String password = mongoConf.getMongoPassword(); if(username != null && password != null) { final MongoCredential cred = MongoCredential.createCredential(username, database, password.toCharArray()); diff --git a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoIndexerDeleteIT.java b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoIndexerDeleteIT.java index 6acc9989e..9b314ce5b 100644 --- a/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoIndexerDeleteIT.java +++ b/extras/rya.geoindexing/geo.mongo/src/test/java/org/apache/rya/indexing/mongo/MongoIndexerDeleteIT.java @@ -73,10 +73,10 @@ public void deleteTest() throws Exception { final MongoClient client = conf.getMongoClient(); //The extra 1 is from the person type defined in freetext - assertEquals(8, client.getDatabase(conf.getMongoDBName()).getCollection(conf.getTriplesCollectionName()).count()); - assertEquals(4, client.getDatabase(conf.getMongoDBName()).getCollection("ryatest_geo").count()); - assertEquals(1, client.getDatabase(conf.getMongoDBName()).getCollection("ryatest_temporal").count()); - assertEquals(2, client.getDatabase(conf.getMongoDBName()).getCollection("ryatest_freetext").count()); + assertEquals(8, client.getDatabase(conf.getRyaInstanceName()).getCollection(conf.getTriplesCollectionName()).count()); + assertEquals(4, client.getDatabase(conf.getRyaInstanceName()).getCollection("ryatest_geo").count()); + assertEquals(1, client.getDatabase(conf.getRyaInstanceName()).getCollection("ryatest_temporal").count()); + assertEquals(2, client.getDatabase(conf.getRyaInstanceName()).getCollection("ryatest_freetext").count()); //free text -- remove one from many String delete = "DELETE DATA \n" // @@ -111,10 +111,10 @@ public void deleteTest() throws Exception { update = conn.prepareUpdate(QueryLanguage.SPARQL, delete); update.execute(); - assertEquals(2, client.getDatabase(conf.getMongoDBName()).getCollection("ryatest_geo").count()); - assertEquals(0, client.getDatabase(conf.getMongoDBName()).getCollection("ryatest_temporal").count()); - assertEquals(1, client.getDatabase(conf.getMongoDBName()).getCollection("ryatest_freetext").count()); - assertEquals(4, client.getDatabase(conf.getMongoDBName()).getCollection(conf.getTriplesCollectionName()).count()); + assertEquals(2, client.getDatabase(conf.getRyaInstanceName()).getCollection("ryatest_geo").count()); + assertEquals(0, client.getDatabase(conf.getRyaInstanceName()).getCollection("ryatest_temporal").count()); + assertEquals(1, client.getDatabase(conf.getRyaInstanceName()).getCollection("ryatest_freetext").count()); + assertEquals(4, client.getDatabase(conf.getRyaInstanceName()).getCollection(conf.getTriplesCollectionName()).count()); } finally { conn.close(); sail.shutDown();