You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2011/05/20 11:56:48 UTC
svn commit: r1125303 - in /incubator/jena/Jena2/ARQ/trunk:
src-test/com/hp/hpl/jena/sparql/core/ src/com/hp/hpl/jena/sparql/core/
Author: andy
Date: Fri May 20 09:56:48 2011
New Revision: 1125303
URL: http://svn.apache.org/viewvc?rev=1125303&view=rev
Log: (empty)
Modified:
incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/core/DatasetGraphTests.java
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/core/DatasetGraph.java
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/core/DatasetGraphBase.java
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/core/DatasetGraphTriplesQuads.java
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/core/DatasetGraphWrapper.java
Modified: incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/core/DatasetGraphTests.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/core/DatasetGraphTests.java?rev=1125303&r1=1125302&r2=1125303&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/core/DatasetGraphTests.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/core/DatasetGraphTests.java Fri May 20 09:56:48 2011
@@ -110,6 +110,25 @@ public abstract class DatasetGraphTests
assertTrue(x.contains(quad2)) ;
}
+ @Test public void quad_05()
+ {
+ DatasetGraph dsg = emptyDataset() ;
+ assertNotNull(dsg) ;
+ Quad quad1 = SSE.parseQuad("(quad <g> <s> <p> <o1>)") ;
+ Quad quad2 = SSE.parseQuad("(quad <g> <s> <p> <o2>)") ;
+ Node g = SSE.parseNode("<g>") ;
+ Node s = SSE.parseNode("<s>") ;
+ Node p = SSE.parseNode("<p>") ;
+ Node o1 = SSE.parseNode("<o1>") ;
+ Node o2 = SSE.parseNode("<o2>") ;
+
+ dsg.add(g,s,p,o1) ;
+ assertTrue(dsg.contains(quad1)) ;
+ assertTrue(dsg.contains(g,s,p,o1)) ;
+ assertFalse(dsg.contains(g,s,p,o2)) ;
+ }
+
+
/*
* getDefaultGraph()
* getGraph(Node)
Modified: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/core/DatasetGraph.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/core/DatasetGraph.java?rev=1125303&r1=1125302&r2=1125303&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/core/DatasetGraph.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/core/DatasetGraph.java Fri May 20 09:56:48 2011
@@ -74,6 +74,12 @@ public interface DatasetGraph extends Cl
/** Delete a quad */
public void delete(Quad quad) ;
+ /** Add a quad */
+ public void add(Node g, Node s, Node p, Node o) ;
+
+ /** Delete a quad */
+ public void delete(Node g, Node s, Node p, Node o) ;
+
/** Delete any quads matching the pattern */
public void deleteAny(Node g, Node s, Node p, Node o) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/core/DatasetGraphBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/core/DatasetGraphBase.java?rev=1125303&r1=1125302&r2=1125303&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/core/DatasetGraphBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/core/DatasetGraphBase.java Fri May 20 09:56:48 2011
@@ -70,6 +70,12 @@ abstract public class DatasetGraphBase i
public void delete(Quad quad) { throw new UnsupportedOperationException("DatasetGraph.delete(Quad)") ; }
//@Override
+ public void add(Node g, Node s, Node p, Node o) { throw new UnsupportedOperationException("DatasetGraph.add(Node, Node, Node, Node)") ; }
+
+ //@Override
+ public void delete(Node g, Node s, Node p, Node o) { throw new UnsupportedOperationException("DatasetGraph.delete(Node, Node, Node, Node)") ; }
+
+ //@Override
/** Simple implementation */
public void deleteAny(Node g, Node s, Node p, Node o)
{
Modified: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/core/DatasetGraphTriplesQuads.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/core/DatasetGraphTriplesQuads.java?rev=1125303&r1=1125302&r2=1125303&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/core/DatasetGraphTriplesQuads.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/core/DatasetGraphTriplesQuads.java Fri May 20 09:56:48 2011
@@ -17,21 +17,33 @@ public abstract class DatasetGraphTriple
@Override
public void add(Quad quad)
{
- if ( quad.isDefaultGraph() )
- addToDftGraph(quad.getSubject(), quad.getPredicate(), quad.getObject()) ;
- else
- addToNamedGraph(quad.getGraph(), quad.getSubject(), quad.getPredicate(), quad.getObject()) ;
+ add(quad.getGraph(), quad.getSubject(), quad.getPredicate(), quad.getObject());
}
@Override
public void delete(Quad quad)
{
- if ( quad.isDefaultGraph() )
- deleteFromDftGraph(quad.getSubject(), quad.getPredicate(), quad.getObject()) ;
+ delete(quad.getGraph(), quad.getSubject(), quad.getPredicate(), quad.getObject());
+ }
+
+ @Override
+ public void add(Node g, Node s, Node p, Node o)
+ {
+ if ( Quad.isDefaultGraphGenerated(g) || Quad.isDefaultGraphExplicit(g) )
+ addToDftGraph(s, p, o) ;
else
- deleteFromNamedGraph(quad.getGraph(), quad.getSubject(), quad.getPredicate(), quad.getObject()) ;
+ addToNamedGraph(g, s, p, o) ;
}
+ @Override
+ public void delete(Node g, Node s, Node p, Node o)
+ {
+ if ( Quad.isDefaultGraphGenerated(g) || Quad.isDefaultGraphExplicit(g) )
+ deleteFromDftGraph(s, p, o) ;
+ else
+ deleteFromNamedGraph(g, s, p, o) ;
+ }
+
protected abstract void addToDftGraph(Node s, Node p, Node o) ;
protected abstract void addToNamedGraph(Node g, Node s, Node p, Node o) ;
protected abstract void deleteFromDftGraph(Node s, Node p, Node o) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/core/DatasetGraphWrapper.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/core/DatasetGraphWrapper.java?rev=1125303&r1=1125302&r2=1125303&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/core/DatasetGraphWrapper.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/core/DatasetGraphWrapper.java Fri May 20 09:56:48 2011
@@ -60,6 +60,14 @@ public class DatasetGraphWrapper impleme
public void delete(Quad quad)
{ dsg.delete(quad) ; }
+ //@Override
+ public void add(Node g, Node s, Node p, Node o)
+ { dsg.add(g, s, p, o) ; }
+
+ //@Override
+ public void delete(Node g, Node s, Node p, Node o)
+ { dsg.delete(g, s, p, o) ; }
+
public void deleteAny(Node g, Node s, Node p, Node o)
{ dsg.deleteAny(g, s, p, o) ; }