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 2015/11/16 23:13:00 UTC
[05/10] jena git commit: JENA-1068: DatasetGraphTDB to use
DatasetGraphTriplesQuads.
JENA-1068: DatasetGraphTDB to use DatasetGraphTriplesQuads.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a5794db0
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a5794db0
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a5794db0
Branch: refs/heads/master
Commit: a5794db036946b6225232768625b9b1a747f128e
Parents: e5adf62
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Nov 16 17:54:19 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Nov 16 21:44:07 2015 +0000
----------------------------------------------------------------------
.../apache/jena/tdb/store/DatasetGraphTDB.java | 21 ++++++++------------
1 file changed, 8 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a5794db0/jena-tdb/src/main/java/org/apache/jena/tdb/store/DatasetGraphTDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/store/DatasetGraphTDB.java b/jena-tdb/src/main/java/org/apache/jena/tdb/store/DatasetGraphTDB.java
index 8db7ab5..c35862a 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/store/DatasetGraphTDB.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/store/DatasetGraphTDB.java
@@ -20,6 +20,7 @@ package org.apache.jena.tdb.store;
import java.util.Iterator ;
+
import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.atlas.lib.Closeable ;
import org.apache.jena.atlas.lib.Sync ;
@@ -27,7 +28,7 @@ import org.apache.jena.atlas.lib.Tuple ;
import org.apache.jena.graph.Graph ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.Triple ;
-import org.apache.jena.sparql.core.DatasetGraphCaching ;
+import org.apache.jena.sparql.core.DatasetGraphTriplesQuads ;
import org.apache.jena.sparql.core.Quad ;
import org.apache.jena.sparql.engine.optimizer.reorder.ReorderTransformation ;
import org.apache.jena.tdb.base.file.Location ;
@@ -47,7 +48,7 @@ import org.apache.jena.tdb.transaction.DatasetGraphTxn ;
* </ul>
*/
final
-public class DatasetGraphTDB extends DatasetGraphCaching
+public class DatasetGraphTDB extends DatasetGraphTriplesQuads
implements /*DatasetGraph,*/ Sync, Closeable, Session
{
private TripleTable tripleTable ;
@@ -73,9 +74,8 @@ public class DatasetGraphTDB extends DatasetGraphCaching
public TripleTable getTripleTable() { return tripleTable ; }
@Override
- protected Iterator<Quad> findInDftGraph(Node s, Node p, Node o) {
- return triples2quadsDftGraph(getTripleTable().find(s, p, o)) ;
- }
+ protected Iterator<Quad> findInDftGraph(Node s, Node p, Node o)
+ { return triples2quadsDftGraph(getTripleTable().find(s, p, o)) ; }
@Override
protected Iterator<Quad> findInSpecificNamedGraph(Node g, Node s, Node p, Node o)
@@ -111,7 +111,7 @@ public class DatasetGraphTDB extends DatasetGraphCaching
{ return (GraphTDB)getGraph(graphNode) ; }
@Override
- protected void _close() {
+ public void close() {
if ( closed )
return ;
closed = true ;
@@ -130,11 +130,6 @@ public class DatasetGraphTDB extends DatasetGraphCaching
public boolean containsGraph(Node graphNode) {
if ( Quad.isDefaultGraphExplicit(graphNode) || Quad.isUnionGraph(graphNode) )
return true ;
- return _containsGraph(graphNode) ;
- }
-
- @Override
- protected boolean _containsGraph(Node graphNode) {
// Have to look explicitly, which is a bit of a nuisance.
// But does not normally happen for GRAPH <g> because that's rewritten to quads.
// Only pattern with complex paths go via GRAPH.
@@ -150,11 +145,11 @@ public class DatasetGraphTDB extends DatasetGraphCaching
}
@Override
- protected Graph _createDefaultGraph()
+ public Graph getDefaultGraph()
{ return new GraphTDB(this, null) ; }
@Override
- protected Graph _createNamedGraph(Node graphNode)
+ public Graph getGraph(Node graphNode)
{ return new GraphTDB(this, graphNode) ; }
//public void setEffectiveDefaultGraph(GraphTDB g) { effectiveDefaultGraph = g ; }