http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.prospector/src/test/java/org/apache/rya/joinselect/mr/JoinSelectStatisticsTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.prospector/src/test/java/org/apache/rya/joinselect/mr/JoinSelectStatisticsTest.java b/extras/rya.prospector/src/test/java/org/apache/rya/joinselect/mr/JoinSelectStatisticsTest.java index 9bbe518..15cd0d4 100644 --- a/extras/rya.prospector/src/test/java/org/apache/rya/joinselect/mr/JoinSelectStatisticsTest.java +++ b/extras/rya.prospector/src/test/java/org/apache/rya/joinselect/mr/JoinSelectStatisticsTest.java @@ -42,7 +42,7 @@ import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.resolver.RyaTripleContext; import org.apache.rya.api.resolver.triple.TripleRow; import org.apache.rya.joinselect.mr.JoinSelectAggregate.JoinReducer; @@ -99,7 +99,7 @@ public class JoinSelectStatisticsTest { private static final String PREFIX = JoinSelectStatisticsTest.class.getSimpleName(); private static final String DELIM = "\u0000"; - private static final String uri = "uri:"; + private static final String iri = "uri:"; private List<String> cardList = Arrays.asList("subject", "predicate", "object"); private List<String> aggCardList = Arrays.asList("subjectobject", "subjectpredicate", "subjectsubject", "predicateobject", "predicatepredicate", "predicatesubject"); private static File SPOOUT; @@ -417,7 +417,7 @@ public class JoinSelectStatisticsTest { BatchWriter bw_table1 = c.createBatchWriter("rya_spo", new BatchWriterConfig()); for (int i = 1; i < 3; i++) { - RyaStatement rs = new RyaStatement(new RyaURI(uri + i), new RyaURI(uri + 5), new RyaType(uri + (i + 2))); + RyaStatement rs = new RyaStatement(new RyaIRI(iri + i), new RyaIRI(iri + 5), new RyaType(iri + (i + 2))); Map<TABLE_LAYOUT, TripleRow> tripleRowMap = ryaContext.serializeTriple(rs); TripleRow tripleRow = tripleRowMap.get(TABLE_LAYOUT.SPO); Mutation m = JoinSelectStatsUtil.createMutation(tripleRow); @@ -433,7 +433,7 @@ public class JoinSelectStatisticsTest { int j = 1; for (String s : cardList) { - Mutation m = new Mutation(new Text(s + DELIM + uri + i + DELIM + i)); + Mutation m = new Mutation(new Text(s + DELIM + iri + i + DELIM + i)); m.put(new Text(), new Text(), new Value(new IntWritable(i + j).toString().getBytes())); bw_table2.addMutation(m); j++; @@ -457,7 +457,7 @@ public class JoinSelectStatisticsTest { } Scanner scan1 = c.createScanner("rya_selectivity" , new Authorizations()); - scan1.setRange(Range.prefix("predicate" +DELIM + uri + 5)); + scan1.setRange(Range.prefix("predicate" +DELIM + iri + 5)); int i = 5; for (Map.Entry<Key, Value> entry : scan1) { @@ -479,7 +479,7 @@ public class JoinSelectStatisticsTest { Scanner scan2 = c.createScanner("rya_selectivity" , new Authorizations()); - scan2.setRange(Range.prefix("object" +DELIM + uri + 3)); + scan2.setRange(Range.prefix("object" +DELIM + iri + 3)); int j = 5; for (Map.Entry<Key, Value> entry : scan2) { @@ -502,7 +502,7 @@ public class JoinSelectStatisticsTest { Scanner scan3 = c.createScanner("rya_selectivity", new Authorizations()); - scan3.setRange(Range.prefix("objectsubject" + DELIM + uri + 3 +DELIM +uri +1 )); + scan3.setRange(Range.prefix("objectsubject" + DELIM + iri + 3 +DELIM +iri +1 )); int k = 8; for (Map.Entry<Key, Value> entry : scan3) { @@ -536,7 +536,7 @@ public class JoinSelectStatisticsTest { BatchWriter bw_table1 = c.createBatchWriter("rya_spo", new BatchWriterConfig()); for (int i = 1; i < 4; i++) { - RyaStatement rs = new RyaStatement(new RyaURI(uri + 1), new RyaURI(uri + 2), new RyaType(uri + i)); + RyaStatement rs = new RyaStatement(new RyaIRI(iri + 1), new RyaIRI(iri + 2), new RyaType(iri + i)); Map<TABLE_LAYOUT, TripleRow> tripleRowMap = ryaContext.serializeTriple(rs); TripleRow tripleRow = tripleRowMap.get(TABLE_LAYOUT.SPO); Mutation m = JoinSelectStatsUtil.createMutation(tripleRow); @@ -549,7 +549,7 @@ public class JoinSelectStatisticsTest { for (int i = 1; i < 4; i++) { for (String s : cardList) { - Mutation m = new Mutation(new Text(s + DELIM + uri + i + DELIM + i)); + Mutation m = new Mutation(new Text(s + DELIM + iri + i + DELIM + i)); m.put(new Text(), new Text(), new Value(new IntWritable(i + 2).toString().getBytes())); bw_table2.addMutation(m); } @@ -559,7 +559,7 @@ public class JoinSelectStatisticsTest { Assert.assertEquals(0, ToolRunner.run(new JoinSelectTestDriver(), new String[]{""})); Scanner scan1 = c.createScanner("rya_selectivity" , new Authorizations()); - scan1.setRange(Range.prefix("subject" +DELIM + uri + 1)); + scan1.setRange(Range.prefix("subject" +DELIM + iri + 1)); int i = 0; for (Map.Entry<Key, Value> entry : scan1) { @@ -570,7 +570,7 @@ public class JoinSelectStatisticsTest { Assert.assertTrue(i == 6); Scanner scan2 = c.createScanner("rya_selectivity" , new Authorizations()); - scan2.setRange(Range.prefix("predicate" +DELIM + uri + 2)); + scan2.setRange(Range.prefix("predicate" +DELIM + iri + 2)); int j = 0; for (Map.Entry<Key, Value> entry : scan2) { @@ -586,7 +586,7 @@ public class JoinSelectStatisticsTest { Assert.assertTrue(j == 6); Scanner scan3 = c.createScanner("rya_selectivity" , new Authorizations()); - scan3.setRange(Range.prefix("predicateobject" +DELIM + uri + 2 +DELIM + uri + 2)); + scan3.setRange(Range.prefix("predicateobject" +DELIM + iri + 2 +DELIM + iri + 2)); int k = 0; for (Map.Entry<Key, Value> entry : scan3) { @@ -612,7 +612,7 @@ public class JoinSelectStatisticsTest { for (int j = 1; j < 3; j++) { for (int k = 1; k < 3; k++) { - RyaStatement rs = new RyaStatement(new RyaURI(uri + i), new RyaURI(uri + (j)), new RyaType(uri + k)); + RyaStatement rs = new RyaStatement(new RyaIRI(iri + i), new RyaIRI(iri + (j)), new RyaType(iri + k)); Map<TABLE_LAYOUT, TripleRow> tripleRowMap = ryaContext.serializeTriple(rs); TripleRow tripleRow = tripleRowMap.get(TABLE_LAYOUT.SPO); Mutation m = JoinSelectStatsUtil.createMutation(tripleRow); @@ -629,7 +629,7 @@ public class JoinSelectStatisticsTest { int k = 1; for (String s : cardList) { - Mutation m = new Mutation(new Text(s + DELIM + uri + i + DELIM + i)); + Mutation m = new Mutation(new Text(s + DELIM + iri + i + DELIM + i)); m.put(new Text(), new Text(), new Value(new IntWritable(i + k).toString().getBytes())); bw_table2.addMutation(m); k++; @@ -638,7 +638,7 @@ public class JoinSelectStatisticsTest { for (int j = 1; j < 3; j++) { k = 1; for (String s : aggCardList) { - Mutation m = new Mutation(new Text(s + DELIM + uri + i + DELIM + uri + j + DELIM + i)); + Mutation m = new Mutation(new Text(s + DELIM + iri + i + DELIM + iri + j + DELIM + i)); m.put(new Text(), new Text(), new Value(new IntWritable(i + k +j).toString().getBytes())); bw_table2.addMutation(m); k++; @@ -665,7 +665,7 @@ public class JoinSelectStatisticsTest { Scanner scan1 = c.createScanner("rya_selectivity" , new Authorizations()); - scan1.setRange(Range.prefix("subject" +DELIM + uri + 1)); + scan1.setRange(Range.prefix("subject" +DELIM + iri + 1)); int i = 0; for (Map.Entry<Key, Value> entry : scan1) { @@ -722,7 +722,7 @@ public class JoinSelectStatisticsTest { break; } - RyaStatement rs = new RyaStatement(new RyaURI(uri + i), new RyaURI(uri + (j)), new RyaType(uri + k)); + RyaStatement rs = new RyaStatement(new RyaIRI(iri + i), new RyaIRI(iri + (j)), new RyaType(iri + k)); Map<TABLE_LAYOUT, TripleRow> tripleRowMap = ryaContext.serializeTriple(rs); TripleRow tripleRow = tripleRowMap.get(TABLE_LAYOUT.SPO); Mutation m = JoinSelectStatsUtil.createMutation(tripleRow); @@ -739,7 +739,7 @@ public class JoinSelectStatisticsTest { int k = 1; for (String s : cardList) { - Mutation m = new Mutation(new Text(s + DELIM + uri + i + DELIM + i)); + Mutation m = new Mutation(new Text(s + DELIM + iri + i + DELIM + i)); m.put(new Text(), new Text(), new Value(new IntWritable(i + k).toString().getBytes())); bw_table2.addMutation(m); k++; @@ -748,7 +748,7 @@ public class JoinSelectStatisticsTest { for (int j = 1; j < 3; j++) { k = 1; for (String s : aggCardList) { - Mutation m = new Mutation(new Text(s + DELIM + uri + i + DELIM + uri + j + DELIM + i)); + Mutation m = new Mutation(new Text(s + DELIM + iri + i + DELIM + iri + j + DELIM + i)); m.put(new Text(), new Text(), new Value(new IntWritable(i + k + 2*j).toString().getBytes())); bw_table2.addMutation(m); k++; @@ -775,7 +775,7 @@ public class JoinSelectStatisticsTest { Scanner scan1 = c.createScanner("rya_selectivity" , new Authorizations()); - scan1.setRange(Range.prefix("subject" +DELIM + uri + 1)); + scan1.setRange(Range.prefix("subject" +DELIM + iri + 1)); int i = 0; for (Map.Entry<Key, Value> entry : scan1) { @@ -810,7 +810,7 @@ public class JoinSelectStatisticsTest { Scanner scan2 = c.createScanner("rya_selectivity" , new Authorizations()); - scan2.setRange(Range.prefix("predicate" +DELIM + uri + 1)); + scan2.setRange(Range.prefix("predicate" +DELIM + iri + 1)); int j = 0; for (Map.Entry<Key, Value> entry : scan2) {
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.prospector/src/test/java/org/apache/rya/prospector/mr/ProspectorTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.prospector/src/test/java/org/apache/rya/prospector/mr/ProspectorTest.java b/extras/rya.prospector/src/test/java/org/apache/rya/prospector/mr/ProspectorTest.java index 96f2685..06e5005 100644 --- a/extras/rya.prospector/src/test/java/org/apache/rya/prospector/mr/ProspectorTest.java +++ b/extras/rya.prospector/src/test/java/org/apache/rya/prospector/mr/ProspectorTest.java @@ -40,7 +40,7 @@ import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.accumulo.AccumuloRyaDAO; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.prospector.domain.IndexEntry; import org.apache.rya.prospector.domain.TripleValueType; import org.apache.rya.prospector.service.ProspectorService; @@ -73,11 +73,11 @@ public class ProspectorTest { ryaDAO.setConnector(connector); ryaDAO.init(); - ryaDAO.add(new RyaStatement(new RyaURI("urn:gem:etype#1234"), new RyaURI("urn:gem#pred"), new RyaType("mydata1"))); - ryaDAO.add(new RyaStatement(new RyaURI("urn:gem:etype#1234"), new RyaURI("urn:gem#pred"), new RyaType("mydata2"))); - ryaDAO.add(new RyaStatement(new RyaURI("urn:gem:etype#1234"), new RyaURI("urn:gem#pred"), new RyaType("12"))); - ryaDAO.add(new RyaStatement(new RyaURI("urn:gem:etype#1235"), new RyaURI("urn:gem#pred"), new RyaType(XMLSchema.INTEGER, "12"))); - ryaDAO.add(new RyaStatement(new RyaURI("urn:gem:etype#1235"), new RyaURI("urn:gem#pred1"), new RyaType("12"))); + ryaDAO.add(new RyaStatement(new RyaIRI("urn:gem:etype#1234"), new RyaIRI("urn:gem#pred"), new RyaType("mydata1"))); + ryaDAO.add(new RyaStatement(new RyaIRI("urn:gem:etype#1234"), new RyaIRI("urn:gem#pred"), new RyaType("mydata2"))); + ryaDAO.add(new RyaStatement(new RyaIRI("urn:gem:etype#1234"), new RyaIRI("urn:gem#pred"), new RyaType("12"))); + ryaDAO.add(new RyaStatement(new RyaIRI("urn:gem:etype#1235"), new RyaIRI("urn:gem#pred"), new RyaType(XMLSchema.INTEGER, "12"))); + ryaDAO.add(new RyaStatement(new RyaIRI("urn:gem:etype#1235"), new RyaIRI("urn:gem#pred1"), new RyaType("12"))); final String confFile = "stats_cluster_config.xml"; final Path confPath = new Path(getClass().getClassLoader().getResource(confFile).toString()); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.prospector/src/test/java/org/apache/rya/prospector/service/ProspectorServiceEvalStatsDAOTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.prospector/src/test/java/org/apache/rya/prospector/service/ProspectorServiceEvalStatsDAOTest.java b/extras/rya.prospector/src/test/java/org/apache/rya/prospector/service/ProspectorServiceEvalStatsDAOTest.java index b94ed8d..21e3e8f 100644 --- a/extras/rya.prospector/src/test/java/org/apache/rya/prospector/service/ProspectorServiceEvalStatsDAOTest.java +++ b/extras/rya.prospector/src/test/java/org/apache/rya/prospector/service/ProspectorServiceEvalStatsDAOTest.java @@ -39,7 +39,7 @@ import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.accumulo.AccumuloRyaDAO; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.persist.RdfEvalStatsDAO; import org.apache.rya.api.persist.RdfEvalStatsDAO.CARDINALITY_OF; import org.apache.rya.prospector.mr.Prospector; @@ -73,11 +73,11 @@ public class ProspectorServiceEvalStatsDAOTest { ryaDAO.setConnector(connector); ryaDAO.init(); - ryaDAO.add(new RyaStatement(new RyaURI("urn:gem:etype#1234"), new RyaURI("urn:gem#pred"), new RyaType("mydata1"))); - ryaDAO.add(new RyaStatement(new RyaURI("urn:gem:etype#1234"), new RyaURI("urn:gem#pred"), new RyaType("mydata2"))); - ryaDAO.add(new RyaStatement(new RyaURI("urn:gem:etype#1234"), new RyaURI("urn:gem#pred"), new RyaType("12"))); - ryaDAO.add(new RyaStatement(new RyaURI("urn:gem:etype#1235"), new RyaURI("urn:gem#pred"), new RyaType(XMLSchema.INTEGER, "12"))); - ryaDAO.add(new RyaStatement(new RyaURI("urn:gem:etype#1235"), new RyaURI("urn:gem#pred1"), new RyaType("12"))); + ryaDAO.add(new RyaStatement(new RyaIRI("urn:gem:etype#1234"), new RyaIRI("urn:gem#pred"), new RyaType("mydata1"))); + ryaDAO.add(new RyaStatement(new RyaIRI("urn:gem:etype#1234"), new RyaIRI("urn:gem#pred"), new RyaType("mydata2"))); + ryaDAO.add(new RyaStatement(new RyaIRI("urn:gem:etype#1234"), new RyaIRI("urn:gem#pred"), new RyaType("12"))); + ryaDAO.add(new RyaStatement(new RyaIRI("urn:gem:etype#1235"), new RyaIRI("urn:gem#pred"), new RyaType(XMLSchema.INTEGER, "12"))); + ryaDAO.add(new RyaStatement(new RyaIRI("urn:gem:etype#1235"), new RyaIRI("urn:gem#pred1"), new RyaType("12"))); final String confFile = "stats_cluster_config.xml"; final Path confPath = new Path(getClass().getClassLoader().getResource(confFile).toString()); @@ -130,11 +130,11 @@ public class ProspectorServiceEvalStatsDAOTest { ryaDAO.setConnector(connector); ryaDAO.init(); - ryaDAO.add(new RyaStatement(new RyaURI("urn:gem:etype#1234"), new RyaURI("urn:gem#pred"), new RyaType("mydata1"))); - ryaDAO.add(new RyaStatement(new RyaURI("urn:gem:etype#1234"), new RyaURI("urn:gem#pred"), new RyaType("mydata2"))); - ryaDAO.add(new RyaStatement(new RyaURI("urn:gem:etype#1234"), new RyaURI("urn:gem#pred"), new RyaType("12"))); - ryaDAO.add(new RyaStatement(new RyaURI("urn:gem:etype#1235"), new RyaURI("urn:gem#pred"), new RyaType(XMLSchema.INTEGER, "12"))); - ryaDAO.add(new RyaStatement(new RyaURI("urn:gem:etype#1235"), new RyaURI("urn:gem#pred1"), new RyaType("12"))); + ryaDAO.add(new RyaStatement(new RyaIRI("urn:gem:etype#1234"), new RyaIRI("urn:gem#pred"), new RyaType("mydata1"))); + ryaDAO.add(new RyaStatement(new RyaIRI("urn:gem:etype#1234"), new RyaIRI("urn:gem#pred"), new RyaType("mydata2"))); + ryaDAO.add(new RyaStatement(new RyaIRI("urn:gem:etype#1234"), new RyaIRI("urn:gem#pred"), new RyaType("12"))); + ryaDAO.add(new RyaStatement(new RyaIRI("urn:gem:etype#1235"), new RyaIRI("urn:gem#pred"), new RyaType(XMLSchema.INTEGER, "12"))); + ryaDAO.add(new RyaStatement(new RyaIRI("urn:gem:etype#1235"), new RyaIRI("urn:gem#pred1"), new RyaType("12"))); final String confFile = "stats_cluster_config.xml"; final Path confPath = new Path(getClass().getClassLoader().getResource(confFile).toString()); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/LocalReasoner.java ---------------------------------------------------------------------- diff --git a/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/LocalReasoner.java b/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/LocalReasoner.java index 921d0cf..67157cf 100644 --- a/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/LocalReasoner.java +++ b/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/LocalReasoner.java @@ -112,7 +112,7 @@ public class LocalReasoner extends AbstractReasoner { } // Otherwise, consider the semantics of the statement: Resource subject = fact.getSubject(); - IRI predURI = fact.getPredicate(); + IRI predIRI = fact.getPredicate(); Value object = fact.getObject(); boolean relevantToSubject = false; boolean relevantToObject = false; @@ -121,18 +121,18 @@ public class LocalReasoner extends AbstractReasoner { // Type statements could be relevant to the subject, if the schema gives // them any meaning: - if (predURI.equals(RDF.TYPE)) { + if (predIRI.equals(RDF.TYPE)) { // Assume the object is a valid URI - Resource typeURI = (Resource) fact.getObject(); - if (typeURI.equals(OWL.NOTHING) - || schema.hasClass(typeURI)) { + Resource typeIRI = (Resource) fact.getObject(); + if (typeIRI.equals(OWL.NOTHING) + || schema.hasClass(typeIRI)) { relevantToSubject = true; } } // If the schema knows about the property: - if (schema.hasProperty(predURI)) { - OwlProperty prop = schema.getProperty(predURI); + if (schema.hasProperty(predIRI)) { + OwlProperty prop = schema.getProperty(predIRI); // Relevant to both: // Any statement with an asymmetric property @@ -185,7 +185,7 @@ public class LocalReasoner extends AbstractReasoner { return Relevance.NONE; } // Otherwise, consider the semantics of the statement: - IRI predURI = fact.getPredicate(); + IRI predIRI = fact.getPredicate(); Value object = fact.getObject(); boolean relevantToSubject = false; boolean relevantToObject = false; @@ -193,10 +193,10 @@ public class LocalReasoner extends AbstractReasoner { boolean literalObject = object instanceof Literal; // Type statements can be joined if... - if (predURI.equals(RDF.TYPE)) { - Resource typeURI = (Resource) fact.getObject(); - if (schema.hasClass(typeURI)) { - OwlClass c = schema.getClass(typeURI); + if (predIRI.equals(RDF.TYPE)) { + Resource typeIRI = (Resource) fact.getObject(); + if (schema.hasClass(typeIRI)) { + OwlClass c = schema.getClass(typeIRI); // 1. the type is a property restriction if (!c.getOnProperty().isEmpty() // 2. the type is relevant to a property restriction @@ -212,8 +212,8 @@ public class LocalReasoner extends AbstractReasoner { } // If the schema knows about the property: - if (schema.hasProperty(predURI)) { - OwlProperty prop = schema.getProperty(predURI); + if (schema.hasProperty(predIRI)) { + OwlProperty prop = schema.getProperty(predIRI); // transitivity: relevant to both if (prop.isTransitive()) { relevantToSubject = true; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/OwlClass.java ---------------------------------------------------------------------- diff --git a/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/OwlClass.java b/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/OwlClass.java index c3c60a8..364be52 100644 --- a/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/OwlClass.java +++ b/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/OwlClass.java @@ -56,7 +56,7 @@ import org.eclipse.rdf4j.model.vocabulary.OWL; */ public class OwlClass implements Serializable { private static final long serialVersionUID = 1L; - private Resource uri; + private Resource iri; // Relations to other classes: private Set<OwlClass> superClasses = new HashSet<>(); @@ -78,12 +78,12 @@ public class OwlClass implements Serializable { int maxCardinality = -1; int maxQualifiedCardinality = -1; - OwlClass(Resource uri) { - this.uri = uri; + OwlClass(Resource iri) { + this.iri = iri; } - public Resource getURI() { return uri; } - public void setURI(Resource uri) { this.uri = uri; } + public Resource getURI() { return iri; } + public void setURI(Resource iri) { this.iri = iri; } /** * Add a superclass @@ -235,10 +235,10 @@ public class OwlClass implements Serializable { public Set<Resource> getSuperClasses() { Set<Resource> ancestors = new HashSet<>(); for (OwlClass ancestor : superClasses) { - ancestors.add(ancestor.uri); + ancestors.add(ancestor.iri); } // RL rule scm-cls: Every class is a subclass of itself and owl:Thing - ancestors.add(this.uri); + ancestors.add(this.iri); ancestors.add(OWL.THING); return ancestors; } @@ -252,11 +252,11 @@ public class OwlClass implements Serializable { Set<Resource> equivalents = new HashSet<>(); for (OwlClass other : superClasses) { if (other.superClasses.contains(this)) { - equivalents.add(other.uri); + equivalents.add(other.iri); } } // RL rule scm-cls: Every class is its own equivalent - equivalents.add(this.uri); + equivalents.add(this.iri); return equivalents; } @@ -266,7 +266,7 @@ public class OwlClass implements Serializable { public Set<Resource> getDisjointClasses() { Set<Resource> disjoint = new HashSet<>(); for (OwlClass other : disjointClasses) { - disjoint.add(other.uri); + disjoint.add(other.iri); } return disjoint; } @@ -277,7 +277,7 @@ public class OwlClass implements Serializable { public Set<Resource> getComplementaryClasses() { Set<Resource> complements = new HashSet<>(); for (OwlClass other : complementaryClasses) { - complements.add(other.uri); + complements.add(other.iri); } return complements; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/OwlProperty.java ---------------------------------------------------------------------- diff --git a/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/OwlProperty.java b/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/OwlProperty.java index e745532..426a228 100644 --- a/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/OwlProperty.java +++ b/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/OwlProperty.java @@ -65,7 +65,7 @@ import org.eclipse.rdf4j.model.Resource; public class OwlProperty implements Serializable { private static final long serialVersionUID = 1L; - private IRI uri; + private IRI iri; // Boolean qualities the property might have private boolean transitive = false; @@ -87,8 +87,8 @@ public class OwlProperty implements Serializable { // Restrictions on this property private Set<OwlClass> restrictions = new HashSet<OwlClass>(); - OwlProperty(IRI uri) { - this.uri = uri; + OwlProperty(IRI iri) { + this.iri = iri; } boolean addSuperProperty(OwlProperty p) { @@ -115,7 +115,7 @@ public class OwlProperty implements Serializable { } boolean addRestriction(OwlClass r) { return restrictions.add(r); } - public void setURI(IRI uri) { this.uri = uri; } + public void setURI(IRI iri) { this.iri = iri; } void setTransitive() { transitive = true; } void setSymmetric() { symmetric = true; } void setAsymmetric() { asymmetric = true; } @@ -123,7 +123,7 @@ public class OwlProperty implements Serializable { void setInverseFunctional() { inverseFunctional = true; } void setIrreflexive() { irreflexive = true; } - public IRI getURI() { return uri; } + public IRI getURI() { return iri; } public boolean isTransitive() { return transitive; } public boolean isSymmetric() { return symmetric; } public boolean isAsymmetric() { return asymmetric; } @@ -188,10 +188,10 @@ public class OwlProperty implements Serializable { public Set<IRI> getSuperProperties() { Set<IRI> ancestors = new HashSet<>(); for (OwlProperty ancestor : superProperties) { - ancestors.add(ancestor.uri); + ancestors.add(ancestor.iri); } // RL rules scm-op & scm-dp: Every property is a subproperty of itself - ancestors.add(this.uri); + ancestors.add(this.iri); return ancestors; } @@ -203,11 +203,11 @@ public class OwlProperty implements Serializable { Set<IRI> equivalents = new HashSet<>(); for (OwlProperty other : superProperties) { if (other.superProperties.contains(this)) { - equivalents.add(other.uri); + equivalents.add(other.iri); } } // RL rules scm-op & scm-dp: Every property is equivalent to itself - equivalents.add(this.uri); + equivalents.add(this.iri); return equivalents; } @@ -217,7 +217,7 @@ public class OwlProperty implements Serializable { public Set<IRI> getDisjointProperties() { Set<IRI> disjoint = new HashSet<>(); for (OwlProperty other : disjointProperties) { - disjoint.add(other.uri); + disjoint.add(other.iri); } return disjoint; } @@ -228,13 +228,13 @@ public class OwlProperty implements Serializable { public Set<IRI> getInverseProperties() { Set<IRI> inverse = new HashSet<>(); for (OwlProperty other : inverseProperties) { - inverse.add(other.uri); + inverse.add(other.iri); } return inverse; } /** - * Get the domain (set of class URIs/Resources). + * Get the domain (set of class IRIs/Resources). */ public Set<Resource> getDomain() { Set<Resource> domain = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/ConformanceTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/ConformanceTest.java b/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/ConformanceTest.java index 87f1c8b..d3c6bcb 100644 --- a/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/ConformanceTest.java +++ b/extras/rya.reasoning/src/main/java/org/apache/rya/reasoning/mr/ConformanceTest.java @@ -87,7 +87,7 @@ public class ConformanceTest extends Configured implements Tool { static String TEST_RDFBASED = TEST + "RDF-BASED"; private static class OwlTest extends AbstractRDFHandler { - Value uri; + Value iri; String name; String description; String premise; @@ -211,7 +211,7 @@ public class ConformanceTest extends Configured implements Tool { // Run the conformance tests int result; for (final OwlTest test : conformanceTests) { - System.out.println(test.uri); + System.out.println(test.iri); result = runTest(conf, args, test); if (result != 0) { return result; @@ -386,7 +386,7 @@ public class ConformanceTest extends Configured implements Tool { } else { test = new OwlTest(); - test.uri = iri; + test.iri = iri; test.name = bindings.getValue("name").stringValue(); test.description = bindings.getValue("description").stringValue(); test.premise = bindings.getValue("graph").stringValue(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/TestUtils.java ---------------------------------------------------------------------- diff --git a/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/TestUtils.java b/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/TestUtils.java index bec124b..2a2c90f 100644 --- a/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/TestUtils.java +++ b/extras/rya.reasoning/src/test/java/org/apache/rya/reasoning/TestUtils.java @@ -20,7 +20,7 @@ package org.apache.rya.reasoning; */ import org.apache.rya.api.domain.RyaStatement; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.eclipse.rdf4j.model.BNode; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.Literal; @@ -72,7 +72,7 @@ public class TestUtils { } public static RyaStatement ryaStatement(String s, String p, String o) { - return new RyaStatement(new RyaURI(TEST_PREFIX + "#" + s), - new RyaURI(TEST_PREFIX + "#" + p), new RyaURI(TEST_PREFIX + "#" + o)); + return new RyaStatement(new RyaIRI(TEST_PREFIX + "#" + s), + new RyaIRI(TEST_PREFIX + "#" + p), new RyaIRI(TEST_PREFIX + "#" + o)); } } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/filter/TemporalFilterIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/filter/TemporalFilterIT.java b/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/filter/TemporalFilterIT.java index 15c33ee..680c095 100644 --- a/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/filter/TemporalFilterIT.java +++ b/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/filter/TemporalFilterIT.java @@ -30,7 +30,7 @@ import java.util.UUID; import org.apache.kafka.streams.processor.TopologyBuilder; import org.apache.rya.api.function.projection.RandomUUIDFactory; -import org.apache.rya.api.function.temporal.TemporalURIs; +import org.apache.rya.api.function.temporal.TemporalIRIs; import org.apache.rya.api.model.VisibilityBindingSet; import org.apache.rya.api.model.VisibilityStatement; import org.apache.rya.streams.kafka.KafkaTopics; @@ -89,7 +89,7 @@ public class TemporalFilterIT { // Get the RDF model objects that will be used to build the query. final String sparql = "PREFIX time: <http://www.w3.org/2006/time/> \n" - + "PREFIX tempf: <" + TemporalURIs.NAMESPACE + ">\n" + + "PREFIX tempf: <" + TemporalIRIs.NAMESPACE + ">\n" + "SELECT * \n" + "WHERE { \n" + " <urn:time> time:atTime ?date .\n" @@ -122,7 +122,7 @@ public class TemporalFilterIT { // Get the RDF model objects that will be used to build the query. final String sparql = "PREFIX time: <http://www.w3.org/2006/time/> \n" - + "PREFIX tempf: <" + TemporalURIs.NAMESPACE + ">\n" + + "PREFIX tempf: <" + TemporalIRIs.NAMESPACE + ">\n" + "SELECT * \n" + "WHERE { \n" + " <urn:time> time:atTime ?date .\n" @@ -155,7 +155,7 @@ public class TemporalFilterIT { // Get the RDF model objects that will be used to build the query. final String sparql = "PREFIX time: <http://www.w3.org/2006/time/> \n" - + "PREFIX tempf: <" + TemporalURIs.NAMESPACE + ">\n" + + "PREFIX tempf: <" + TemporalIRIs.NAMESPACE + ">\n" + "SELECT * \n" + "WHERE { \n" + " <urn:time> time:atTime ?date .\n" @@ -188,7 +188,7 @@ public class TemporalFilterIT { // Get the RDF model objects that will be used to build the query. final String sparql = "PREFIX time: <http://www.w3.org/2006/time/> \n" - + "PREFIX tempf: <" + TemporalURIs.NAMESPACE + ">\n" + + "PREFIX tempf: <" + TemporalIRIs.NAMESPACE + ">\n" + "SELECT * \n" + "WHERE { \n" + " <urn:time> time:atTime ?date .\n" http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/mapreduce/src/main/java/org/apache/rya/accumulo/mr/GraphXEdgeInputFormat.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/GraphXEdgeInputFormat.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/GraphXEdgeInputFormat.java index eac06c6..1670e23 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/GraphXEdgeInputFormat.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/GraphXEdgeInputFormat.java @@ -186,9 +186,9 @@ public class GraphXEdgeInputFormat extends InputFormatBase<Object, Edge> { } public static long getVertexId(final RyaType resource) throws IOException { - String uri = ""; + String iri = ""; if (resource != null) { - uri = resource.getData().toString(); + iri = resource.getData().toString(); } try { // SHA-256 the string value and then generate a hashcode from @@ -197,7 +197,7 @@ public class GraphXEdgeInputFormat extends InputFormatBase<Object, Edge> { // collision ratio final MessageDigest messageDigest = MessageDigest .getInstance("SHA-256"); - messageDigest.update(uri.getBytes(StandardCharsets.UTF_8)); + messageDigest.update(iri.getBytes(StandardCharsets.UTF_8)); final String encryptedString = new String(messageDigest.digest(), StandardCharsets.UTF_8); return hash(encryptedString); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaOutputFormat.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaOutputFormat.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaOutputFormat.java index 0dd08b1..6d964ea 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaOutputFormat.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaOutputFormat.java @@ -52,7 +52,7 @@ import org.apache.rya.accumulo.AccumuloRyaDAO; import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.api.resolver.RdfToRyaConversions; import org.apache.rya.api.resolver.RyaTripleContext; @@ -301,7 +301,7 @@ public class RyaOutputFormat extends OutputFormat<Writable, RyaStatementWritable private final RyaTripleContext tripleContext; private MultiTableBatchWriter writer; private byte[] cv = AccumuloRdfConstants.EMPTY_CV.getExpression(); - private RyaURI defaultContext = null; + private RyaIRI defaultContext = null; private static final long ONE_MEGABYTE = 1024L * 1024L; private static final long AVE_STATEMENT_SIZE = 100L; @@ -336,7 +336,7 @@ public class RyaOutputFormat extends OutputFormat<Writable, RyaStatementWritable // set the default context final String context = conf.get(CONTEXT_PROPERTY, ""); if (context != null && !context.isEmpty()) { - defaultContext = new RyaURI(context); + defaultContext = new RyaIRI(context); } // set up the buffer @@ -485,10 +485,10 @@ public class RyaOutputFormat extends OutputFormat<Writable, RyaStatementWritable } private int statementSize(final RyaStatement ryaStatement) { - final RyaURI subject = ryaStatement.getSubject(); - final RyaURI predicate = ryaStatement.getPredicate(); + final RyaIRI subject = ryaStatement.getSubject(); + final RyaIRI predicate = ryaStatement.getPredicate(); final RyaType object = ryaStatement.getObject(); - final RyaURI context = ryaStatement.getContext(); + final RyaIRI context = ryaStatement.getContext(); int size = 3 + subject.getData().length() + predicate.getData().length() + object.getData().length(); if (!XMLSchema.ANYURI.equals(object.getDataType())) { size += 2 + object.getDataType().toString().length(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaStatementWritable.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaStatementWritable.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaStatementWritable.java index 0e8f43d..37e8d95 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaStatementWritable.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/RyaStatementWritable.java @@ -38,7 +38,7 @@ import org.apache.rya.api.resolver.triple.TripleRowResolverException; /** * Basic {@link WritableComparable} for using Rya data with Hadoop. * RyaStatementWritable wraps a {@link RyaStatement}, which in turn represents a - * statement as a collection of {@link org.apache.rya.api.domain.RyaURI} and + * statement as a collection of {@link org.apache.rya.api.domain.RyaIRI} and * {@link org.apache.rya.api.domain.RyaType} objects. * <p> * This class is mutable, like all {@link org.apache.hadoop.io.Writable}s. When http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/mapreduce/src/main/java/org/apache/rya/accumulo/mr/examples/TextOutputExample.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/examples/TextOutputExample.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/examples/TextOutputExample.java index 593e568..fa10237 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/examples/TextOutputExample.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/examples/TextOutputExample.java @@ -46,7 +46,7 @@ import org.apache.rya.accumulo.mr.AbstractAccumuloMRTool; import org.apache.rya.accumulo.mr.MRUtils; import org.apache.rya.accumulo.mr.RyaStatementWritable; import org.apache.rya.api.domain.RyaStatement; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.api.resolver.RyaToRdfConversions; import org.eclipse.rdf4j.model.Statement; @@ -85,12 +85,12 @@ public class TextOutputExample extends AbstractAccumuloMRTool { dao.setConf(conf); dao.init(); String ns = "http://example.com/";; - dao.add(new RyaStatement(new RyaURI(ns+"s1"), new RyaURI(ns+"p1"), new RyaURI(ns+"o1"))); - dao.add(new RyaStatement(new RyaURI(ns+"s1"), new RyaURI(ns+"p2"), new RyaURI(ns+"o2"))); - dao.add(new RyaStatement(new RyaURI(ns+"s2"), new RyaURI(ns+"p1"), new RyaURI(ns+"o3"), - new RyaURI(ns+"g1"))); - dao.add(new RyaStatement(new RyaURI(ns+"s3"), new RyaURI(ns+"p3"), new RyaURI(ns+"o3"), - new RyaURI(ns+"g2"))); + dao.add(new RyaStatement(new RyaIRI(ns+"s1"), new RyaIRI(ns+"p1"), new RyaIRI(ns+"o1"))); + dao.add(new RyaStatement(new RyaIRI(ns+"s1"), new RyaIRI(ns+"p2"), new RyaIRI(ns+"o2"))); + dao.add(new RyaStatement(new RyaIRI(ns+"s2"), new RyaIRI(ns+"p1"), new RyaIRI(ns+"o3"), + new RyaIRI(ns+"g1"))); + dao.add(new RyaStatement(new RyaIRI(ns+"s3"), new RyaIRI(ns+"p3"), new RyaIRI(ns+"o3"), + new RyaIRI(ns+"g2"))); dao.destroy(); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountTool.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountTool.java b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountTool.java index c2ad57a..5c68291 100644 --- a/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountTool.java +++ b/mapreduce/src/main/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountTool.java @@ -43,7 +43,7 @@ import org.apache.rya.accumulo.mr.AbstractAccumuloMRTool; import org.apache.rya.accumulo.mr.MRUtils; import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.api.domain.RyaStatement; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.resolver.RyaTripleContext; import org.apache.rya.api.resolver.triple.TripleRow; import org.apache.rya.api.resolver.triple.TripleRowResolverException; @@ -152,7 +152,7 @@ public class AccumuloRdfCountTool extends AbstractAccumuloMRTool implements Tool final String subj = statement.getSubject().getData(); final String pred = statement.getPredicate().getData(); // byte[] objBytes = tripleFormat.getValueFormat().serialize(statement.getObject()); - final RyaURI scontext = statement.getContext(); + final RyaIRI scontext = statement.getContext(); final boolean includesContext = scontext != null; final String scontext_str = (includesContext) ? scontext.getData() : null; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/mapreduce/src/test/java/org/apache/rya/accumulo/mr/GraphXEdgeInputFormatTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/GraphXEdgeInputFormatTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/GraphXEdgeInputFormatTest.java index 6686c8f..0c9c06c 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/GraphXEdgeInputFormatTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/GraphXEdgeInputFormatTest.java @@ -24,7 +24,7 @@ import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.accumulo.AccumuloRyaDAO; import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; import org.apache.rya.api.domain.RyaStatement; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Instance; @@ -78,9 +78,9 @@ public class GraphXEdgeInputFormatTest { @Test public void testInputFormat() throws Exception { RyaStatement input = RyaStatement.builder() - .setSubject(new RyaURI("http://www.google.com";)) - .setPredicate(new RyaURI("http://some_other_uri";)) - .setObject(new RyaURI("http://www.yahoo.com";)) + .setSubject(new RyaIRI("http://www.google.com";)) + .setPredicate(new RyaIRI("http://some_other_uri";)) + .setObject(new RyaIRI("http://www.yahoo.com";)) .setColumnVisibility(new byte[0]) .setValue(new byte[0]) .build(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/mapreduce/src/test/java/org/apache/rya/accumulo/mr/GraphXInputFormatTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/GraphXInputFormatTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/GraphXInputFormatTest.java index b2a663c..93df522 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/GraphXInputFormatTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/GraphXInputFormatTest.java @@ -25,7 +25,7 @@ import org.apache.rya.accumulo.AccumuloRyaDAO; import org.apache.rya.accumulo.mr.GraphXInputFormat.RyaStatementRecordReader; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Instance; @@ -78,9 +78,9 @@ public class GraphXInputFormatTest { @Test public void testInputFormat() throws Exception { RyaStatement input = RyaStatement.builder() - .setSubject(new RyaURI("http://www.google.com";)) - .setPredicate(new RyaURI("http://some_other_uri";)) - .setObject(new RyaURI("http://www.yahoo.com";)) + .setSubject(new RyaIRI("http://www.google.com";)) + .setPredicate(new RyaIRI("http://some_other_uri";)) + .setObject(new RyaIRI("http://www.yahoo.com";)) .setColumnVisibility(new byte[0]) .setValue(new byte[0]) .build(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaInputFormatTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaInputFormatTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaInputFormatTest.java index f571682..0c9763c 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaInputFormatTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaInputFormatTest.java @@ -40,7 +40,7 @@ import org.apache.rya.accumulo.AccumuloRyaDAO; import org.apache.rya.accumulo.mr.RyaInputFormat.RyaStatementRecordReader; import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; import org.apache.rya.api.domain.RyaStatement; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -85,9 +85,9 @@ public class RyaInputFormatTest { RyaStatement input = RyaStatement.builder() - .setSubject(new RyaURI("http://www.google.com";)) - .setPredicate(new RyaURI("http://some_other_uri";)) - .setObject(new RyaURI("http://www.yahoo.com";)) + .setSubject(new RyaIRI("http://www.google.com";)) + .setPredicate(new RyaIRI("http://some_other_uri";)) + .setObject(new RyaIRI("http://www.yahoo.com";)) .setColumnVisibility(new byte[0]) .setValue(new byte[0]) .build(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaOutputFormatTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaOutputFormatTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaOutputFormatTest.java index e0a7ac0..a2691d6 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaOutputFormatTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaOutputFormatTest.java @@ -23,7 +23,7 @@ import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.accumulo.AccumuloRyaDAO; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.resolver.RdfToRyaConversions; import org.apache.rya.api.resolver.RyaToRdfConversions; import org.apache.rya.api.resolver.RyaTripleContext; @@ -117,12 +117,12 @@ public class RyaOutputFormatTest { @Test public void testOutputFormat() throws Exception { final RyaStatement input = RyaStatement.builder() - .setSubject(new RyaURI("http://www.google.com";)) - .setPredicate(new RyaURI("http://some_other_uri";)) - .setObject(new RyaURI("http://www.yahoo.com";)) + .setSubject(new RyaIRI("http://www.google.com";)) + .setPredicate(new RyaIRI("http://some_other_uri";)) + .setObject(new RyaIRI("http://www.yahoo.com";)) .setColumnVisibility(CV.getBytes()) .setValue(new byte[0]) - .setContext(new RyaURI(GRAPH)) + .setContext(new RyaIRI(GRAPH)) .build(); RyaOutputFormat.setCoreTablesEnabled(job, true); RyaOutputFormat.setFreeTextEnabled(job, false); @@ -135,18 +135,18 @@ public class RyaOutputFormatTest { @Test public void testDefaultCV() throws Exception { final RyaStatement input = RyaStatement.builder() - .setSubject(new RyaURI("http://www.google.com";)) - .setPredicate(new RyaURI("http://some_other_uri";)) - .setObject(new RyaURI("http://www.yahoo.com";)) + .setSubject(new RyaIRI("http://www.google.com";)) + .setPredicate(new RyaIRI("http://some_other_uri";)) + .setObject(new RyaIRI("http://www.yahoo.com";)) .setValue(new byte[0]) - .setContext(new RyaURI(GRAPH)) + .setContext(new RyaIRI(GRAPH)) .build(); final RyaStatement expected = RyaStatement.builder() - .setSubject(new RyaURI("http://www.google.com";)) - .setPredicate(new RyaURI("http://some_other_uri";)) - .setObject(new RyaURI("http://www.yahoo.com";)) + .setSubject(new RyaIRI("http://www.google.com";)) + .setPredicate(new RyaIRI("http://some_other_uri";)) + .setObject(new RyaIRI("http://www.yahoo.com";)) .setValue(new byte[0]) - .setContext(new RyaURI(GRAPH)) + .setContext(new RyaIRI(GRAPH)) .setColumnVisibility(CV.getBytes()) .build(); RyaOutputFormat.setCoreTablesEnabled(job, true); @@ -161,19 +161,19 @@ public class RyaOutputFormatTest { @Test public void testDefaultGraph() throws Exception { final RyaStatement input = RyaStatement.builder() - .setSubject(new RyaURI("http://www.google.com";)) - .setPredicate(new RyaURI("http://some_other_uri";)) - .setObject(new RyaURI("http://www.yahoo.com";)) + .setSubject(new RyaIRI("http://www.google.com";)) + .setPredicate(new RyaIRI("http://some_other_uri";)) + .setObject(new RyaIRI("http://www.yahoo.com";)) .setValue(new byte[0]) .setColumnVisibility(CV.getBytes()) .build(); final RyaStatement expected = RyaStatement.builder() - .setSubject(new RyaURI("http://www.google.com";)) - .setPredicate(new RyaURI("http://some_other_uri";)) - .setObject(new RyaURI("http://www.yahoo.com";)) + .setSubject(new RyaIRI("http://www.google.com";)) + .setPredicate(new RyaIRI("http://some_other_uri";)) + .setObject(new RyaIRI("http://www.yahoo.com";)) .setValue(new byte[0]) .setColumnVisibility(CV.getBytes()) - .setContext(new RyaURI(GRAPH)) + .setContext(new RyaIRI(GRAPH)) .build(); RyaOutputFormat.setCoreTablesEnabled(job, true); RyaOutputFormat.setFreeTextEnabled(job, false); @@ -189,8 +189,8 @@ public class RyaOutputFormatTest { final AccumuloFreeTextIndexer ft = new AccumuloFreeTextIndexer(); ft.setConf(conf); final RyaStatement input = RyaStatement.builder() - .setSubject(new RyaURI(GRAPH + ":s")) - .setPredicate(new RyaURI(GRAPH + ":p")) + .setSubject(new RyaIRI(GRAPH + ":s")) + .setPredicate(new RyaIRI(GRAPH + ":p")) .setObject(new RyaType(XMLSchema.STRING, "one two three four five")) .build(); RyaOutputFormat.setCoreTablesEnabled(job, false); @@ -227,8 +227,8 @@ public class RyaOutputFormatTest { for (int i = 0; i < instants.length; i++) { final RyaType time = RdfToRyaConversions.convertLiteral(vf.createLiteral(instants[i].toString())); final RyaStatement input = RyaStatement.builder() - .setSubject(new RyaURI(GRAPH + ":s")) - .setPredicate(new RyaURI(GRAPH + ":p")) + .setSubject(new RyaIRI(GRAPH + ":s")) + .setPredicate(new RyaIRI(GRAPH + ":p")) .setObject(time) .build(); write(input); @@ -260,9 +260,9 @@ public class RyaOutputFormatTest { final EntityCentricIndex entity = new EntityCentricIndex(); entity.setConf(conf); final RyaStatement input = RyaStatement.builder() - .setSubject(new RyaURI(GRAPH + ":s")) - .setPredicate(new RyaURI(GRAPH + ":p")) - .setObject(new RyaURI(GRAPH + ":o")) + .setSubject(new RyaIRI(GRAPH + ":s")) + .setPredicate(new RyaIRI(GRAPH + ":p")) + .setObject(new RyaIRI(GRAPH + ":o")) .build(); RyaOutputFormat.setCoreTablesEnabled(job, false); RyaOutputFormat.setFreeTextEnabled(job, false); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaStatementWritableTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaStatementWritableTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaStatementWritableTest.java index 98d36c9..fc0ee4d 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaStatementWritableTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/RyaStatementWritableTest.java @@ -8,7 +8,7 @@ import java.io.DataOutputStream; import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.resolver.RyaTripleContext; import org.eclipse.rdf4j.model.vocabulary.XMLSchema; import org.junit.Assert; @@ -36,14 +36,14 @@ import org.junit.rules.ExpectedException; */ public class RyaStatementWritableTest { - private static final RyaURI s1 = new RyaURI(":s"); - private static final RyaURI p1 = new RyaURI(":p"); + private static final RyaIRI s1 = new RyaIRI(":s"); + private static final RyaIRI p1 = new RyaIRI(":p"); private static final RyaType o1 = new RyaType(XMLSchema.INTEGER, "123"); - private static final RyaURI s2 = new RyaURI(":s2"); - private static final RyaURI p2 = new RyaURI(":p2"); + private static final RyaIRI s2 = new RyaIRI(":s2"); + private static final RyaIRI p2 = new RyaIRI(":p2"); private static final RyaType o2 = new RyaType(XMLSchema.STRING, "123"); - private static final RyaURI graph1 = new RyaURI("http://example.org/graph1";); - private static final RyaURI graph2 = new RyaURI("http://example.org/graph2";); + private static final RyaIRI graph1 = new RyaIRI("http://example.org/graph1";); + private static final RyaIRI graph2 = new RyaIRI("http://example.org/graph2";); private static final byte[] cv1 = "test_visibility".getBytes(); private static final long t1 = 1000; private static final long t2 = 1001; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountToolTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountToolTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountToolTest.java index ae15b65..7f49ac5 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountToolTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/AccumuloRdfCountToolTest.java @@ -40,7 +40,7 @@ import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.accumulo.AccumuloRyaDAO; import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.api.domain.RyaStatement; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.resolver.RdfToRyaConversions; import org.eclipse.rdf4j.model.ValueFactory; import org.eclipse.rdf4j.model.impl.SimpleValueFactory; @@ -105,8 +105,8 @@ public class AccumuloRdfCountToolTest { @Test public void testMR() throws Exception { - RyaURI test1 = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "test1")); - RyaURI pred1 = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "pred1")); + RyaIRI test1 = RdfToRyaConversions.convertIRI(VF.createIRI(litdupsNS, "test1")); + RyaIRI pred1 = RdfToRyaConversions.convertIRI(VF.createIRI(litdupsNS, "pred1")); dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(0)))); dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(1)))); dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(2)))); @@ -197,8 +197,8 @@ public class AccumuloRdfCountToolTest { @Test public void testTTL() throws Exception { - RyaURI test1 = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "test1")); - RyaURI pred1 = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "pred1")); + RyaIRI test1 = RdfToRyaConversions.convertIRI(VF.createIRI(litdupsNS, "test1")); + RyaIRI pred1 = RdfToRyaConversions.convertIRI(VF.createIRI(litdupsNS, "pred1")); dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(0)))); dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(1)))); dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(2)))); @@ -231,9 +231,9 @@ public class AccumuloRdfCountToolTest { @Test public void testContext() throws Exception { - RyaURI test1 = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "test1")); - RyaURI pred1 = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "pred1")); - RyaURI cntxt = RdfToRyaConversions.convertURI(VF.createIRI(litdupsNS, "cntxt")); + RyaIRI test1 = RdfToRyaConversions.convertIRI(VF.createIRI(litdupsNS, "test1")); + RyaIRI pred1 = RdfToRyaConversions.convertIRI(VF.createIRI(litdupsNS, "pred1")); + RyaIRI cntxt = RdfToRyaConversions.convertIRI(VF.createIRI(litdupsNS, "cntxt")); dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(0)), cntxt)); dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(1)), cntxt)); dao.add(new RyaStatement(test1, pred1, RdfToRyaConversions.convertLiteral(VF.createLiteral(2)), cntxt)); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/RdfFileInputToolTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/RdfFileInputToolTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/RdfFileInputToolTest.java index b8b2384..8f92cf1 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/RdfFileInputToolTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/RdfFileInputToolTest.java @@ -31,7 +31,7 @@ import org.apache.rya.accumulo.mr.TestUtils; import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.eclipse.rdf4j.rio.RDFFormat; import org.junit.Test; @@ -93,9 +93,9 @@ public class RdfFileInputToolTest extends TestCase { "-Drdf.format=" + RDFFormat.NTRIPLES.getName(), "src/test/resources/test.ntriples", }); - RyaStatement rs = new RyaStatement(new RyaURI("urn:lubm:rdfts#GraduateStudent01"), - new RyaURI("urn:lubm:rdfts#hasFriend"), - new RyaURI("urn:lubm:rdfts#GraduateStudent02")); + RyaStatement rs = new RyaStatement(new RyaIRI("urn:lubm:rdfts#GraduateStudent01"), + new RyaIRI("urn:lubm:rdfts#hasFriend"), + new RyaIRI("urn:lubm:rdfts#GraduateStudent02")); rs.setColumnVisibility(auths.toString().getBytes()); AccumuloRdfConfiguration conf = new AccumuloRdfConfiguration(); conf.setTablePrefix(tablePrefix); @@ -116,10 +116,10 @@ public class RdfFileInputToolTest extends TestCase { "-Drdf.format=" + RDFFormat.TRIG.getName(), "src/test/resources/namedgraphs.trig", }); - RyaStatement rs = new RyaStatement(new RyaURI("http://www.example.org/exampleDocument#Monica";), - new RyaURI("http://www.example.org/vocabulary#name";), + RyaStatement rs = new RyaStatement(new RyaIRI("http://www.example.org/exampleDocument#Monica";), + new RyaIRI("http://www.example.org/vocabulary#name";), new RyaType("Monica Murphy"), - new RyaURI("http://www.example.org/exampleDocument#G1";)); + new RyaIRI("http://www.example.org/exampleDocument#G1";)); rs.setColumnVisibility(auths.toString().getBytes()); AccumuloRdfConfiguration conf = new AccumuloRdfConfiguration(); conf.setTablePrefix(tablePrefix); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/Upgrade322ToolTest.java ---------------------------------------------------------------------- diff --git a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/Upgrade322ToolTest.java b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/Upgrade322ToolTest.java index cfdbeb7..eed87af 100644 --- a/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/Upgrade322ToolTest.java +++ b/mapreduce/src/test/java/org/apache/rya/accumulo/mr/tools/Upgrade322ToolTest.java @@ -41,7 +41,7 @@ import org.apache.rya.accumulo.query.AccumuloRyaQueryEngine; import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.eclipse.rdf4j.model.vocabulary.XMLSchema; import junit.framework.TestCase; @@ -219,41 +219,41 @@ public class Upgrade322ToolTest extends TestCase { final AccumuloRyaQueryEngine queryEngine = ryaDAO.getQueryEngine(); TestUtils.verify(new RyaStatement( - new RyaURI("http://here/2010/tracked-data-provenance/ns#uuid10";), - new RyaURI("http://here/2010/tracked-data-provenance/ns#booleanLit";), + new RyaIRI("http://here/2010/tracked-data-provenance/ns#uuid10";), + new RyaIRI("http://here/2010/tracked-data-provenance/ns#booleanLit";), new RyaType(XMLSchema.BOOLEAN, "true")), queryEngine); TestUtils.verify(new RyaStatement( - new RyaURI("http://here/2010/tracked-data-provenance/ns#uuid10";), - new RyaURI("http://here/2010/tracked-data-provenance/ns#longLit";), + new RyaIRI("http://here/2010/tracked-data-provenance/ns#uuid10";), + new RyaIRI("http://here/2010/tracked-data-provenance/ns#longLit";), new RyaType(XMLSchema.LONG, "10")), queryEngine); TestUtils.verify(new RyaStatement( - new RyaURI("http://here/2010/tracked-data-provenance/ns#uuid10";), - new RyaURI("http://here/2010/tracked-data-provenance/ns#intLit";), + new RyaIRI("http://here/2010/tracked-data-provenance/ns#uuid10";), + new RyaIRI("http://here/2010/tracked-data-provenance/ns#intLit";), new RyaType(XMLSchema.INTEGER, "10")), queryEngine); TestUtils.verify(new RyaStatement( - new RyaURI("http://here/2010/tracked-data-provenance/ns#uuid10";), - new RyaURI("http://here/2010/tracked-data-provenance/ns#byteLit";), + new RyaIRI("http://here/2010/tracked-data-provenance/ns#uuid10";), + new RyaIRI("http://here/2010/tracked-data-provenance/ns#byteLit";), new RyaType(XMLSchema.BYTE, "10")), queryEngine); TestUtils.verify(new RyaStatement( - new RyaURI("http://here/2010/tracked-data-provenance/ns#uuid10";), - new RyaURI("http://here/2010/tracked-data-provenance/ns#doubleLit";), + new RyaIRI("http://here/2010/tracked-data-provenance/ns#uuid10";), + new RyaIRI("http://here/2010/tracked-data-provenance/ns#doubleLit";), new RyaType(XMLSchema.DOUBLE, "10.0")), queryEngine); TestUtils.verify(new RyaStatement( - new RyaURI("http://here/2010/tracked-data-provenance/ns#uuid10";), - new RyaURI("http://here/2010/tracked-data-provenance/ns#dateLit";), + new RyaIRI("http://here/2010/tracked-data-provenance/ns#uuid10";), + new RyaIRI("http://here/2010/tracked-data-provenance/ns#dateLit";), new RyaType(XMLSchema.DATETIME, "2011-07-12T06:00:00.000Z")), queryEngine); TestUtils.verify(new RyaStatement( - new RyaURI("http://here/2010/tracked-data-provenance/ns#uuid10";), - new RyaURI("http://here/2010/tracked-data-provenance/ns#stringLit";), + new RyaIRI("http://here/2010/tracked-data-provenance/ns#uuid10";), + new RyaIRI("http://here/2010/tracked-data-provenance/ns#stringLit";), new RyaType("stringLit")), queryEngine); TestUtils.verify(new RyaStatement( - new RyaURI("http://here/2010/tracked-data-provenance/ns#uuid10";), - new RyaURI("http://here/2010/tracked-data-provenance/ns#uriLit";), - new RyaURI("http://here/2010/tracked-data-provenance/ns"; + + new RyaIRI("http://here/2010/tracked-data-provenance/ns#uuid10";), + new RyaIRI("http://here/2010/tracked-data-provenance/ns#uriLit";), + new RyaIRI("http://here/2010/tracked-data-provenance/ns"; + "#objectuuid1")), queryEngine); TestUtils.verify(new RyaStatement( - new RyaURI("urn:org.apache.rya/2012/05#rts"), - new RyaURI("urn:org.apache.rya/2012/05#version"), + new RyaIRI("urn:org.apache.rya/2012/05#rts"), + new RyaIRI("urn:org.apache.rya/2012/05#version"), new RyaType("3.0.0")), queryEngine); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/StatementPatternStorage.java ---------------------------------------------------------------------- diff --git a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/StatementPatternStorage.java b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/StatementPatternStorage.java index 0837e5c..7c87de7 100644 --- a/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/StatementPatternStorage.java +++ b/pig/accumulo.pig/src/main/java/org/apache/rya/accumulo/pig/StatementPatternStorage.java @@ -41,7 +41,7 @@ import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; import org.apache.rya.api.RdfCloudTripleStoreUtils; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.persist.RyaDAOException; import org.apache.rya.api.query.strategy.ByteRange; import org.apache.rya.api.query.strategy.TriplePatternStrategy; @@ -190,8 +190,8 @@ public class StatementPatternStorage extends AccumuloStorage { } protected Map.Entry<TABLE_LAYOUT, Range> createRange(Value s_v, Value p_v, Value o_v) throws IOException { - RyaURI subject_rya = RdfToRyaConversions.convertResource((Resource) s_v); - RyaURI predicate_rya = RdfToRyaConversions.convertURI((IRI) p_v); + RyaIRI subject_rya = RdfToRyaConversions.convertResource((Resource) s_v); + RyaIRI predicate_rya = RdfToRyaConversions.convertIRI((IRI) p_v); RyaType object_rya = RdfToRyaConversions.convertValue(o_v); TriplePatternStrategy strategy = ryaContext.retrieveStrategy(subject_rya, predicate_rya, object_rya, null); if (strategy == null) { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/StatementPatternStorageTest.java ---------------------------------------------------------------------- diff --git a/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/StatementPatternStorageTest.java b/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/StatementPatternStorageTest.java index eb40df9..942510b 100644 --- a/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/StatementPatternStorageTest.java +++ b/pig/accumulo.pig/src/test/java/org/apache/rya/accumulo/pig/StatementPatternStorageTest.java @@ -43,7 +43,7 @@ import org.apache.rya.accumulo.AccumuloRyaDAO; import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.api.domain.RyaStatement; import org.apache.rya.api.domain.RyaType; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import junit.framework.TestCase; @@ -98,9 +98,9 @@ public class StatementPatternStorageTest extends TestCase { } public void testSimplePredicateRange() throws Exception { - ryaDAO.add(new RyaStatement(new RyaURI(namespace, "a"),new RyaURI(namespace,"p"), new RyaType("l"))); - ryaDAO.add(new RyaStatement(new RyaURI(namespace, "b"), new RyaURI(namespace, "p"), new RyaType("l"))); - ryaDAO.add(new RyaStatement(new RyaURI(namespace, "c"), new RyaURI(namespace, "n"), new RyaType("l"))); + ryaDAO.add(new RyaStatement(new RyaIRI(namespace, "a"),new RyaIRI(namespace,"p"), new RyaType("l"))); + ryaDAO.add(new RyaStatement(new RyaIRI(namespace, "b"), new RyaIRI(namespace, "p"), new RyaType("l"))); + ryaDAO.add(new RyaStatement(new RyaIRI(namespace, "c"), new RyaIRI(namespace, "n"), new RyaType("l"))); int count = 0; @@ -119,8 +119,8 @@ public class StatementPatternStorageTest extends TestCase { } public void testContext() throws Exception { - ryaDAO.add(new RyaStatement(new RyaURI(namespace, "a"), new RyaURI(namespace, "p"), new RyaType("l1"))); - ryaDAO.add(new RyaStatement(new RyaURI(namespace, "a"), new RyaURI(namespace, "p"), new RyaType("l2"), new RyaURI(namespace, "g1"))); + ryaDAO.add(new RyaStatement(new RyaIRI(namespace, "a"), new RyaIRI(namespace, "p"), new RyaType("l1"))); + ryaDAO.add(new RyaStatement(new RyaIRI(namespace, "a"), new RyaIRI(namespace, "p"), new RyaType("l2"), new RyaIRI(namespace, "g1"))); int count = 0; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStoreConnection.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStoreConnection.java b/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStoreConnection.java index e582321..ae97fd8 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStoreConnection.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/RdfCloudTripleStoreConnection.java @@ -34,7 +34,7 @@ import org.apache.hadoop.conf.Configurable; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; import org.apache.rya.api.RdfCloudTripleStoreConstants; import org.apache.rya.api.domain.RyaStatement; -import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaIRI; import org.apache.rya.api.domain.StatementMetadata; import org.apache.rya.api.persist.RdfEvalStatsDAO; import org.apache.rya.api.persist.RyaDAO; @@ -158,7 +158,7 @@ public class RdfCloudTripleStoreConnection<C extends RdfCloudTripleStoreConfigur for (final Resource context : contexts) { final RyaStatement statement = new RyaStatement( RdfToRyaConversions.convertResource(subject), - RdfToRyaConversions.convertURI(predicate), + RdfToRyaConversions.convertIRI(predicate), RdfToRyaConversions.convertValue(object), RdfToRyaConversions.convertResource(context), null, new StatementMetadata(), cv); @@ -168,7 +168,7 @@ public class RdfCloudTripleStoreConnection<C extends RdfCloudTripleStoreConfigur } else { final RyaStatement statement = new RyaStatement( RdfToRyaConversions.convertResource(subject), - RdfToRyaConversions.convertURI(predicate), + RdfToRyaConversions.convertIRI(predicate), RdfToRyaConversions.convertValue(object), null, null, new StatementMetadata(), cv); @@ -186,7 +186,7 @@ public class RdfCloudTripleStoreConnection<C extends RdfCloudTripleStoreConfigur @Override protected void clearInternal(final Resource... aresource) throws SailException { try { - final RyaURI[] graphs = new RyaURI[aresource.length]; + final RyaIRI[] graphs = new RyaIRI[aresource.length]; for (int i = 0 ; i < graphs.length ; i++){ graphs[i] = RdfToRyaConversions.convertResource(aresource[i]); } @@ -565,7 +565,7 @@ public class RdfCloudTripleStoreConnection<C extends RdfCloudTripleStoreConfigur } final RyaStatement statement = new RyaStatement( RdfToRyaConversions.convertResource(subject), - RdfToRyaConversions.convertURI(predicate), + RdfToRyaConversions.convertIRI(predicate), RdfToRyaConversions.convertValue(object), RdfToRyaConversions.convertResource(context)); @@ -574,7 +574,7 @@ public class RdfCloudTripleStoreConnection<C extends RdfCloudTripleStoreConfigur } else { final RyaStatement statement = new RyaStatement( RdfToRyaConversions.convertResource(subject), - RdfToRyaConversions.convertURI(predicate), + RdfToRyaConversions.convertIRI(predicate), RdfToRyaConversions.convertValue(object), null); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/FilterRangeVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/FilterRangeVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/FilterRangeVisitor.java index 6b049b9..e6abb09 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/FilterRangeVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/evaluation/FilterRangeVisitor.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; import org.apache.rya.api.RdfCloudTripleStoreConfiguration; -import org.apache.rya.api.domain.RangeURI; +import org.apache.rya.api.domain.RangeIRI; import org.apache.rya.api.domain.RangeValue; import org.eclipse.rdf4j.model.Value; import org.eclipse.rdf4j.model.impl.BooleanLiteral; @@ -87,10 +87,10 @@ public class FilterRangeVisitor extends AbstractQueryModelVisitor<Exception> { final Var objVar = node.getObjectVar(); final RangeValue objRange = rangeValues.get(objVar); if(subjRange != null) { - subjectVar.setValue(new RangeURI(subjRange));//Assumes no blank nodes can be ranges + subjectVar.setValue(new RangeIRI(subjRange));//Assumes no blank nodes can be ranges } if(predRange != null) { - predVar.setValue(new RangeURI(predRange)); + predVar.setValue(new RangeIRI(predRange)); } if(objRange != null) { objVar.setValue(objRange); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/sail/src/main/java/org/apache/rya/rdftriplestore/inference/HasValueVisitor.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/HasValueVisitor.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/HasValueVisitor.java index 0bcbc6b..974f4df 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/HasValueVisitor.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/HasValueVisitor.java @@ -94,8 +94,8 @@ public class HasValueVisitor extends AbstractInferVisitor { // { ?var rdf:type :Restriction } and { ?var :property ?value } // Both require defined predicate if (predVar != null && predVar.getValue() != null) { - final IRI predURI = (IRI) predVar.getValue(); - if (RDF.TYPE.equals(predURI) && objVar != null && objVar.getValue() != null + final IRI predIRI = (IRI) predVar.getValue(); + if (RDF.TYPE.equals(predIRI) && objVar != null && objVar.getValue() != null && objVar.getValue() instanceof Resource) { // If the predicate is rdf:type and the type is specified, check whether it can be // inferred using any hasValue restriction(s) @@ -119,7 +119,7 @@ public class HasValueVisitor extends AbstractInferVisitor { else { // If the predicate has some hasValue restriction associated with it, then finding // that the object belongs to the appropriate type implies a value. - final Map<Resource, Set<Value>> impliedValues = inferenceEngine.getHasValueByProperty(predURI); + final Map<Resource, Set<Value>> impliedValues = inferenceEngine.getHasValueByProperty(predIRI); if (impliedValues.size() > 0) { final Var rdfTypeVar = new Var(RDF.TYPE.stringValue(), RDF.TYPE); final Var typeVar = new Var("t-" + UUID.randomUUID()); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferenceEngine.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferenceEngine.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferenceEngine.java index ada151a..9da1c4a 100644 --- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferenceEngine.java +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InferenceEngine.java @@ -358,7 +358,7 @@ public class InferenceEngine { null, conf); String integerValue = ""; Value anonPropNode = null; - Value propURI = null; + Value propIRI = null; if (iter2 != null){ while (iter2.hasNext()){ final Statement iter2Statement = iter2.next(); @@ -381,17 +381,17 @@ public class InferenceEngine { null, conf); while (iter2.hasNext()){ final Statement iter2Statement = iter2.next(); - propURI = iter2Statement.getObject(); + propIRI = iter2Statement.getObject(); break; } iter2.close(); } } - if (!integerValue.isEmpty() && propURI!=null) { + if (!integerValue.isEmpty() && propIRI!=null) { try { final int indexValue = Integer.parseInt(integerValue); - final IRI chainPropURI = VF.createIRI(propURI.stringValue()); - orderedProperties.put(indexValue, chainPropURI); + final IRI chainPropIRI = VF.createIRI(propIRI.stringValue()); + orderedProperties.put(indexValue, chainPropIRI); } catch (final Exception e){ log.error("Error adding chain property to ordered properties", e); @@ -440,7 +440,7 @@ public class InferenceEngine { if (iter2.hasNext()){ iter2Statement = iter2.next(); if (iter2Statement.getObject() instanceof IRI){ - properties.add(new InverseURI((IRI)iter2Statement.getObject())); + properties.add(new InverseIRI((IRI)iter2Statement.getObject())); } } } @@ -918,7 +918,7 @@ public class InferenceEngine { * have this property are also assumed to have the property. * * @param type - * The type (URI or bnode) to check against the known + * The type (IRI or bnode) to check against the known * restrictions * @return For each relevant property, a set of values such that whenever a * resource has that value for that property, it is implied to @@ -1407,7 +1407,7 @@ public class InferenceEngine { * one is considered individually sufficient: if a resource has the property and the value, then * it belongs to the provided type. Takes type hierarchy into account, so the value may imply a * subtype which in turn implies the provided type. - * @param type The type (URI or bnode) to check against the known restrictions + * @param type The type (IRI or bnode) to check against the known restrictions * @return For each relevant property, a set of values such that whenever a resource has that * value for that property, it is implied to belong to the type. */ @@ -1597,7 +1597,7 @@ public class InferenceEngine { * restrictions on those properties could imply this type. A type can have * multiple intersections and each intersection is a set of types so a list * of all the type sets is returned. - * @param type The type (URI or bnode) to check against the known + * @param type The type (IRI or bnode) to check against the known * intersections. * @return A {@link List} of {@link Resource} type {@link Set}s that * represents all the known intersections that imply the specified type. @@ -1616,7 +1616,7 @@ public class InferenceEngine { * For a given type, return all sets of types such that owl:oneOf * restrictions on those properties could imply this type. A enumeration * of all the types that are part of the specified class type. - * @param type The type (URI or bnode) to check against the known oneOf + * @param type The type (IRI or bnode) to check against the known oneOf * sets. * @return A {@link Set} of {@link Resource} types that represents the * enumeration of resources that belong to the class type. @@ -1636,7 +1636,7 @@ public class InferenceEngine { /** * Checks if the specified type is an enumerated type. - * @param type The type (URI or bnode) to check against the known oneOf + * @param type The type (IRI or bnode) to check against the known oneOf * sets. * @return {@code true} if the type is an enumerated type. {@code false} * otherwise. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseIRI.java ---------------------------------------------------------------------- diff --git a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseIRI.java b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseIRI.java new file mode 100644 index 0000000..ff083ff --- /dev/null +++ b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseIRI.java @@ -0,0 +1,64 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.rya.rdftriplestore.inference; + +import org.eclipse.rdf4j.model.IRI; + +public class InverseIRI implements IRI { + private static final long serialVersionUID = 1L; + + private final IRI impl; + + public InverseIRI(final IRI iri) { + this.impl = iri; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((impl == null) ? 0 : impl.hashCode()); + return result; + } + + @Override + public boolean equals(final Object obj) { + if (obj instanceof InverseIRI){ + return impl.equals(((InverseIRI) obj).impl); + } + return false; + } + + @Override + public String stringValue() { + return impl.stringValue(); + } + + @Override + public String getNamespace() { + return impl.getNamespace(); + } + + @Override + public String getLocalName() { + return impl.getLocalName(); + } + + +}
