You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by en...@apache.org on 2014/01/14 18:54:18 UTC
git commit: CLEREZZA-865: Fix serialization of bnodes for internal
queries
Updated Branches:
refs/heads/master 2cc95d0ce -> f30ebdf5d
CLEREZZA-865: Fix serialization of bnodes for internal queries
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/f30ebdf5
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/f30ebdf5
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/f30ebdf5
Branch: refs/heads/master
Commit: f30ebdf5d6a8f901e9b5ccfb57dcf32dcb891c27
Parents: 2cc95d0
Author: enridaga <en...@apache.org>
Authored: Tue Jan 14 17:54:11 2014 +0000
Committer: enridaga <en...@apache.org>
Committed: Tue Jan 14 17:54:11 2014 +0000
----------------------------------------------------------------------
.../rdf/virtuoso/storage/VirtuosoMGraph.java | 3 +-
.../virtuoso/storage/VirtuosoMGraphTest.java | 66 ++++++++++++++++++++
2 files changed, 68 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f30ebdf5/clerezza-virtuoso/rdf.virtuoso.storage/src/main/java/rdf/virtuoso/storage/VirtuosoMGraph.java
----------------------------------------------------------------------
diff --git a/clerezza-virtuoso/rdf.virtuoso.storage/src/main/java/rdf/virtuoso/storage/VirtuosoMGraph.java b/clerezza-virtuoso/rdf.virtuoso.storage/src/main/java/rdf/virtuoso/storage/VirtuosoMGraph.java
index e2bc826..04df4ba 100644
--- a/clerezza-virtuoso/rdf.virtuoso.storage/src/main/java/rdf/virtuoso/storage/VirtuosoMGraph.java
+++ b/clerezza-virtuoso/rdf.virtuoso.storage/src/main/java/rdf/virtuoso/storage/VirtuosoMGraph.java
@@ -378,7 +378,7 @@ public class VirtuosoMGraph extends AbstractMGraph implements MGraph,
BNode bnode = bnodesMap.get(virtbnode);
if (bnode == null) {
bnode = new BNode();
- bnodesMap.put(virtbnode, bnode);
+ bnodesMap.put(virtbnode.replaceFirst("nodeID://", "_:"), bnode);
}
// Subject is BNode
return bnode;
@@ -404,6 +404,7 @@ public class VirtuosoMGraph extends AbstractMGraph implements MGraph,
private String toVirtBnode(BNode bnode) {
logger.debug("toVirtBnode(BNode {})", bnode);
String virtBnode = bnodesMap.getKey(bnode);
+
if (virtBnode == null) {
// We create a local bnode mapped to the BNode given
virtBnode = nextVirtBnode();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f30ebdf5/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/VirtuosoMGraphTest.java
----------------------------------------------------------------------
diff --git a/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/VirtuosoMGraphTest.java b/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/VirtuosoMGraphTest.java
index 077a5c6..1bc8396 100644
--- a/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/VirtuosoMGraphTest.java
+++ b/clerezza-virtuoso/rdf.virtuoso.storage/src/test/java/rdf/virtuoso/storage/VirtuosoMGraphTest.java
@@ -20,12 +20,14 @@ package rdf.virtuoso.storage;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Iterator;
+import org.apache.clerezza.rdf.core.BNode;
import org.apache.clerezza.rdf.core.Graph;
import org.apache.clerezza.rdf.core.NonLiteral;
import org.apache.clerezza.rdf.core.PlainLiteral;
@@ -101,6 +103,7 @@ public class VirtuosoMGraphTest {
assertTrue(mgraph.size() == 1);
}
+
@Test
public void testFilter() {
log.info("testFilter(); Test filter(s,p,o)");
@@ -146,6 +149,69 @@ public class VirtuosoMGraphTest {
assertTrue(found);
}
+
+ @Test
+ public void testFilterSubjectBnode() {
+ log.info("testFilterSubjectBnode(); Test filter(s,null,null)");
+ if (TestUtils.SKIP) {
+ log.warn("SKIPPED");
+ return;
+ }
+ // We use testAdd to prepare this
+ Triple triple = new Triple() {
+
+ @Override
+ public NonLiteral getSubject() {
+ return new BNode();
+ }
+
+ @Override
+ public UriRef getPredicate() {
+ return predicate;
+ }
+
+ @Override
+ public Resource getObject() {
+ return new BNode();
+ }
+ };
+
+ boolean success = mgraph.add(triple);
+ assertTrue(success);
+ Iterator<Triple> it = mgraph.filter(new BNode(), predicate, new BNode());
+ boolean found = false;
+ Triple t = null; // we will use it to make a further query
+ while (it.hasNext()) {
+ found = true;
+ t = it.next();
+ if (log.isDebugEnabled()) {
+ log.debug("Found matching triple: {}", t);
+ TestUtils.stamp(t);
+ }
+ assertEquals(t.getPredicate(), predicate);
+ }
+ assertTrue(found);
+
+ assertNotNull(t);
+
+ //NonLiteral s = t.getSubject();
+ it = mgraph.filter(t.getSubject(), predicate, t.getObject());
+ found = false;
+ while (it.hasNext()) {
+ found = true;
+ t = it.next();
+ if (log.isDebugEnabled()) {
+ log.debug("Found matching triple: {}", t);
+ TestUtils.stamp(t);
+ }
+ //assertEquals(t.getSubject(), s);
+ //log.info(" {} {}", s, t.getSubject());
+ //assertEquals(t.getPredicate(), predicate);
+ assertEquals(t.getPredicate(), predicate);
+ }
+ assertTrue(found);
+ }
+
@Test
public void testFilterPredicate() {
log.info("testFilterPredicate(); Test filter(null,p,null)");