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:01 UTC
[06/10] jena git commit: JENA-1068 : Move Helper code into SDB.
JENA-1068 : Move Helper code into SDB.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/46b50b7a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/46b50b7a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/46b50b7a
Branch: refs/heads/master
Commit: 46b50b7aa35512274d156da6533a9e69eb7e58f5
Parents: d26fab4
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Nov 16 14:55:09 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Nov 16 21:44:07 2015 +0000
----------------------------------------------------------------------
.../jena/sparql/core/DatasetGraphCaching.java | 41 --------------------
.../apache/jena/sdb/store/DatasetGraphSDB.java | 40 +++++++++++++++++++
2 files changed, 40 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/46b50b7a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphCaching.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphCaching.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphCaching.java
index 1b18332..dc5f917 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphCaching.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphCaching.java
@@ -19,16 +19,13 @@
package org.apache.jena.sparql.core;
-import java.util.Iterator ;
import java.util.concurrent.Callable ;
-import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.atlas.lib.Cache ;
import org.apache.jena.atlas.lib.CacheFactory ;
import org.apache.jena.graph.Graph ;
import org.apache.jena.graph.GraphUtil ;
import org.apache.jena.graph.Node ;
-import org.apache.jena.graph.Triple ;
/**
* DatasetGraph that <em>caches</em> calls to make graph implementations.
@@ -134,42 +131,4 @@ abstract public class DatasetGraphCaching extends DatasetGraphTriplesQuads
super.close() ;
}
}
-
- // Helper implementations of operations.
- // Not necessarily efficient.
- protected static class Helper {
- public static void addToDftGraph(DatasetGraphCaching dsg, Node s, Node p, Node o) {
- dsg.getDefaultGraph().add(new Triple(s, p, o)) ;
- }
-
- public static void addToNamedGraph(DatasetGraphCaching dsg, Node g, Node s, Node p, Node o) {
- dsg.getGraph(g).add(new Triple(s, p, o)) ;
- }
-
- public static void deleteFromDftGraph(DatasetGraphCaching dsg, Node s, Node p, Node o) {
- dsg.getDefaultGraph().delete(new Triple(s, p, o)) ;
- }
-
- public static void deleteFromNamedGraph(DatasetGraphCaching dsg, Node g, Node s, Node p, Node o) {
- dsg.getGraph(g).delete(new Triple(s, p, o)) ;
- }
-
- public static Iterator<Quad> findInAnyNamedGraphs(DatasetGraphCaching dsg, Node s, Node p, Node o) {
- Iterator<Node> iter = dsg.listGraphNodes() ;
- Iterator<Quad> quads = null ;
- for ( ; iter.hasNext() ; ) {
- Node gn = iter.next() ;
- quads = Iter.append(quads, findInSpecificNamedGraph(dsg, gn, s, p, o)) ;
- }
- return quads ;
- }
-
- public static Iterator<Quad> findInDftGraph(DatasetGraphCaching dsg, Node s, Node p, Node o) {
- return triples2quadsDftGraph(dsg.getDefaultGraph().find(s, p, o)) ;
- }
-
- public static Iterator<Quad> findInSpecificNamedGraph(DatasetGraphCaching dsg, Node g, Node s, Node p, Node o) {
- return triples2quadsDftGraph(dsg.getGraph(g).find(s, p, o)) ;
- }
- }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/46b50b7a/jena-sdb/src/main/java/org/apache/jena/sdb/store/DatasetGraphSDB.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/store/DatasetGraphSDB.java b/jena-sdb/src/main/java/org/apache/jena/sdb/store/DatasetGraphSDB.java
index 344a984..c6f045a 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/store/DatasetGraphSDB.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/store/DatasetGraphSDB.java
@@ -20,9 +20,11 @@ package org.apache.jena.sdb.store;
import java.util.Iterator ;
+import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.atlas.lib.Closeable ;
import org.apache.jena.graph.Graph ;
import org.apache.jena.graph.Node ;
+import org.apache.jena.graph.Triple ;
import org.apache.jena.sdb.Store ;
import org.apache.jena.sdb.graph.GraphSDB ;
import org.apache.jena.sdb.util.StoreUtils ;
@@ -112,4 +114,42 @@ public class DatasetGraphSDB extends DatasetGraphCaching
protected void _close()
{ store.close() ; }
+ // Helper implementations of operations.
+ // Not necessarily efficient.
+
+ private static class Helper {
+ public static void addToDftGraph(DatasetGraph dsg, Node s, Node p, Node o) {
+ dsg.getDefaultGraph().add(new Triple(s, p, o)) ;
+ }
+
+ public static void addToNamedGraph(DatasetGraph dsg, Node g, Node s, Node p, Node o) {
+ dsg.getGraph(g).add(new Triple(s, p, o)) ;
+ }
+
+ public static void deleteFromDftGraph(DatasetGraph dsg, Node s, Node p, Node o) {
+ dsg.getDefaultGraph().delete(new Triple(s, p, o)) ;
+ }
+
+ public static void deleteFromNamedGraph(DatasetGraph dsg, Node g, Node s, Node p, Node o) {
+ dsg.getGraph(g).delete(new Triple(s, p, o)) ;
+ }
+
+ public static Iterator<Quad> findInAnyNamedGraphs(DatasetGraph dsg, Node s, Node p, Node o) {
+ Iterator<Node> iter = dsg.listGraphNodes() ;
+ Iterator<Quad> quads = null ;
+ for ( ; iter.hasNext() ; ) {
+ Node gn = iter.next() ;
+ quads = Iter.append(quads, findInSpecificNamedGraph(dsg, gn, s, p, o)) ;
+ }
+ return quads ;
+ }
+
+ public static Iterator<Quad> findInDftGraph(DatasetGraph dsg, Node s, Node p, Node o) {
+ return triples2quadsDftGraph(dsg.getDefaultGraph().find(s, p, o)) ;
+ }
+
+ public static Iterator<Quad> findInSpecificNamedGraph(DatasetGraph dsg, Node g, Node s, Node p, Node o) {
+ return triples2quadsDftGraph(dsg.getGraph(g).find(s, p, o)) ;
+ }
+ }
}