http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/GetStatementsRyaCommand.java ---------------------------------------------------------------------- diff --git a/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/GetStatementsRyaCommand.java b/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/GetStatementsRyaCommand.java index 408f700..96017c7 100644 --- a/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/GetStatementsRyaCommand.java +++ b/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/GetStatementsRyaCommand.java @@ -19,17 +19,15 @@ package org.apache.rya.alx.command; * under the License. */ - - import org.apache.felix.gogo.commands.Command; import org.apache.felix.gogo.commands.Option; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.RepositoryResult; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.RepositoryResult; -import static org.apache.rya.api.RdfCloudTripleStoreUtils.*; +import static org.apache.rya.api.RdfCloudTripleStoreUtils.createValue; /** * Date: 5/16/12 @@ -62,7 +60,7 @@ public class GetStatementsRyaCommand extends AbstractRyaCommand { connection = repository.getConnection(); RepositoryResult<Statement> statements = connection.getStatements( (subject != null) ? (Resource) createValue(subject) : null, - (predicate != null) ? (URI) createValue(predicate) : null, + (predicate != null) ? (IRI) createValue(predicate) : null, (object != null) ? createValue(object) : null, false, (context != null) ? new Resource[]{(Resource) createValue(context)} : new Resource[0]);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/InfoRyaCommand.java ---------------------------------------------------------------------- diff --git a/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/InfoRyaCommand.java b/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/InfoRyaCommand.java index 37be971..1712050 100644 --- a/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/InfoRyaCommand.java +++ b/osgi/alx.rya.console/src/main/java/org/apache/rya/alx/command/InfoRyaCommand.java @@ -19,12 +19,10 @@ package org.apache.rya.alx.command; * under the License. */ +import java.util.Map; - -import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.felix.gogo.commands.Command; - -import java.util.Map; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; /** * Date: 5/16/12 http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/osgi/alx.rya/src/main/features/alx.rya-features.xml ---------------------------------------------------------------------- diff --git a/osgi/alx.rya/src/main/features/alx.rya-features.xml b/osgi/alx.rya/src/main/features/alx.rya-features.xml index 87794b9..1d892a6 100644 --- a/osgi/alx.rya/src/main/features/alx.rya-features.xml +++ b/osgi/alx.rya/src/main/features/alx.rya-features.xml @@ -20,47 +20,47 @@ under the License. --> <features name="alx.rya"> - <feature name='org.openrdf.sesame.runtime' version="2.6.4"> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-model/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-runtime/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-query/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-queryalgebra-model/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-queryparser-api/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-queryparser-serql/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-queryparser-sparql/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-queryresultio-api/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-queryresultio-binary/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-queryresultio-sparqljson/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-queryresultio-text/2.6.4</bundle> + <feature name='org.eclipse.rdf4j.runtime' version="2.3.1"> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-model/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-runtime/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-query/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-queryalgebra-model/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-queryparser-api/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-queryparser-serql/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-queryparser-sparql/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-queryresultio-api/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-queryresultio-binary/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-queryresultio-sparqljson/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-queryresultio-text/2.3.1</bundle> <bundle>wrap:mvn:net.sf.opencsv/opencsv/2.0</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-repository-api/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-repository-manager/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-repository-event/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-repository-sail/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-sail-memory/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-sail-inferencer/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-queryalgebra-evaluation/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-repository-sparql/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-repository-http/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-http-client/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-repository-dataset/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-repository-contextaware/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-http-protocol/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-rio-ntriples/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-rio-api/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-rio-binary/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-rio-n3/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-rio-trix/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-rio-turtle/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-rio-trig/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-sail-api/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-sail-nativerdf/2.6.4</bundle> - <!--bundle>wrap:mvn:org.openrdf.sesame/sesame-sail-rdbms/2.6.4</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-repository-api/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-repository-manager/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-repository-event/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-repository-sail/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-sail-memory/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-sail-inferencer/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-queryalgebra-evaluation/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-repository-sparql/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-repository-http/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-http-client/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-repository-dataset/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-repository-contextaware/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-http-protocol/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-rio-ntriples/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-rio-api/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-rio-binary/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-rio-n3/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-rio-trix/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-rio-turtle/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-rio-trig/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-sail-api/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-sail-nativerdf/2.3.1</bundle> + <!--bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-sail-rdbms/2.3.1</bundle> <bundle>wrap:mvn:commons-dbcp/commons-dbcp/1.3</bundle> <bundle>wrap:mvn:commons-pool/commons-pool/1.3</bundle--> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-queryresultio-sparqlxml/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-util/2.6.4</bundle> - <bundle>wrap:mvn:org.openrdf.sesame/sesame-rio-rdfxml/2.6.4</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-queryresultio-sparqlxml/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-util/2.3.1</bundle> + <bundle>wrap:mvn:org.eclipse.rdf4j/rdf4j-rio-rdfxml/2.3.1</bundle> </feature> <feature name='tinkerpop.blueprints' version='1.2'> <bundle>wrap:mvn:com.tinkerpop.blueprints/blueprints-core/1.2</bundle> @@ -71,10 +71,10 @@ under the License. <bundle>mvn:org.codehaus.jackson/jackson-mapper-asl/1.8.5</bundle> </feature> <feature name='rya.sail' version='3.0.4'> - <!--<feature version="[2.6,3.0)">org.openrdf.sesame.runtime</feature>--> + <!--<feature version="[2.3,3.0)">org.eclipse.rdf4j.runtime</feature>--> <feature version="1.2">tinkerpop.blueprints</feature> <feature version="[10,12)">google.guava</feature> - <bundle>mvn:org.apache.rya/sesame-runtime-osgi/2.6.4</bundle> + <bundle>mvn:org.apache.rya/rdf4j-runtime-osgi/2.3.1s</bundle> <bundle>wrap:mvn:org.apache.rya/rya.api/3.0.4-SNAPSHOT</bundle> <bundle>wrap:mvn:org.apache.rya/rya.sail.impl/3.0.4-SNAPSHOT</bundle> </feature> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailComponent.java ---------------------------------------------------------------------- diff --git a/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailComponent.java b/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailComponent.java index e5d73d2..940bce5 100644 --- a/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailComponent.java +++ b/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailComponent.java @@ -19,18 +19,16 @@ package org.apache.rya.camel.cbsail; * under the License. */ +import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Map; import org.apache.camel.Endpoint; import org.apache.camel.impl.DefaultComponent; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.repository.Repository; -import org.openrdf.repository.sail.SailRepository; - -import java.util.Map; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.repository.Repository; -import static com.google.common.base.Preconditions.*; /** * Save and retrieve triples */ @@ -41,7 +39,7 @@ public class CbSailComponent extends DefaultComponent { public static final String SPARQL_QUERY_PROP = "cbsail.sparql"; public static final String START_TIME_QUERY_PROP = "cbsail.startTime"; public static final String TTL_QUERY_PROP = "cbsail.ttl"; - public static final ValueFactory valueFactory = new ValueFactoryImpl(); + public static final ValueFactory VALUE_FACTORY = SimpleValueFactory.getInstance(); @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailEndpoint.java ---------------------------------------------------------------------- diff --git a/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailEndpoint.java b/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailEndpoint.java index a8909cb..6d09c52 100644 --- a/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailEndpoint.java +++ b/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailEndpoint.java @@ -19,13 +19,15 @@ package org.apache.rya.camel.cbsail; * under the License. */ +import static com.google.common.base.Preconditions.checkNotNull; - -import org.apache.camel.*; +import org.apache.camel.Component; +import org.apache.camel.Consumer; +import org.apache.camel.Processor; +import org.apache.camel.Producer; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.impl.DefaultEndpoint; -import org.openrdf.repository.Repository; - -import static com.google.common.base.Preconditions.*; +import org.eclipse.rdf4j.repository.Repository; /** * setHeader(SPARQL, sqarlQuery).setHeader(TTL, ttl).to("cbsail:server?port=2181&user=user&pwd=pwd&instanceName=name").getBody(<Triple Map>) http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailProducer.java ---------------------------------------------------------------------- diff --git a/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailProducer.java b/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailProducer.java index eba4b3d..0b8738c 100644 --- a/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailProducer.java +++ b/osgi/camel.rya/src/main/java/org/apache/rya/camel/cbsail/CbSailProducer.java @@ -1,18 +1,3 @@ -package org.apache.rya.camel.cbsail; - -import static org.apache.rya.api.RdfCloudTripleStoreConfiguration.CONF_INFER; -import static org.apache.rya.api.RdfCloudTripleStoreConfiguration.CONF_QUERY_AUTH; -import static org.apache.rya.camel.cbsail.CbSailComponent.SPARQL_QUERY_PROP; -import static org.apache.rya.camel.cbsail.CbSailComponent.valueFactory; - -import java.io.ByteArrayOutputStream; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -31,23 +16,35 @@ import java.util.Map; * specific language governing permissions and limitations * under the License. */ +package org.apache.rya.camel.cbsail; +import static org.apache.rya.api.RdfCloudTripleStoreConfiguration.CONF_INFER; +import static org.apache.rya.api.RdfCloudTripleStoreConfiguration.CONF_QUERY_AUTH; +import static org.apache.rya.camel.cbsail.CbSailComponent.SPARQL_QUERY_PROP; +import static org.apache.rya.camel.cbsail.CbSailComponent.VALUE_FACTORY; +import java.io.ByteArrayOutputStream; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultProducer; -import org.openrdf.model.Statement; -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.TupleQueryResultHandlerBase; -import org.openrdf.query.TupleQueryResultHandlerException; -import org.openrdf.query.resultio.sparqlxml.SPARQLResultsXMLWriter; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.RepositoryException; -import org.openrdf.rio.RDFHandlerException; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.query.AbstractTupleQueryResultHandler; +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.TupleQueryResultHandlerException; +import org.eclipse.rdf4j.query.resultio.sparqlxml.SPARQLResultsXMLWriter; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.rio.RDFHandlerException; /** */ @@ -130,14 +127,14 @@ public class CbSailProducer extends DefaultProducer { final TupleQuery tupleQuery = connection.prepareTupleQuery( QueryLanguage.SPARQL, query); if (auth != null && auth.length() > 0) { - tupleQuery.setBinding(CONF_QUERY_AUTH, valueFactory.createLiteral(auth)); + tupleQuery.setBinding(CONF_QUERY_AUTH, VALUE_FACTORY.createLiteral(auth)); } if (infer != null) { - tupleQuery.setBinding(CONF_INFER, valueFactory.createLiteral(infer)); + tupleQuery.setBinding(CONF_INFER, VALUE_FACTORY.createLiteral(infer)); } if (CbSailEndpoint.CbSailOutput.BINARY.equals(queryOutput)) { final List listOutput = new ArrayList(); - final TupleQueryResultHandlerBase handler = new TupleQueryResultHandlerBase() { + final AbstractTupleQueryResultHandler handler = new AbstractTupleQueryResultHandler() { @Override public void handleSolution(final BindingSet bindingSet) throws TupleQueryResultHandlerException { final Map<String, String> map = new HashMap<String, String>(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailTest.java ---------------------------------------------------------------------- diff --git a/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailTest.java b/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailTest.java index 4803bd4..f9e8855 100644 --- a/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailTest.java +++ b/osgi/camel.rya/src/test/java/org/apache/rya/camel/cbsail/CbSailTest.java @@ -19,16 +19,11 @@ package org.apache.rya.camel.cbsail; * under the License. */ +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; - -import org.apache.rya.accumulo.AccumuloRdfConfiguration; -import org.apache.rya.accumulo.AccumuloRyaDAO; -import org.apache.rya.api.RdfCloudTripleStoreConfiguration; -import org.apache.rya.api.RdfCloudTripleStoreConstants; -import org.apache.rya.rdftriplestore.RdfCloudTripleStore; -import org.apache.rya.rdftriplestore.RyaSailRepository; -import org.apache.rya.rdftriplestore.inference.InferenceEngine; -import org.apache.rya.rdftriplestore.namespace.NamespaceManager; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.mock.MockInstance; @@ -39,17 +34,20 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.JndiRegistry; import org.apache.camel.test.CamelTestSupport; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.repository.Repository; -import org.openrdf.repository.RepositoryConnection; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.rdftriplestore.RdfCloudTripleStore; +import org.apache.rya.rdftriplestore.RyaSailRepository; +import org.apache.rya.rdftriplestore.inference.InferenceEngine; +import org.apache.rya.rdftriplestore.namespace.NamespaceManager; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.repository.Repository; +import org.eclipse.rdf4j.repository.RepositoryConnection; /** */ @@ -59,7 +57,7 @@ public class CbSailTest extends CamelTestSupport { private RdfCloudTripleStore store; private Repository repository; - private ValueFactory vf = RdfCloudTripleStoreConstants.VALUE_FACTORY; + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @EndpointInject(uri = "mock:results") protected MockEndpoint resultEndpoint; @@ -108,9 +106,9 @@ public class CbSailTest extends CamelTestSupport { public void testSimpleQuery() throws Exception { RepositoryConnection conn = repository.getConnection(); - URI cpu = vf.createURI(litdupsNS, "cpu"); - URI loadPerc = vf.createURI(litdupsNS, "loadPerc"); - URI uri1 = vf.createURI(litdupsNS, "uri1"); + IRI cpu = VF.createIRI(litdupsNS, "cpu"); + IRI loadPerc = VF.createIRI(litdupsNS, "loadPerc"); + IRI uri1 = VF.createIRI(litdupsNS, "uri1"); conn.add(cpu, loadPerc, uri1); conn.commit(); conn.close(); @@ -128,11 +126,11 @@ public class CbSailTest extends CamelTestSupport { public void testSimpleQueryAuth() throws Exception { RepositoryConnection conn = repository.getConnection(); - URI cpu = vf.createURI(litdupsNS, "cpu"); - URI loadPerc = vf.createURI(litdupsNS, "loadPerc"); - URI uri1 = vf.createURI(litdupsNS, "uri1"); - URI uri2 = vf.createURI(litdupsNS, "uri2"); - URI auth1 = vf.createURI(RdfCloudTripleStoreConstants.AUTH_NAMESPACE, "auth1"); + IRI cpu = VF.createIRI(litdupsNS, "cpu"); + IRI loadPerc = VF.createIRI(litdupsNS, "loadPerc"); + IRI uri1 = VF.createIRI(litdupsNS, "uri1"); + IRI uri2 = VF.createIRI(litdupsNS, "uri2"); + IRI auth1 = VF.createIRI(RdfCloudTripleStoreConstants.AUTH_NAMESPACE, "auth1"); conn.add(cpu, loadPerc, uri1, auth1); conn.add(cpu, loadPerc, uri2); conn.commit(); @@ -162,13 +160,13 @@ public class CbSailTest extends CamelTestSupport { } public void testInsertData() throws Exception { - URI cpu = vf.createURI(litdupsNS, "cpu"); - URI loadPerc = vf.createURI(litdupsNS, "loadPerc"); - URI uri1 = vf.createURI(litdupsNS, "uri1"); - URI uri2 = vf.createURI(litdupsNS, "uri2"); + IRI cpu = VF.createIRI(litdupsNS, "cpu"); + IRI loadPerc = VF.createIRI(litdupsNS, "loadPerc"); + IRI uri1 = VF.createIRI(litdupsNS, "uri1"); + IRI uri2 = VF.createIRI(litdupsNS, "uri2"); List<Statement> insert = new ArrayList<Statement>(); - insert.add(new StatementImpl(cpu, loadPerc, uri1)); - insert.add(new StatementImpl(cpu, loadPerc, uri2)); + insert.add(VF.createStatement(cpu, loadPerc, uri1)); + insert.add(VF.createStatement(cpu, loadPerc, uri2)); resultEndpoint.expectedBodiesReceived(true); template.sendBody(insert); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/osgi/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/pom.xml b/osgi/pom.xml index 4ca9dd2..3371951 100644 --- a/osgi/pom.xml +++ b/osgi/pom.xml @@ -41,7 +41,7 @@ under the License. <module>alx.rya.console</module> <module>camel.rya</module> <!-- Disabling and documented in RYA-8 --> - <!-- <module>sesame-runtime-osgi</module> --> + <!-- <module>rdf4j-runtime-osgi</module> --> </modules> <build> <pluginManagement> @@ -53,7 +53,7 @@ under the License. <excludes> <!-- Services Files --> <exclude>**/resources/META-INF/services/**</exclude> - <exclude>sesame-runtime-osgi/openrdf-sesame-osgi.bnd</exclude> + <exclude>rdf4j-runtime-osgi/eclipse-rdf4j-osgi.bnd</exclude> </excludes> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/osgi/rdf4j-runtime-osgi/eclipse-rdf4j-osgi.bnd ---------------------------------------------------------------------- diff --git a/osgi/rdf4j-runtime-osgi/eclipse-rdf4j-osgi.bnd b/osgi/rdf4j-runtime-osgi/eclipse-rdf4j-osgi.bnd new file mode 100644 index 0000000..a838bfc --- /dev/null +++ b/osgi/rdf4j-runtime-osgi/eclipse-rdf4j-osgi.bnd @@ -0,0 +1,7 @@ +-classpath= target/rdf4j-runtime-osgi.jar +-output= target/rdf4j-runtime-osgi-2.3.1.jar +Import-Package= *;resolution:=optional +Export-Package= * +Bundle-Version= 2.3.1 +Bundle-SymbolicName= rdf4j-runtime-osgi +DynamicImport-Package= * http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/osgi/rdf4j-runtime-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/rdf4j-runtime-osgi/pom.xml b/osgi/rdf4j-runtime-osgi/pom.xml new file mode 100644 index 0000000..df2a35d --- /dev/null +++ b/osgi/rdf4j-runtime-osgi/pom.xml @@ -0,0 +1,139 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +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 +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.rya</groupId> + <artifactId>rya.osgi</artifactId> + <version>3.2.13-incubating-SNAPSHOT</version> + </parent> + + <artifactId>rdf4j-runtime-osgi</artifactId> + <name>RDF4J Runtime for OSGI</name> + + <packaging>pom</packaging> + + <dependencies> + <dependency> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-runtime-osgi</artifactId> + </dependency> + <dependency> + <groupId>biz.aQute</groupId> + <artifactId>bnd</artifactId> + <version>0.0.397</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>generate-resources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-runtime-osgi</artifactId> + <version>${project.version}</version> + <outputDirectory>${project.build.directory}</outputDirectory> + <destFileName>rdf4j-runtime-osgi.jar</destFileName> + </artifactItem> + <artifactItem> + <groupId>biz.aQute</groupId> + <artifactId>bnd</artifactId> + <version>0.0.397</version> + <outputDirectory>${project.build.directory}</outputDirectory> + <destFileName>bnd.jar</destFileName> + </artifactItem> + </artifactItems> + <!-- other configurations here --> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.1</version> + <executions> + <execution> + <phase>process-resources</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + <configuration> + <executable>java</executable> + <arguments> + <argument>-jar</argument> + <argument>target/bnd.jar</argument> + <argument>build</argument> + <argument>eclipse-rdf4j-osgi.bnd</argument> + </arguments> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin + </artifactId> + <version>1.7</version> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${project.build.directory}/rdf4j-runtime-osgi-${project.version}.jar</file> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <repositories> + <repository> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + <id>bndrepo</id> + <name>aQute BND Repo</name> + <url>http://www.aqute.biz/repo</url> + </repository> + </repositories> +</project> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/osgi/sesame-runtime-osgi/openrdf-sesame-osgi.bnd ---------------------------------------------------------------------- diff --git a/osgi/sesame-runtime-osgi/openrdf-sesame-osgi.bnd b/osgi/sesame-runtime-osgi/openrdf-sesame-osgi.bnd deleted file mode 100644 index c0aea07..0000000 --- a/osgi/sesame-runtime-osgi/openrdf-sesame-osgi.bnd +++ /dev/null @@ -1,7 +0,0 @@ --classpath= target/sesame-runtime-osgi.jar --output= target/sesame-runtime-osgi-2.6.4.jar -Import-Package= *;resolution:=optional -Export-Package= * -Bundle-Version= 2.6.4 -Bundle-SymbolicName= sesame-runtime-osgi -DynamicImport-Package= * http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/osgi/sesame-runtime-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/sesame-runtime-osgi/pom.xml b/osgi/sesame-runtime-osgi/pom.xml deleted file mode 100644 index ce55927..0000000 --- a/osgi/sesame-runtime-osgi/pom.xml +++ /dev/null @@ -1,139 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -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 -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.rya</groupId> - <artifactId>rya.osgi</artifactId> - <version>3.2.10-incubating-SNAPSHOT</version> - </parent> - - <artifactId>sesame-runtime-osgi</artifactId> - <name>Sesame Runtime for OSGI</name> - - <packaging>pom</packaging> - - <dependencies> - <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-runtime-osgi</artifactId> - </dependency> - <dependency> - <groupId>biz.aQute</groupId> - <artifactId>bnd</artifactId> - <version>0.0.397</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>generate-resources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-runtime-osgi</artifactId> - <version>${project.version}</version> - <outputDirectory>${project.build.directory}</outputDirectory> - <destFileName>sesame-runtime-osgi.jar</destFileName> - </artifactItem> - <artifactItem> - <groupId>biz.aQute</groupId> - <artifactId>bnd</artifactId> - <version>0.0.397</version> - <outputDirectory>${project.build.directory}</outputDirectory> - <destFileName>bnd.jar</destFileName> - </artifactItem> - </artifactItems> - <!-- other configurations here --> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <phase>process-resources</phase> - <goals> - <goal>exec</goal> - </goals> - </execution> - </executions> - <configuration> - <executable>java</executable> - <arguments> - <argument>-jar</argument> - <argument>target/bnd.jar</argument> - <argument>build</argument> - <argument>openrdf-sesame-osgi.bnd</argument> - </arguments> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin - </artifactId> - <version>1.7</version> - <executions> - <execution> - <id>attach-artifacts</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>${project.build.directory}/sesame-runtime-osgi-${project.version}.jar</file> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <repositories> - <repository> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>bndrepo</id> - <name>aQute BND Repo</name> - <url>http://www.aqute.biz/repo</url> - </repository> - </repositories> -</project> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/pig/accumulo.pig/pom.xml ---------------------------------------------------------------------- diff --git a/pig/accumulo.pig/pom.xml b/pig/accumulo.pig/pom.xml index e9b14d0..de1b3d0 100644 --- a/pig/accumulo.pig/pom.xml +++ b/pig/accumulo.pig/pom.xml @@ -41,8 +41,8 @@ under the License. </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-queryparser-sparql</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-queryparser-sparql</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/IndexWritingTool.java ---------------------------------------------------------------------- diff --git a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/IndexWritingTool.java b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/IndexWritingTool.java index 3d5de56..c6ce45a 100644 --- a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/IndexWritingTool.java +++ b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/IndexWritingTool.java @@ -19,8 +19,6 @@ package org.apache.rya.accumulo.pig; * under the License. */ - - import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -53,10 +51,10 @@ import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; import org.apache.log4j.Logger; import org.apache.rya.api.path.PathUtils; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.Projection; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.parser.sparql.SPARQLParser; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/SparqlQueryPigEngine.java ---------------------------------------------------------------------- diff --git a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/SparqlQueryPigEngine.java b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/SparqlQueryPigEngine.java index d0641e6..7302559 100644 --- a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/SparqlQueryPigEngine.java +++ b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/SparqlQueryPigEngine.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * 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 + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.rya.accumulo.pig; import java.io.ByteArrayInputStream; @@ -24,31 +42,10 @@ import org.apache.rya.rdftriplestore.inference.InferenceEngine; import org.apache.rya.rdftriplestore.inference.InverseOfVisitor; import org.apache.rya.rdftriplestore.inference.SymmetricPropertyVisitor; import org.apache.rya.rdftriplestore.inference.TransitivePropertyVisitor; -import org.openrdf.query.algebra.QueryRoot; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.QueryParser; -import org.openrdf.query.parser.sparql.SPARQLParser; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * 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 - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - - +import org.eclipse.rdf4j.query.algebra.QueryRoot; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.QueryParser; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/SparqlToPigTransformVisitor.java ---------------------------------------------------------------------- diff --git a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/SparqlToPigTransformVisitor.java b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/SparqlToPigTransformVisitor.java index c57aab8..673750d 100644 --- a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/SparqlToPigTransformVisitor.java +++ b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/SparqlToPigTransformVisitor.java @@ -18,16 +18,25 @@ package org.apache.rya.accumulo.pig; * specific language governing permissions and limitations * under the License. */ - - - -import org.openrdf.model.Literal; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.query.algebra.*; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; - -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.ProjectionElemList; +import org.eclipse.rdf4j.query.algebra.Slice; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.Union; +import org.eclipse.rdf4j.query.algebra.Var; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; /** * Created by IntelliJ IDEA. @@ -35,7 +44,7 @@ import java.util.*; * Time: 10:17 AM * To change this template use File | Settings | File Templates. */ -public class SparqlToPigTransformVisitor extends QueryModelVisitorBase<RuntimeException> { +public class SparqlToPigTransformVisitor extends AbstractQueryModelVisitor<RuntimeException> { private StringBuilder pigScriptBuilder = new StringBuilder(); private String tablePrefix; private String instance, zk, user, password; //TODO: use a Configuration object to get these @@ -328,7 +337,7 @@ public class SparqlToPigTransformVisitor extends QueryModelVisitorBase<RuntimeEx if (value == null) { return ""; } - if (value instanceof URI) { + if (value instanceof IRI) { return "<" + value.stringValue() + ">"; } if (value instanceof Literal) { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/StatementPatternStorage.java ---------------------------------------------------------------------- diff --git a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/StatementPatternStorage.java b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/StatementPatternStorage.java index bc3914c..0837e5c 100644 --- a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/StatementPatternStorage.java +++ b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/StatementPatternStorage.java @@ -19,8 +19,6 @@ package org.apache.rya.accumulo.pig; * under the License. */ - - import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Collection; @@ -52,17 +50,17 @@ import org.apache.rya.api.resolver.RyaTripleContext; import org.apache.rya.api.resolver.triple.TripleRow; import org.apache.rya.rdftriplestore.inference.InferenceEngine; import org.apache.rya.rdftriplestore.inference.InferenceEngineException; -import org.openrdf.model.Resource; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.vocabulary.RDF; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.Var; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.QueryParser; -import org.openrdf.query.parser.sparql.SPARQLParser; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.vocabulary.RDF; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.Var; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.QueryParser; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteStreams; @@ -169,7 +167,7 @@ public class StatementPatternStorage extends AccumuloStorage { } catch (MalformedQueryException e) { throw new IOException(e); } - parsedQuery.getTupleExpr().visitChildren(new QueryModelVisitorBase<IOException>() { + parsedQuery.getTupleExpr().visitChildren(new AbstractQueryModelVisitor<IOException>() { @Override public void meet(StatementPattern node) throws IOException { Var subjectVar = node.getSubjectVar(); @@ -193,7 +191,7 @@ public class StatementPatternStorage extends AccumuloStorage { protected Map.Entry<TABLE_LAYOUT, Range> createRange(Value s_v, Value p_v, Value o_v) throws IOException { RyaURI subject_rya = RdfToRyaConversions.convertResource((Resource) s_v); - RyaURI predicate_rya = RdfToRyaConversions.convertURI((URI) p_v); + RyaURI predicate_rya = RdfToRyaConversions.convertURI((IRI) p_v); RyaType object_rya = RdfToRyaConversions.convertValue(o_v); TriplePatternStrategy strategy = ryaContext.retrieveStrategy(subject_rya, predicate_rya, object_rya, null); if (strategy == null) { @@ -232,12 +230,12 @@ public class StatementPatternStorage extends AccumuloStorage { //is it subclassof or subpropertyof if (RDF.TYPE.equals(predicate_value)) { //try subclassof - Collection<URI> parents = inferenceEngine.findParents(inferenceEngine.getSubClassOfGraph(), (URI) object_value); + Collection<IRI> parents = InferenceEngine.findParents(inferenceEngine.getSubClassOfGraph(), (IRI) object_value); if (parents != null && parents.size() > 0) { //subclassof relationships found //don't add self, that will happen anyway later //add all relationships - for (URI parent : parents) { + for (IRI parent : parents) { Map.Entry<TABLE_LAYOUT, Range> temp = createRange(subject_value, predicate_value, parent); Range range = temp.getValue(); @@ -249,8 +247,8 @@ public class StatementPatternStorage extends AccumuloStorage { } } else if (predicate_value != null) { //subpropertyof check - Set<URI> parents = inferenceEngine.findParents(inferenceEngine.getSubPropertyOfGraph(), (URI) predicate_value); - for (URI parent : parents) { + Set<IRI> parents = InferenceEngine.findParents(inferenceEngine.getSubPropertyOfGraph(), (IRI) predicate_value); + for (IRI parent : parents) { Map.Entry<TABLE_LAYOUT, Range> temp = createRange(subject_value, parent, object_value); Range range = temp.getValue(); @@ -285,8 +283,8 @@ public class StatementPatternStorage extends AccumuloStorage { public Tuple getNext() throws IOException { try { if (reader.nextKeyValue()) { - Key key = (Key) reader.getCurrentKey(); - org.apache.accumulo.core.data.Value value = (org.apache.accumulo.core.data.Value) reader.getCurrentValue(); + Key key = reader.getCurrentKey(); + org.apache.accumulo.core.data.Value value = reader.getCurrentValue(); ByteArrayDataInput input = ByteStreams.newDataInput(key.getRow().getBytes()); RyaStatement ryaStatement = ryaContext.deserializeTriple(layout, new TripleRow(key.getRow().getBytes(), key.getColumnFamily().getBytes(), key.getColumnQualifier().getBytes())); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/optimizer/SimilarVarJoinOptimizer.java ---------------------------------------------------------------------- diff --git a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/optimizer/SimilarVarJoinOptimizer.java b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/optimizer/SimilarVarJoinOptimizer.java index c046a3d..36739c5 100644 --- a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/optimizer/SimilarVarJoinOptimizer.java +++ b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/optimizer/SimilarVarJoinOptimizer.java @@ -18,18 +18,24 @@ package org.apache.rya.accumulo.pig.optimizer; * specific language governing permissions and limitations * under the License. */ - - - -import org.openrdf.query.BindingSet; -import org.openrdf.query.Dataset; -import org.openrdf.query.algebra.*; -import org.openrdf.query.algebra.evaluation.QueryOptimizer; -import org.openrdf.query.algebra.evaluation.impl.EvaluationStatistics; -import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import org.openrdf.query.algebra.helpers.StatementPatternCollector; - -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.Dataset; +import org.eclipse.rdf4j.query.algebra.Join; +import org.eclipse.rdf4j.query.algebra.LeftJoin; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.Var; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryOptimizer; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.EvaluationStatistics; +import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor; +import org.eclipse.rdf4j.query.algebra.helpers.StatementPatternCollector; /** * A query optimizer that re-orders nested Joins according to cardinality, preferring joins that have similar variables. @@ -57,7 +63,7 @@ public class SimilarVarJoinOptimizer implements QueryOptimizer { tupleExpr.visit(new JoinVisitor()); } - protected class JoinVisitor extends QueryModelVisitorBase<RuntimeException> { + protected class JoinVisitor extends AbstractQueryModelVisitor<RuntimeException> { Set<String> boundVars = new HashSet<String>(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/SparqlToPigTransformVisitorTest.java ---------------------------------------------------------------------- diff --git a/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/SparqlToPigTransformVisitorTest.java b/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/SparqlToPigTransformVisitorTest.java index 5bd5b35..baf4c55 100644 --- a/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/SparqlToPigTransformVisitorTest.java +++ b/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/SparqlToPigTransformVisitorTest.java @@ -19,15 +19,13 @@ package org.apache.rya.accumulo.pig; * under the License. */ - - import junit.framework.TestCase; import org.apache.rya.accumulo.pig.optimizer.SimilarVarJoinOptimizer; -import org.openrdf.query.algebra.QueryRoot; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.QueryParser; -import org.openrdf.query.parser.sparql.SPARQLParser; +import org.eclipse.rdf4j.query.algebra.QueryRoot; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.QueryParser; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; /** * Created by IntelliJ IDEA. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/StatementPatternStorageTest.java ---------------------------------------------------------------------- diff --git a/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/StatementPatternStorageTest.java b/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/StatementPatternStorageTest.java index 1446d20..eb40df9 100644 --- a/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/StatementPatternStorageTest.java +++ b/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/StatementPatternStorageTest.java @@ -19,20 +19,10 @@ package org.apache.rya.accumulo.pig; * under the License. */ - - import java.io.IOException; import java.util.ArrayList; import java.util.List; -import junit.framework.TestCase; -import org.apache.rya.accumulo.AccumuloRdfConfiguration; -import org.apache.rya.accumulo.AccumuloRyaDAO; -import org.apache.rya.api.RdfCloudTripleStoreConstants; -import org.apache.rya.api.domain.RyaStatement; -import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; - import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.admin.SecurityOperations; @@ -48,8 +38,14 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.hadoop.mapreduce.TaskAttemptID; import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl; import org.apache.pig.data.Tuple; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaType; +import org.apache.rya.api.domain.RyaURI; + +import junit.framework.TestCase; /** * Created by IntelliJ IDEA. @@ -66,7 +62,6 @@ public class StatementPatternStorageTest extends TestCase { private Authorizations auths = Constants.NO_AUTHS; private Connector connector; private AccumuloRyaDAO ryaDAO; - private ValueFactory vf = new ValueFactoryImpl(); private String namespace = "urn:test#"; private AccumuloRdfConfiguration conf; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b3b9dbb..f31873a 100644 --- a/pom.xml +++ b/pom.xml @@ -69,8 +69,7 @@ under the License. <module>web</module> </modules> <properties> - <openrdf.sesame.version>2.7.6</openrdf.sesame.version> <!-- Newest: 4.0.0 --> - <!--Cannot upgrade to openrdf.sesame 2.7.6 until RYA-9 is resolved --> + <org.eclipse.rdf4j.version>2.3.1</org.eclipse.rdf4j.version> <!-- Newest: 2.3.1 --> <accumulo.version>1.6.4</accumulo.version> <!-- Newest: 1.7.0 --> <hadoop.version>2.5.0</hadoop.version> <!-- Newest: 2.7.1 --> @@ -79,7 +78,7 @@ under the License. <pig.version>0.9.2</pig.version> <!-- Newest: 0.15.0 --> - <lucene.version>3.6.2</lucene.version> <!-- Newest: 5.3.1 --> + <lucene.version>5.2.1</lucene.version> <!-- Newest: 5.3.1 --> <joda-time.version>2.1</joda-time.version> <!-- Newest: 2.9.1 --> <mongodb.version>3.3.0</mongodb.version> @@ -479,104 +478,104 @@ under the License. <version>${accumulo.version}</version> </dependency> <dependency> - <groupId>org.apache.rya</groupId> - <artifactId>sesame-runtime-osgi</artifactId> - <version>${openrdf.sesame.version}</version> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-runtime-osgi</artifactId> + <version>${org.eclipse.rdf4j.version}</version> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-runtime</artifactId> - <version>${openrdf.sesame.version}</version> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-runtime</artifactId> + <version>${org.eclipse.rdf4j.version}</version> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-model</artifactId> - <version>${openrdf.sesame.version}</version> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-model</artifactId> + <version>${org.eclipse.rdf4j.version}</version> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-query</artifactId> - <version>${openrdf.sesame.version}</version> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-query</artifactId> + <version>${org.eclipse.rdf4j.version}</version> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-queryalgebra-model</artifactId> - <version>${openrdf.sesame.version}</version> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-queryalgebra-model</artifactId> + <version>${org.eclipse.rdf4j.version}</version> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-queryparser-sparql</artifactId> - <version>${openrdf.sesame.version}</version> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-queryparser-sparql</artifactId> + <version>${org.eclipse.rdf4j.version}</version> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-queryresultio-sparqlxml</artifactId> - <version>${openrdf.sesame.version}</version> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-queryresultio-sparqlxml</artifactId> + <version>${org.eclipse.rdf4j.version}</version> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-queryresultio-text</artifactId> - <version>${openrdf.sesame.version}</version> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-queryresultio-text</artifactId> + <version>${org.eclipse.rdf4j.version}</version> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-rio-nquads</artifactId> - <version>${openrdf.sesame.version}</version> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-nquads</artifactId> + <version>${org.eclipse.rdf4j.version}</version> </dependency> - <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-rio-ntriples</artifactId> - <version>${openrdf.sesame.version}</version> + <dependency> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-ntriples</artifactId> + <version>${org.eclipse.rdf4j.version}</version> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-rio-rdfxml</artifactId> - <version>${openrdf.sesame.version}</version> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-rdfxml</artifactId> + <version>${org.eclipse.rdf4j.version}</version> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-rio-trig</artifactId> - <version>${openrdf.sesame.version}</version> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-trig</artifactId> + <version>${org.eclipse.rdf4j.version}</version> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-rio-turtle</artifactId> - <version>${openrdf.sesame.version}</version> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-turtle</artifactId> + <version>${org.eclipse.rdf4j.version}</version> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-queryrender</artifactId> - <version>${openrdf.sesame.version}</version> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-queryrender</artifactId> + <version>${org.eclipse.rdf4j.version}</version> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-runtime-osgi</artifactId> - <version>${openrdf.sesame.version}</version> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-runtime-osgi</artifactId> + <version>${org.eclipse.rdf4j.version}</version> <exclusions> <exclusion> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-http-client</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-http-client</artifactId> </exclusion> <exclusion> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-http-server-spring</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-http-server-spring</artifactId> </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-queryalgebra-evaluation</artifactId> - <version>${openrdf.sesame.version}</version> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-queryalgebra-evaluation</artifactId> + <version>${org.eclipse.rdf4j.version}</version> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-queryresultio-sparqljson</artifactId> - <version>${openrdf.sesame.version}</version> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-queryresultio-sparqljson</artifactId> + <version>${org.eclipse.rdf4j.version}</version> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-repository-api</artifactId> - <version>${openrdf.sesame.version}</version> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-repository-api</artifactId> + <version>${org.eclipse.rdf4j.version}</version> </dependency> <dependency> @@ -790,7 +789,7 @@ under the License. </dependency> <dependency> <groupId>org.apache.lucene</groupId> - <artifactId>lucene-analyzers</artifactId> + <artifactId>lucene-analyzers-common</artifactId> <version>${lucene.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/pom.xml ---------------------------------------------------------------------- diff --git a/sail/pom.xml b/sail/pom.xml index aedca13..5fc159c 100644 --- a/sail/pom.xml +++ b/sail/pom.xml @@ -34,6 +34,13 @@ under the License. <groupId>org.apache.rya</groupId> <artifactId>rya.api</artifactId> </dependency> + + <dependency> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-sail-api</artifactId> + <version>${org.eclipse.rdf4j.version}</version> + </dependency> + <dependency> <groupId>org.apache.rya</groupId> <artifactId>rya.provenance</artifactId> @@ -59,8 +66,8 @@ under the License. </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-runtime</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-runtime</artifactId> </dependency> <!-- Test --> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStore.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStore.java b/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStore.java index a99fe66..e475fec 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStore.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStore.java @@ -28,13 +28,13 @@ import org.apache.rya.api.persist.joinselect.SelectivityEvalDAO; import org.apache.rya.rdftriplestore.inference.InferenceEngine; import org.apache.rya.rdftriplestore.namespace.NamespaceManager; import org.apache.rya.rdftriplestore.provenance.ProvenanceCollector; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.sail.SailConnection; -import org.openrdf.sail.SailException; -import org.openrdf.sail.helpers.SailBase; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.sail.SailConnection; +import org.eclipse.rdf4j.sail.SailException; +import org.eclipse.rdf4j.sail.helpers.AbstractSail; -public class RdfCloudTripleStore<C extends RdfCloudTripleStoreConfiguration> extends SailBase { +public class RdfCloudTripleStore<C extends RdfCloudTripleStoreConfiguration> extends AbstractSail { private C conf; @@ -45,7 +45,7 @@ public class RdfCloudTripleStore<C extends RdfCloudTripleStoreConfiguration> ext private NamespaceManager namespaceManager; protected ProvenanceCollector provenanceCollector; - private static final ValueFactory VF = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Override protected SailConnection getConnectionInternal() throws SailException { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStoreConnection.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStoreConnection.java b/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStoreConnection.java index ed9ad0b..e582321 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStoreConnection.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStoreConnection.java @@ -69,44 +69,42 @@ import org.apache.rya.rdftriplestore.namespace.NamespaceManager; import org.apache.rya.rdftriplestore.provenance.ProvenanceCollectionException; import org.apache.rya.rdftriplestore.provenance.ProvenanceCollector; import org.apache.rya.rdftriplestore.utils.DefaultStatistics; -import org.openrdf.model.Namespace; -import org.openrdf.model.Resource; -import org.openrdf.model.Statement; -import org.openrdf.model.URI; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ContextStatementImpl; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; -import org.openrdf.query.Dataset; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.QueryRoot; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; -import org.openrdf.query.algebra.Var; -import org.openrdf.query.algebra.evaluation.EvaluationStrategy; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.query.algebra.evaluation.QueryOptimizer; -import org.openrdf.query.algebra.evaluation.TripleSource; -import org.openrdf.query.algebra.evaluation.impl.BindingAssigner; -import org.openrdf.query.algebra.evaluation.impl.CompareOptimizer; -import org.openrdf.query.algebra.evaluation.impl.ConjunctiveConstraintSplitter; -import org.openrdf.query.algebra.evaluation.impl.ConstantOptimizer; -import org.openrdf.query.algebra.evaluation.impl.DisjunctiveConstraintOptimizer; -import org.openrdf.query.algebra.evaluation.impl.EvaluationStatistics; -import org.openrdf.query.algebra.evaluation.impl.FilterOptimizer; -import org.openrdf.query.algebra.evaluation.impl.IterativeEvaluationOptimizer; -import org.openrdf.query.algebra.evaluation.impl.OrderLimitOptimizer; -import org.openrdf.query.algebra.evaluation.impl.QueryModelNormalizer; -import org.openrdf.query.algebra.evaluation.impl.SameTermFilterOptimizer; -import org.openrdf.query.impl.EmptyBindingSet; -import org.openrdf.sail.SailException; -import org.openrdf.sail.helpers.SailConnectionBase; - -import info.aduna.iteration.CloseableIteration; - -public class RdfCloudTripleStoreConnection<C extends RdfCloudTripleStoreConfiguration> extends SailConnectionBase { +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.Namespace; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.Value; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.Dataset; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.QueryRoot; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.algebra.Var; +import org.eclipse.rdf4j.query.algebra.evaluation.EvaluationStrategy; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryOptimizer; +import org.eclipse.rdf4j.query.algebra.evaluation.TripleSource; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.BindingAssigner; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.CompareOptimizer; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.ConjunctiveConstraintSplitter; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.ConstantOptimizer; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.DisjunctiveConstraintOptimizer; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.EvaluationStatistics; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.FilterOptimizer; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.IterativeEvaluationOptimizer; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.OrderLimitOptimizer; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.QueryModelNormalizer; +import org.eclipse.rdf4j.query.algebra.evaluation.impl.SameTermFilterOptimizer; +import org.eclipse.rdf4j.query.impl.EmptyBindingSet; +import org.eclipse.rdf4j.sail.SailException; +import org.eclipse.rdf4j.sail.helpers.AbstractSailConnection; + +public class RdfCloudTripleStoreConnection<C extends RdfCloudTripleStoreConfiguration> extends AbstractSailConnection { private final RdfCloudTripleStore<C> store; private RdfEvalStatsDAO<C> rdfEvalStatsDAO; @@ -150,7 +148,7 @@ public class RdfCloudTripleStoreConnection<C extends RdfCloudTripleStoreConfigur } @Override - protected void addStatementInternal(final Resource subject, final URI predicate, + protected void addStatementInternal(final Resource subject, final IRI predicate, final Value object, final Resource... contexts) throws SailException { try { final String cv_s = conf.getCv(); @@ -294,7 +292,7 @@ public class RdfCloudTripleStoreConnection<C extends RdfCloudTripleStoreConfigur if(pcjOptimizer != null) { QueryOptimizer opt = null; try { - final Constructor<QueryOptimizer> construct = pcjOptimizer.getDeclaredConstructor(new Class[] {}); + final Constructor<QueryOptimizer> construct = pcjOptimizer.getDeclaredConstructor(); opt = construct.newInstance(); } catch (final Exception e) { } @@ -329,7 +327,7 @@ public class RdfCloudTripleStoreConnection<C extends RdfCloudTripleStoreConfigur for (final Class<QueryOptimizer> optclz : optimizers) { QueryOptimizer result = null; try { - final Constructor<QueryOptimizer> meth = optclz.getDeclaredConstructor(new Class[] {}); + final Constructor<QueryOptimizer> meth = optclz.getDeclaredConstructor(); result = meth.newInstance(); } catch (final Exception e) { } @@ -462,7 +460,7 @@ public class RdfCloudTripleStoreConnection<C extends RdfCloudTripleStoreConfigur @Override protected CloseableIteration<? extends Statement, SailException> getStatementsInternal( - final Resource subject, final URI predicate, final Value object, final boolean flag, + final Resource subject, final IRI predicate, final Value object, final boolean flag, final Resource... contexts) throws SailException { // try { //have to do this to get the inferred values @@ -509,15 +507,16 @@ public class RdfCloudTripleStoreConnection<C extends RdfCloudTripleStoreConfigur try { final BindingSet next = evaluate.next(); final Resource bs_subj = (Resource) ((subjVar.hasValue()) ? subjVar.getValue() : next.getBinding(subjVar.getName()).getValue()); - final URI bs_pred = (URI) ((predVar.hasValue()) ? predVar.getValue() : next.getBinding(predVar.getName()).getValue()); - final Value bs_obj = (objVar.hasValue()) ? objVar.getValue() : (Value) next.getBinding(objVar.getName()).getValue(); + final IRI bs_pred = (IRI) ((predVar.hasValue()) ? predVar.getValue() : next.getBinding(predVar.getName()).getValue()); + final Value bs_obj = (objVar.hasValue()) ? objVar.getValue() : + next.getBinding(objVar.getName()).getValue(); final Binding b_cntxt = next.getBinding(cntxtVar.getName()); //convert BindingSet to Statement if (b_cntxt != null) { - return new ContextStatementImpl(bs_subj, bs_pred, bs_obj, (Resource) b_cntxt.getValue()); + return SimpleValueFactory.getInstance().createStatement(bs_subj, bs_pred, bs_obj, (Resource) b_cntxt.getValue()); } else { - return new StatementImpl(bs_subj, bs_pred, bs_obj); + return SimpleValueFactory.getInstance().createStatement(bs_subj, bs_pred, bs_obj); } } catch (final QueryEvaluationException e) { throw new SailException(e); @@ -552,16 +551,16 @@ public class RdfCloudTripleStoreConnection<C extends RdfCloudTripleStoreConfigur } @Override - protected void removeStatementsInternal(final Resource subject, final URI predicate, + protected void removeStatementsInternal(final Resource subject, final IRI predicate, final Value object, final Resource... contexts) throws SailException { - if (!(subject instanceof URI)) { + if (!(subject instanceof IRI)) { throw new SailException("Subject[" + subject + "] must be URI"); } try { if (contexts != null && contexts.length > 0) { for (final Resource context : contexts) { - if (!(context instanceof URI)) { + if (!(context instanceof IRI)) { throw new SailException("Context[" + context + "] must be URI"); } final RyaStatement statement = new RyaStatement( @@ -609,6 +608,11 @@ public class RdfCloudTripleStoreConnection<C extends RdfCloudTripleStoreConfigur //TODO: ? } + @Override + public boolean pendingRemovals() { + return false; + } + public static class StoreTripleSource<C extends RdfCloudTripleStoreConfiguration> implements TripleSource { private final C conf; @@ -621,7 +625,7 @@ public class RdfCloudTripleStoreConnection<C extends RdfCloudTripleStoreConfigur @Override public CloseableIteration<Statement, QueryEvaluationException> getStatements( - final Resource subject, final URI predicate, final Value object, + final Resource subject, final IRI predicate, final Value object, final Resource... contexts) throws QueryEvaluationException { return RyaDAOHelper.query(ryaDAO, subject, predicate, object, conf, contexts); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/RyaSailRepository.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/RyaSailRepository.java b/sail/src/main/java/org/apache/rya/rdftriplestore/RyaSailRepository.java index 402e5bb..ac45baa 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/RyaSailRepository.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/RyaSailRepository.java @@ -19,13 +19,11 @@ package org.apache.rya.rdftriplestore; * under the License. */ - - -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.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; /** * Created by IntelliJ IDEA. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/RyaSailRepositoryConnection.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/RyaSailRepositoryConnection.java b/sail/src/main/java/org/apache/rya/rdftriplestore/RyaSailRepositoryConnection.java index 5dfe5f3..145d2d0 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/RyaSailRepositoryConnection.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/RyaSailRepositoryConnection.java @@ -19,24 +19,21 @@ package org.apache.rya.rdftriplestore; * under the License. */ - - import java.io.IOException; import java.io.InputStream; import java.io.Reader; import org.apache.rya.rdftriplestore.utils.CombineContextsRdfInserter; - -import org.openrdf.OpenRDFUtil; -import org.openrdf.model.Resource; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.repository.sail.SailRepositoryConnection; -import org.openrdf.repository.util.RDFLoader; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFHandlerException; -import org.openrdf.rio.RDFParseException; -import org.openrdf.sail.SailConnection; +import org.eclipse.rdf4j.OpenRDFUtil; +import org.eclipse.rdf4j.model.Resource; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.repository.sail.SailRepository; +import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection; +import org.eclipse.rdf4j.repository.util.RDFLoader; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.RDFHandlerException; +import org.eclipse.rdf4j.rio.RDFParseException; +import org.eclipse.rdf4j.sail.SailConnection; /** * The real reason for this is so that we can combine contexts from an input stream/reader and the given contexts in the add function http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ExternalBatchingIterator.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ExternalBatchingIterator.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ExternalBatchingIterator.java index 606c1fb..93f847d 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ExternalBatchingIterator.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ExternalBatchingIterator.java @@ -19,14 +19,11 @@ package org.apache.rya.rdftriplestore.evaluation; * under the License. */ - - -import info.aduna.iteration.CloseableIteration; - import java.util.Collection; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; public interface ExternalBatchingIterator { public CloseableIteration<BindingSet, QueryEvaluationException> evaluate(Collection<BindingSet> bindingset) throws QueryEvaluationException; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ExternalMultipleBindingSetsIterator.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ExternalMultipleBindingSetsIterator.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ExternalMultipleBindingSetsIterator.java index c36ef68..812d2af 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ExternalMultipleBindingSetsIterator.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/ExternalMultipleBindingSetsIterator.java @@ -19,18 +19,14 @@ package org.apache.rya.rdftriplestore.evaluation; * under the License. */ - - -import info.aduna.iteration.CloseableIteration; -import info.aduna.iteration.LookAheadIteration; - import java.util.ArrayList; import java.util.Collection; -import org.openrdf.query.BindingSet; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.algebra.TupleExpr; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.common.iteration.LookAheadIteration; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.algebra.TupleExpr; /** */
