http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverterTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverterTest.java b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverterTest.java index b263038..3ec2766 100644 --- a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverterTest.java +++ b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverterTest.java @@ -24,18 +24,17 @@ import java.math.BigDecimal; import java.math.BigInteger; import org.apache.rya.indexing.pcj.storage.accumulo.BindingSetConverter.BindingSetConversionException; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Test; -import org.openrdf.model.impl.BooleanLiteralImpl; -import org.openrdf.model.impl.DecimalLiteralImpl; -import org.openrdf.model.impl.IntegerLiteralImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.query.BindingSet; -import org.openrdf.query.impl.MapBindingSet; /** * Tests the methods of {@link BindingSetStringConverter}. */ public class BindingSetStringConverterTest { + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Test public void noBindings() throws BindingSetConversionException { @@ -58,9 +57,9 @@ public class BindingSetStringConverterTest { public void toString_URIs() throws BindingSetConversionException { // Setup the binding set that will be converted. final MapBindingSet originalBindingSet = new MapBindingSet(); - originalBindingSet.addBinding("x", new URIImpl("http://a";)); - originalBindingSet.addBinding("y", new URIImpl("http://b";)); - originalBindingSet.addBinding("z", new URIImpl("http://c";)); + originalBindingSet.addBinding("x", VF.createIRI("http://a";)); + originalBindingSet.addBinding("y", VF.createIRI("http://b";)); + originalBindingSet.addBinding("z", VF.createIRI("http://c";)); // Convert it to a String. final VariableOrder varOrder = new VariableOrder("y", "z", "x"); @@ -80,7 +79,7 @@ public class BindingSetStringConverterTest { public void toString_Decimal() throws BindingSetConversionException { // Setup the binding set that will be converted. final MapBindingSet originalBindingSet = new MapBindingSet(); - originalBindingSet.addBinding("x", new DecimalLiteralImpl(new BigDecimal(2.5))); + originalBindingSet.addBinding("x", VF.createLiteral(new BigDecimal(2.5))); // Convert it to a String. final VariableOrder varOrder = new VariableOrder("x"); @@ -96,7 +95,7 @@ public class BindingSetStringConverterTest { public void toString_Boolean() throws BindingSetConversionException { // Setup the binding set that will be converted. final MapBindingSet originalBindingSet = new MapBindingSet(); - originalBindingSet.addBinding("x", new BooleanLiteralImpl(true)); + originalBindingSet.addBinding("x", VF.createLiteral((true))); // Convert it to a String. final VariableOrder varOrder = new VariableOrder("x"); @@ -112,7 +111,7 @@ public class BindingSetStringConverterTest { public void toString_Integer() throws BindingSetConversionException { // Setup the binding set that will be converted. final MapBindingSet originalBindingSet = new MapBindingSet(); - originalBindingSet.addBinding("x", new IntegerLiteralImpl(BigInteger.valueOf(5))); + originalBindingSet.addBinding("x", VF.createLiteral((BigInteger.valueOf(5)))); // Convert it to a String. final VariableOrder varOrder = new VariableOrder("x"); @@ -132,8 +131,8 @@ public class BindingSetStringConverterTest { public void toString_bindingsMatchVarOrder() throws BindingSetConversionException { // Setup the Binding Set. final MapBindingSet originalBindingSet = new MapBindingSet(); - originalBindingSet.addBinding("x", new URIImpl("http://a";)); - originalBindingSet.addBinding("y", new URIImpl("http://b";)); + originalBindingSet.addBinding("x", VF.createIRI("http://a";)); + originalBindingSet.addBinding("y", VF.createIRI("http://b";)); // Setup the variable order. final VariableOrder varOrder = new VariableOrder("x", "y"); @@ -158,8 +157,8 @@ public class BindingSetStringConverterTest { public void toString_bindingsSubsetOfVarOrder() throws BindingSetConversionException { // Setup the Binding Set. final MapBindingSet originalBindingSet = new MapBindingSet(); - originalBindingSet.addBinding("x", new URIImpl("http://a";)); - originalBindingSet.addBinding("y", new URIImpl("http://b";)); + originalBindingSet.addBinding("x", VF.createIRI("http://a";)); + originalBindingSet.addBinding("y", VF.createIRI("http://b";)); // Setup the variable order. final VariableOrder varOrder = new VariableOrder("x", "a", "y", "b"); @@ -192,9 +191,9 @@ public class BindingSetStringConverterTest { // Ensure it converted to the expected result. final MapBindingSet expected = new MapBindingSet(); - expected.addBinding("x", new URIImpl("http://a";)); - expected.addBinding("y", new URIImpl("http://b";)); - expected.addBinding("z", new URIImpl("http://c";)); + expected.addBinding("x", VF.createIRI("http://a";)); + expected.addBinding("y", VF.createIRI("http://b";)); + expected.addBinding("z", VF.createIRI("http://c";)); assertEquals(expected, bindingSet); } @@ -219,8 +218,8 @@ public class BindingSetStringConverterTest { // Ensure it converted to the expected reuslt. final MapBindingSet expected = new MapBindingSet(); - expected.addBinding("x", new URIImpl("http://value 1")); - expected.addBinding("y", new URIImpl("http://value 2")); + expected.addBinding("x", VF.createIRI("http://value 1")); + expected.addBinding("y", VF.createIRI("http://value 2")); assertEquals(expected, bindingSet); } @@ -236,7 +235,7 @@ public class BindingSetStringConverterTest { // Ensure it converted to the expected result. final MapBindingSet expected = new MapBindingSet(); - expected.addBinding("x", new DecimalLiteralImpl(new BigDecimal(2.5))); + expected.addBinding("x", VF.createLiteral((new BigDecimal(2.5)))); assertEquals(expected, bindingSet); } @@ -252,7 +251,7 @@ public class BindingSetStringConverterTest { // Ensure it converted to the expected result. final MapBindingSet expected = new MapBindingSet(); - expected.addBinding("x", new BooleanLiteralImpl(true)); + expected.addBinding("x", VF.createLiteral((true))); assertEquals(expected, bindingSet); } @@ -268,7 +267,7 @@ public class BindingSetStringConverterTest { // Ensure it converted to the expected result. final MapBindingSet expected = new MapBindingSet(); - expected.addBinding("x", new IntegerLiteralImpl(BigInteger.valueOf(5))); + expected.addBinding("x", VF.createLiteral((BigInteger.valueOf(5)))); assertEquals(expected, bindingSet); }
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTablesIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTablesIT.java b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTablesIT.java index b95c812..f142b77 100644 --- a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTablesIT.java +++ b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTablesIT.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import java.io.IOException; +import java.math.BigInteger; import java.util.HashSet; import java.util.Map.Entry; import java.util.Set; @@ -53,21 +54,18 @@ import org.apache.rya.indexing.pcj.storage.accumulo.BindingSetConverter.BindingS import org.apache.rya.rdftriplestore.RdfCloudTripleStore; import org.apache.rya.rdftriplestore.RyaSailRepository; import org.apache.zookeeper.ClientCnxn; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +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.junit.After; 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.impl.LiteralImpl; -import org.openrdf.model.impl.NumericLiteralImpl; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.BindingSet; -import org.openrdf.query.impl.MapBindingSet; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.RepositoryException; import com.google.common.base.Optional; import com.google.common.collect.HashMultimap; @@ -84,6 +82,7 @@ public class PcjTablesIT { private static final String CLOUDBASE_INSTANCE = "sc.cloudbase.instancename"; private static final String CLOUDBASE_USER = "sc.cloudbase.username"; private static final String CLOUDBASE_PASSWORD = "sc.cloudbase.password"; + private static final ValueFactory VF = SimpleValueFactory.getInstance(); private static final AccumuloPcjSerializer converter = new AccumuloPcjSerializer(); @@ -209,19 +208,19 @@ public class PcjTablesIT { // Add a few results to the PCJ table. final MapBindingSet alice = new MapBindingSet(); - alice.addBinding("name", new URIImpl("http://Alice";)); - alice.addBinding("age", new NumericLiteralImpl(14, XMLSchema.INTEGER)); + alice.addBinding("name", VF.createIRI("http://Alice";)); + alice.addBinding("age", VF.createLiteral(BigInteger.valueOf(14))); final MapBindingSet bob = new MapBindingSet(); - bob.addBinding("name", new URIImpl("http://Bob";)); - bob.addBinding("age", new NumericLiteralImpl(16, XMLSchema.INTEGER)); + bob.addBinding("name", VF.createIRI("http://Bob";)); + bob.addBinding("age", VF.createLiteral(BigInteger.valueOf(16))); final MapBindingSet charlie = new MapBindingSet(); - charlie.addBinding("name", new URIImpl("http://Charlie";)); - charlie.addBinding("age", new NumericLiteralImpl(12, XMLSchema.INTEGER)); + charlie.addBinding("name", VF.createIRI("http://Charlie";)); + charlie.addBinding("age", VF.createLiteral(BigInteger.valueOf(12))); - final Set<BindingSet> results = Sets.<BindingSet>newHashSet(alice, bob, charlie); - pcjs.addResults(accumuloConn, pcjTableName, Sets.<VisibilityBindingSet>newHashSet( + final Set<BindingSet> results = Sets.newHashSet(alice, bob, charlie); + pcjs.addResults(accumuloConn, pcjTableName, Sets.newHashSet( new VisibilityBindingSet(alice), new VisibilityBindingSet(bob), new VisibilityBindingSet(charlie))); @@ -260,18 +259,18 @@ public class PcjTablesIT { // Add a few results to the PCJ table. final MapBindingSet alice = new MapBindingSet(); - alice.addBinding("name", new URIImpl("http://Alice";)); - alice.addBinding("age", new NumericLiteralImpl(14, XMLSchema.INTEGER)); + alice.addBinding("name", VF.createIRI("http://Alice";)); + alice.addBinding("age", VF.createLiteral(BigInteger.valueOf(14))); final MapBindingSet bob = new MapBindingSet(); - bob.addBinding("name", new URIImpl("http://Bob";)); - bob.addBinding("age", new NumericLiteralImpl(16, XMLSchema.INTEGER)); + bob.addBinding("name", VF.createIRI("http://Bob";)); + bob.addBinding("age", VF.createLiteral(BigInteger.valueOf(16))); final MapBindingSet charlie = new MapBindingSet(); - charlie.addBinding("name", new URIImpl("http://Charlie";)); - charlie.addBinding("age", new NumericLiteralImpl(12, XMLSchema.INTEGER)); + charlie.addBinding("name", VF.createIRI("http://Charlie";)); + charlie.addBinding("age", VF.createLiteral(BigInteger.valueOf(12))); - pcjs.addResults(accumuloConn, pcjTableName, Sets.<VisibilityBindingSet>newHashSet( + pcjs.addResults(accumuloConn, pcjTableName, Sets.newHashSet( new VisibilityBindingSet(alice), new VisibilityBindingSet(bob), new VisibilityBindingSet(charlie))); @@ -289,7 +288,7 @@ public class PcjTablesIT { } // Verify the fetched results match the expected ones. - final Set<BindingSet> expected = Sets.<BindingSet>newHashSet(alice, bob, charlie); + final Set<BindingSet> expected = Sets.newHashSet(alice, bob, charlie); assertEquals(expected, results); } @@ -297,20 +296,20 @@ public class PcjTablesIT { * Ensure when results are already stored in Rya, that we are able to populate * the PCJ table for a new SPARQL query using those results. * <p> - * The method being tested is: {@link PcjTables#populatePcj(Connector, String, RepositoryConnection, String)} + * The method being tested is: {@link PcjTables#populatePcj(Connector, String, RepositoryConnection)} */ @Test public void populatePcj() throws RepositoryException, PcjException, TableNotFoundException, BindingSetConversionException, AccumuloException, AccumuloSecurityException { // Load some Triples into Rya. final Set<Statement> triples = new HashSet<>(); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://hasAge";), new NumericLiteralImpl(14, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://hasAge";), new NumericLiteralImpl(16, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://hasAge";), new NumericLiteralImpl(12, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://hasAge";), new NumericLiteralImpl(43, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(14))) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(16))) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(12))) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(43))) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); for(final Statement triple : triples) { ryaConn.add(triple); @@ -344,18 +343,18 @@ public class PcjTablesIT { // Ensure the expected results match those that were stored. final MapBindingSet alice = new MapBindingSet(); - alice.addBinding("name", new URIImpl("http://Alice";)); - alice.addBinding("age", new NumericLiteralImpl(14, XMLSchema.INTEGER)); + alice.addBinding("name", VF.createIRI("http://Alice";)); + alice.addBinding("age", VF.createLiteral(BigInteger.valueOf(14))); final MapBindingSet bob = new MapBindingSet(); - bob.addBinding("name", new URIImpl("http://Bob";)); - bob.addBinding("age", new NumericLiteralImpl(16, XMLSchema.INTEGER)); + bob.addBinding("name", VF.createIRI("http://Bob";)); + bob.addBinding("age", VF.createLiteral(BigInteger.valueOf(16))); final MapBindingSet charlie = new MapBindingSet(); - charlie.addBinding("name", new URIImpl("http://Charlie";)); - charlie.addBinding("age", new NumericLiteralImpl(12, XMLSchema.INTEGER)); + charlie.addBinding("name", VF.createIRI("http://Charlie";)); + charlie.addBinding("age", VF.createLiteral(BigInteger.valueOf(12))); - final Set<BindingSet> results = Sets.<BindingSet>newHashSet(alice, bob, charlie); + final Set<BindingSet> results = Sets.newHashSet(alice, bob, charlie); final Multimap<String, BindingSet> expectedResults = HashMultimap.create(); expectedResults.putAll("name;age", results); @@ -373,14 +372,14 @@ public class PcjTablesIT { public void createAndPopulatePcj() throws RepositoryException, PcjException, TableNotFoundException, BindingSetConversionException, AccumuloException, AccumuloSecurityException { // Load some Triples into Rya. final Set<Statement> triples = new HashSet<>(); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://hasAge";), new NumericLiteralImpl(14, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://hasAge";), new NumericLiteralImpl(16, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://hasAge";), new NumericLiteralImpl(12, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://hasAge";), new NumericLiteralImpl(43, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://hasAge";), VF.createLiteral(14)) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://hasAge";), VF.createLiteral(16)) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://hasAge";), VF.createLiteral(12)) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://hasAge";), VF.createLiteral(43)) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); for(final Statement triple : triples) { ryaConn.add(triple); @@ -401,7 +400,7 @@ public class PcjTablesIT { // Create and populate the PCJ table. final PcjTables pcjs = new PcjTables(); - pcjs.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.<PcjVarOrderFactory>absent()); + pcjs.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"name", "age"}, Optional.absent()); // Make sure the cardinality was updated. final PcjMetadata metadata = pcjs.getPcjMetadata(accumuloConn, pcjTableName); @@ -412,18 +411,18 @@ public class PcjTablesIT { // Ensure the expected results match those that were stored. final MapBindingSet alice = new MapBindingSet(); - alice.addBinding("name", new URIImpl("http://Alice";)); - alice.addBinding("age", new NumericLiteralImpl(14, XMLSchema.INTEGER)); + alice.addBinding("name", VF.createIRI("http://Alice";)); + alice.addBinding("age", VF.createLiteral(BigInteger.valueOf(14))); final MapBindingSet bob = new MapBindingSet(); - bob.addBinding("name", new URIImpl("http://Bob";)); - bob.addBinding("age", new NumericLiteralImpl(16, XMLSchema.INTEGER)); + bob.addBinding("name", VF.createIRI("http://Bob";)); + bob.addBinding("age", VF.createLiteral(BigInteger.valueOf(16))); final MapBindingSet charlie = new MapBindingSet(); - charlie.addBinding("name", new URIImpl("http://Charlie";)); - charlie.addBinding("age", new NumericLiteralImpl(12, XMLSchema.INTEGER)); + charlie.addBinding("name", VF.createIRI("http://Charlie";)); + charlie.addBinding("age", VF.createLiteral(BigInteger.valueOf(12))); - final Set<BindingSet> results = Sets.<BindingSet>newHashSet(alice, bob, charlie); + final Set<BindingSet> results = Sets.newHashSet(alice, bob, charlie); final Multimap<String, BindingSet> expectedResults = HashMultimap.create(); expectedResults.putAll("name;age", results); @@ -487,18 +486,18 @@ public class PcjTablesIT { // Add a few results to the PCJ table. final MapBindingSet alice = new MapBindingSet(); - alice.addBinding("name", new URIImpl("http://Alice";)); - alice.addBinding("age", new NumericLiteralImpl(14, XMLSchema.INTEGER)); + alice.addBinding("name", VF.createIRI("http://Alice";)); + alice.addBinding("age", VF.createLiteral(BigInteger.valueOf(14))); final MapBindingSet bob = new MapBindingSet(); - bob.addBinding("name", new URIImpl("http://Bob";)); - bob.addBinding("age", new NumericLiteralImpl(16, XMLSchema.INTEGER)); + bob.addBinding("name", VF.createIRI("http://Bob";)); + bob.addBinding("age", VF.createLiteral(BigInteger.valueOf(16))); final MapBindingSet charlie = new MapBindingSet(); - charlie.addBinding("name", new URIImpl("http://Charlie";)); - charlie.addBinding("age", new NumericLiteralImpl(12, XMLSchema.INTEGER)); + charlie.addBinding("name", VF.createIRI("http://Charlie";)); + charlie.addBinding("age", VF.createLiteral(BigInteger.valueOf(12))); - pcjs.addResults(accumuloConn, pcjTableName, Sets.<VisibilityBindingSet>newHashSet( + pcjs.addResults(accumuloConn, pcjTableName, Sets.newHashSet( new VisibilityBindingSet(alice), new VisibilityBindingSet(bob), new VisibilityBindingSet(charlie))); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTablesWithMockTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTablesWithMockTest.java b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTablesWithMockTest.java index bbd0f11..cec64fe 100644 --- a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTablesWithMockTest.java +++ b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTablesWithMockTest.java @@ -16,21 +16,14 @@ * specific language governing permissions and limitations * under the License. */ - - package org.apache.rya.indexing.pcj.storage.accumulo; import static org.junit.Assert.assertEquals; +import java.math.BigInteger; import java.util.HashSet; import java.util.Set; -import org.apache.rya.accumulo.AccumuloRdfConfiguration; -import org.apache.rya.accumulo.AccumuloRyaDAO; -import org.apache.rya.api.RdfCloudTripleStoreConfiguration; -import org.apache.rya.rdftriplestore.RdfCloudTripleStore; -import org.apache.rya.rdftriplestore.RyaSailRepository; - import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Connector; @@ -39,20 +32,22 @@ import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.mock.MockInstance; import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.log4j.Logger; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.indexing.pcj.storage.PcjException; import org.apache.rya.indexing.pcj.storage.PcjMetadata; import org.apache.rya.indexing.pcj.storage.accumulo.BindingSetConverter.BindingSetConversionException; +import org.apache.rya.rdftriplestore.RdfCloudTripleStore; +import org.apache.rya.rdftriplestore.RyaSailRepository; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.repository.RepositoryException; +import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.openrdf.model.Statement; -import org.openrdf.model.impl.LiteralImpl; -import org.openrdf.model.impl.NumericLiteralImpl; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.sail.SailRepositoryConnection; import com.google.common.base.Optional; @@ -69,6 +64,7 @@ public class PcjTablesWithMockTest { private Connector accumuloConn; private RyaSailRepository ryaRepo; private SailRepositoryConnection ryaConn; + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Before public void init() throws AccumuloException, AccumuloSecurityException, RepositoryException { @@ -79,39 +75,39 @@ public class PcjTablesWithMockTest { } - @Test - public void populatePcj() throws RepositoryException, PcjException, TableNotFoundException, BindingSetConversionException { - // Load some Triples into Rya. - final Set<Statement> triples = new HashSet<>(); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://hasAge";), new NumericLiteralImpl(14, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://hasAge";), new NumericLiteralImpl(16, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://hasAge";), new NumericLiteralImpl(12, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://hasAge";), new NumericLiteralImpl(43, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - - for(final Statement triple : triples) { - ryaConn.add(triple); - } - - // Create a PCJ table that will include those triples in its results. - final String sparql = - "SELECT ?name ?age " + - "{" + - "?name <http://hasAge> ?age." + - "?name <http://playsSport> \"Soccer\" " + - "}"; - - final String pcjTableName = new PcjTableNameFactory().makeTableName(RYA_TABLE_PREFIX, "testPcj"); - final PcjTables pcjs = new PcjTables(); - pcjs.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"age","name"}, Optional.<PcjVarOrderFactory>absent()); - - // Make sure the cardinality was updated. - final PcjMetadata metadata = pcjs.getPcjMetadata(accumuloConn, pcjTableName); - assertEquals(4, metadata.getCardinality()); - } + @Test + public void populatePcj() throws RepositoryException, PcjException, TableNotFoundException, BindingSetConversionException { + // Load some Triples into Rya. + final Set<Statement> triples = new HashSet<>(); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(14))) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(16))) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(12))) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://hasAge";), VF.createLiteral((43)))); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + + for(final Statement triple : triples) { + ryaConn.add(triple); + } + + // Create a PCJ table that will include those triples in its results. + final String sparql = + "SELECT ?name ?age " + + "{" + + "?name <http://hasAge> ?age." + + "?name <http://playsSport> \"Soccer\" " + + "}"; + + final String pcjTableName = new PcjTableNameFactory().makeTableName(RYA_TABLE_PREFIX, "testPcj"); + final PcjTables pcjs = new PcjTables(); + pcjs.createAndPopulatePcj(ryaConn, accumuloConn, pcjTableName, sparql, new String[]{"age","name"}, Optional.absent()); + + // Make sure the cardinality was updated. + final PcjMetadata metadata = pcjs.getPcjMetadata(accumuloConn, pcjTableName); + assertEquals(4, metadata.getCardinality()); + } @After http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/ShiftVarOrderFactoryTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/ShiftVarOrderFactoryTest.java b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/ShiftVarOrderFactoryTest.java index 68515f6..b41aba3 100644 --- a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/ShiftVarOrderFactoryTest.java +++ b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/ShiftVarOrderFactoryTest.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 @@ -22,8 +22,8 @@ import static org.junit.Assert.assertEquals; import java.util.Set; +import org.eclipse.rdf4j.query.MalformedQueryException; 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/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetSerDeTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetSerDeTest.java b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetSerDeTest.java index b32331c..758965e 100644 --- a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetSerDeTest.java +++ b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetSerDeTest.java @@ -28,12 +28,12 @@ import java.util.ArrayList; import org.apache.fluo.api.data.Bytes; import org.apache.rya.api.model.VisibilityBindingSet; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.openrdf.model.ValueFactory; -import org.openrdf.model.impl.ValueFactoryImpl; -import org.openrdf.query.impl.MapBindingSet; /** * Tests the methods of {@link VisibilityBindingSetSerDe}. @@ -42,7 +42,7 @@ public class VisibilityBindingSetSerDeTest { @Test public void rountTrip() throws Exception { - final ValueFactory vf = new ValueFactoryImpl(); + final ValueFactory vf = SimpleValueFactory.getInstance(); final MapBindingSet bs = new MapBindingSet(); bs.addBinding("name", vf.createLiteral("Alice")); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverterTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverterTest.java b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverterTest.java index 40e3322..c9252b0 100644 --- a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverterTest.java +++ b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/VisibilityBindingSetStringConverterTest.java @@ -23,23 +23,25 @@ import static org.junit.Assert.assertEquals; import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.indexing.pcj.storage.accumulo.BindingSetConverter.BindingSetConversionException; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Test; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.query.BindingSet; -import org.openrdf.query.impl.MapBindingSet; /** * Tests the methods of {@link BindingSetStringConverter}. */ public class VisibilityBindingSetStringConverterTest { + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Test public void toString_URIs() throws BindingSetConversionException { // Setup the binding set that will be converted. final MapBindingSet originalBindingSet = new MapBindingSet(); - originalBindingSet.addBinding("x", new URIImpl("http://a";)); - originalBindingSet.addBinding("y", new URIImpl("http://b";)); - originalBindingSet.addBinding("z", new URIImpl("http://c";)); + originalBindingSet.addBinding("x", VF.createIRI("http://a";)); + originalBindingSet.addBinding("y", VF.createIRI("http://b";)); + originalBindingSet.addBinding("z", VF.createIRI("http://c";)); final VisibilityBindingSet visiSet = new VisibilityBindingSet(originalBindingSet, "A&B&C"); @@ -74,9 +76,9 @@ public class VisibilityBindingSetStringConverterTest { // Ensure it converted to the expected result. final MapBindingSet expected = new MapBindingSet(); - expected.addBinding("z", new URIImpl("http://c";)); - expected.addBinding("y", new URIImpl("http://b";)); - expected.addBinding("x", new URIImpl("http://a";)); + expected.addBinding("z", VF.createIRI("http://c";)); + expected.addBinding("y", VF.createIRI("http://b";)); + expected.addBinding("x", VF.createIRI("http://a";)); final VisibilityBindingSet visiSet = new VisibilityBindingSet(expected, "A&B"); assertEquals(visiSet, bindingSet); @@ -86,9 +88,9 @@ public class VisibilityBindingSetStringConverterTest { public void toString_URIs_noVisi() throws BindingSetConversionException { // Setup the binding set that will be converted. final MapBindingSet originalBindingSet = new MapBindingSet(); - originalBindingSet.addBinding("x", new URIImpl("http://a";)); - originalBindingSet.addBinding("y", new URIImpl("http://b";)); - originalBindingSet.addBinding("z", new URIImpl("http://c";)); + originalBindingSet.addBinding("x", VF.createIRI("http://a";)); + originalBindingSet.addBinding("y", VF.createIRI("http://b";)); + originalBindingSet.addBinding("z", VF.createIRI("http://c";)); final VisibilityBindingSet visiSet = new VisibilityBindingSet(originalBindingSet); @@ -121,9 +123,9 @@ public class VisibilityBindingSetStringConverterTest { // Ensure it converted to the expected result. final MapBindingSet expected = new MapBindingSet(); - expected.addBinding("z", new URIImpl("http://c";)); - expected.addBinding("y", new URIImpl("http://b";)); - expected.addBinding("x", new URIImpl("http://a";)); + expected.addBinding("z", VF.createIRI("http://c";)); + expected.addBinding("y", VF.createIRI("http://b";)); + expected.addBinding("x", VF.createIRI("http://a";)); final VisibilityBindingSet visiSet = new VisibilityBindingSet(expected); assertEquals(visiSet, bindingSet); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/integration/AccumuloPcjStorageIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/integration/AccumuloPcjStorageIT.java b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/integration/AccumuloPcjStorageIT.java index 33571f7..8968898 100644 --- a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/integration/AccumuloPcjStorageIT.java +++ b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/integration/AccumuloPcjStorageIT.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 @@ -46,11 +46,12 @@ import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage.PCJStorageExce import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjStorage; import org.apache.rya.indexing.pcj.storage.accumulo.ShiftVarOrderFactory; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.MalformedQueryException; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Test; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.query.BindingSet; -import org.openrdf.query.MalformedQueryException; -import org.openrdf.query.impl.MapBindingSet; import com.google.common.collect.ImmutableMap; @@ -61,13 +62,14 @@ import com.google.common.collect.ImmutableMap; * also update the Rya instance's details. */ public class AccumuloPcjStorageIT extends AccumuloRyaITBase { + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Test public void createPCJ() throws AccumuloException, AccumuloSecurityException, PCJStorageException, NotInitializedException, RyaDetailsRepositoryException { // Setup the PCJ storage that will be tested against. final Connector connector = super.getClusterInstance().getConnector(); final String ryaInstanceName = super.getRyaInstanceName(); - try(final PrecomputedJoinStorage pcjStorage = new AccumuloPcjStorage(connector, ryaInstanceName)) { + try(final PrecomputedJoinStorage pcjStorage = new AccumuloPcjStorage(connector, ryaInstanceName)) { // Create a PCJ. final String pcjId = pcjStorage.createPcj("SELECT * WHERE { ?a <http://isA> ?b } "); @@ -171,13 +173,13 @@ public class AccumuloPcjStorageIT extends AccumuloRyaITBase { final Set<VisibilityBindingSet> results = new HashSet<>(); final MapBindingSet aliceBS = new MapBindingSet(); - aliceBS.addBinding("a", new URIImpl("http://Alice";)); - aliceBS.addBinding("b", new URIImpl("http://Person";)); + aliceBS.addBinding("a", VF.createIRI("http://Alice";)); + aliceBS.addBinding("b", VF.createIRI("http://Person";)); results.add( new VisibilityBindingSet(aliceBS, "") ); final MapBindingSet charlieBS = new MapBindingSet(); - charlieBS.addBinding("a", new URIImpl("http://Charlie";)); - charlieBS.addBinding("b", new URIImpl("http://Comedian";)); + charlieBS.addBinding("a", VF.createIRI("http://Charlie";)); + charlieBS.addBinding("b", VF.createIRI("http://Comedian";)); results.add( new VisibilityBindingSet(charlieBS, "") ); pcjStorage.addResults(pcjId, results); @@ -205,13 +207,13 @@ public class AccumuloPcjStorageIT extends AccumuloRyaITBase { final Set<VisibilityBindingSet> storedResults = new HashSet<>(); final MapBindingSet aliceBS = new MapBindingSet(); - aliceBS.addBinding("a", new URIImpl("http://Alice";)); - aliceBS.addBinding("b", new URIImpl("http://Person";)); + aliceBS.addBinding("a", VF.createIRI("http://Alice";)); + aliceBS.addBinding("b", VF.createIRI("http://Person";)); storedResults.add( new VisibilityBindingSet(aliceBS, "") ); final MapBindingSet charlieBS = new MapBindingSet(); - charlieBS.addBinding("a", new URIImpl("http://Charlie";)); - charlieBS.addBinding("b", new URIImpl("http://Comedian";)); + charlieBS.addBinding("a", VF.createIRI("http://Charlie";)); + charlieBS.addBinding("b", VF.createIRI("http://Comedian";)); storedResults.add( new VisibilityBindingSet(charlieBS, "") ); pcjStorage.addResults(pcjId, storedResults); @@ -247,13 +249,13 @@ public class AccumuloPcjStorageIT extends AccumuloRyaITBase { final Set<VisibilityBindingSet> expectedResults = new HashSet<>(); final MapBindingSet aliceBS = new MapBindingSet(); - aliceBS.addBinding("a", new URIImpl("http://Alice";)); - aliceBS.addBinding("b", new URIImpl("http://Person";)); + aliceBS.addBinding("a", VF.createIRI("http://Alice";)); + aliceBS.addBinding("b", VF.createIRI("http://Person";)); expectedResults.add( new VisibilityBindingSet(aliceBS, "") ); final MapBindingSet charlieBS = new MapBindingSet(); - charlieBS.addBinding("a", new URIImpl("http://Charlie";)); - charlieBS.addBinding("b", new URIImpl("http://Comedian";)); + charlieBS.addBinding("a", VF.createIRI("http://Charlie";)); + charlieBS.addBinding("b", VF.createIRI("http://Comedian";)); expectedResults.add( new VisibilityBindingSet(charlieBS, "") ); pcjStorage.addResults(pcjId, expectedResults); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/integration/AccumuloPeriodicQueryResultStorageIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/integration/AccumuloPeriodicQueryResultStorageIT.java b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/integration/AccumuloPeriodicQueryResultStorageIT.java index 2d9da4d..723c700 100644 --- a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/integration/AccumuloPeriodicQueryResultStorageIT.java +++ b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/integration/AccumuloPeriodicQueryResultStorageIT.java @@ -37,22 +37,22 @@ import org.apache.rya.indexing.pcj.storage.PeriodicQueryStorageMetadata; import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPeriodicQueryResultStorage; import org.apache.rya.indexing.pcj.storage.accumulo.PeriodicQueryTableNameFactory; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; +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.Before; import org.junit.Test; -import org.openrdf.model.ValueFactory; -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; public class AccumuloPeriodicQueryResultStorageIT extends AccumuloITBase { private PeriodicQueryResultStorage periodicStorage; private static final String RYA = "rya_"; private static final PeriodicQueryTableNameFactory nameFactory = new PeriodicQueryTableNameFactory(); - private static final ValueFactory vf = new ValueFactoryImpl(); + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Before public void init() throws AccumuloException, AccumuloSecurityException { @@ -86,15 +86,15 @@ public class AccumuloPeriodicQueryResultStorageIT extends AccumuloITBase { //add result matching user's visibility QueryBindingSet bs = new QueryBindingSet(); - bs.addBinding("periodicBinId", vf.createLiteral(1L)); - bs.addBinding("x",vf.createURI("uri:uri123")); + bs.addBinding("periodicBinId", VF.createLiteral(1L)); + bs.addBinding("x", VF.createIRI("uri:uri123")); expected.add(bs); storageSet.add(new VisibilityBindingSet(bs,"U")); //add result with different visibility that is not expected bs = new QueryBindingSet(); - bs.addBinding("periodicBinId", vf.createLiteral(1L)); - bs.addBinding("x",vf.createURI("uri:uri456")); + bs.addBinding("periodicBinId", VF.createLiteral(1L)); + bs.addBinding("x", VF.createIRI("uri:uri456")); storageSet.add(new VisibilityBindingSet(bs,"V")); periodicStorage.addPeriodicQueryResults(id, storageSet); @@ -129,7 +129,6 @@ public class AccumuloPeriodicQueryResultStorageIT extends AccumuloITBase { + "?obs <uri:hasId> ?id } group by ?id"; //n - final ValueFactory vf = new ValueFactoryImpl(); long currentTime = System.currentTimeMillis(); String queryId = UUID.randomUUID().toString().replace("-", ""); @@ -144,72 +143,72 @@ public class AccumuloPeriodicQueryResultStorageIT extends AccumuloITBase { long binId = (currentTime/period)*period; MapBindingSet bs = new MapBindingSet(); - bs.addBinding("total", vf.createLiteral("2", XMLSchema.INTEGER)); - bs.addBinding("id", vf.createLiteral("id_1", XMLSchema.STRING)); - bs.addBinding("periodicBinId", vf.createLiteral(binId)); + bs.addBinding("total", VF.createLiteral("2", XMLSchema.INTEGER)); + bs.addBinding("id", VF.createLiteral("id_1", XMLSchema.STRING)); + bs.addBinding("periodicBinId", VF.createLiteral(binId)); expected1.add(bs); storageResults.add(new VisibilityBindingSet(bs)); bs = new MapBindingSet(); - bs.addBinding("total", vf.createLiteral("2", XMLSchema.INTEGER)); - bs.addBinding("id", vf.createLiteral("id_2", XMLSchema.STRING)); - bs.addBinding("periodicBinId", vf.createLiteral(binId)); + bs.addBinding("total", VF.createLiteral("2", XMLSchema.INTEGER)); + bs.addBinding("id", VF.createLiteral("id_2", XMLSchema.STRING)); + bs.addBinding("periodicBinId", VF.createLiteral(binId)); expected1.add(bs); storageResults.add(new VisibilityBindingSet(bs)); bs = new MapBindingSet(); - bs.addBinding("total", vf.createLiteral("1", XMLSchema.INTEGER)); - bs.addBinding("id", vf.createLiteral("id_3", XMLSchema.STRING)); - bs.addBinding("periodicBinId", vf.createLiteral(binId)); + bs.addBinding("total", VF.createLiteral("1", XMLSchema.INTEGER)); + bs.addBinding("id", VF.createLiteral("id_3", XMLSchema.STRING)); + bs.addBinding("periodicBinId", VF.createLiteral(binId)); expected1.add(bs); storageResults.add(new VisibilityBindingSet(bs)); bs = new MapBindingSet(); - bs.addBinding("total", vf.createLiteral("1", XMLSchema.INTEGER)); - bs.addBinding("id", vf.createLiteral("id_4", XMLSchema.STRING)); - bs.addBinding("periodicBinId", vf.createLiteral(binId)); + bs.addBinding("total", VF.createLiteral("1", XMLSchema.INTEGER)); + bs.addBinding("id", VF.createLiteral("id_4", XMLSchema.STRING)); + bs.addBinding("periodicBinId", VF.createLiteral(binId)); expected1.add(bs); storageResults.add(new VisibilityBindingSet(bs)); bs = new MapBindingSet(); - bs.addBinding("total", vf.createLiteral("1", XMLSchema.INTEGER)); - bs.addBinding("id", vf.createLiteral("id_1", XMLSchema.STRING)); - bs.addBinding("periodicBinId", vf.createLiteral(binId + period)); + bs.addBinding("total", VF.createLiteral("1", XMLSchema.INTEGER)); + bs.addBinding("id", VF.createLiteral("id_1", XMLSchema.STRING)); + bs.addBinding("periodicBinId", VF.createLiteral(binId + period)); expected2.add(bs); storageResults.add(new VisibilityBindingSet(bs)); bs = new MapBindingSet(); - bs.addBinding("total", vf.createLiteral("2", XMLSchema.INTEGER)); - bs.addBinding("id", vf.createLiteral("id_2", XMLSchema.STRING)); - bs.addBinding("periodicBinId", vf.createLiteral(binId + period)); + bs.addBinding("total", VF.createLiteral("2", XMLSchema.INTEGER)); + bs.addBinding("id", VF.createLiteral("id_2", XMLSchema.STRING)); + bs.addBinding("periodicBinId", VF.createLiteral(binId + period)); expected2.add(bs); storageResults.add(new VisibilityBindingSet(bs)); bs = new MapBindingSet(); - bs.addBinding("total", vf.createLiteral("1", XMLSchema.INTEGER)); - bs.addBinding("id", vf.createLiteral("id_3", XMLSchema.STRING)); - bs.addBinding("periodicBinId", vf.createLiteral(binId + period)); + bs.addBinding("total", VF.createLiteral("1", XMLSchema.INTEGER)); + bs.addBinding("id", VF.createLiteral("id_3", XMLSchema.STRING)); + bs.addBinding("periodicBinId", VF.createLiteral(binId + period)); expected2.add(bs); storageResults.add(new VisibilityBindingSet(bs)); bs = new MapBindingSet(); - bs.addBinding("total", vf.createLiteral("1", XMLSchema.INTEGER)); - bs.addBinding("id", vf.createLiteral("id_1", XMLSchema.STRING)); - bs.addBinding("periodicBinId", vf.createLiteral(binId + 2*period)); + bs.addBinding("total", VF.createLiteral("1", XMLSchema.INTEGER)); + bs.addBinding("id", VF.createLiteral("id_1", XMLSchema.STRING)); + bs.addBinding("periodicBinId", VF.createLiteral(binId + 2*period)); expected3.add(bs); storageResults.add(new VisibilityBindingSet(bs)); bs = new MapBindingSet(); - bs.addBinding("total", vf.createLiteral("1", XMLSchema.INTEGER)); - bs.addBinding("id", vf.createLiteral("id_2", XMLSchema.STRING)); - bs.addBinding("periodicBinId", vf.createLiteral(binId + 2*period)); + bs.addBinding("total", VF.createLiteral("1", XMLSchema.INTEGER)); + bs.addBinding("id", VF.createLiteral("id_2", XMLSchema.STRING)); + bs.addBinding("periodicBinId", VF.createLiteral(binId + 2*period)); expected3.add(bs); storageResults.add(new VisibilityBindingSet(bs)); bs = new MapBindingSet(); - bs.addBinding("total", vf.createLiteral("1", XMLSchema.INTEGER)); - bs.addBinding("id", vf.createLiteral("id_1", XMLSchema.STRING)); - bs.addBinding("periodicBinId", vf.createLiteral(binId + 3*period)); + bs.addBinding("total", VF.createLiteral("1", XMLSchema.INTEGER)); + bs.addBinding("id", VF.createLiteral("id_1", XMLSchema.STRING)); + bs.addBinding("periodicBinId", VF.createLiteral(binId + 3*period)); expected4.add(bs); storageResults.add(new VisibilityBindingSet(bs)); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/mongo/MongoPcjDocumentsTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/mongo/MongoPcjDocumentsTest.java b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/mongo/MongoPcjDocumentsTest.java index f522fac..0596daf 100644 --- a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/mongo/MongoPcjDocumentsTest.java +++ b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/mongo/MongoPcjDocumentsTest.java @@ -28,14 +28,17 @@ import org.apache.rya.indexing.pcj.storage.PcjMetadata; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import org.apache.rya.mongodb.MongoITBase; import org.bson.Document; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Test; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.query.impl.MapBindingSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; public class MongoPcjDocumentsTest extends MongoITBase { + private static final ValueFactory VF = SimpleValueFactory.getInstance(); + @Test public void pcjToMetadata() throws Exception { final MongoPcjDocuments docConverter = new MongoPcjDocuments(getMongoClient(), conf.getRyaInstanceName()); @@ -62,16 +65,16 @@ public class MongoPcjDocumentsTest extends MongoITBase { // Setup the binding set that will be converted. final MapBindingSet originalBindingSet1 = new MapBindingSet(); - originalBindingSet1.addBinding("x", new URIImpl("http://a";)); - originalBindingSet1.addBinding("y", new URIImpl("http://b";)); - originalBindingSet1.addBinding("z", new URIImpl("http://c";)); + originalBindingSet1.addBinding("x", VF.createIRI("http://a";)); + originalBindingSet1.addBinding("y", VF.createIRI("http://b";)); + originalBindingSet1.addBinding("z", VF.createIRI("http://c";)); final VisibilityBindingSet results1 = new VisibilityBindingSet(originalBindingSet1, "A&B&C"); // Setup the binding set that will be converted. final MapBindingSet originalBindingSet2 = new MapBindingSet(); - originalBindingSet2.addBinding("x", new URIImpl("http://1";)); - originalBindingSet2.addBinding("y", new URIImpl("http://2";)); - originalBindingSet2.addBinding("z", new URIImpl("http://3";)); + originalBindingSet2.addBinding("x", VF.createIRI("http://1";)); + originalBindingSet2.addBinding("y", VF.createIRI("http://2";)); + originalBindingSet2.addBinding("z", VF.createIRI("http://3";)); final VisibilityBindingSet results2 = new VisibilityBindingSet(originalBindingSet2, "A&B&C"); final List<VisibilityBindingSet> bindingSets = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/mongo/MongoPcjStorageIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/mongo/MongoPcjStorageIT.java b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/mongo/MongoPcjStorageIT.java index 6747558..d87f597 100644 --- a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/mongo/MongoPcjStorageIT.java +++ b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/mongo/MongoPcjStorageIT.java @@ -45,10 +45,11 @@ import org.apache.rya.indexing.pcj.storage.accumulo.ShiftVarOrderFactory; import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import org.apache.rya.mongodb.MongoITBase; import org.apache.rya.mongodb.instance.MongoRyaInstanceDetailsRepository; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.impl.MapBindingSet; import org.junit.Test; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.query.BindingSet; -import org.openrdf.query.impl.MapBindingSet; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; @@ -60,6 +61,7 @@ import com.google.common.collect.ImmutableMap; * also update the Rya instance's details. */ public class MongoPcjStorageIT extends MongoITBase { + private static final ValueFactory VF = SimpleValueFactory.getInstance(); @Test public void createPCJ() throws Exception { @@ -219,13 +221,13 @@ public class MongoPcjStorageIT extends MongoITBase { final Set<VisibilityBindingSet> results = new HashSet<>(); final MapBindingSet aliceBS = new MapBindingSet(); - aliceBS.addBinding("a", new URIImpl("http://Alice";)); - aliceBS.addBinding("b", new URIImpl("http://Person";)); + aliceBS.addBinding("a", VF.createIRI("http://Alice";)); + aliceBS.addBinding("b", VF.createIRI("http://Person";)); results.add( new VisibilityBindingSet(aliceBS, "") ); final MapBindingSet charlieBS = new MapBindingSet(); - charlieBS.addBinding("a", new URIImpl("http://Charlie";)); - charlieBS.addBinding("b", new URIImpl("http://Comedian";)); + charlieBS.addBinding("a", VF.createIRI("http://Charlie";)); + charlieBS.addBinding("b", VF.createIRI("http://Comedian";)); results.add( new VisibilityBindingSet(charlieBS, "") ); pcjStorage.addResults(pcjId, results); @@ -264,14 +266,14 @@ public class MongoPcjStorageIT extends MongoITBase { final Set<BindingSet> expectedResults = new HashSet<>(); final MapBindingSet aliceBS = new MapBindingSet(); - aliceBS.addBinding("a", new URIImpl("http://Alice";)); - aliceBS.addBinding("b", new URIImpl("http://Person";)); + aliceBS.addBinding("a", VF.createIRI("http://Alice";)); + aliceBS.addBinding("b", VF.createIRI("http://Person";)); visiSets.add( new VisibilityBindingSet(aliceBS, "") ); expectedResults.add(aliceBS); final MapBindingSet charlieBS = new MapBindingSet(); - charlieBS.addBinding("a", new URIImpl("http://Charlie";)); - charlieBS.addBinding("b", new URIImpl("http://Comedian";)); + charlieBS.addBinding("a", VF.createIRI("http://Charlie";)); + charlieBS.addBinding("b", VF.createIRI("http://Comedian";)); visiSets.add( new VisibilityBindingSet(charlieBS, "") ); expectedResults.add(charlieBS); @@ -313,13 +315,13 @@ public class MongoPcjStorageIT extends MongoITBase { final Set<VisibilityBindingSet> expectedResults = new HashSet<>(); final MapBindingSet aliceBS = new MapBindingSet(); - aliceBS.addBinding("a", new URIImpl("http://Alice";)); - aliceBS.addBinding("b", new URIImpl("http://Person";)); + aliceBS.addBinding("a", VF.createIRI("http://Alice";)); + aliceBS.addBinding("b", VF.createIRI("http://Person";)); expectedResults.add( new VisibilityBindingSet(aliceBS, "") ); final MapBindingSet charlieBS = new MapBindingSet(); - charlieBS.addBinding("a", new URIImpl("http://Charlie";)); - charlieBS.addBinding("b", new URIImpl("http://Comedian";)); + charlieBS.addBinding("a", VF.createIRI("http://Charlie";)); + charlieBS.addBinding("b", VF.createIRI("http://Comedian";)); expectedResults.add( new VisibilityBindingSet(charlieBS, "") ); pcjStorage.addResults(pcjId, expectedResults); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/mongo/PcjDocumentsIntegrationTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/mongo/PcjDocumentsIntegrationTest.java b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/mongo/PcjDocumentsIntegrationTest.java index 0c71c9f..e326339 100644 --- a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/mongo/PcjDocumentsIntegrationTest.java +++ b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/mongo/PcjDocumentsIntegrationTest.java @@ -20,6 +20,7 @@ package org.apache.rya.indexing.pcj.storage.mongo; import static org.junit.Assert.assertEquals; +import java.math.BigInteger; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; @@ -45,17 +46,14 @@ import org.apache.rya.mongodb.MongoITBase; import org.apache.rya.mongodb.StatefulMongoDBRdfConfiguration; import org.apache.rya.rdftriplestore.RdfCloudTripleStore; import org.apache.rya.rdftriplestore.RyaSailRepository; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.query.BindingSet; +import org.eclipse.rdf4j.query.impl.MapBindingSet; +import org.eclipse.rdf4j.repository.RepositoryConnection; +import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection; import org.junit.Test; -import org.openrdf.model.Statement; -import org.openrdf.model.impl.LiteralImpl; -import org.openrdf.model.impl.NumericLiteralImpl; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.query.BindingSet; -import org.openrdf.query.impl.MapBindingSet; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.sail.SailRepositoryConnection; import com.google.common.base.Optional; import com.google.common.collect.Sets; @@ -65,6 +63,8 @@ import com.google.common.collect.Sets; * functions of {@link PcjTables} work within a cluster setting. */ public class PcjDocumentsIntegrationTest extends MongoITBase { + private static final ValueFactory VF = SimpleValueFactory.getInstance(); + @Override protected void updateConfiguration(final MongoDBRdfConfiguration conf) { conf.setDisplayQueryPlan(true); @@ -119,16 +119,16 @@ public class PcjDocumentsIntegrationTest extends MongoITBase { // Add a few results to the PCJ table. final MapBindingSet alice = new MapBindingSet(); - alice.addBinding("name", new URIImpl("http://Alice";)); - alice.addBinding("age", new NumericLiteralImpl(14, XMLSchema.INTEGER)); + alice.addBinding("name", VF.createIRI("http://Alice";)); + alice.addBinding("age", VF.createLiteral(BigInteger.valueOf(14))); final MapBindingSet bob = new MapBindingSet(); - bob.addBinding("name", new URIImpl("http://Bob";)); - bob.addBinding("age", new NumericLiteralImpl(16, XMLSchema.INTEGER)); + bob.addBinding("name", VF.createIRI("http://Bob";)); + bob.addBinding("age", VF.createLiteral(BigInteger.valueOf(16))); final MapBindingSet charlie = new MapBindingSet(); - charlie.addBinding("name", new URIImpl("http://Charlie";)); - charlie.addBinding("age", new NumericLiteralImpl(12, XMLSchema.INTEGER)); + charlie.addBinding("name", VF.createIRI("http://Charlie";)); + charlie.addBinding("age", VF.createLiteral(BigInteger.valueOf(12))); final Set<BindingSet> expected = Sets.<BindingSet>newHashSet(alice, bob, charlie); pcjs.addResults(pcjTableName, Sets.<VisibilityBindingSet>newHashSet( @@ -161,16 +161,16 @@ public class PcjDocumentsIntegrationTest extends MongoITBase { // Add a few results to the PCJ table. final MapBindingSet alice = new MapBindingSet(); - alice.addBinding("name", new URIImpl("http://Alice";)); - alice.addBinding("age", new NumericLiteralImpl(14, XMLSchema.INTEGER)); + alice.addBinding("name", VF.createIRI("http://Alice";)); + alice.addBinding("age", VF.createLiteral(BigInteger.valueOf(14))); final MapBindingSet bob = new MapBindingSet(); - bob.addBinding("name", new URIImpl("http://Bob";)); - bob.addBinding("age", new NumericLiteralImpl(16, XMLSchema.INTEGER)); + bob.addBinding("name", VF.createIRI("http://Bob";)); + bob.addBinding("age", VF.createLiteral(BigInteger.valueOf(16))); final MapBindingSet charlie = new MapBindingSet(); - charlie.addBinding("name", new URIImpl("http://Charlie";)); - charlie.addBinding("age", new NumericLiteralImpl(12, XMLSchema.INTEGER)); + charlie.addBinding("name", VF.createIRI("http://Charlie";)); + charlie.addBinding("age", VF.createLiteral(BigInteger.valueOf(12))); pcjs.addResults(pcjTableName, Sets.<VisibilityBindingSet>newHashSet( new VisibilityBindingSet(alice), @@ -214,14 +214,14 @@ public class PcjDocumentsIntegrationTest extends MongoITBase { try { // Load some Triples into Rya. final Set<Statement> triples = new HashSet<>(); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://hasAge";), new NumericLiteralImpl(14, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://hasAge";), new NumericLiteralImpl(16, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://hasAge";), new NumericLiteralImpl(12, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://hasAge";), new NumericLiteralImpl(43, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(14))) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(16))) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(12))) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(43))) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); for(final Statement triple : triples) { ryaConn.add(triple); @@ -251,16 +251,16 @@ public class PcjDocumentsIntegrationTest extends MongoITBase { // Ensure the expected results match those that were stored. final MapBindingSet alice = new MapBindingSet(); - alice.addBinding("name", new URIImpl("http://Alice";)); - alice.addBinding("age", new NumericLiteralImpl(14, XMLSchema.INTEGER)); + alice.addBinding("name", VF.createIRI("http://Alice";)); + alice.addBinding("age", VF.createLiteral(BigInteger.valueOf(14))); final MapBindingSet bob = new MapBindingSet(); - bob.addBinding("name", new URIImpl("http://Bob";)); - bob.addBinding("age", new NumericLiteralImpl(16, XMLSchema.INTEGER)); + bob.addBinding("name", VF.createIRI("http://Bob";)); + bob.addBinding("age", VF.createLiteral(BigInteger.valueOf(16))); final MapBindingSet charlie = new MapBindingSet(); - charlie.addBinding("name", new URIImpl("http://Charlie";)); - charlie.addBinding("age", new NumericLiteralImpl(12, XMLSchema.INTEGER)); + charlie.addBinding("name", VF.createIRI("http://Charlie";)); + charlie.addBinding("age", VF.createLiteral(BigInteger.valueOf(12))); final Set<BindingSet> expected = Sets.<BindingSet>newHashSet(alice, bob, charlie); @@ -291,14 +291,14 @@ public class PcjDocumentsIntegrationTest extends MongoITBase { try { // Load some Triples into Rya. final Set<Statement> triples = new HashSet<>(); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://hasAge";), new NumericLiteralImpl(14, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://hasAge";), new NumericLiteralImpl(16, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://hasAge";), new NumericLiteralImpl(12, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://hasAge";), new NumericLiteralImpl(43, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(14))) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(16))) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(12))) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(43))) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); for(final Statement triple : triples) { ryaConn.add(triple); @@ -328,16 +328,16 @@ public class PcjDocumentsIntegrationTest extends MongoITBase { // Ensure the expected results match those that were stored. final MapBindingSet alice = new MapBindingSet(); - alice.addBinding("name", new URIImpl("http://Alice";)); - alice.addBinding("age", new NumericLiteralImpl(14, XMLSchema.INTEGER)); + alice.addBinding("name", VF.createIRI("http://Alice";)); + alice.addBinding("age", VF.createLiteral(BigInteger.valueOf(14))); final MapBindingSet bob = new MapBindingSet(); - bob.addBinding("name", new URIImpl("http://Bob";)); - bob.addBinding("age", new NumericLiteralImpl(16, XMLSchema.INTEGER)); + bob.addBinding("name", VF.createIRI("http://Bob";)); + bob.addBinding("age", VF.createLiteral(BigInteger.valueOf(16))); final MapBindingSet charlie = new MapBindingSet(); - charlie.addBinding("name", new URIImpl("http://Charlie";)); - charlie.addBinding("age", new NumericLiteralImpl(12, XMLSchema.INTEGER)); + charlie.addBinding("name", VF.createIRI("http://Charlie";)); + charlie.addBinding("age", VF.createLiteral(BigInteger.valueOf(12))); final Set<BindingSet> expected = Sets.<BindingSet>newHashSet(alice, bob, charlie); @@ -397,16 +397,16 @@ public class PcjDocumentsIntegrationTest extends MongoITBase { // Add a few results to the PCJ table. final MapBindingSet alice = new MapBindingSet(); - alice.addBinding("name", new URIImpl("http://Alice";)); - alice.addBinding("age", new NumericLiteralImpl(14, XMLSchema.INTEGER)); + alice.addBinding("name", VF.createIRI("http://Alice";)); + alice.addBinding("age", VF.createLiteral(BigInteger.valueOf(14))); final MapBindingSet bob = new MapBindingSet(); - bob.addBinding("name", new URIImpl("http://Bob";)); - bob.addBinding("age", new NumericLiteralImpl(16, XMLSchema.INTEGER)); + bob.addBinding("name", VF.createIRI("http://Bob";)); + bob.addBinding("age", VF.createLiteral(BigInteger.valueOf(16))); final MapBindingSet charlie = new MapBindingSet(); - charlie.addBinding("name", new URIImpl("http://Charlie";)); - charlie.addBinding("age", new NumericLiteralImpl(12, XMLSchema.INTEGER)); + charlie.addBinding("name", VF.createIRI("http://Charlie";)); + charlie.addBinding("age", VF.createLiteral(BigInteger.valueOf(12))); pcjs.addResults(pcjTableName, Sets.<VisibilityBindingSet>newHashSet( new VisibilityBindingSet(alice), http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/mongo/PcjDocumentsWithMockTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/mongo/PcjDocumentsWithMockTest.java b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/mongo/PcjDocumentsWithMockTest.java index a3ba747..2666b85 100644 --- a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/mongo/PcjDocumentsWithMockTest.java +++ b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/mongo/PcjDocumentsWithMockTest.java @@ -22,6 +22,7 @@ package org.apache.rya.indexing.pcj.storage.mongo; import static org.junit.Assert.assertEquals; +import java.math.BigInteger; import java.util.HashSet; import java.util.Set; @@ -33,16 +34,15 @@ import org.apache.rya.mongodb.MongoITBase; import org.apache.rya.mongodb.StatefulMongoDBRdfConfiguration; import org.apache.rya.rdftriplestore.RdfCloudTripleStore; import org.apache.rya.rdftriplestore.RyaSailRepository; +import org.eclipse.rdf4j.model.Statement; +import org.eclipse.rdf4j.model.ValueFactory; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection; import org.junit.Test; -import org.openrdf.model.Statement; -import org.openrdf.model.impl.LiteralImpl; -import org.openrdf.model.impl.NumericLiteralImpl; -import org.openrdf.model.impl.StatementImpl; -import org.openrdf.model.impl.URIImpl; -import org.openrdf.model.vocabulary.XMLSchema; -import org.openrdf.repository.sail.SailRepositoryConnection; public class PcjDocumentsWithMockTest extends MongoITBase { + private static final ValueFactory VF = SimpleValueFactory.getInstance(); + @Override protected void updateConfiguration(final MongoDBRdfConfiguration conf) { conf.setDisplayQueryPlan(false); @@ -61,14 +61,14 @@ public class PcjDocumentsWithMockTest extends MongoITBase { try { // Load some Triples into Rya. final Set<Statement> triples = new HashSet<>(); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://hasAge";), new NumericLiteralImpl(14, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Alice";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://hasAge";), new NumericLiteralImpl(16, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Bob";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://hasAge";), new NumericLiteralImpl(12, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Charlie";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://hasAge";), new NumericLiteralImpl(43, XMLSchema.INTEGER)) ); - triples.add( new StatementImpl(new URIImpl("http://Eve";), new URIImpl("http://playsSport";), new LiteralImpl("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(14))) ); + triples.add( VF.createStatement(VF.createIRI("http://Alice";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(16))) ); + triples.add( VF.createStatement(VF.createIRI("http://Bob";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(12))) ); + triples.add( VF.createStatement(VF.createIRI("http://Charlie";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://hasAge";), VF.createLiteral(BigInteger.valueOf(43))) ); + triples.add( VF.createStatement(VF.createIRI("http://Eve";), VF.createIRI("http://playsSport";), VF.createLiteral("Soccer")) ); for(final Statement triple : triples) { ryaConn.add(triple); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.manual/src/site/markdown/alx.md ---------------------------------------------------------------------- diff --git a/extras/rya.manual/src/site/markdown/alx.md b/extras/rya.manual/src/site/markdown/alx.md index ca28501..a6486f4 100644 --- a/extras/rya.manual/src/site/markdown/alx.md +++ b/extras/rya.manual/src/site/markdown/alx.md @@ -57,8 +57,8 @@ The bundle registers a Sail Repository, so you can interact with it directly as ``` JAVA import org.springframework.osgi.extensions.annotation.*; -import org.openrdf.repository.*; -import org.openrdf.model.ValueFactory; +import org.eclipse.rdf4j.repository.*; +import org.eclipse.rdf4j.model.ValueFactory; import static org.apache.rya.api.RdfCloudTripleStoreConstants.*; class TstRepo { @@ -68,7 +68,7 @@ class TstRepo { println repo RepositoryConnection conn = repo.getConnection(); ValueFactory vf = VALUE_FACTORY; - def statements = conn.getStatements(vf.createURI("http://www.Department0.University0.edu";), null, null, true); + def statements = conn.getStatements(vf.createIRI("http://www.Department0.University0.edu";), null, null, true); while(statements.hasNext()) { System.out.println(statements.next()); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.manual/src/site/markdown/loaddata.md ---------------------------------------------------------------------- diff --git a/extras/rya.manual/src/site/markdown/loaddata.md b/extras/rya.manual/src/site/markdown/loaddata.md index 5d3f298..e5c7bd2 100644 --- a/extras/rya.manual/src/site/markdown/loaddata.md +++ b/extras/rya.manual/src/site/markdown/loaddata.md @@ -106,7 +106,7 @@ Options: - rdf.tablePrefix : The tables (spo, po, osp) are prefixed with this qualifier. The tables become: (rdf.tablePrefix)spo,(rdf.tablePrefix)po,(rdf.tablePrefix)osp - ac.* : Accumulo connection parameters -- rdf.format : See RDFFormat from openrdf, samples include (Trig, N-Triples, RDF/XML) +- rdf.format : See RDFFormat from RDF4J, samples include (Trig, N-Triples, RDF/XML) - sc.use_freetext, sc.use_geo, sc.use_temporal, sc.use_entity : If any of these are set to true, statements will also be added to the enabled secondary indices. - sc.freetext.predicates, sc.geo.predicates, sc.temporal.predicates: If the associated indexer is enabled, these options specify @@ -116,9 +116,9 @@ Options: The argument is the directory/file to load. This file needs to be loaded into HDFS before running. If loading a directory, all files should have the same RDF format. -## Direct OpenRDF API +## Direct RDF4J API -Here is some sample code to load data directly through the OpenRDF API. (Loading N-Triples data) +Here is some sample code to load data directly through the RDF4J API. (Loading N-Triples data) You will need at least `accumulo.rya-<version>`, `rya.api`, `rya.sail.impl` on the classpath and transitive dependencies. I find that Maven is the easiest way to get a project dependency tree set up. ``` JAVA http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.manual/src/site/markdown/mapreduce.md ---------------------------------------------------------------------- diff --git a/extras/rya.manual/src/site/markdown/mapreduce.md b/extras/rya.manual/src/site/markdown/mapreduce.md index f99a78f..ec2bdc8 100644 --- a/extras/rya.manual/src/site/markdown/mapreduce.md +++ b/extras/rya.manual/src/site/markdown/mapreduce.md @@ -37,7 +37,7 @@ Input formats are provided for reading triple data from Rya or from RDF files: - *RdfFileInputFormat* will read and parse RDF files of any format. Format must be explicitly specified. Reading and parsing is done asynchronously, enabling - large input files depending on how much information the openrdf parser itself + large input files depending on how much information the RDF4J parser itself needs to hold in memory in order to parse the file. (For example, large N-Triples files can be handled easily, but large XML files might require you to allocate more memory for the Map task.) Handles multiple files if given a http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.manual/src/site/markdown/overview.md ---------------------------------------------------------------------- diff --git a/extras/rya.manual/src/site/markdown/overview.md b/extras/rya.manual/src/site/markdown/overview.md index 46da734..2ce3dc8 100644 --- a/extras/rya.manual/src/site/markdown/overview.md +++ b/extras/rya.manual/src/site/markdown/overview.md @@ -21,6 +21,6 @@ --> # Overview -Apache Rya is a scalable RDF Store that is built on top of a Columnar Index Store (such as Accumulo). It is implemented as an extension to OpenRdf to provide easy query mechanisms (SPARQL, SERQL, etc) and Rdf data storage (RDF/XML, NTriples, etc). +Apache Rya is a scalable RDF Store that is built on top of a Columnar Index Store (such as Accumulo). It is implemented as an extension to RDF4J to provide easy query mechanisms (SPARQL, SERQL, etc) and Rdf data storage (RDF/XML, NTriples, etc). Rya stands for RDF y(and) Accumulo. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/81b99327/extras/rya.manual/src/site/markdown/sm-addauth.md ---------------------------------------------------------------------- diff --git a/extras/rya.manual/src/site/markdown/sm-addauth.md b/extras/rya.manual/src/site/markdown/sm-addauth.md index 2f32422..eec0949 100644 --- a/extras/rya.manual/src/site/markdown/sm-addauth.md +++ b/extras/rya.manual/src/site/markdown/sm-addauth.md @@ -89,9 +89,9 @@ RepositoryConnection conn = myRepository.getConnection(); //define and add statement String litdupsNS = "urn:test:litdups#"; -URI cpu = vf.createURI(litdupsNS, "cpu"); -URI loadPerc = vf.createURI(litdupsNS, "loadPerc"); -URI uri1 = vf.createURI(litdupsNS, "uri1"); +URI cpu = vf.createIRI(litdupsNS, "cpu"); +URI loadPerc = vf.createIRI(litdupsNS, "loadPerc"); +URI uri1 = vf.createIRI(litdupsNS, "uri1"); conn.add(cpu, loadPerc, uri1); conn.commit();
