Repository: incubator-rya Updated Branches: refs/heads/master 62de7c5d1 -> 4576f556a
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/767349da/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataIT.java index 2f3214d..52dd064 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/MongoStatementMetadataIT.java @@ -18,6 +18,8 @@ */ package org.apache.rya.indexing.statement.metadata; +import static org.junit.Assert.assertEquals; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -29,11 +31,11 @@ import org.apache.rya.api.domain.RyaType; import org.apache.rya.api.domain.RyaURI; import org.apache.rya.api.domain.StatementMetadata; import org.apache.rya.api.persist.RyaDAOException; +import org.apache.rya.mongodb.MongoDBRdfConfiguration; import org.apache.rya.mongodb.MongoDBRyaDAO; import org.apache.rya.mongodb.MongoTestBase; import org.apache.rya.sail.config.RyaSailFactory; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import org.openrdf.model.impl.LiteralImpl; import org.openrdf.model.impl.URIImpl; @@ -50,10 +52,11 @@ import org.openrdf.sail.Sail; public class MongoStatementMetadataIT extends MongoTestBase { - private Sail sail; - private SailRepository repo; - private SailRepositoryConnection conn; - private MongoDBRyaDAO dao; +// private Sail sail; +// private SailRepository repo; +// private SailRepositoryConnection conn; +// private MongoDBRyaDAO dao; + private final String query1 = "prefix owl: <http://www.w3.org/2002/07/owl#> prefix ano: <http://www.w3.org/2002/07/owl#annotated> prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> select ?x ?y where {_:blankNode rdf:type owl:Annotation; ano:Source <http://Joe>; " + "ano:Property <http://worksAt>; ano:Target ?x; <http://createdBy> ?y; <http://createdOn> \'2017-01-04\'^^xsd:date }"; private final String query2 = "prefix owl: <http://www.w3.org/2002/07/owl#> prefix ano: <http://www.w3.org/2002/07/owl#annotated> prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> select ?a ?b ?c where {_:blankNode1 rdf:type owl:Annotation; ano:Source ?a; " @@ -61,46 +64,66 @@ public class MongoStatementMetadataIT extends MongoTestBase { + "_:blankNode2 rdf:type owl:Annotation; ano:Source ?a; " + "ano:Property <http://talksTo>; ano:Target ?b; <http://createdBy> ?c; <http://createdOn> \'2017-01-04\'^^xsd:date }"; - @Before - public void init() throws Exception { - final Set<RyaURI> propertySet = new HashSet<RyaURI>( + @Override + protected void updateConfiguration(final MongoDBRdfConfiguration conf) { + final Set<RyaURI> propertySet = new HashSet<>( Arrays.asList(new RyaURI("http://createdBy";), new RyaURI("http://createdOn";))); conf.setUseStatementMetadata(true); conf.setStatementMetadataProperties(propertySet); - - sail = RyaSailFactory.getInstance(conf); - repo = new SailRepository(sail); - conn = repo.getConnection(); - - dao = new MongoDBRyaDAO(conf, super.getMongoClient()); - dao.init(); } +// @Before +// public void init() throws Exception { +// final Set<RyaURI> propertySet = new HashSet<>( +// Arrays.asList(new RyaURI("http://createdBy";), new RyaURI("http://createdOn";))); +// conf.setUseStatementMetadata(true); +// conf.setStatementMetadataProperties(propertySet); + +// sail = RyaSailFactory.getInstance(conf); +// repo = new SailRepository(sail); +// conn = repo.getConnection(); +// +// dao = new MongoDBRyaDAO(); +// dao.setConf(conf); +// dao.init(); +// } + @Test public void simpleQueryWithoutBindingSet() throws Exception { - final StatementMetadata metadata = new StatementMetadata(); - metadata.addMetadata(new RyaURI("http://createdBy";), new RyaType("Joe")); - metadata.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-04")); - - final RyaStatement statement = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), - new RyaType("CoffeeShop"), new RyaURI("http://context";), "", metadata); - dao.add(statement); - - final TupleQueryResult result = conn.prepareTupleQuery(QueryLanguage.SPARQL, query1).evaluate(); - - final QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("x", new LiteralImpl("CoffeeShop")); - bs.addBinding("y", new LiteralImpl("Joe")); - - final List<BindingSet> bsList = new ArrayList<>(); - while (result.hasNext()) { - bsList.add(result.next()); + Sail sail = RyaSailFactory.getInstance(conf); + MongoDBRyaDAO dao = new MongoDBRyaDAO(); + try { + dao.setConf(conf); + dao.init(); + + final StatementMetadata metadata = new StatementMetadata(); + metadata.addMetadata(new RyaURI("http://createdBy";), new RyaType("Joe")); + metadata.addMetadata(new RyaURI("http://createdOn";), new RyaType(XMLSchema.DATE, "2017-01-04")); + + final RyaStatement statement = new RyaStatement(new RyaURI("http://Joe";), new RyaURI("http://worksAt";), + new RyaType("CoffeeShop"), new RyaURI("http://context";), "", metadata); + dao.add(statement); + + SailRepositoryConnection conn = new SailRepository(sail).getConnection(); + final TupleQueryResult result = conn.prepareTupleQuery(QueryLanguage.SPARQL, query1).evaluate(); + + final QueryBindingSet bs = new QueryBindingSet(); + bs.addBinding("x", new LiteralImpl("CoffeeShop")); + bs.addBinding("y", new LiteralImpl("Joe")); + + final List<BindingSet> bsList = new ArrayList<>(); + while (result.hasNext()) { + bsList.add(result.next()); + } + + System.out.println(bsList); + assertEquals(1, bsList.size()); + assertEquals(bs, bsList.get(0)); + dao.delete(statement, conf); + } finally { +// dao.destroy(); +// sail.shutDown(); } - - System.out.println(bsList); - Assert.assertEquals(1, bsList.size()); - Assert.assertEquals(bs, bsList.get(0)); - dao.delete(statement, conf); } /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/767349da/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataExternalSetProviderTest.java ---------------------------------------------------------------------- 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 5e28a5b..f3d0c1e 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 @@ -7,9 +7,9 @@ package org.apache.rya.indexing.statement.metadata; * 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 @@ -73,7 +73,7 @@ public class StatementMetadataExternalSetProviderTest { patterns.addAll(StatementPatternCollector.process(pq.getTupleExpr())); JoinSegment<StatementMetadataNode<?>> segment = new JoinSegment<>( - new HashSet<QueryModelNode>(patterns), patterns, new HashMap<ValueExpr, Filter>()); + new HashSet<>(patterns), patterns, new HashMap<ValueExpr, Filter>()); List<StatementMetadataNode<?>> extSets = metaProvider.getExternalSets(segment); expected.add(new StatementMetadataNode<>(sp, conf)); @@ -81,7 +81,7 @@ public class StatementMetadataExternalSetProviderTest { Assert.assertEquals(expected, extSets); } - + @Test public void createSingleMongoMetadataNode() throws MalformedQueryException { @@ -99,7 +99,7 @@ public class StatementMetadataExternalSetProviderTest { patterns.addAll(StatementPatternCollector.process(pq.getTupleExpr())); JoinSegment<StatementMetadataNode<?>> segment = new JoinSegment<>( - new HashSet<QueryModelNode>(patterns), patterns, new HashMap<ValueExpr, Filter>()); + new HashSet<>(patterns), patterns, new HashMap<ValueExpr, Filter>()); List<StatementMetadataNode<?>> extSets = metaProvider.getExternalSets(segment); expected.add(new StatementMetadataNode<>(sp,conf)); @@ -107,8 +107,8 @@ public class StatementMetadataExternalSetProviderTest { Assert.assertEquals(expected, extSets); } - - + + @Test public void createMultipleMetadataNode() throws MalformedQueryException { @@ -133,7 +133,7 @@ public class StatementMetadataExternalSetProviderTest { patterns.addAll(StatementPatternCollector.process(pq2.getTupleExpr())); JoinSegment<StatementMetadataNode<?>> segment = new JoinSegment<>( - new HashSet<QueryModelNode>(patterns), patterns, new HashMap<ValueExpr, Filter>()); + new HashSet<>(patterns), patterns, new HashMap<ValueExpr, Filter>()); List<StatementMetadataNode<?>> extSets = metaProvider.getExternalSets(segment); expected.add(new StatementMetadataNode<>(sp1,conf)); @@ -147,7 +147,7 @@ public class StatementMetadataExternalSetProviderTest { if (useMongo) { MongoDBRdfConfiguration conf = new MongoDBRdfConfiguration(); conf.setBoolean("sc.useMongo", true); - conf.setMongoInstance("localhost"); + conf.setMongoHostname("localhost"); conf.setMongoPort("27017"); conf.setMongoDBName("rya_"); return conf; @@ -164,7 +164,7 @@ public class StatementMetadataExternalSetProviderTest { return conf; } } - + private void removePatternWithGivenSubject(String subject, Set<StatementPattern> patterns) { Iterator<StatementPattern> spIter = patterns.iterator(); while(spIter.hasNext()) { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/767349da/extras/indexing/src/test/java/org/apache/rya/indexing/statement/metadata/StatementMetadataOptimizerTest.java ---------------------------------------------------------------------- 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 d4c9436..4a65d99 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 @@ -7,9 +7,9 @@ package org.apache.rya.indexing.statement.metadata; * 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 @@ -90,8 +90,8 @@ public class StatementMetadataOptimizerTest { @Before public void init() { - RdfCloudTripleStoreConfiguration mongoConf = (RdfCloudTripleStoreConfiguration) getConf(true); - RdfCloudTripleStoreConfiguration accumuloConf = (RdfCloudTripleStoreConfiguration) getConf(false); + RdfCloudTripleStoreConfiguration mongoConf = getConf(true); + RdfCloudTripleStoreConfiguration accumuloConf = getConf(false); mongoOptimizer = new StatementMetadataOptimizer(mongoConf); accumuloOptimizer = new StatementMetadataOptimizer(accumuloConf); } @@ -127,12 +127,12 @@ public class StatementMetadataOptimizerTest { private static RdfCloudTripleStoreConfiguration getConf(boolean useMongo) { RdfCloudTripleStoreConfiguration conf; - Set<RyaURI> propertySet = new HashSet<RyaURI>( + Set<RyaURI> propertySet = new HashSet<>( Arrays.asList(new RyaURI("http://createdBy";), new RyaURI("http://createdOn";))); if (useMongo) { MongoDBRdfConfiguration mConf = new MongoDBRdfConfiguration(); mConf.setBoolean("sc.useMongo", true); - mConf.setMongoInstance("localhost"); + mConf.setMongoHostname("localhost"); mConf.setMongoPort("27017"); mConf.setMongoDBName("rya_"); conf = mConf; @@ -152,9 +152,9 @@ public class StatementMetadataOptimizerTest { private static Set<StatementMetadataNode<?>> getExpected(String query) throws MalformedQueryException { ParsedQuery pq = parser.parseQuery(query, null); StatementMetadataExternalSetProvider provider = new StatementMetadataExternalSetProvider( - (RdfCloudTripleStoreConfiguration) getConf(false)); + getConf(false)); List<StatementPattern> patterns = StatementPatternCollector.process(pq.getTupleExpr()); - JoinSegment<StatementMetadataNode<?>> segment = new JoinSegment<StatementMetadataNode<?>>( + JoinSegment<StatementMetadataNode<?>> segment = new JoinSegment<>( new HashSet<QueryModelNode>(patterns), new ArrayList<QueryModelNode>(patterns), new HashMap<ValueExpr, Filter>()); return new HashSet<>(provider.getExternalSets(segment)); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/767349da/extras/indexingExample/src/main/java/InferenceExamples.java ---------------------------------------------------------------------- diff --git a/extras/indexingExample/src/main/java/InferenceExamples.java b/extras/indexingExample/src/main/java/InferenceExamples.java index d1d9dc4..5b5a937 100644 --- a/extras/indexingExample/src/main/java/InferenceExamples.java +++ b/extras/indexingExample/src/main/java/InferenceExamples.java @@ -31,16 +31,11 @@ import org.apache.rya.indexing.accumulo.ConfigUtils; import org.apache.rya.indexing.mongodb.MongoIndexingConfiguration; import org.apache.rya.indexing.mongodb.MongoIndexingConfiguration.MongoDBIndexingConfigBuilder; import org.apache.rya.mongodb.EmbeddedMongoFactory; -import org.apache.rya.mongodb.MongoConnectorFactory; import org.apache.rya.rdftriplestore.RdfCloudTripleStore; import org.apache.rya.rdftriplestore.inference.InferenceEngineException; import org.apache.rya.sail.config.RyaSailFactory; import org.apache.zookeeper.ClientCnxn; -import org.openrdf.model.Namespace; -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; import org.openrdf.model.vocabulary.OWL; -import org.openrdf.model.vocabulary.RDF; import org.openrdf.model.vocabulary.RDFS; import org.openrdf.query.BindingSet; import org.openrdf.query.MalformedQueryException; @@ -53,7 +48,6 @@ import org.openrdf.query.TupleQueryResultHandlerException; import org.openrdf.query.Update; import org.openrdf.query.UpdateExecutionException; import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.RepositoryResult; import org.openrdf.repository.sail.SailRepository; import org.openrdf.repository.sail.SailRepositoryConnection; import org.openrdf.sail.Sail; @@ -106,7 +100,7 @@ public class InferenceExamples { repository = new SailRepository(sail); conn = repository.getConnection(); - + final long start = System.currentTimeMillis(); testInfer(conn, sail); @@ -122,7 +116,6 @@ public class InferenceExamples { log.info("Shutting down"); closeQuietly(conn); closeQuietly(repository); - MongoConnectorFactory.closeMongoClient(); } } @@ -152,7 +145,7 @@ public class InferenceExamples { // .setUseMockMongo(USE_MOCK).setUseInference(USE_INFER).setAuths("U"); MongoDBIndexingConfigBuilder builder = MongoIndexingConfiguration.builder() .setUseMockMongo(USE_EMBEDDED_MONGO).setUseInference(true).setAuths("U"); - + if (USE_EMBEDDED_MONGO) { final MongoClient c = EmbeddedMongoFactory.newFactory().newMongoClient(); final ServerAddress address = c.getAddress(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/767349da/extras/indexingExample/src/main/java/MongoRyaDirectExample.java ---------------------------------------------------------------------- diff --git a/extras/indexingExample/src/main/java/MongoRyaDirectExample.java b/extras/indexingExample/src/main/java/MongoRyaDirectExample.java index f8927d4..477e579 100644 --- a/extras/indexingExample/src/main/java/MongoRyaDirectExample.java +++ b/extras/indexingExample/src/main/java/MongoRyaDirectExample.java @@ -31,7 +31,6 @@ import org.apache.rya.indexing.accumulo.ConfigUtils; import org.apache.rya.indexing.mongodb.MongoIndexingConfiguration; import org.apache.rya.indexing.mongodb.MongoIndexingConfiguration.MongoDBIndexingConfigBuilder; import org.apache.rya.mongodb.EmbeddedMongoFactory; -import org.apache.rya.mongodb.MongoConnectorFactory; import org.apache.rya.rdftriplestore.RdfCloudTripleStore; import org.apache.rya.rdftriplestore.inference.InferenceEngineException; import org.apache.rya.sail.config.RyaSailFactory; @@ -132,7 +131,6 @@ public class MongoRyaDirectExample { log.info("Shutting down"); closeQuietly(conn); closeQuietly(repository); - MongoConnectorFactory.closeMongoClient(); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/767349da/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java ---------------------------------------------------------------------- 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 e7f020d..60fff56 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 @@ -265,7 +265,7 @@ public abstract class ITBase { conf.set(RdfCloudTripleStoreConfiguration.CONF_TBL_PREFIX, "rya_"); conf.setMongoPort(""+port); - conf.setMongoInstance(hostname); + conf.setMongoHostname(hostname); conf.setMongoDBName(ryaInstanceName); return conf; }
