http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexingExample/src/main/java/RyaDirectExample.java ---------------------------------------------------------------------- diff --git a/extras/indexingExample/src/main/java/RyaDirectExample.java b/extras/indexingExample/src/main/java/RyaDirectExample.java index eed1a22..c05edd5 100644 --- a/extras/indexingExample/src/main/java/RyaDirectExample.java +++ b/extras/indexingExample/src/main/java/RyaDirectExample.java @@ -39,30 +39,28 @@ import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig; import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinStorageType; import org.apache.rya.indexing.pcj.storage.PcjException; import org.apache.rya.indexing.pcj.storage.accumulo.PcjTables; -import org.apache.rya.indexing.pcj.storage.accumulo.PcjVarOrderFactory; import org.apache.rya.rdftriplestore.inference.InferenceEngineException; import org.apache.rya.sail.config.RyaSailFactory; -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; -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.TupleQuery; -import org.openrdf.query.TupleQueryResultHandler; -import org.openrdf.query.TupleQueryResultHandlerException; -import org.openrdf.query.Update; -import org.openrdf.query.UpdateExecutionException; -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.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.TupleQuery; +import org.eclipse.rdf4j.query.TupleQueryResultHandler; +import org.eclipse.rdf4j.query.TupleQueryResultHandlerException; +import org.eclipse.rdf4j.query.Update; +import org.eclipse.rdf4j.query.UpdateExecutionException; +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; @@ -90,13 +88,14 @@ public class RyaDirectExample { SailRepositoryConnection conn = null; try { + log.info("Creating PCJ Tables"); + createPCJ(conf); + log.info("Connecting to Indexing Sail Repository."); final Sail extSail = RyaSailFactory.getInstance(conf); repository = new SailRepository(extSail); conn = repository.getConnection(); - createPCJ(conf); - final long start = System.currentTimeMillis(); log.info("Running SPARQL Example: Add and Delete"); testAddAndDelete(conn); @@ -335,19 +334,19 @@ public class RyaDirectExample { final SailRepositoryConnection conn) throws Exception { // add data to the repository using the SailRepository add methods final ValueFactory f = conn.getValueFactory(); - final URI person = f.createURI("http://example.org/ontology/Person";); + final IRI person = f.createIRI("http://example.org/ontology/Person";); String uuid; uuid = "urn:people:alice"; - conn.add(f.createURI(uuid), RDF.TYPE, person); - conn.add(f.createURI(uuid), RDFS.LABEL, - f.createLiteral("Alice Palace Hose", f.createURI("xsd:string"))); + conn.add(f.createIRI(uuid), RDF.TYPE, person); + conn.add(f.createIRI(uuid), RDFS.LABEL, + f.createLiteral("Alice Palace Hose", f.createIRI("xsd:string"))); - uuid = "urn:people:bobss"; - conn.add(f.createURI(uuid), RDF.TYPE, person); - conn.add(f.createURI(uuid), RDFS.LABEL, - f.createLiteral("Bob Snob Hose", "en")); + uuid = "urn:people:bob"; + conn.add(f.createIRI(uuid), RDF.TYPE, person); + conn.add(f.createIRI(uuid), RDFS.LABEL, + f.createLiteral("Bob Snob Hose", f.createIRI("xsd:string"))); String queryString; TupleQuery tupleQuery; @@ -645,21 +644,21 @@ public class RyaDirectExample { // Delete data from the repository using the SailRepository remove // methods final ValueFactory f = conn.getValueFactory(); - final URI person = f.createURI("http://example.org/ontology/Person";); + final IRI person = f.createIRI("http://example.org/ontology/Person";); String uuid; uuid = "urn:people:alice"; - conn.remove(f.createURI(uuid), RDF.TYPE, person); - conn.remove(f.createURI(uuid), RDFS.LABEL, - f.createLiteral("Alice Palace Hose", f.createURI("xsd:string"))); + conn.remove(f.createIRI(uuid), RDF.TYPE, person); + conn.remove(f.createIRI(uuid), RDFS.LABEL, + f.createLiteral("Alice Palace Hose", f.createIRI("xsd:string"))); - uuid = "urn:people:bobss"; - conn.remove(f.createURI(uuid), RDF.TYPE, person); - conn.remove(f.createURI(uuid), RDFS.LABEL, - f.createLiteral("Bob Snob Hose", "en")); + uuid = "urn:people:bob"; + conn.remove(f.createIRI(uuid), RDF.TYPE, person); + conn.remove(f.createIRI(uuid), RDFS.LABEL, + f.createLiteral("Bob Snob Hose", f.createIRI("xsd:string"))); - conn.remove(person, RDFS.LABEL, f.createLiteral("label", "en")); + conn.remove(person, RDFS.LABEL, f.createLiteral("label", f.createIRI("xsd:string"))); String queryString; TupleQuery tupleQuery; @@ -753,18 +752,19 @@ public class RyaDirectExample { + " ?e <uri:talksTo> ?o . "// + "}";// - URI obj, subclass, talksTo; - final URI person = new URIImpl("urn:people:alice"); - final URI feature = new URIImpl("urn:feature"); - final URI sub = new URIImpl("uri:entity"); - subclass = new URIImpl("uri:class"); - obj = new URIImpl("uri:obj"); - talksTo = new URIImpl("uri:talksTo"); + ValueFactory vf = SimpleValueFactory.getInstance(); + IRI obj, subclass, talksTo; + final IRI person = vf.createIRI("urn:people:alice"); + final IRI feature = vf.createIRI("urn:feature"); + final IRI sub = vf.createIRI("uri:entity"); + subclass = vf.createIRI("uri:class"); + obj = vf.createIRI("uri:obj"); + talksTo = vf.createIRI("uri:talksTo"); conn.add(person, RDF.TYPE, sub); conn.add(feature, RDF.TYPE, sub); 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 String tablename1 = RYA_TABLE_PREFIX + "INDEX_1"; @@ -775,11 +775,11 @@ public class RyaDirectExample { new PcjTables().createAndPopulatePcj(conn, accCon, tablename1, queryString1, new String[] { "e", "c", "l", "o" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); new PcjTables().createAndPopulatePcj(conn, accCon, tablename2, queryString2, new String[] { "e", "c", "l", "o" }, - Optional.<PcjVarOrderFactory> absent()); + Optional.absent()); } catch (final RyaDAOException e) { throw new Error("While creating PCJ tables.",e);
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/indexingExample/src/main/java/StatementMetadataExample.java ---------------------------------------------------------------------- diff --git a/extras/indexingExample/src/main/java/StatementMetadataExample.java b/extras/indexingExample/src/main/java/StatementMetadataExample.java index b759fd2..9f0afc9 100644 --- a/extras/indexingExample/src/main/java/StatementMetadataExample.java +++ b/extras/indexingExample/src/main/java/StatementMetadataExample.java @@ -23,7 +23,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; - import org.apache.accumulo.core.client.Connector; import org.apache.commons.lang3.Validate; import org.apache.hadoop.conf.Configuration; @@ -39,24 +38,25 @@ import org.apache.rya.api.domain.RyaURI; import org.apache.rya.api.domain.StatementMetadata; import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.indexing.accumulo.ConfigUtils; +import org.apache.rya.indexing.statement.metadata.matching.StatementMetadataNode; import org.apache.rya.indexing.statement.metadata.matching.StatementMetadataOptimizer; import org.apache.rya.sail.config.RyaSailFactory; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.BindingSet; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.QueryLanguage; -import org.openrdf.query.QueryResultHandlerException; -import org.openrdf.query.TupleQuery; -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.Sail; -import org.openrdf.sail.SailException; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.QueryLanguage; +import org.eclipse.rdf4j.query.QueryResultHandlerException; +import org.eclipse.rdf4j.query.TupleQuery; +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.Sail; +import org.eclipse.rdf4j.sail.SailException; public class StatementMetadataExample { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/periodic.notification/api/pom.xml ---------------------------------------------------------------------- diff --git a/extras/periodic.notification/api/pom.xml b/extras/periodic.notification/api/pom.xml index ebed3c7..1118e14 100644 --- a/extras/periodic.notification/api/pom.xml +++ b/extras/periodic.notification/api/pom.xml @@ -40,8 +40,8 @@ <artifactId>gson</artifactId> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-query</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-query</artifactId> </dependency> <dependency> <groupId>org.apache.kafka</groupId> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/periodic.notification/api/src/main/java/org/apache/rya/periodic/notification/api/BinPruner.java ---------------------------------------------------------------------- diff --git a/extras/periodic.notification/api/src/main/java/org/apache/rya/periodic/notification/api/BinPruner.java b/extras/periodic.notification/api/src/main/java/org/apache/rya/periodic/notification/api/BinPruner.java index f4a083c..8aee25b 100644 --- a/extras/periodic.notification/api/src/main/java/org/apache/rya/periodic/notification/api/BinPruner.java +++ b/extras/periodic.notification/api/src/main/java/org/apache/rya/periodic/notification/api/BinPruner.java @@ -18,8 +18,8 @@ */ package org.apache.rya.periodic.notification.api; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; /** * Object that cleans up old {@link BindingSet}s corresponding to the specified http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/periodic.notification/api/src/main/java/org/apache/rya/periodic/notification/api/BindingSetExporter.java ---------------------------------------------------------------------- diff --git a/extras/periodic.notification/api/src/main/java/org/apache/rya/periodic/notification/api/BindingSetExporter.java b/extras/periodic.notification/api/src/main/java/org/apache/rya/periodic/notification/api/BindingSetExporter.java index 491576b..364ad4e 100644 --- a/extras/periodic.notification/api/src/main/java/org/apache/rya/periodic/notification/api/BindingSetExporter.java +++ b/extras/periodic.notification/api/src/main/java/org/apache/rya/periodic/notification/api/BindingSetExporter.java @@ -18,7 +18,7 @@ */ package org.apache.rya.periodic.notification.api; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; /** * An Object that is used to export {@link BindingSet}s to an external repository or queuing system. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/periodic.notification/api/src/main/java/org/apache/rya/periodic/notification/api/BindingSetRecord.java ---------------------------------------------------------------------- diff --git a/extras/periodic.notification/api/src/main/java/org/apache/rya/periodic/notification/api/BindingSetRecord.java b/extras/periodic.notification/api/src/main/java/org/apache/rya/periodic/notification/api/BindingSetRecord.java index c3f70f1..1deb230 100644 --- a/extras/periodic.notification/api/src/main/java/org/apache/rya/periodic/notification/api/BindingSetRecord.java +++ b/extras/periodic.notification/api/src/main/java/org/apache/rya/periodic/notification/api/BindingSetRecord.java @@ -18,7 +18,7 @@ */ package org.apache.rya.periodic.notification.api; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/periodic.notification/api/src/main/java/org/apache/rya/periodic/notification/serialization/BindingSetSerDe.java ---------------------------------------------------------------------- diff --git a/extras/periodic.notification/api/src/main/java/org/apache/rya/periodic/notification/serialization/BindingSetSerDe.java b/extras/periodic.notification/api/src/main/java/org/apache/rya/periodic/notification/serialization/BindingSetSerDe.java index 6db7b18..ba7dcad 100644 --- a/extras/periodic.notification/api/src/main/java/org/apache/rya/periodic/notification/serialization/BindingSetSerDe.java +++ b/extras/periodic.notification/api/src/main/java/org/apache/rya/periodic/notification/serialization/BindingSetSerDe.java @@ -28,14 +28,17 @@ import org.apache.kafka.common.serialization.Serializer; import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjSerializer; import org.apache.rya.indexing.pcj.storage.accumulo.BindingSetConverter.BindingSetConversionException; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; -import org.openrdf.query.BindingSet; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; import com.google.common.primitives.Bytes; +import com.google.common.base.Joiner; +import com.google.common.primitives.Bytes; + /** * Kafka {@link Serializer} and {@link Deserializer} for producing and consuming messages * from Kafka. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/periodic.notification/service/pom.xml ---------------------------------------------------------------------- diff --git a/extras/periodic.notification/service/pom.xml b/extras/periodic.notification/service/pom.xml index ef07131..dc68d3d 100644 --- a/extras/periodic.notification/service/pom.xml +++ b/extras/periodic.notification/service/pom.xml @@ -49,8 +49,8 @@ <artifactId>rya.indexing</artifactId> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-query</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-query</artifactId> </dependency> <dependency> <groupId>org.apache.rya</groupId> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/application/PeriodicNotificationApplication.java ---------------------------------------------------------------------- diff --git a/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/application/PeriodicNotificationApplication.java b/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/application/PeriodicNotificationApplication.java index 79abe2f..66cb25b 100644 --- a/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/application/PeriodicNotificationApplication.java +++ b/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/application/PeriodicNotificationApplication.java @@ -32,7 +32,7 @@ import org.apache.rya.periodic.notification.exporter.KafkaExporterExecutor; import org.apache.rya.periodic.notification.processor.NotificationProcessorExecutor; import org.apache.rya.periodic.notification.pruner.PeriodicQueryPrunerExecutor; import org.apache.rya.periodic.notification.registration.kafka.KafkaNotificationProvider; -import org.openrdf.query.algebra.evaluation.function.Function; +import org.eclipse.rdf4j.query.algebra.evaluation.function.Function; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/application/PeriodicNotificationApplicationFactory.java ---------------------------------------------------------------------- diff --git a/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/application/PeriodicNotificationApplicationFactory.java b/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/application/PeriodicNotificationApplicationFactory.java index fbc03f3..85f6e15 100644 --- a/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/application/PeriodicNotificationApplicationFactory.java +++ b/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/application/PeriodicNotificationApplicationFactory.java @@ -18,13 +18,10 @@ */ package org.apache.rya.periodic.notification.application; -import java.io.File; -import java.io.FileInputStream; import java.util.Optional; import java.util.Properties; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.TimeUnit; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; @@ -54,9 +51,7 @@ import org.apache.rya.periodic.notification.recovery.PeriodicNotificationProvide import org.apache.rya.periodic.notification.registration.kafka.KafkaNotificationProvider; import org.apache.rya.periodic.notification.serialization.BindingSetSerDe; import org.apache.rya.periodic.notification.serialization.CommandNotificationSerializer; -import org.openrdf.query.BindingSet; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.eclipse.rdf4j.query.BindingSet; /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/exporter/KafkaExporterExecutor.java ---------------------------------------------------------------------- diff --git a/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/exporter/KafkaExporterExecutor.java b/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/exporter/KafkaExporterExecutor.java index 815a794..b9f3de8 100644 --- a/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/exporter/KafkaExporterExecutor.java +++ b/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/exporter/KafkaExporterExecutor.java @@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.rya.periodic.notification.api.BindingSetRecord; import org.apache.rya.periodic.notification.api.LifeCycle; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/exporter/KafkaPeriodicBindingSetExporter.java ---------------------------------------------------------------------- diff --git a/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/exporter/KafkaPeriodicBindingSetExporter.java b/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/exporter/KafkaPeriodicBindingSetExporter.java index c343116..182f328 100644 --- a/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/exporter/KafkaPeriodicBindingSetExporter.java +++ b/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/exporter/KafkaPeriodicBindingSetExporter.java @@ -31,8 +31,8 @@ import org.apache.rya.indexing.pcj.fluo.app.IncrementalUpdateConstants; import org.apache.rya.periodic.notification.api.BindingSetExporter; import org.apache.rya.periodic.notification.api.BindingSetRecord; import org.apache.rya.periodic.notification.api.BindingSetRecordExportException; -import org.openrdf.model.Literal; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.query.BindingSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/processor/TimestampedNotificationProcessor.java ---------------------------------------------------------------------- diff --git a/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/processor/TimestampedNotificationProcessor.java b/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/processor/TimestampedNotificationProcessor.java index dcc47b6..a27bf7a 100644 --- a/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/processor/TimestampedNotificationProcessor.java +++ b/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/processor/TimestampedNotificationProcessor.java @@ -30,7 +30,7 @@ import org.apache.rya.periodic.notification.api.NodeBin; import org.apache.rya.periodic.notification.api.NotificationProcessor; import org.apache.rya.periodic.notification.exporter.KafkaPeriodicBindingSetExporter; import org.apache.rya.periodic.notification.notification.TimestampedNotification; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.query.BindingSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -95,7 +95,7 @@ public class TimestampedNotificationProcessor implements NotificationProcessor, final long bin = getBinFromTimestamp(ts, period); final NodeBin nodeBin = new NodeBin(id, bin); - try (CloseableIterator<BindingSet> iter = periodicStorage.listResults(id, Optional.of(bin));) { + try (CloseableIterator<BindingSet> iter = periodicStorage.listResults(id, Optional.of(bin))) { while(iter.hasNext()) { bindingSets.add(new BindingSetRecord(iter.next(), id)); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/pruner/FluoBinPruner.java ---------------------------------------------------------------------- diff --git a/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/pruner/FluoBinPruner.java b/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/pruner/FluoBinPruner.java index ea08af5..886ffc2 100644 --- a/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/pruner/FluoBinPruner.java +++ b/extras/periodic.notification/service/src/main/java/org/apache/rya/periodic/notification/pruner/FluoBinPruner.java @@ -29,9 +29,8 @@ import org.apache.rya.indexing.pcj.fluo.app.batch.SpanBatchDeleteInformation; import org.apache.rya.indexing.pcj.fluo.app.util.BindingHashShardingFunction; import org.apache.rya.periodic.notification.api.BinPruner; import org.apache.rya.periodic.notification.api.NodeBin; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,7 +42,7 @@ import com.google.common.base.Optional; public class FluoBinPruner implements BinPruner { private static final Logger log = LoggerFactory.getLogger(FluoBinPruner.class); - private static final ValueFactory vf = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); private final FluoClient client; public FluoBinPruner(final FluoClient client) { @@ -54,10 +53,8 @@ public class FluoBinPruner implements BinPruner { * This method deletes BindingSets in the specified bin from the BindingSet * Column of the indicated Fluo nodeId * - * @param id + * @param nodeBin * - Fluo nodeId - * @param bin - * - bin id */ @Override public void pruneBindingSetBin(final NodeBin nodeBin) { @@ -70,7 +67,7 @@ public class FluoBinPruner implements BinPruner { throw new RuntimeException(); } final Column batchInfoColumn = type.get().getResultColumn(); - final Bytes batchInfoSpanPrefix = BindingHashShardingFunction.getShardedScanPrefix(id, vf.createLiteral(bin)); + final Bytes batchInfoSpanPrefix = BindingHashShardingFunction.getShardedScanPrefix(id, VF.createLiteral(bin)); final SpanBatchDeleteInformation batchInfo = SpanBatchDeleteInformation.builder().setColumn(batchInfoColumn) .setSpan(Span.prefix(batchInfoSpanPrefix)).build(); BatchInformationDAO.addBatch(tx, id, batchInfo); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/application/PeriodicNotificationApplicationIT.java ---------------------------------------------------------------------- diff --git a/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/application/PeriodicNotificationApplicationIT.java b/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/application/PeriodicNotificationApplicationIT.java index cd06f2a..bd87df5 100644 --- a/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/application/PeriodicNotificationApplicationIT.java +++ b/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/application/PeriodicNotificationApplicationIT.java @@ -71,25 +71,23 @@ import org.apache.rya.periodic.notification.serialization.CommandNotificationSer import org.apache.rya.test.kafka.EmbeddedKafkaInstance; import org.apache.rya.test.kafka.EmbeddedKafkaSingleton; import org.apache.rya.test.kafka.KafkaTestInstanceRule; +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.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; -import org.openrdf.model.Statement; -import org.openrdf.model.Value; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.LiteralImpl; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.BindingSet; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import com.google.common.collect.Sets;; - +import com.google.common.collect.Sets; public class PeriodicNotificationApplicationIT extends RyaExportITBase { @@ -142,12 +140,11 @@ public class PeriodicNotificationApplicationIT extends RyaExportITBase { //make data final int periodMult = 15; - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final DatatypeFactory dtf = DatatypeFactory.newInstance(); //Sleep until current time aligns nicely with period to makell //results more predictable while(System.currentTimeMillis() % (periodMult*1000) > 500) { - ; } final ZonedDateTime time = ZonedDateTime.now(); @@ -161,21 +158,21 @@ public class PeriodicNotificationApplicationIT extends RyaExportITBase { final String time3 = zTime3.format(DateTimeFormatter.ISO_INSTANT); final Collection<Statement> statements = Sets.newHashSet( - vf.createStatement(vf.createURI("urn:obs_1"), vf.createURI("uri:hasTime"), + vf.createStatement(vf.createIRI("urn:obs_1"), vf.createIRI("uri:hasTime"), vf.createLiteral(dtf.newXMLGregorianCalendar(time1))), - vf.createStatement(vf.createURI("urn:obs_1"), vf.createURI("uri:hasObsType"), vf.createLiteral("ship")), - vf.createStatement(vf.createURI("urn:obs_2"), vf.createURI("uri:hasTime"), + vf.createStatement(vf.createIRI("urn:obs_1"), vf.createIRI("uri:hasObsType"), vf.createLiteral("ship")), + vf.createStatement(vf.createIRI("urn:obs_2"), vf.createIRI("uri:hasTime"), vf.createLiteral(dtf.newXMLGregorianCalendar(time1))), - vf.createStatement(vf.createURI("urn:obs_2"), vf.createURI("uri:hasObsType"), vf.createLiteral("airplane")), - vf.createStatement(vf.createURI("urn:obs_3"), vf.createURI("uri:hasTime"), + vf.createStatement(vf.createIRI("urn:obs_2"), vf.createIRI("uri:hasObsType"), vf.createLiteral("airplane")), + vf.createStatement(vf.createIRI("urn:obs_3"), vf.createIRI("uri:hasTime"), vf.createLiteral(dtf.newXMLGregorianCalendar(time2))), - vf.createStatement(vf.createURI("urn:obs_3"), vf.createURI("uri:hasObsType"), vf.createLiteral("ship")), - vf.createStatement(vf.createURI("urn:obs_4"), vf.createURI("uri:hasTime"), + vf.createStatement(vf.createIRI("urn:obs_3"), vf.createIRI("uri:hasObsType"), vf.createLiteral("ship")), + vf.createStatement(vf.createIRI("urn:obs_4"), vf.createIRI("uri:hasTime"), vf.createLiteral(dtf.newXMLGregorianCalendar(time2))), - vf.createStatement(vf.createURI("urn:obs_4"), vf.createURI("uri:hasObsType"), vf.createLiteral("airplane")), - vf.createStatement(vf.createURI("urn:obs_5"), vf.createURI("uri:hasTime"), + vf.createStatement(vf.createIRI("urn:obs_4"), vf.createIRI("uri:hasObsType"), vf.createLiteral("airplane")), + vf.createStatement(vf.createIRI("urn:obs_5"), vf.createIRI("uri:hasTime"), vf.createLiteral(dtf.newXMLGregorianCalendar(time3))), - vf.createStatement(vf.createURI("urn:obs_5"), vf.createURI("uri:hasObsType"), vf.createLiteral("automobile"))); + vf.createStatement(vf.createIRI("urn:obs_5"), vf.createIRI("uri:hasObsType"), vf.createLiteral("automobile"))); try (FluoClient fluo = FluoClientFactory.getFluoClient(conf.getFluoAppName(), Optional.of(conf.getFluoTableName()), conf)) { final Connector connector = ConfigUtils.getConnector(conf); @@ -210,17 +207,17 @@ public class PeriodicNotificationApplicationIT extends RyaExportITBase { final Set<BindingSet> expected1 = new HashSet<>(); final QueryBindingSet bs1 = new QueryBindingSet(); bs1.addBinding(IncrementalUpdateConstants.PERIODIC_BIN_ID, vf.createLiteral(ids.get(0))); - bs1.addBinding("total", new LiteralImpl("2", XMLSchema.INTEGER)); + bs1.addBinding("total", vf.createLiteral("2", XMLSchema.INTEGER)); bs1.addBinding("type", vf.createLiteral("airplane")); final QueryBindingSet bs2 = new QueryBindingSet(); bs2.addBinding(IncrementalUpdateConstants.PERIODIC_BIN_ID, vf.createLiteral(ids.get(0))); - bs2.addBinding("total", new LiteralImpl("2", XMLSchema.INTEGER)); + bs2.addBinding("total", vf.createLiteral("2", XMLSchema.INTEGER)); bs2.addBinding("type", vf.createLiteral("ship")); final QueryBindingSet bs3 = new QueryBindingSet(); bs3.addBinding(IncrementalUpdateConstants.PERIODIC_BIN_ID, vf.createLiteral(ids.get(0))); - bs3.addBinding("total", new LiteralImpl("1", XMLSchema.INTEGER)); + bs3.addBinding("total", vf.createLiteral("1", XMLSchema.INTEGER)); bs3.addBinding("type", vf.createLiteral("automobile")); expected1.add(bs1); @@ -230,12 +227,12 @@ public class PeriodicNotificationApplicationIT extends RyaExportITBase { final Set<BindingSet> expected2 = new HashSet<>(); final QueryBindingSet bs4 = new QueryBindingSet(); bs4.addBinding(IncrementalUpdateConstants.PERIODIC_BIN_ID, vf.createLiteral(ids.get(1))); - bs4.addBinding("total", new LiteralImpl("2", XMLSchema.INTEGER)); + bs4.addBinding("total", vf.createLiteral("2", XMLSchema.INTEGER)); bs4.addBinding("type", vf.createLiteral("airplane")); final QueryBindingSet bs5 = new QueryBindingSet(); bs5.addBinding(IncrementalUpdateConstants.PERIODIC_BIN_ID, vf.createLiteral(ids.get(1))); - bs5.addBinding("total", new LiteralImpl("2", XMLSchema.INTEGER)); + bs5.addBinding("total", vf.createLiteral("2", XMLSchema.INTEGER)); bs5.addBinding("type", vf.createLiteral("ship")); expected2.add(bs4); @@ -244,12 +241,12 @@ public class PeriodicNotificationApplicationIT extends RyaExportITBase { final Set<BindingSet> expected3 = new HashSet<>(); final QueryBindingSet bs6 = new QueryBindingSet(); bs6.addBinding(IncrementalUpdateConstants.PERIODIC_BIN_ID, vf.createLiteral(ids.get(2))); - bs6.addBinding("total", new LiteralImpl("1", XMLSchema.INTEGER)); + bs6.addBinding("total", vf.createLiteral("1", XMLSchema.INTEGER)); bs6.addBinding("type", vf.createLiteral("ship")); final QueryBindingSet bs7 = new QueryBindingSet(); bs7.addBinding(IncrementalUpdateConstants.PERIODIC_BIN_ID, vf.createLiteral(ids.get(2))); - bs7.addBinding("total", new LiteralImpl("1", XMLSchema.INTEGER)); + bs7.addBinding("total", vf.createLiteral("1", XMLSchema.INTEGER)); bs7.addBinding("type", vf.createLiteral("airplane")); expected3.add(bs6); @@ -286,12 +283,11 @@ public class PeriodicNotificationApplicationIT extends RyaExportITBase { //make data final int periodMult = 15; - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final DatatypeFactory dtf = DatatypeFactory.newInstance(); //Sleep until current time aligns nicely with period to make //results more predictable while(System.currentTimeMillis() % (periodMult*1000) > 500) { - ; } final ZonedDateTime time = ZonedDateTime.now(); @@ -305,15 +301,15 @@ public class PeriodicNotificationApplicationIT extends RyaExportITBase { final String time3 = zTime3.format(DateTimeFormatter.ISO_INSTANT); final Collection<Statement> statements = Sets.newHashSet( - vf.createStatement(vf.createURI("urn:obs_1"), vf.createURI("uri:hasTime"), + vf.createStatement(vf.createIRI("urn:obs_1"), vf.createIRI("uri:hasTime"), vf.createLiteral(dtf.newXMLGregorianCalendar(time1))), - vf.createStatement(vf.createURI("urn:obs_1"), vf.createURI("uri:hasId"), vf.createLiteral("id_1")), - vf.createStatement(vf.createURI("urn:obs_2"), vf.createURI("uri:hasTime"), + vf.createStatement(vf.createIRI("urn:obs_1"), vf.createIRI("uri:hasId"), vf.createLiteral("id_1")), + vf.createStatement(vf.createIRI("urn:obs_2"), vf.createIRI("uri:hasTime"), vf.createLiteral(dtf.newXMLGregorianCalendar(time2))), - vf.createStatement(vf.createURI("urn:obs_2"), vf.createURI("uri:hasId"), vf.createLiteral("id_2")), - vf.createStatement(vf.createURI("urn:obs_3"), vf.createURI("uri:hasTime"), + vf.createStatement(vf.createIRI("urn:obs_2"), vf.createIRI("uri:hasId"), vf.createLiteral("id_2")), + vf.createStatement(vf.createIRI("urn:obs_3"), vf.createIRI("uri:hasTime"), vf.createLiteral(dtf.newXMLGregorianCalendar(time3))), - vf.createStatement(vf.createURI("urn:obs_3"), vf.createURI("uri:hasId"), vf.createLiteral("id_3"))); + vf.createStatement(vf.createIRI("urn:obs_3"), vf.createIRI("uri:hasId"), vf.createLiteral("id_3"))); try (FluoClient fluo = FluoClientFactory.getFluoClient(conf.getFluoAppName(), Optional.of(conf.getFluoTableName()), conf)) { final Connector connector = ConfigUtils.getConnector(conf); @@ -378,12 +374,11 @@ public class PeriodicNotificationApplicationIT extends RyaExportITBase { //make data final int periodMult = 15; - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final DatatypeFactory dtf = DatatypeFactory.newInstance(); //Sleep until current time aligns nicely with period to make //results more predictable while(System.currentTimeMillis() % (periodMult*1000) > 500) { - ; } final ZonedDateTime time = ZonedDateTime.now(); @@ -397,15 +392,15 @@ public class PeriodicNotificationApplicationIT extends RyaExportITBase { final String time3 = zTime3.format(DateTimeFormatter.ISO_INSTANT); final Collection<Statement> statements = Sets.newHashSet( - vf.createStatement(vf.createURI("urn:obs_1"), vf.createURI("uri:hasTime"), + vf.createStatement(vf.createIRI("urn:obs_1"), vf.createIRI("uri:hasTime"), vf.createLiteral(dtf.newXMLGregorianCalendar(time1))), - vf.createStatement(vf.createURI("urn:obs_1"), vf.createURI("uri:hasId"), vf.createLiteral("id_1")), - vf.createStatement(vf.createURI("urn:obs_2"), vf.createURI("uri:hasTime"), + vf.createStatement(vf.createIRI("urn:obs_1"), vf.createIRI("uri:hasId"), vf.createLiteral("id_1")), + vf.createStatement(vf.createIRI("urn:obs_2"), vf.createIRI("uri:hasTime"), vf.createLiteral(dtf.newXMLGregorianCalendar(time2))), - vf.createStatement(vf.createURI("urn:obs_2"), vf.createURI("uri:hasId"), vf.createLiteral("id_2")), - vf.createStatement(vf.createURI("urn:obs_3"), vf.createURI("uri:hasTime"), + vf.createStatement(vf.createIRI("urn:obs_2"), vf.createIRI("uri:hasId"), vf.createLiteral("id_2")), + vf.createStatement(vf.createIRI("urn:obs_3"), vf.createIRI("uri:hasTime"), vf.createLiteral(dtf.newXMLGregorianCalendar(time3))), - vf.createStatement(vf.createURI("urn:obs_3"), vf.createURI("uri:hasId"), vf.createLiteral("id_3"))); + vf.createStatement(vf.createIRI("urn:obs_3"), vf.createIRI("uri:hasId"), vf.createLiteral("id_3"))); try (FluoClient fluo = FluoClientFactory.getFluoClient(conf.getFluoAppName(), Optional.of(conf.getFluoTableName()), conf)) { final Connector connector = ConfigUtils.getConnector(conf); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/application/PeriodicNotificationProviderIT.java ---------------------------------------------------------------------- diff --git a/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/application/PeriodicNotificationProviderIT.java b/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/application/PeriodicNotificationProviderIT.java index e05ca6f..cadbc57 100644 --- a/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/application/PeriodicNotificationProviderIT.java +++ b/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/application/PeriodicNotificationProviderIT.java @@ -31,9 +31,9 @@ import org.apache.rya.indexing.pcj.fluo.app.util.FluoQueryUtils; import org.apache.rya.periodic.notification.coordinator.PeriodicNotificationCoordinatorExecutor; import org.apache.rya.periodic.notification.notification.TimestampedNotification; import org.apache.rya.periodic.notification.recovery.PeriodicNotificationProvider; +import org.eclipse.rdf4j.query.MalformedQueryException; import org.junit.Assert; import org.junit.Test; -import org.openrdf.query.MalformedQueryException; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/exporter/PeriodicNotificationExporterIT.java ---------------------------------------------------------------------- diff --git a/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/exporter/PeriodicNotificationExporterIT.java b/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/exporter/PeriodicNotificationExporterIT.java index 82338b9..a2c76ec 100644 --- a/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/exporter/PeriodicNotificationExporterIT.java +++ b/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/exporter/PeriodicNotificationExporterIT.java @@ -38,13 +38,13 @@ import org.apache.rya.periodic.notification.api.BindingSetRecord; import org.apache.rya.periodic.notification.serialization.BindingSetSerDe; import org.apache.rya.test.kafka.KafkaITBase; import org.apache.rya.test.kafka.KafkaTestInstanceRule; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.BindingSet; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; public class PeriodicNotificationExporterIT extends KafkaITBase { @@ -53,7 +53,7 @@ public class PeriodicNotificationExporterIT extends KafkaITBase { public KafkaTestInstanceRule kafkaTestInstanceRule = new KafkaTestInstanceRule(false); - private static final ValueFactory vf = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Test public void testExporter() throws InterruptedException { @@ -69,13 +69,13 @@ public class PeriodicNotificationExporterIT extends KafkaITBase { final KafkaExporterExecutor exporter = new KafkaExporterExecutor(new KafkaProducer<String, BindingSet>(createKafkaProducerConfig()), 1, records); exporter.start(); final QueryBindingSet bs1 = new QueryBindingSet(); - bs1.addBinding(PeriodicQueryResultStorage.PeriodicBinId, vf.createLiteral(1L)); - bs1.addBinding("name", vf.createURI("uri:Bob")); + bs1.addBinding(PeriodicQueryResultStorage.PeriodicBinId, VF.createLiteral(1L)); + bs1.addBinding("name", VF.createIRI("uri:Bob")); final BindingSetRecord record1 = new BindingSetRecord(bs1, topic1); final QueryBindingSet bs2 = new QueryBindingSet(); - bs2.addBinding(PeriodicQueryResultStorage.PeriodicBinId, vf.createLiteral(2L)); - bs2.addBinding("name", vf.createURI("uri:Joe")); + bs2.addBinding(PeriodicQueryResultStorage.PeriodicBinId, VF.createLiteral(2L)); + bs2.addBinding("name", VF.createIRI("uri:Joe")); final BindingSetRecord record2 = new BindingSetRecord(bs2, topic2); records.add(record1); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/processor/PeriodicNotificationProcessorIT.java ---------------------------------------------------------------------- diff --git a/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/processor/PeriodicNotificationProcessorIT.java b/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/processor/PeriodicNotificationProcessorIT.java index 221a18d..1c04a42 100644 --- a/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/processor/PeriodicNotificationProcessorIT.java +++ b/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/processor/PeriodicNotificationProcessorIT.java @@ -34,16 +34,16 @@ import org.apache.rya.periodic.notification.api.BindingSetRecord; import org.apache.rya.periodic.notification.api.NodeBin; import org.apache.rya.periodic.notification.notification.PeriodicNotification; import org.apache.rya.periodic.notification.notification.TimestampedNotification; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; import org.junit.Assert; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.BindingSet; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; public class PeriodicNotificationProcessorIT extends AccumuloExportITBase { - private static final ValueFactory vf = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); private static final String RYA_INSTANCE_NAME = "rya_"; @Test @@ -72,26 +72,26 @@ public class PeriodicNotificationProcessorIT extends AccumuloExportITBase { Set<VisibilityBindingSet> storageResults = new HashSet<>(); QueryBindingSet bs1 = new QueryBindingSet(); - bs1.addBinding("periodicBinId", vf.createLiteral(binId1)); - bs1.addBinding("id", vf.createLiteral(1)); + bs1.addBinding("periodicBinId", VF.createLiteral(binId1)); + bs1.addBinding("id", VF.createLiteral(1)); expected.add(bs1); storageResults.add(new VisibilityBindingSet(bs1)); QueryBindingSet bs2 = new QueryBindingSet(); - bs2.addBinding("periodicBinId", vf.createLiteral(binId1)); - bs2.addBinding("id", vf.createLiteral(2)); + bs2.addBinding("periodicBinId", VF.createLiteral(binId1)); + bs2.addBinding("id", VF.createLiteral(2)); expected.add(bs2); storageResults.add(new VisibilityBindingSet(bs2)); QueryBindingSet bs3 = new QueryBindingSet(); - bs3.addBinding("periodicBinId", vf.createLiteral(binId2)); - bs3.addBinding("id", vf.createLiteral(3)); + bs3.addBinding("periodicBinId", VF.createLiteral(binId2)); + bs3.addBinding("id", VF.createLiteral(3)); expected.add(bs3); storageResults.add(new VisibilityBindingSet(bs3)); QueryBindingSet bs4 = new QueryBindingSet(); - bs4.addBinding("periodicBinId", vf.createLiteral(binId2)); - bs4.addBinding("id", vf.createLiteral(4)); + bs4.addBinding("periodicBinId", VF.createLiteral(binId2)); + bs4.addBinding("id", VF.createLiteral(4)); expected.add(bs4); storageResults.add(new VisibilityBindingSet(bs4)); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/pruner/PeriodicNotificationBinPrunerIT.java ---------------------------------------------------------------------- diff --git a/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/pruner/PeriodicNotificationBinPrunerIT.java b/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/pruner/PeriodicNotificationBinPrunerIT.java index ac2202c..d403450 100644 --- a/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/pruner/PeriodicNotificationBinPrunerIT.java +++ b/extras/periodic.notification/tests/src/test/java/org/apache/rya/periodic/notification/pruner/PeriodicNotificationBinPrunerIT.java @@ -53,16 +53,15 @@ import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPeriodicQueryResultS import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import org.apache.rya.pcj.fluo.test.base.RyaExportITBase; import org.apache.rya.periodic.notification.api.NodeBin; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.algebra.evaluation.QueryBindingSet; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Assert; import org.junit.Test; -import org.openrdf.model.Statement; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.LiteralImpl; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.BindingSet; -import org.openrdf.query.algebra.evaluation.QueryBindingSet; -import org.openrdf.query.impl.MapBindingSet; import com.google.common.collect.Sets; @@ -88,7 +87,7 @@ public class PeriodicNotificationBinPrunerIT extends RyaExportITBase { String queryId = FluoQueryUtils.convertFluoQueryIdToPcjId(createPeriodicQuery.createPeriodicQuery(sparql).getQueryId()); // create statements to ingest into Fluo - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final DatatypeFactory dtf = DatatypeFactory.newInstance(); ZonedDateTime time = ZonedDateTime.now(); long currentTime = time.toInstant().toEpochMilli(); @@ -106,24 +105,24 @@ public class PeriodicNotificationBinPrunerIT extends RyaExportITBase { String time4 = zTime4.format(DateTimeFormatter.ISO_INSTANT); final Collection<Statement> statements = Sets.newHashSet( - vf.createStatement(vf.createURI("urn:obs_1"), vf.createURI("uri:hasTime"), + vf.createStatement(vf.createIRI("urn:obs_1"), vf.createIRI("uri:hasTime"), vf.createLiteral(dtf.newXMLGregorianCalendar(time1))), - vf.createStatement(vf.createURI("urn:obs_1"), vf.createURI("uri:hasId"), vf.createLiteral("id_1")), - vf.createStatement(vf.createURI("urn:obs_2"), vf.createURI("uri:hasTime"), + vf.createStatement(vf.createIRI("urn:obs_1"), vf.createIRI("uri:hasId"), vf.createLiteral("id_1")), + vf.createStatement(vf.createIRI("urn:obs_2"), vf.createIRI("uri:hasTime"), vf.createLiteral(dtf.newXMLGregorianCalendar(time2))), - vf.createStatement(vf.createURI("urn:obs_2"), vf.createURI("uri:hasId"), vf.createLiteral("id_2")), - vf.createStatement(vf.createURI("urn:obs_3"), vf.createURI("uri:hasTime"), + vf.createStatement(vf.createIRI("urn:obs_2"), vf.createIRI("uri:hasId"), vf.createLiteral("id_2")), + vf.createStatement(vf.createIRI("urn:obs_3"), vf.createIRI("uri:hasTime"), vf.createLiteral(dtf.newXMLGregorianCalendar(time3))), - vf.createStatement(vf.createURI("urn:obs_3"), vf.createURI("uri:hasId"), vf.createLiteral("id_3")), - vf.createStatement(vf.createURI("urn:obs_4"), vf.createURI("uri:hasTime"), + vf.createStatement(vf.createIRI("urn:obs_3"), vf.createIRI("uri:hasId"), vf.createLiteral("id_3")), + vf.createStatement(vf.createIRI("urn:obs_4"), vf.createIRI("uri:hasTime"), vf.createLiteral(dtf.newXMLGregorianCalendar(time4))), - vf.createStatement(vf.createURI("urn:obs_4"), vf.createURI("uri:hasId"), vf.createLiteral("id_4")), - vf.createStatement(vf.createURI("urn:obs_1"), vf.createURI("uri:hasTime"), + vf.createStatement(vf.createIRI("urn:obs_4"), vf.createIRI("uri:hasId"), vf.createLiteral("id_4")), + vf.createStatement(vf.createIRI("urn:obs_1"), vf.createIRI("uri:hasTime"), vf.createLiteral(dtf.newXMLGregorianCalendar(time4))), - vf.createStatement(vf.createURI("urn:obs_1"), vf.createURI("uri:hasId"), vf.createLiteral("id_1")), - vf.createStatement(vf.createURI("urn:obs_2"), vf.createURI("uri:hasTime"), + vf.createStatement(vf.createIRI("urn:obs_1"), vf.createIRI("uri:hasId"), vf.createLiteral("id_1")), + vf.createStatement(vf.createIRI("urn:obs_2"), vf.createIRI("uri:hasTime"), vf.createLiteral(dtf.newXMLGregorianCalendar(time3))), - vf.createStatement(vf.createURI("urn:obs_2"), vf.createURI("uri:hasId"), vf.createLiteral("id_2"))); + vf.createStatement(vf.createIRI("urn:obs_2"), vf.createIRI("uri:hasId"), vf.createLiteral("id_2"))); // add statements to Fluo InsertTriples inserter = new InsertTriples(); @@ -250,8 +249,10 @@ public class PeriodicNotificationBinPrunerIT extends RyaExportITBase { } private void compareFluoCounts(FluoClient client, String pcjId, long bin) { + final ValueFactory vf = SimpleValueFactory.getInstance(); QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding(IncrementalUpdateConstants.PERIODIC_BIN_ID, new LiteralImpl(Long.toString(bin), XMLSchema.LONG)); + + bs.addBinding(IncrementalUpdateConstants.PERIODIC_BIN_ID, vf.createLiteral(Long.toString(bin), XMLSchema.LONG)); VariableOrder varOrder = new VariableOrder(IncrementalUpdateConstants.PERIODIC_BIN_ID); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/periodic/BenchmarkStatementGenerator.java ---------------------------------------------------------------------- diff --git a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/periodic/BenchmarkStatementGenerator.java b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/periodic/BenchmarkStatementGenerator.java index fdd3b63..e766c18 100644 --- a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/periodic/BenchmarkStatementGenerator.java +++ b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/periodic/BenchmarkStatementGenerator.java @@ -25,10 +25,10 @@ import java.util.List; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; -import org.openrdf.model.Literal; -import org.openrdf.model.Statement; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; +import org.eclipse.rdf4j.model.Literal; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,11 +41,10 @@ public class BenchmarkStatementGenerator { private static final Logger logger = LoggerFactory.getLogger(BenchmarkStatementGenerator.class); - private final ValueFactory vf; + private static final ValueFactory VF = SimpleValueFactory.getInstance(); private final DatatypeFactory dtf; public BenchmarkStatementGenerator() throws DatatypeConfigurationException { - vf = new ValueFactoryImpl(); dtf = DatatypeFactory.newInstance(); } @@ -69,7 +68,7 @@ public class BenchmarkStatementGenerator { */ public List<Statement> generate(final long numObservationsPerType, final int numTypes, final String typePrefix, final long observationOffset, final ZonedDateTime zonedTime) { final String time = zonedTime.format(DateTimeFormatter.ISO_INSTANT); - final Literal litTime = vf.createLiteral(dtf.newXMLGregorianCalendar(time)); + final Literal litTime = VF.createLiteral(dtf.newXMLGregorianCalendar(time)); final List<Statement> statements = Lists.newArrayList(); for (long i = 0; i < numObservationsPerType; i++) { @@ -80,8 +79,8 @@ public class BenchmarkStatementGenerator { final String obsId = "urn:obs_" + String.format("%020d", observationId); final String type = typePrefix + j; //logger.info(obsId + " " + type + " " + litTime); - statements.add(vf.createStatement(vf.createURI(obsId), vf.createURI("uri:hasTime"), litTime)); - statements.add(vf.createStatement(vf.createURI(obsId), vf.createURI("uri:hasObsType"), vf.createLiteral(type))); + statements.add(VF.createStatement(VF.createIRI(obsId), VF.createIRI("uri:hasTime"), litTime)); + statements.add(VF.createStatement(VF.createIRI(obsId), VF.createIRI("uri:hasObsType"), VF.createLiteral(type))); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/periodic/KafkaLatencyBenchmark.java ---------------------------------------------------------------------- diff --git a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/periodic/KafkaLatencyBenchmark.java b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/periodic/KafkaLatencyBenchmark.java index e75d499..258d9df 100644 --- a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/periodic/KafkaLatencyBenchmark.java +++ b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/periodic/KafkaLatencyBenchmark.java @@ -53,8 +53,8 @@ import org.apache.rya.api.client.RyaClientException; import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.indexing.pcj.fluo.app.export.kafka.KryoVisibilityBindingSetSerializer; import org.apache.rya.periodic.notification.serialization.BindingSetSerDe; -import org.openrdf.model.Statement; -import org.openrdf.query.BindingSet; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.query.BindingSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java ---------------------------------------------------------------------- diff --git a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java index cf4ca8f..8b386ab 100644 --- a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java +++ b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java @@ -1,4 +1,4 @@ -/** +/* * 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 @@ -33,6 +33,10 @@ 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.MalformedQueryException; +import org.eclipse.rdf4j.query.algebra.Projection; +import org.eclipse.rdf4j.query.algebra.TupleExpr; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Scope; @@ -43,10 +47,6 @@ import org.openjdk.jmh.runner.RunnerException; import org.openjdk.jmh.runner.options.CommandLineOptionException; import org.openjdk.jmh.runner.options.CommandLineOptions; import org.openjdk.jmh.runner.options.OptionsBuilder; -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 com.google.common.base.Joiner; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueryBenchmark.java ---------------------------------------------------------------------- diff --git a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueryBenchmark.java b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueryBenchmark.java index 248ea88..68fa53d 100644 --- a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueryBenchmark.java +++ b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueryBenchmark.java @@ -1,4 +1,4 @@ -/** +/* * 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 @@ -35,10 +35,24 @@ import org.apache.log4j.ConsoleAppender; import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.log4j.PatternLayout; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.benchmark.query.Parameters.NumReadsRuns; import org.apache.rya.benchmark.query.QueryBenchmark.QueryBenchmarkRun.NotEnoughResultsException; import org.apache.rya.benchmark.query.Rya.Accumulo; import org.apache.rya.benchmark.query.Rya.SecondaryIndexing; +import org.apache.rya.indexing.accumulo.ConfigUtils; +import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinStorageType; +import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinUpdaterType; +import org.apache.rya.sail.config.RyaSailFactory; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.QueryEvaluationException; +import org.eclipse.rdf4j.query.parser.ParsedQuery; +import org.eclipse.rdf4j.query.parser.sparql.SPARQLParser; +import org.eclipse.rdf4j.sail.Sail; +import org.eclipse.rdf4j.sail.SailConnection; +import org.eclipse.rdf4j.sail.SailException; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Mode; @@ -51,21 +65,6 @@ import org.openjdk.jmh.annotations.Timeout; import org.openjdk.jmh.runner.Runner; import org.openjdk.jmh.runner.options.CommandLineOptions; import org.openjdk.jmh.runner.options.OptionsBuilder; -import org.openrdf.query.BindingSet; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.QueryEvaluationException; -import org.openrdf.query.parser.ParsedQuery; -import org.openrdf.query.parser.sparql.SPARQLParser; -import org.openrdf.sail.Sail; -import org.openrdf.sail.SailConnection; -import org.openrdf.sail.SailException; - -import info.aduna.iteration.CloseableIteration; -import org.apache.rya.accumulo.AccumuloRdfConfiguration; -import org.apache.rya.indexing.accumulo.ConfigUtils; -import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinStorageType; -import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinUpdaterType; -import org.apache.rya.sail.config.RyaSailFactory; /** * A benchmark that may be used to evaluate the performance of SPARQL queries http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.benchmark/src/test/java/org/apache/rya/benchmark/query/QueryBenchmarkRunIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.benchmark/src/test/java/org/apache/rya/benchmark/query/QueryBenchmarkRunIT.java b/extras/rya.benchmark/src/test/java/org/apache/rya/benchmark/query/QueryBenchmarkRunIT.java index dd5fe68..1160ad3 100644 --- a/extras/rya.benchmark/src/test/java/org/apache/rya/benchmark/query/QueryBenchmarkRunIT.java +++ b/extras/rya.benchmark/src/test/java/org/apache/rya/benchmark/query/QueryBenchmarkRunIT.java @@ -42,10 +42,10 @@ import org.apache.zookeeper.ClientCnxn; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import org.openrdf.model.ValueFactory; -import org.openrdf.sail.Sail; -import org.openrdf.sail.SailConnection; -import org.openrdf.sail.SailException; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.sail.Sail; +import org.eclipse.rdf4j.sail.SailConnection; +import org.eclipse.rdf4j.sail.SailException; /** * Integration tests {@link QueryBenchmarkRun}. @@ -121,23 +121,23 @@ public class QueryBenchmarkRunIT { final SailConnection sailConn = sail.getConnection(); sailConn.begin(); - sailConn.addStatement(vf.createURI("urn:Alice"), vf.createURI("urn:likes"), vf.createURI("urn:icecream")); - sailConn.addStatement(vf.createURI("urn:Bob"), vf.createURI("urn:likes"), vf.createURI("urn:icecream")); - sailConn.addStatement(vf.createURI("urn:Charlie"), vf.createURI("urn:likes"), vf.createURI("urn:icecream")); - sailConn.addStatement(vf.createURI("urn:David"), vf.createURI("urn:likes"), vf.createURI("urn:icecream")); - sailConn.addStatement(vf.createURI("urn:Eve"), vf.createURI("urn:likes"), vf.createURI("urn:icecream")); - sailConn.addStatement(vf.createURI("urn:Frank"), vf.createURI("urn:likes"), vf.createURI("urn:icecream")); - sailConn.addStatement(vf.createURI("urn:George"), vf.createURI("urn:likes"), vf.createURI("urn:icecream")); - sailConn.addStatement(vf.createURI("urn:Hillary"), vf.createURI("urn:likes"), vf.createURI("urn:icecream")); - - sailConn.addStatement(vf.createURI("urn:Alice"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:blue")); - sailConn.addStatement(vf.createURI("urn:Bob"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:blue")); - sailConn.addStatement(vf.createURI("urn:Charlie"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:blue")); - sailConn.addStatement(vf.createURI("urn:David"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:blue")); - sailConn.addStatement(vf.createURI("urn:Eve"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:blue")); - sailConn.addStatement(vf.createURI("urn:Frank"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:blue")); - sailConn.addStatement(vf.createURI("urn:George"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:green")); - sailConn.addStatement(vf.createURI("urn:Hillary"), vf.createURI("urn:hasEyeColor"), vf.createURI("urn:brown")); + sailConn.addStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream")); + sailConn.addStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream")); + sailConn.addStatement(vf.createIRI("urn:Charlie"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream")); + sailConn.addStatement(vf.createIRI("urn:David"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream")); + sailConn.addStatement(vf.createIRI("urn:Eve"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream")); + sailConn.addStatement(vf.createIRI("urn:Frank"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream")); + sailConn.addStatement(vf.createIRI("urn:George"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream")); + sailConn.addStatement(vf.createIRI("urn:Hillary"), vf.createIRI("urn:likes"), vf.createIRI("urn:icecream")); + + sailConn.addStatement(vf.createIRI("urn:Alice"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:blue")); + sailConn.addStatement(vf.createIRI("urn:Bob"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:blue")); + sailConn.addStatement(vf.createIRI("urn:Charlie"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:blue")); + sailConn.addStatement(vf.createIRI("urn:David"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:blue")); + sailConn.addStatement(vf.createIRI("urn:Eve"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:blue")); + sailConn.addStatement(vf.createIRI("urn:Frank"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:blue")); + sailConn.addStatement(vf.createIRI("urn:George"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:green")); + sailConn.addStatement(vf.createIRI("urn:Hillary"), vf.createIRI("urn:hasEyeColor"), vf.createIRI("urn:brown")); sailConn.commit(); sailConn.close(); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.export/export.accumulo/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.export/export.accumulo/pom.xml b/extras/rya.export/export.accumulo/pom.xml index 48a83d1..06201dc 100644 --- a/extras/rya.export/export.accumulo/pom.xml +++ b/extras/rya.export/export.accumulo/pom.xml @@ -73,6 +73,12 @@ under the License. <version>${accumulo.version}</version> <type>pom</type> </dependency> + + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-minicluster</artifactId> + </dependency> + <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/accumulo/AccumuloRyaStatementStore.java ---------------------------------------------------------------------- diff --git a/extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/accumulo/AccumuloRyaStatementStore.java b/extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/accumulo/AccumuloRyaStatementStore.java index f5992df..ddcdd4c 100644 --- a/extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/accumulo/AccumuloRyaStatementStore.java +++ b/extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/accumulo/AccumuloRyaStatementStore.java @@ -38,10 +38,8 @@ import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.api.resolver.RyaTripleContext; import org.apache.rya.api.resolver.triple.TripleRowResolverException; -import org.apache.rya.export.InstanceType; import org.apache.rya.export.accumulo.parent.AccumuloParentMetadataRepository; import org.apache.rya.export.accumulo.util.AccumuloRyaUtils; -import org.apache.rya.export.api.MergerException; import org.apache.rya.export.api.metadata.MergeParentMetadata; import org.apache.rya.export.api.metadata.ParentMetadataExistsException; import org.apache.rya.export.api.store.AddStatementException; @@ -50,12 +48,11 @@ import org.apache.rya.export.api.store.FetchStatementException; import org.apache.rya.export.api.store.RemoveStatementException; import org.apache.rya.export.api.store.RyaStatementStore; import org.apache.rya.export.api.store.UpdateStatementException; +import org.eclipse.rdf4j.common.iteration.CloseableIteration; import com.google.common.base.Function; import com.google.common.collect.Iterators; -import info.aduna.iteration.CloseableIteration; - /** * Allows specific CRUD operations an Accumulo {@link RyaStatement} storage * system. @@ -79,15 +76,9 @@ public class AccumuloRyaStatementStore implements RyaStatementStore { /** * Creates a new instance of {@link AccumuloRyaStatementStore}. - * @param instanceName the Accumulo instance name. - * @param username the Accumulo user name. - * @param password the Accumulo user's password. - * @param instanceType the {@link InstanceType}. + * @param dao the {@AccumuloRyaDAO}. * @param tablePrefix the Rya instance's table prefix. - * @param auths the comma-separated list of Accumulo authorizations for the - * user. - * @param zooKeepers the comma-separated list of zoo keeper host names. - * @throws MergerException + * @param ryaInstance the Rya instance name. */ public AccumuloRyaStatementStore(final AccumuloRyaDAO dao, final String tablePrefix, final String ryaInstance) { this.tablePrefix = tablePrefix; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/accumulo/conf/AccumuloExportConstants.java ---------------------------------------------------------------------- diff --git a/extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/accumulo/conf/AccumuloExportConstants.java b/extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/accumulo/conf/AccumuloExportConstants.java index 51dec9b..1fc9eaa 100644 --- a/extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/accumulo/conf/AccumuloExportConstants.java +++ b/extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/accumulo/conf/AccumuloExportConstants.java @@ -27,6 +27,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.log4j.Logger; import org.apache.rya.accumulo.mr.MRUtils; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.export.InstanceType; import org.apache.rya.indexing.accumulo.ConfigUtils; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/accumulo/util/AccumuloRyaUtils.java ---------------------------------------------------------------------- diff --git a/extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/accumulo/util/AccumuloRyaUtils.java b/extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/accumulo/util/AccumuloRyaUtils.java index 1073b6e..090d22f 100644 --- a/extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/accumulo/util/AccumuloRyaUtils.java +++ b/extras/rya.export/export.accumulo/src/main/java/org/apache/rya/export/accumulo/util/AccumuloRyaUtils.java @@ -61,7 +61,7 @@ import org.apache.rya.api.resolver.RyaTripleContext; import org.apache.rya.api.resolver.triple.TripleRow; import org.apache.rya.api.resolver.triple.TripleRowResolverException; import org.apache.rya.indexing.accumulo.ConfigUtils; -import org.openrdf.model.ValueFactory; +import org.eclipse.rdf4j.model.ValueFactory; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; @@ -104,7 +104,7 @@ public final class AccumuloRyaUtils { * @return the {@link RyaURI}. */ public static RyaURI createRyaUri(final String namespace, final String localName) { - return RdfToRyaConversions.convertURI(VALUE_FACTORY.createURI(namespace, localName)); + return RdfToRyaConversions.convertURI(VALUE_FACTORY.createIRI(namespace, localName)); } /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.export/export.client/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.export/export.client/pom.xml b/extras/rya.export/export.client/pom.xml index 979cb7d..c942702 100644 --- a/extras/rya.export/export.client/pom.xml +++ b/extras/rya.export/export.client/pom.xml @@ -56,21 +56,20 @@ under the License. </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-queryrender</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-queryrender</artifactId> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-rio-ntriples</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-ntriples</artifactId> </dependency> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-rio-trig</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-rio-trig</artifactId> </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> </dependency> <!-- Testing dependencies. --> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/MergeDriverClient.java ---------------------------------------------------------------------- diff --git a/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/MergeDriverClient.java b/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/MergeDriverClient.java index 232a0ed..2a902a7 100644 --- a/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/MergeDriverClient.java +++ b/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/MergeDriverClient.java @@ -45,10 +45,10 @@ import org.apache.rya.export.client.merge.MemoryTimeMerger; import org.apache.rya.export.client.merge.StatementStoreFactory; import org.apache.rya.export.client.merge.VisibilityStatementMerger; import org.apache.rya.rdftriplestore.inference.InferenceEngineException; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.UpdateExecutionException; -import org.openrdf.repository.RepositoryException; -import org.openrdf.sail.SailException; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.UpdateExecutionException; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.sail.SailException; import com.google.common.base.Optional; @@ -89,7 +89,7 @@ public class MergeDriverClient { final String tomcat = configuration.getChildTomcatUrl(); final String ntpHost = configuration.getNtpServerHost(); try { - offset = Optional.<Long>fromNullable(TimeUtils.getNtpServerAndMachineTimeDifference(ntpHost, tomcat)); + offset = Optional.fromNullable(TimeUtils.getNtpServerAndMachineTimeDifference(ntpHost, tomcat)); } catch (final IOException e) { LOG.error("Unable to get time difference between time server: " + ntpHost + " and the server: " + tomcat, e); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/TimeUtils.java ---------------------------------------------------------------------- diff --git a/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/TimeUtils.java b/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/TimeUtils.java index b1731de..30ac924 100644 --- a/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/TimeUtils.java +++ b/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/TimeUtils.java @@ -31,10 +31,10 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.net.ntp.NTPUDPClient; import org.apache.commons.net.ntp.TimeInfo; import org.apache.log4j.Logger; -import org.codehaus.plexus.util.StringUtils; import org.mortbay.jetty.HttpMethods; import com.google.common.net.HttpHeaders; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java ---------------------------------------------------------------------- diff --git a/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java b/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java index 60fff56..83fd774 100644 --- a/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java +++ b/extras/rya.export/export.integration/src/test/java/org/apache/rya/indexing/export/ITBase.java @@ -44,16 +44,16 @@ import org.apache.rya.mongodb.MongoDBRdfConfiguration; import org.apache.rya.rdftriplestore.RyaSailRepository; import org.apache.rya.rdftriplestore.inference.InferenceEngineException; import org.apache.rya.sail.config.RyaSailFactory; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.vocabulary.XMLSchema; +import org.eclipse.rdf4j.query.Binding; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.impl.MapBindingSet; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.sail.Sail; +import org.eclipse.rdf4j.sail.SailException; import org.junit.AfterClass; -import org.openrdf.model.Statement; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.Binding; -import org.openrdf.query.BindingSet; -import org.openrdf.query.impl.MapBindingSet; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.RepositoryException; -import org.openrdf.sail.Sail; -import org.openrdf.sail.SailException; import com.mongodb.MongoClient; import com.mongodb.MongoException; @@ -193,7 +193,7 @@ public abstract class ITBase { } /** - * A helper function for creating a Sesame {@link Statement} that represents + * A helper function for creating a RDF4J {@link Statement} that represents * a Triple.. * * @param subject http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.forwardchain/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.forwardchain/pom.xml b/extras/rya.forwardchain/pom.xml index 454cb74..2fdaf15 100644 --- a/extras/rya.forwardchain/pom.xml +++ b/extras/rya.forwardchain/pom.xml @@ -31,8 +31,8 @@ under the License. <dependencies> <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-runtime</artifactId> + <groupId>org.eclipse.rdf4j</groupId> + <artifactId>rdf4j-runtime</artifactId> </dependency> <dependency> <groupId>org.apache.rya</groupId> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/ForwardChainConstants.java ---------------------------------------------------------------------- diff --git a/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/ForwardChainConstants.java b/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/ForwardChainConstants.java index f1fe8b3..d4ae96f 100644 --- a/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/ForwardChainConstants.java +++ b/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/ForwardChainConstants.java @@ -22,15 +22,15 @@ import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.api.domain.RyaSchema; import org.apache.rya.api.domain.RyaURI; import org.apache.rya.api.resolver.RdfToRyaConversions; -import org.openrdf.model.URI; -import org.openrdf.model.ValueFactory; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.ValueFactory; public class ForwardChainConstants { private static final ValueFactory VF = RdfCloudTripleStoreConstants.VALUE_FACTORY; private static final String NAMESPACE = RyaSchema.NAMESPACE; - public static final URI DERIVATION_TIME = VF.createURI(NAMESPACE, "forwardChainIteration"); - public static final URI DERIVATION_RULE = VF.createURI(NAMESPACE, "forwardChainRule"); + public static final IRI DERIVATION_TIME = VF.createIRI(NAMESPACE, "forwardChainIteration"); + public static final IRI DERIVATION_RULE = VF.createIRI(NAMESPACE, "forwardChainRule"); public static final RyaURI RYA_DERIVATION_RULE = RdfToRyaConversions.convertURI(DERIVATION_RULE); public static final RyaURI RYA_DERIVATION_TIME = RdfToRyaConversions.convertURI(DERIVATION_TIME); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/rule/AbstractConstructRule.java ---------------------------------------------------------------------- diff --git a/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/rule/AbstractConstructRule.java b/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/rule/AbstractConstructRule.java index c4c12c7..649baa7 100644 --- a/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/rule/AbstractConstructRule.java +++ b/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/rule/AbstractConstructRule.java @@ -21,8 +21,8 @@ package org.apache.rya.forwardchain.rule; import org.apache.rya.api.domain.StatementMetadata; import org.apache.rya.forwardchain.ForwardChainException; import org.apache.rya.forwardchain.strategy.AbstractRuleExecutionStrategy; -import org.openrdf.query.algebra.StatementPattern; -import org.openrdf.query.parser.ParsedGraphQuery; +import org.eclipse.rdf4j.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.parser.ParsedGraphQuery; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/rule/AbstractInconsistencyRule.java ---------------------------------------------------------------------- diff --git a/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/rule/AbstractInconsistencyRule.java b/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/rule/AbstractInconsistencyRule.java index 451c5e4..56afae7 100644 --- a/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/rule/AbstractInconsistencyRule.java +++ b/extras/rya.forwardchain/src/main/java/org/apache/rya/forwardchain/rule/AbstractInconsistencyRule.java @@ -24,7 +24,7 @@ import java.util.Collection; import org.apache.rya.api.domain.StatementMetadata; import org.apache.rya.forwardchain.ForwardChainException; import org.apache.rya.forwardchain.strategy.AbstractRuleExecutionStrategy; -import org.openrdf.query.algebra.StatementPattern; +import org.eclipse.rdf4j.query.algebra.StatementPattern; /** * A rule that identifies an inconsistency in the data, but does not add or
