http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/external/AccumuloPcjIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/external/AccumuloPcjIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/external/AccumuloPcjIT.java index d8a70aa..3a29ac3 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/external/AccumuloPcjIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/external/AccumuloPcjIT.java @@ -1,7 +1,3 @@ -package org.apache.rya.indexing.external; - -import java.net.UnknownHostException; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -20,7 +16,9 @@ import java.net.UnknownHostException; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.indexing.external; +import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -45,37 +43,37 @@ import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet; import org.apache.rya.indexing.pcj.matching.PCJOptimizer; import org.apache.rya.indexing.pcj.matching.provider.AccumuloIndexSetProvider; import org.apache.rya.indexing.pcj.storage.PcjException; -import org.apache.rya.indexing.pcj.storage.accumulo.PcjVarOrderFactory; import org.apache.rya.rdftriplestore.inference.InferenceEngineException; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.QueryResultHandlerException; +import org.eclipse.rdf4j.query.TupleQueryResultHandler; +import org.eclipse.rdf4j.query.TupleQueryResultHandlerException; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.repository.sail.SailRepository; +import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection; +import org.eclipse.rdf4j.sail.SailException; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.openrdf.model.URI; -import org.openrdf.model.impl.LiteralImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; -import org.openrdf.query.BindingSet; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.QueryResultHandlerException; -import org.openrdf.query.TupleQueryResultHandler; -import org.openrdf.query.TupleQueryResultHandlerException; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.repository.sail.SailRepositoryConnection; -import org.openrdf.sail.SailException; import com.google.common.base.Optional; import com.google.common.collect.Lists; import com.google.common.collect.Sets; public class AccumuloPcjIT { + private static final ValueFactory VF = SimpleValueFactory.getInstance(); private SailRepositoryConnection conn, pcjConn; private SailRepository repo, pcjRepo; @@ -83,7 +81,7 @@ public class AccumuloPcjIT { private final Configuration conf = getConf(); private final String prefix = "table_"; private final String tablename = "table_INDEX_"; - private URI obj, obj2, subclass, subclass2, talksTo; + private IRI obj, obj2, subclass, subclass2, talksTo; @Before public void init() throws RepositoryException, @@ -99,21 +97,21 @@ public class AccumuloPcjIT { pcjRepo = PcjIntegrationTestingUtil.getAccumuloPcjRepo(prefix, "instance"); pcjConn = pcjRepo.getConnection(); - final URI sub = new URIImpl("uri:entity"); - subclass = new URIImpl("uri:class"); - obj = new URIImpl("uri:obj"); - talksTo = new URIImpl("uri:talksTo"); + final IRI sub = VF.createIRI("uri:entity"); + subclass = VF.createIRI("uri:class"); + obj = VF.createIRI("uri:obj"); + talksTo = VF.createIRI("uri:talksTo"); conn.add(sub, RDF.TYPE, subclass); - conn.add(sub, RDFS.LABEL, new LiteralImpl("label")); + conn.add(sub, RDFS.LABEL, VF.createLiteral("label")); conn.add(sub, talksTo, obj); - final URI sub2 = new URIImpl("uri:entity2"); - subclass2 = new URIImpl("uri:class2"); - obj2 = new URIImpl("uri:obj2"); + final IRI sub2 = VF.createIRI("uri:entity2"); + subclass2 = VF.createIRI("uri:class2"); + obj2 = VF.createIRI("uri:obj2"); conn.add(sub2, RDF.TYPE, subclass2); - conn.add(sub2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(sub2, RDFS.LABEL, VF.createLiteral("label2")); conn.add(sub2, talksTo, obj2); accCon = ConfigUtils.getConnector(conf); @@ -147,7 +145,7 @@ public class AccumuloPcjIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 1, indexSparqlString, new String[] { "e", "l", "c" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); final String queryString = ""// + "SELECT ?e ?c ?l ?o " // @@ -177,8 +175,8 @@ public class AccumuloPcjIT { AccumuloSecurityException, TableExistsException, PcjException, SailException, TableNotFoundException { - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); final String indexSparqlString = ""// + "SELECT ?e ?l ?c " // @@ -208,11 +206,11 @@ public class AccumuloPcjIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 1, indexSparqlString, new String[] { "e", "l", "c" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 2, indexSparqlString2, new String[] { "e", "o", "l" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); conn.prepareTupleQuery(QueryLanguage.SPARQL, queryString) .evaluate(crh1); @@ -232,8 +230,8 @@ public class AccumuloPcjIT { AccumuloException, AccumuloSecurityException, TableExistsException, SailException, TableNotFoundException { - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); final String indexSparqlString = ""// + "SELECT ?c ?e ?l " // @@ -263,11 +261,11 @@ public class AccumuloPcjIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 1, indexSparqlString, new String[] { "c", "e", "l" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 2, indexSparqlString2, new String[] { "e", "o", "l" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); conn.prepareTupleQuery(QueryLanguage.SPARQL, queryString) .evaluate(crh1); @@ -287,8 +285,8 @@ public class AccumuloPcjIT { QueryEvaluationException, MalformedQueryException, SailException, TableNotFoundException { - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); final String indexSparqlString = ""// + "SELECT ?e ?c ?l " // @@ -318,11 +316,11 @@ public class AccumuloPcjIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 1, indexSparqlString, new String[] { "e", "c", "l" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 2, indexSparqlString2, new String[] { "e", "o", "l" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); conn.prepareTupleQuery(QueryLanguage.SPARQL, queryString) .evaluate(crh1); @@ -346,15 +344,15 @@ public class AccumuloPcjIT { final Collection<String> vals = ops.tableIdMap().values(); System.out.println("Tables: " + tables + "and values " + vals); - final URI superclass = new URIImpl("uri:superclass"); - final URI superclass2 = new URIImpl("uri:superclass2"); + final IRI superclass = VF.createIRI("uri:superclass"); + final IRI superclass2 = VF.createIRI("uri:superclass2"); conn.add(subclass, RDF.TYPE, superclass); conn.add(subclass2, RDF.TYPE, superclass2); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); final String indexSparqlString = ""// + "SELECT ?c ?e ?l " // @@ -386,11 +384,11 @@ public class AccumuloPcjIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 1, indexSparqlString, new String[] { "c", "e", "l" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 2, indexSparqlString2, new String[] { "e", "c", "l", "f", "o" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); conn.prepareTupleQuery(QueryLanguage.SPARQL, queryString) .evaluate(crh1); @@ -409,15 +407,15 @@ public class AccumuloPcjIT { MalformedQueryException, SailException, QueryEvaluationException, TupleQueryResultHandlerException { - final URI superclass = new URIImpl("uri:superclass"); - final URI superclass2 = new URIImpl("uri:superclass2"); + final IRI superclass = VF.createIRI("uri:superclass"); + final IRI superclass2 = VF.createIRI("uri:superclass2"); conn.add(subclass, RDF.TYPE, superclass); conn.add(subclass2, RDF.TYPE, superclass2); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); final String indexSparqlString = ""// + "SELECT ?dog ?pig ?owl " // @@ -448,11 +446,11 @@ public class AccumuloPcjIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 1, indexSparqlString, new String[] { "dog", "pig", "owl" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 2, indexSparqlString2, new String[] { "e", "c", "l", "f", "o" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); PcjIntegrationTestingUtil.deleteCoreRyaTables(accCon, prefix); pcjConn.prepareTupleQuery(QueryLanguage.SPARQL, queryString).evaluate( crh2); @@ -468,16 +466,16 @@ public class AccumuloPcjIT { TupleQueryResultHandlerException, QueryEvaluationException, MalformedQueryException, SailException { - final URI superclass = new URIImpl("uri:superclass"); - final URI superclass2 = new URIImpl("uri:superclass2"); + final IRI superclass = VF.createIRI("uri:superclass"); + final IRI superclass2 = VF.createIRI("uri:superclass2"); conn.add(subclass, RDF.TYPE, superclass); conn.add(subclass2, RDF.TYPE, superclass2); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); accCon.tableOperations().create("table2"); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); final String indexSparqlString = ""// + "SELECT ?c ?e ?l " // @@ -508,11 +506,11 @@ public class AccumuloPcjIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 1, indexSparqlString, new String[] { "c", "e", "l" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 2, indexSparqlString2, new String[] { "o", "f", "e", "c", "l" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); PcjIntegrationTestingUtil.deleteCoreRyaTables(accCon, prefix); pcjConn.prepareTupleQuery(QueryLanguage.SPARQL, queryString).evaluate( crh2); @@ -528,24 +526,24 @@ public class AccumuloPcjIT { AccumuloSecurityException, TableNotFoundException, TableExistsException, PcjException, SailException { - final URI sub3 = new URIImpl("uri:entity3"); - final URI subclass3 = new URIImpl("uri:class3"); - final URI obj3 = new URIImpl("uri:obj3"); - final URI superclass = new URIImpl("uri:superclass"); - final URI superclass2 = new URIImpl("uri:superclass2"); - final URI superclass3 = new URIImpl("uri:superclass3"); + final IRI sub3 = VF.createIRI("uri:entity3"); + final IRI subclass3 = VF.createIRI("uri:class3"); + final IRI obj3 = VF.createIRI("uri:obj3"); + final IRI superclass = VF.createIRI("uri:superclass"); + final IRI superclass2 = VF.createIRI("uri:superclass2"); + final IRI superclass3 = VF.createIRI("uri:superclass3"); conn.add(sub3, RDF.TYPE, subclass3); - conn.add(sub3, RDFS.LABEL, new LiteralImpl("label3")); + conn.add(sub3, RDFS.LABEL, VF.createLiteral("label3")); conn.add(sub3, talksTo, obj3); conn.add(subclass, RDF.TYPE, superclass); conn.add(subclass2, RDF.TYPE, superclass2); conn.add(subclass3, RDF.TYPE, superclass3); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); - conn.add(obj3, RDFS.LABEL, new LiteralImpl("label3")); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); + conn.add(obj3, RDFS.LABEL, VF.createLiteral("label3")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); final String indexSparqlString = ""// + "SELECT ?c ?e ?l " // + "{" // @@ -575,11 +573,11 @@ public class AccumuloPcjIT { final CountingResultHandler crh2 = new CountingResultHandler(); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 1, indexSparqlString, new String[] { "c", "e", "l" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 2, indexSparqlString2, new String[] { "o", "f", "l", "e", "c" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); conn.prepareTupleQuery(QueryLanguage.SPARQL, queryString) .evaluate(crh1); @@ -598,25 +596,25 @@ public class AccumuloPcjIT { AccumuloSecurityException, TableNotFoundException, TableExistsException, PcjException, SailException { - final URI sub3 = new URIImpl("uri:entity3"); - final URI subclass3 = new URIImpl("uri:class3"); - final URI obj3 = new URIImpl("uri:obj3"); + final IRI sub3 = VF.createIRI("uri:entity3"); + final IRI subclass3 = VF.createIRI("uri:class3"); + final IRI obj3 = VF.createIRI("uri:obj3"); - final URI superclass = new URIImpl("uri:superclass"); - final URI superclass2 = new URIImpl("uri:superclass2"); - final URI superclass3 = new URIImpl("uri:superclass3"); + final IRI superclass = VF.createIRI("uri:superclass"); + final IRI superclass2 = VF.createIRI("uri:superclass2"); + final IRI superclass3 = VF.createIRI("uri:superclass3"); conn.add(sub3, RDF.TYPE, subclass3); - conn.add(sub3, RDFS.LABEL, new LiteralImpl("label3")); + conn.add(sub3, RDFS.LABEL, VF.createLiteral("label3")); conn.add(sub3, talksTo, obj3); conn.add(subclass, RDF.TYPE, superclass); conn.add(subclass2, RDF.TYPE, superclass2); conn.add(subclass3, RDF.TYPE, superclass3); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); - conn.add(obj3, RDFS.LABEL, new LiteralImpl("label3")); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); + conn.add(obj3, RDFS.LABEL, VF.createLiteral("label3")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); final String indexSparqlString = ""// + "SELECT ?c ?e ?l " // + "{" // @@ -647,11 +645,11 @@ public class AccumuloPcjIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 1, indexSparqlString, new String[] { "c", "e", "l" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 2, indexSparqlString2, new String[] { "o", "f", "e", "l", "c" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); conn.prepareTupleQuery(QueryLanguage.SPARQL, queryString) .evaluate(crh1); @@ -671,25 +669,25 @@ public class AccumuloPcjIT { TableNotFoundException, TupleQueryResultHandlerException, QueryEvaluationException, MalformedQueryException, SailException { - final URI sub3 = new URIImpl("uri:entity3"); - final URI subclass3 = new URIImpl("uri:class3"); - final URI obj3 = new URIImpl("uri:obj3"); + final IRI sub3 = VF.createIRI("uri:entity3"); + final IRI subclass3 = VF.createIRI("uri:class3"); + final IRI obj3 = VF.createIRI("uri:obj3"); - final URI superclass = new URIImpl("uri:superclass"); - final URI superclass2 = new URIImpl("uri:superclass2"); - final URI superclass3 = new URIImpl("uri:superclass3"); + final IRI superclass = VF.createIRI("uri:superclass"); + final IRI superclass2 = VF.createIRI("uri:superclass2"); + final IRI superclass3 = VF.createIRI("uri:superclass3"); conn.add(sub3, RDF.TYPE, subclass3); - conn.add(sub3, RDFS.LABEL, new LiteralImpl("label3")); + conn.add(sub3, RDFS.LABEL, VF.createLiteral("label3")); conn.add(sub3, talksTo, obj3); conn.add(subclass, RDF.TYPE, superclass); conn.add(subclass2, RDF.TYPE, superclass2); conn.add(subclass3, RDF.TYPE, superclass3); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); - conn.add(obj3, RDFS.LABEL, new LiteralImpl("label3")); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); + conn.add(obj3, RDFS.LABEL, VF.createLiteral("label3")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); final String indexSparqlString = ""// + "SELECT ?c ?e ?l " // @@ -721,11 +719,11 @@ public class AccumuloPcjIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 1, indexSparqlString, new String[] { "c", "e", "l" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 2, indexSparqlString2, new String[] { "o", "f", "c", "e", "l" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); conn.prepareTupleQuery(QueryLanguage.SPARQL, queryString) .evaluate(crh1); @@ -746,25 +744,25 @@ public class AccumuloPcjIT { TupleQueryResultHandlerException, QueryEvaluationException, SailException { - final URI sub3 = new URIImpl("uri:entity3"); - final URI subclass3 = new URIImpl("uri:class3"); - final URI obj3 = new URIImpl("uri:obj3"); + final IRI sub3 = VF.createIRI("uri:entity3"); + final IRI subclass3 = VF.createIRI("uri:class3"); + final IRI obj3 = VF.createIRI("uri:obj3"); - final URI superclass = new URIImpl("uri:superclass"); - final URI superclass2 = new URIImpl("uri:superclass2"); - final URI superclass3 = new URIImpl("uri:superclass3"); + final IRI superclass = VF.createIRI("uri:superclass"); + final IRI superclass2 = VF.createIRI("uri:superclass2"); + final IRI superclass3 = VF.createIRI("uri:superclass3"); conn.add(sub3, RDF.TYPE, subclass3); - conn.add(sub3, RDFS.LABEL, new LiteralImpl("label3")); + conn.add(sub3, RDFS.LABEL, VF.createLiteral("label3")); conn.add(sub3, talksTo, obj3); conn.add(subclass, RDF.TYPE, superclass); conn.add(subclass2, RDF.TYPE, superclass2); conn.add(subclass3, RDF.TYPE, superclass3); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); - conn.add(obj3, RDFS.LABEL, new LiteralImpl("label3")); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); + conn.add(obj3, RDFS.LABEL, VF.createLiteral("label3")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); final String indexSparqlString = ""// + "SELECT ?c ?e ?l " // + "{" // @@ -795,11 +793,11 @@ public class AccumuloPcjIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 1, indexSparqlString, new String[] { "c", "e", "l" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 2, indexSparqlString2, new String[] { "c", "l", "e", "o", "f" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); conn.prepareTupleQuery(QueryLanguage.SPARQL, queryString) .evaluate(crh1); @@ -819,25 +817,25 @@ public class AccumuloPcjIT { TableNotFoundException, TupleQueryResultHandlerException, QueryEvaluationException, MalformedQueryException, SailException { - final URI sub3 = new URIImpl("uri:entity3"); - final URI subclass3 = new URIImpl("uri:class3"); - final URI obj3 = new URIImpl("uri:obj3"); + final IRI sub3 = VF.createIRI("uri:entity3"); + final IRI subclass3 = VF.createIRI("uri:class3"); + final IRI obj3 = VF.createIRI("uri:obj3"); - final URI superclass = new URIImpl("uri:superclass"); - final URI superclass2 = new URIImpl("uri:superclass2"); - final URI superclass3 = new URIImpl("uri:superclass3"); + final IRI superclass = VF.createIRI("uri:superclass"); + final IRI superclass2 = VF.createIRI("uri:superclass2"); + final IRI superclass3 = VF.createIRI("uri:superclass3"); conn.add(sub3, RDF.TYPE, subclass3); - conn.add(sub3, RDFS.LABEL, new LiteralImpl("label3")); + conn.add(sub3, RDFS.LABEL, VF.createLiteral("label3")); conn.add(sub3, talksTo, obj3); conn.add(subclass, RDF.TYPE, superclass); conn.add(subclass2, RDF.TYPE, superclass2); conn.add(subclass3, RDF.TYPE, superclass3); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); - conn.add(obj3, RDFS.LABEL, new LiteralImpl("label3")); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); + conn.add(obj3, RDFS.LABEL, VF.createLiteral("label3")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); final String indexSparqlString = ""// + "SELECT ?c ?e ?l " // + "{" // @@ -868,11 +866,11 @@ public class AccumuloPcjIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 1, indexSparqlString, new String[] { "c", "e", "l" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 2, indexSparqlString2, new String[] { "o", "l", "c", "e", "f" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); conn.prepareTupleQuery(QueryLanguage.SPARQL, queryString) .evaluate(crh1); @@ -891,15 +889,15 @@ public class AccumuloPcjIT { AccumuloSecurityException, TableExistsException, TableNotFoundException, PcjException, SailException { - final URI superclass = new URIImpl("uri:superclass"); - final URI superclass2 = new URIImpl("uri:superclass2"); + final IRI superclass = VF.createIRI("uri:superclass"); + final IRI superclass2 = VF.createIRI("uri:superclass2"); conn.add(subclass, RDF.TYPE, superclass); conn.add(subclass2, RDF.TYPE, superclass2); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); final String indexSparqlString = ""// + "SELECT ?c ?e ?l " // @@ -931,11 +929,11 @@ public class AccumuloPcjIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 1, indexSparqlString, new String[] { "c", "e", "l" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 2, indexSparqlString2, new String[] { "e", "o", "f", "c", "l" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); conn.prepareTupleQuery(QueryLanguage.SPARQL, queryString) .evaluate(crh1); @@ -954,15 +952,15 @@ public class AccumuloPcjIT { MalformedQueryException, SailException, QueryEvaluationException, TupleQueryResultHandlerException { - final URI superclass = new URIImpl("uri:superclass"); - final URI superclass2 = new URIImpl("uri:superclass2"); + final IRI superclass = VF.createIRI("uri:superclass"); + final IRI superclass2 = VF.createIRI("uri:superclass2"); conn.add(subclass, RDF.TYPE, superclass); conn.add(subclass2, RDF.TYPE, superclass2); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); final String indexSparqlString = ""// + "SELECT ?dog ?pig ?duck " // @@ -976,7 +974,7 @@ public class AccumuloPcjIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 1, indexSparqlString, new String[] { "dog", "pig", "duck" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); conn.prepareTupleQuery(QueryLanguage.SPARQL, indexSparqlString) .evaluate(crh1); @@ -995,15 +993,15 @@ public class AccumuloPcjIT { TupleQueryResultHandlerException, QueryEvaluationException, MalformedQueryException, SailException { - final URI superclass = new URIImpl("uri:superclass"); - final URI superclass2 = new URIImpl("uri:superclass2"); + final IRI superclass = VF.createIRI("uri:superclass"); + final IRI superclass2 = VF.createIRI("uri:superclass2"); conn.add(subclass, RDF.TYPE, superclass); conn.add(subclass2, RDF.TYPE, superclass2); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); final String indexSparqlString = ""// + "SELECT ?dog ?pig ?duck " // @@ -1035,11 +1033,11 @@ public class AccumuloPcjIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 1, indexSparqlString, new String[] { "dog", "pig", "duck" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 2, indexSparqlString2, new String[] { "o", "f", "e", "c", "l" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); conn.prepareTupleQuery(QueryLanguage.SPARQL, queryString) .evaluate(crh1); @@ -1056,15 +1054,15 @@ public class AccumuloPcjIT { TableNotFoundException, TableExistsException, MalformedQueryException, SailException, QueryEvaluationException { - final URI superclass = new URIImpl("uri:superclass"); - final URI superclass2 = new URIImpl("uri:superclass2"); + final IRI superclass = VF.createIRI("uri:superclass"); + final IRI superclass2 = VF.createIRI("uri:superclass2"); conn.add(subclass, RDF.TYPE, superclass); conn.add(subclass2, RDF.TYPE, superclass2); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); final String indexSparqlString = ""// + "SELECT ?dog ?pig ?duck " // @@ -1084,14 +1082,14 @@ public class AccumuloPcjIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 1, indexSparqlString, new String[] { "dog", "pig", "duck" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); final AccumuloIndexSet ais1 = new AccumuloIndexSet(conf, tablename + 1); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename + 2, indexSparqlString2, new String[] { "o", "f", "e", "c", "l" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); final AccumuloIndexSet ais2 = new AccumuloIndexSet(conf, tablename + 2); @@ -1159,15 +1157,15 @@ public class AccumuloPcjIT { TupleQueryResultHandlerException, QueryEvaluationException, MalformedQueryException, SailException { - final URI superclass = new URIImpl("uri:superclass"); - final URI superclass2 = new URIImpl("uri:superclass2"); + final IRI superclass = VF.createIRI("uri:superclass"); + final IRI superclass2 = VF.createIRI("uri:superclass2"); conn.add(subclass, RDF.TYPE, superclass); conn.add(subclass2, RDF.TYPE, superclass2); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); final String indexSparqlString = ""// + "SELECT ?dog ?pig ?duck " // @@ -1199,11 +1197,11 @@ public class AccumuloPcjIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename+1, indexSparqlString, new String[] { "dog", "pig", "duck" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename+2, indexSparqlString2, new String[] { "o", "f", "e", "c", "l" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); conn.prepareTupleQuery(QueryLanguage.SPARQL, queryString) .evaluate(crh1); @@ -1217,15 +1215,15 @@ public class AccumuloPcjIT { @Test public void testEvaluateTwoIndexValidate() throws Exception { - final URI superclass = new URIImpl("uri:superclass"); - final URI superclass2 = new URIImpl("uri:superclass2"); + final IRI superclass = VF.createIRI("uri:superclass"); + final IRI superclass2 = VF.createIRI("uri:superclass2"); conn.add(subclass, RDF.TYPE, superclass); conn.add(subclass2, RDF.TYPE, superclass2); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); final String indexSparqlString = ""// + "SELECT ?dog ?pig ?duck " // @@ -1254,13 +1252,13 @@ public class AccumuloPcjIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename+1, indexSparqlString, new String[] { "dog", "pig", "duck" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); final AccumuloIndexSet ais1 = new AccumuloIndexSet(conf, tablename+1); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename+2, indexSparqlString2, new String[] { "o", "f", "e", "c", "l" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); final AccumuloIndexSet ais2 = new AccumuloIndexSet(conf, tablename+2); @@ -1287,26 +1285,26 @@ public class AccumuloPcjIT { @Test public void testEvaluateThreeIndexValidate() throws Exception { - final URI superclass = new URIImpl("uri:superclass"); - final URI superclass2 = new URIImpl("uri:superclass2"); + final IRI superclass = VF.createIRI("uri:superclass"); + final IRI superclass2 = VF.createIRI("uri:superclass2"); - final URI sub = new URIImpl("uri:entity"); - subclass = new URIImpl("uri:class"); - obj = new URIImpl("uri:obj"); - talksTo = new URIImpl("uri:talksTo"); + final IRI sub = VF.createIRI("uri:entity"); + subclass = VF.createIRI("uri:class"); + obj = VF.createIRI("uri:obj"); + talksTo = VF.createIRI("uri:talksTo"); - final URI howlsAt = new URIImpl("uri:howlsAt"); - final URI subType = new URIImpl("uri:subType"); - final URI superSuperclass = new URIImpl("uri:super_superclass"); + final IRI howlsAt = VF.createIRI("uri:howlsAt"); + final IRI subType = VF.createIRI("uri:subType"); + final IRI superSuperclass = VF.createIRI("uri:super_superclass"); conn.add(subclass, RDF.TYPE, superclass); conn.add(subclass2, RDF.TYPE, superclass2); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); conn.add(sub, howlsAt, superclass); conn.add(superclass, subType, superSuperclass); - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); final String indexSparqlString = ""// + "SELECT ?dog ?pig ?duck " // @@ -1344,20 +1342,20 @@ public class AccumuloPcjIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename+1, indexSparqlString, new String[] { "dog", "pig", "duck" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); final AccumuloIndexSet ais1 = new AccumuloIndexSet(conf, tablename+1); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename+2, indexSparqlString2, new String[] { "o", "f", "e", "c", "l" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); final AccumuloIndexSet ais2 = new AccumuloIndexSet(conf, tablename+2); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablename+3, indexSparqlString3, new String[] { "wolf", "sheep", "chicken" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); final AccumuloIndexSet ais3 = new AccumuloIndexSet(conf, tablename+3);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/external/PCJOptionalTestIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/external/PCJOptionalTestIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/external/PCJOptionalTestIT.java index 026fa34..5527afe 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/external/PCJOptionalTestIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/external/PCJOptionalTestIT.java @@ -38,43 +38,42 @@ import org.apache.rya.indexing.external.tupleSet.SimpleExternalTupleSet; import org.apache.rya.indexing.pcj.matching.PCJOptimizer; import org.apache.rya.indexing.pcj.matching.provider.AccumuloIndexSetProvider; import org.apache.rya.indexing.pcj.storage.PcjException; -import org.apache.rya.indexing.pcj.storage.accumulo.PcjVarOrderFactory; import org.apache.rya.rdftriplestore.inference.InferenceEngineException; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.TupleQuery; +import org.eclipse.rdf4j.query.TupleQueryResultHandlerException; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.repository.sail.SailRepository; +import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection; +import org.eclipse.rdf4j.sail.SailException; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.openrdf.model.URI; -import org.openrdf.model.impl.LiteralImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.TupleQuery; -import org.openrdf.query.TupleQueryResultHandlerException; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.repository.sail.SailRepositoryConnection; -import org.openrdf.sail.SailException; import com.google.common.base.Optional; import com.google.common.collect.Lists; public class PCJOptionalTestIT { - + private static final ValueFactory VF = SimpleValueFactory.getInstance(); private SailRepositoryConnection conn, pcjConn; private SailRepository repo, pcjRepo; private Connector accCon; String tablePrefix = "table_"; - URI sub, sub2, obj, obj2, subclass, subclass2, talksTo, sub3, subclass3; + IRI sub, sub2, obj, obj2, subclass, subclass2, talksTo, sub3, subclass3; @Before public void init() throws RepositoryException, @@ -90,27 +89,27 @@ public class PCJOptionalTestIT { pcjRepo = PcjIntegrationTestingUtil.getAccumuloPcjRepo(tablePrefix, "instance"); pcjConn = pcjRepo.getConnection(); - sub = new URIImpl("uri:entity"); - subclass = new URIImpl("uri:class"); - obj = new URIImpl("uri:obj"); - talksTo = new URIImpl("uri:talksTo"); + sub = VF.createIRI("uri:entity"); + subclass = VF.createIRI("uri:class"); + obj = VF.createIRI("uri:obj"); + talksTo = VF.createIRI("uri:talksTo"); conn.add(sub, RDF.TYPE, subclass); - conn.add(sub, RDFS.LABEL, new LiteralImpl("label")); + conn.add(sub, RDFS.LABEL, VF.createLiteral("label")); conn.add(sub, talksTo, obj); - sub2 = new URIImpl("uri:entity2"); - subclass2 = new URIImpl("uri:class2"); - obj2 = new URIImpl("uri:obj2"); - sub3 = new URIImpl("uri:entity3"); - subclass3 = new URIImpl("uri:class3"); + sub2 = VF.createIRI("uri:entity2"); + subclass2 = VF.createIRI("uri:class2"); + obj2 = VF.createIRI("uri:obj2"); + sub3 = VF.createIRI("uri:entity3"); + subclass3 = VF.createIRI("uri:class3"); conn.add(sub2, RDF.TYPE, subclass2); - conn.add(sub2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(sub2, RDFS.LABEL, VF.createLiteral("label2")); conn.add(sub2, talksTo, obj2); conn.add(sub3, RDF.TYPE, subclass3); - conn.add(sub3, RDFS.LABEL, new LiteralImpl("label3")); + conn.add(sub3, RDFS.LABEL, VF.createLiteral("label3")); accCon = new MockInstance("instance").getConnector("root", @@ -147,7 +146,7 @@ public class PCJOptionalTestIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablePrefix + "INDEX_1", indexSparqlString, new String[] { "e", "c", "l", "o" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); final String queryString = ""// + "SELECT ?e ?c ?l ?o " // + "{" // @@ -184,7 +183,7 @@ public class PCJOptionalTestIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablePrefix + "INDEX_1", indexSparqlString, new String[] { "e", "l", "o" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); final String queryString = ""// + "SELECT ?e ?c ?l ?o " // + "{" // http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/external/PcjIntegrationTestingUtil.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/external/PcjIntegrationTestingUtil.java b/extras/indexing/src/test/java/org/apache/rya/indexing/external/PcjIntegrationTestingUtil.java index 8b3b8f5..56eac96 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/external/PcjIntegrationTestingUtil.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/external/PcjIntegrationTestingUtil.java @@ -52,22 +52,22 @@ import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import org.apache.rya.indexing.pcj.storage.mongo.MongoPcjDocuments; import org.apache.rya.rdftriplestore.inference.InferenceEngineException; import org.apache.rya.sail.config.RyaSailFactory; -import org.openrdf.query.BindingSet; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.TupleQuery; -import org.openrdf.query.TupleQueryResult; -import org.openrdf.query.algebra.BindingSetAssignment; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.repository.sail.SailRepositoryConnection; -import org.openrdf.sail.Sail; -import org.openrdf.sail.SailException; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.TupleQuery; +import org.eclipse.rdf4j.query.TupleQueryResult; +import org.eclipse.rdf4j.query.algebra.BindingSetAssignment; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.repository.sail.SailRepository; +import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection; +import org.eclipse.rdf4j.sail.Sail; +import org.eclipse.rdf4j.sail.SailException; import com.google.common.base.Optional; import com.google.common.collect.Sets; @@ -157,7 +157,7 @@ public class PcjIntegrationTestingUtil { } public static class BindingSetAssignmentCollector extends - QueryModelVisitorBase<RuntimeException> { + AbstractQueryModelVisitor<RuntimeException> { private final Set<QueryModelNode> bindingSetList = Sets.newHashSet(); @@ -178,7 +178,7 @@ public class PcjIntegrationTestingUtil { } public static class ExternalTupleVisitor extends - QueryModelVisitorBase<RuntimeException> { + AbstractQueryModelVisitor<RuntimeException> { private final Set<QueryModelNode> eSet = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/external/PrecompJoinOptimizerIT.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/external/PrecompJoinOptimizerIT.java b/extras/indexing/src/test/java/org/apache/rya/indexing/external/PrecompJoinOptimizerIT.java index 86e5a8e..28a2d24 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/external/PrecompJoinOptimizerIT.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/external/PrecompJoinOptimizerIT.java @@ -1,7 +1,3 @@ -package org.apache.rya.indexing.external; - -import java.net.UnknownHostException; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -20,7 +16,9 @@ import java.net.UnknownHostException; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.indexing.external; +import java.net.UnknownHostException; import java.util.List; import org.apache.accumulo.core.client.AccumuloException; @@ -30,41 +28,40 @@ import org.apache.accumulo.core.client.TableExistsException; import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.mock.MockInstance; import org.apache.accumulo.core.client.security.tokens.PasswordToken; +import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.indexing.pcj.storage.PcjException; -import org.apache.rya.indexing.pcj.storage.accumulo.PcjVarOrderFactory; +import org.apache.rya.rdftriplestore.inference.InferenceEngineException; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.model.vocabulary.RDFS; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.QueryResultHandlerException; +import org.eclipse.rdf4j.query.TupleQueryResultHandler; +import org.eclipse.rdf4j.query.TupleQueryResultHandlerException; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.repository.sail.SailRepository; +import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection; +import org.eclipse.rdf4j.sail.SailException; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.openrdf.model.URI; -import org.openrdf.model.impl.LiteralImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.model.vocabulary.RDFS; -import org.openrdf.query.BindingSet; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.QueryResultHandlerException; -import org.openrdf.query.TupleQueryResultHandler; -import org.openrdf.query.TupleQueryResultHandlerException; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.repository.sail.SailRepositoryConnection; -import org.openrdf.sail.SailException; import com.google.common.base.Optional; -import org.apache.rya.api.persist.RyaDAOException; -import org.apache.rya.rdftriplestore.inference.InferenceEngineException; - public class PrecompJoinOptimizerIT { + private static final ValueFactory VF = SimpleValueFactory.getInstance(); private SailRepositoryConnection conn, pcjConn; private SailRepository repo, pcjRepo; private Connector accCon; String tablePrefix = "table_"; - URI sub, sub2, obj, obj2, subclass, subclass2, talksTo; + IRI sub, sub2, obj, obj2, subclass, subclass2, talksTo; @Before public void init() throws RepositoryException, @@ -80,21 +77,21 @@ public class PrecompJoinOptimizerIT { pcjRepo = PcjIntegrationTestingUtil.getAccumuloPcjRepo(tablePrefix, "instance"); pcjConn = pcjRepo.getConnection(); - sub = new URIImpl("uri:entity"); - subclass = new URIImpl("uri:class"); - obj = new URIImpl("uri:obj"); - talksTo = new URIImpl("uri:talksTo"); + sub = VF.createIRI("uri:entity"); + subclass = VF.createIRI("uri:class"); + obj = VF.createIRI("uri:obj"); + talksTo = VF.createIRI("uri:talksTo"); conn.add(sub, RDF.TYPE, subclass); - conn.add(sub, RDFS.LABEL, new LiteralImpl("label")); + conn.add(sub, RDFS.LABEL, VF.createLiteral("label")); conn.add(sub, talksTo, obj); - sub2 = new URIImpl("uri:entity2"); - subclass2 = new URIImpl("uri:class2"); - obj2 = new URIImpl("uri:obj2"); + sub2 = VF.createIRI("uri:entity2"); + subclass2 = VF.createIRI("uri:class2"); + obj2 = VF.createIRI("uri:obj2"); conn.add(sub2, RDF.TYPE, subclass2); - conn.add(sub2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(sub2, RDFS.LABEL, VF.createLiteral("label2")); conn.add(sub2, talksTo, obj2); accCon = new MockInstance("instance").getConnector("root", @@ -130,7 +127,7 @@ public class PrecompJoinOptimizerIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablePrefix + "INDEX_1", indexSparqlString, new String[] { "e", "l", "c" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); final String queryString = ""// + "SELECT ?e ?c ?l ?o " // + "{" // @@ -159,8 +156,8 @@ public class PrecompJoinOptimizerIT { QueryEvaluationException, TableNotFoundException, TupleQueryResultHandlerException, RyaDAOException, PcjException { - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); final String indexSparqlString = ""// + "SELECT ?e ?l ?c " // @@ -187,10 +184,10 @@ public class PrecompJoinOptimizerIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablePrefix + "INDEX_1", indexSparqlString, new String[] { "e", "l", "c" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablePrefix + "INDEX_2", indexSparqlString2, new String[] { "e", "l", "o" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); final CountingResultHandler crh = new CountingResultHandler(); PcjIntegrationTestingUtil.deleteCoreRyaTables(accCon, tablePrefix); pcjConn.prepareTupleQuery(QueryLanguage.SPARQL, queryString).evaluate( @@ -218,7 +215,7 @@ public class PrecompJoinOptimizerIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablePrefix + "INDEX_1", indexSparqlString, new String[] { "e", "l", "c" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); final String queryString = ""// + "SELECT ?e ?c ?l ?o " // + "{" // @@ -260,7 +257,7 @@ public class PrecompJoinOptimizerIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablePrefix + "INDEX_2", indexSparqlString2, new String[] { "e", "l", "c" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); final String queryString = ""// + "SELECT ?e ?c ?o ?m ?l" // @@ -301,14 +298,14 @@ public class PrecompJoinOptimizerIT { + " ?e <http://www.w3.org/2000/01/rdf-schema#label> ?l "// + "}";// - final URI sub3 = new URIImpl("uri:entity3"); - final URI subclass3 = new URIImpl("uri:class3"); + final IRI sub3 = VF.createIRI("uri:entity3"); + final IRI subclass3 = VF.createIRI("uri:class3"); conn.add(sub3, RDF.TYPE, subclass3); - conn.add(sub3, RDFS.LABEL, new LiteralImpl("label3")); + conn.add(sub3, RDFS.LABEL, VF.createLiteral("label3")); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablePrefix + "INDEX_1", indexSparqlString1, new String[] { "e", "l", "c" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); final String queryString = ""// + "SELECT ?e ?c ?o ?m ?l" // + "{" // @@ -324,7 +321,7 @@ public class PrecompJoinOptimizerIT { repo = PcjIntegrationTestingUtil.getAccumuloPcjRepo(tablePrefix, "instance"); conn = repo.getConnection(); conn.add(sub, talksTo, obj); - conn.add(sub, RDFS.LABEL, new LiteralImpl("label")); + conn.add(sub, RDFS.LABEL, VF.createLiteral("label")); pcjConn.prepareTupleQuery(QueryLanguage.SPARQL, queryString).evaluate( crh); @@ -340,8 +337,8 @@ public class PrecompJoinOptimizerIT { TupleQueryResultHandlerException, RyaDAOException, PcjException, InferenceEngineException, NumberFormatException, UnknownHostException { - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); conn.add(sub, RDF.TYPE, obj); conn.add(sub2, RDF.TYPE, obj2); @@ -372,10 +369,10 @@ public class PrecompJoinOptimizerIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablePrefix + "INDEX_1", indexSparqlString, new String[] { "e", "l", "o" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablePrefix + "INDEX_2", indexSparqlString2, new String[] { "e", "l", "o" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); PcjIntegrationTestingUtil.deleteCoreRyaTables(accCon, tablePrefix); PcjIntegrationTestingUtil.closeAndShutdown(conn, repo); @@ -399,15 +396,15 @@ public class PrecompJoinOptimizerIT { TupleQueryResultHandlerException, RyaDAOException, PcjException, InferenceEngineException, NumberFormatException, UnknownHostException { - conn.add(obj, RDFS.LABEL, new LiteralImpl("label")); - conn.add(obj2, RDFS.LABEL, new LiteralImpl("label2")); + conn.add(obj, RDFS.LABEL, VF.createLiteral("label")); + conn.add(obj2, RDFS.LABEL, VF.createLiteral("label2")); conn.add(sub, RDF.TYPE, obj); conn.add(sub2, RDF.TYPE, obj2); - final URI livesIn = new URIImpl("uri:livesIn"); - final URI city = new URIImpl("uri:city"); - final URI city2 = new URIImpl("uri:city2"); - final URI city3 = new URIImpl("uri:city3"); + final IRI livesIn = VF.createIRI("uri:livesIn"); + final IRI city = VF.createIRI("uri:city"); + final IRI city2 = VF.createIRI("uri:city2"); + final IRI city3 = VF.createIRI("uri:city3"); conn.add(sub, livesIn, city); conn.add(sub2, livesIn, city2); conn.add(sub2, livesIn, city3); @@ -438,10 +435,10 @@ public class PrecompJoinOptimizerIT { PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablePrefix + "INDEX_1", indexSparqlString, new String[] { "e", "l", "o" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); PcjIntegrationTestingUtil.createAndPopulatePcj(conn, accCon, tablePrefix + "INDEX_2", indexSparqlString2, new String[] { "e", "l", "o" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); PcjIntegrationTestingUtil.deleteCoreRyaTables(accCon, tablePrefix); PcjIntegrationTestingUtil.closeAndShutdown(conn, repo); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/external/PrecompJoinOptimizerTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/external/PrecompJoinOptimizerTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/external/PrecompJoinOptimizerTest.java index 0035898..79c5014 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/external/PrecompJoinOptimizerTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/external/PrecompJoinOptimizerTest.java @@ -18,7 +18,6 @@ */ package org.apache.rya.indexing.external; - import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; @@ -34,18 +33,18 @@ import org.apache.rya.indexing.pcj.matching.provider.AbstractPcjIndexSetProvider import org.apache.rya.indexing.pcj.matching.provider.AccumuloIndexSetProvider; import org.apache.rya.mongodb.EmbeddedMongoSingleton; import org.apache.rya.mongodb.StatefulMongoDBRdfConfiguration; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.query.algebra.helpers.StatementPatternCollector; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.query.algebra.helpers.StatementPatternCollector; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -432,7 +431,7 @@ public class PrecompJoinOptimizerTest { } public static class NodeCollector extends - QueryModelVisitorBase<RuntimeException> { + AbstractQueryModelVisitor<RuntimeException> { Set<QueryModelNode> qNodes = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/external/PrecompJoinOptimizerTest2.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/external/PrecompJoinOptimizerTest2.java b/extras/indexing/src/test/java/org/apache/rya/indexing/external/PrecompJoinOptimizerTest2.java index 2988ff3..54960c4 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/external/PrecompJoinOptimizerTest2.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/external/PrecompJoinOptimizerTest2.java @@ -33,17 +33,17 @@ import org.apache.rya.indexing.pcj.matching.provider.AbstractPcjIndexSetProvider import org.apache.rya.indexing.pcj.matching.provider.AccumuloIndexSetProvider; import org.apache.rya.mongodb.EmbeddedMongoSingleton; import org.apache.rya.mongodb.StatefulMongoDBRdfConfiguration; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.helpers.StatementPatternCollector; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.helpers.StatementPatternCollector; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; import com.google.common.collect.Lists; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/external/PrecompJoinOptimizerVarToConstTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/external/PrecompJoinOptimizerVarToConstTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/external/PrecompJoinOptimizerVarToConstTest.java index b3823de..0628afe 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/external/PrecompJoinOptimizerVarToConstTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/external/PrecompJoinOptimizerVarToConstTest.java @@ -19,7 +19,6 @@ package org.apache.rya.indexing.external; * under the License. */ - import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -29,15 +28,15 @@ import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet; import org.apache.rya.indexing.external.tupleSet.SimpleExternalTupleSet; import org.apache.rya.indexing.pcj.matching.PCJOptimizer; import org.apache.rya.indexing.pcj.matching.provider.AccumuloIndexSetProvider; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.QueryModelNode; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.helpers.StatementPatternCollector; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.junit.Assert; import org.junit.Test; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.QueryModelNode; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.helpers.StatementPatternCollector; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/AccumuloIndexSetColumnVisibilityTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/AccumuloIndexSetColumnVisibilityTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/AccumuloIndexSetColumnVisibilityTest.java index fa8aac6..77c5f08 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/AccumuloIndexSetColumnVisibilityTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/external/tupleSet/AccumuloIndexSetColumnVisibilityTest.java @@ -16,14 +16,13 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.rya.indexing.external.tupleSet; import static org.junit.Assert.assertEquals; import java.io.File; import java.io.IOException; -import java.util.Date; +import java.math.BigInteger; import java.util.HashSet; import java.util.Set; @@ -56,23 +55,21 @@ import org.apache.rya.indexing.accumulo.ConfigUtils; import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage.PCJStorageException; import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjStorage; import org.apache.rya.indexing.pcj.storage.accumulo.PcjTableNameFactory; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.repository.RepositoryException; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import org.openrdf.model.impl.NumericLiteralImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.repository.RepositoryException; import com.google.common.base.Optional; import com.google.common.collect.Sets; import com.google.common.io.Files; -import info.aduna.iteration.CloseableIteration; - /** * Tests the evaluation of {@link AccumuloIndexSet}. */ @@ -94,6 +91,7 @@ public class AccumuloIndexSetColumnVisibilityTest { private static String pcjId; private static QueryBindingSet pcjBs1; private static QueryBindingSet pcjBs2; + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @BeforeClass public static void init() throws AccumuloException, AccumuloSecurityException, PCJStorageException, IOException, InterruptedException, TableNotFoundException, AlreadyInitializedException, RyaDetailsRepositoryException { @@ -119,12 +117,12 @@ public class AccumuloIndexSetColumnVisibilityTest { // Store the PCJ's results. pcjBs1 = new QueryBindingSet(); - pcjBs1.addBinding("age", new NumericLiteralImpl(14, XMLSchema.INTEGER)); - pcjBs1.addBinding("name", new URIImpl("http://Alice";)); + pcjBs1.addBinding("age", VF.createLiteral(BigInteger.valueOf(14))); + pcjBs1.addBinding("name", VF.createIRI("http://Alice";)); pcjBs2 = new QueryBindingSet(); - pcjBs2.addBinding("age", new NumericLiteralImpl(16, XMLSchema.INTEGER)); - pcjBs2.addBinding("name", new URIImpl("http://Bob";)); + pcjBs2.addBinding("age", VF.createLiteral(BigInteger.valueOf(16))); + pcjBs2.addBinding("name", VF.createIRI("http://Bob";)); final Set<VisibilityBindingSet> visBs = new HashSet<>(); for (final BindingSet bs : Sets.<BindingSet>newHashSet(pcjBs1, pcjBs2)) { @@ -179,8 +177,8 @@ public class AccumuloIndexSetColumnVisibilityTest { .setPCJIndexDetails( PCJIndexDetails.builder() .setEnabled(true) ) - .setJoinSelectivityDetails( new JoinSelectivityDetails( Optional.<Date>absent() ) ) - .setProspectorDetails( new ProspectorDetails( Optional.<Date>absent() )) + .setJoinSelectivityDetails( new JoinSelectivityDetails( Optional.absent() ) ) + .setProspectorDetails( new ProspectorDetails( Optional.absent() )) .build(); detailsRepo.initialize(details); @@ -205,11 +203,11 @@ public class AccumuloIndexSetColumnVisibilityTest { // Setup the binding sets that will be evaluated. final QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("name", new URIImpl("http://Alice";)); + bs.addBinding("name", VF.createIRI("http://Alice";)); final QueryBindingSet bs2 = new QueryBindingSet(); - bs2.addBinding("name", new URIImpl("http://Bob";)); + bs2.addBinding("name", VF.createIRI("http://Bob";)); - final Set<BindingSet> bSets = Sets.<BindingSet> newHashSet(bs, bs2); + final Set<BindingSet> bSets = Sets.newHashSet(bs, bs2); final CloseableIteration<BindingSet, QueryEvaluationException> results = ais.evaluate(bSets); final Set<BindingSet> fetchedResults = new HashSet<>(); @@ -218,7 +216,7 @@ public class AccumuloIndexSetColumnVisibilityTest { fetchedResults.add(next); } - final Set<BindingSet> expected = Sets.<BindingSet>newHashSet(pcjBs1, pcjBs2); + final Set<BindingSet> expected = Sets.newHashSet(pcjBs1, pcjBs2); assertEquals(expected, fetchedResults); } @@ -230,11 +228,11 @@ public class AccumuloIndexSetColumnVisibilityTest { // Setup the binding sets that will be evaluated. final QueryBindingSet bs1 = new QueryBindingSet(); - bs1.addBinding("age", new NumericLiteralImpl(16, XMLSchema.INTEGER)); + bs1.addBinding("age", VF.createLiteral(BigInteger.valueOf(16))); final QueryBindingSet bs2 = new QueryBindingSet(); - bs2.addBinding("age", new NumericLiteralImpl(14, XMLSchema.INTEGER)); + bs2.addBinding("age", VF.createLiteral(BigInteger.valueOf(14))); - final Set<BindingSet> bSets = Sets.<BindingSet> newHashSet(bs1, bs2); + final Set<BindingSet> bSets = Sets.newHashSet(bs1, bs2); final CloseableIteration<BindingSet, QueryEvaluationException> results = ais.evaluate(bSets); final Set<BindingSet> fetchedResults = new HashSet<>(); @@ -243,7 +241,7 @@ public class AccumuloIndexSetColumnVisibilityTest { fetchedResults.add(next); } - final Set<BindingSet> expected = Sets.<BindingSet>newHashSet(pcjBs1, pcjBs2); + final Set<BindingSet> expected = Sets.newHashSet(pcjBs1, pcjBs2); assertEquals(expected, fetchedResults); } } \ No newline at end of file
