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 2018/06/13 12:29:43 UTC
[1/2] jena git commit: JENA-1562: Fix for Graph.size() for TDB2 graphs
Repository: jena
Updated Branches:
refs/heads/master 4db45da0c -> 874ad4edc
JENA-1562: Fix for Graph.size() for TDB2 graphs
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/074c1179
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/074c1179
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/074c1179
Branch: refs/heads/master
Commit: 074c1179b24f8aa9c53d3cf33ee48c13beca7157
Parents: 30d0934
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jun 10 09:52:18 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jun 11 14:44:34 2018 +0100
----------------------------------------------------------------------
.../org/apache/jena/sparql/core/GraphView.java | 8 +++--
.../jena/tdb2/store/GraphViewSwitchable.java | 36 +++++++++++++-------
2 files changed, 28 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/074c1179/jena-arq/src/main/java/org/apache/jena/sparql/core/GraphView.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/GraphView.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/GraphView.java
index d1ae1b2..6ee11cb 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/GraphView.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/GraphView.java
@@ -101,9 +101,6 @@ public class GraphView extends GraphBase implements NamedGraph, Sync
protected static final boolean isDefaultGraph(Node gn) { return gn == null || Quad.isDefaultGraph(gn) ; }
protected static final boolean isUnionGraph(Node gn) { return Quad.isUnionGraph(gn) ; }
- // TODO Unsatisfactory - need PrefixMap support by DSGs
- // and sort out PrefixMap/PrefixMapping.
-
@Override
protected PrefixMapping createPrefixMapping() {
// Subclasses should override this but in the absence of anything better ...
@@ -165,6 +162,11 @@ public class GraphView extends GraphBase implements NamedGraph, Sync
Node o = t.getObject() ;
dsg.delete(g, s, p, o) ;
}
+
+ /**
+ * Subclasses may wish to provide {@code graphBaseSize} otherwise {@link GraphBase} uses {@code find()}.
+ */
+ @Override protected int graphBaseSize() { return super.graphBaseSize(); }
@Override
public void sync() {
http://git-wip-us.apache.org/repos/asf/jena/blob/074c1179/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/GraphViewSwitchable.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/GraphViewSwitchable.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/GraphViewSwitchable.java
index 4d5229f..2a3fbf5 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/GraphViewSwitchable.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/GraphViewSwitchable.java
@@ -18,13 +18,13 @@
package org.apache.jena.tdb2.store;
-import java.util.Map ;
+import java.util.Map;
import org.apache.jena.graph.Graph;
-import org.apache.jena.graph.Node ;
+import org.apache.jena.graph.Node;
import org.apache.jena.graph.TransactionHandler;
-import org.apache.jena.shared.PrefixMapping ;
-import org.apache.jena.shared.impl.PrefixMappingImpl ;
+import org.apache.jena.shared.PrefixMapping;
+import org.apache.jena.shared.impl.PrefixMappingImpl;
import org.apache.jena.sparql.core.DatasetPrefixStorage;
import org.apache.jena.sparql.core.GraphView;
import org.apache.jena.sparql.core.Quad;
@@ -37,13 +37,13 @@ import org.apache.jena.sparql.expr.nodevalue.NodeFunctions;
public class GraphViewSwitchable extends GraphView {
// Factory style.
public static GraphViewSwitchable createDefaultGraph(DatasetGraphSwitchable dsg)
- { return new GraphViewSwitchable(dsg, Quad.defaultGraphNodeGenerated) ; }
+ { return new GraphViewSwitchable(dsg, Quad.defaultGraphNodeGenerated); }
public static GraphView createNamedGraph(DatasetGraphSwitchable dsg, Node graphIRI)
- { return new GraphViewSwitchable(dsg, graphIRI) ; }
+ { return new GraphViewSwitchable(dsg, graphIRI); }
public static GraphViewSwitchable createUnionGraph(DatasetGraphSwitchable dsg)
- { return new GraphViewSwitchable(dsg, Quad.unionGraph) ; }
+ { return new GraphViewSwitchable(dsg, Quad.unionGraph); }
private final DatasetGraphSwitchable dsgx;
protected DatasetGraphSwitchable getx() { return dsgx; }
@@ -51,7 +51,7 @@ public class GraphViewSwitchable extends GraphView {
private TransactionHandler transactionHandler = null;
protected GraphViewSwitchable(DatasetGraphSwitchable dsg, Node gn) {
- super(dsg, gn) ;
+ super(dsg, gn);
this.dsgx = dsg;
// Goes to the switchable DatasetGraph
this.transactionHandler = new TransactionHandlerView(dsgx);
@@ -79,16 +79,28 @@ public class GraphViewSwitchable extends GraphView {
/** Return the {@code DatasetGraphSwitchable} we are viewing. */
@Override
public DatasetGraphSwitchable getDataset() {
- return getx() ;
+ return getx();
}
/** Return the {@code Graph} from the underlying switchable.
* Do not hold onto this reference across switches.
*/
public Graph getGraph() {
- return getx().getGraph(getGraphName()) ;
+ return getx().getGraph(getGraphName());
}
+ // Super uses find. Override to call GraphTDB.size()
+ @Override
+ protected int graphBaseSize() {
+ if ( isDefaultGraph() )
+ return getDSG().getDefaultGraphTDB().size();
+ return getDSG().getGraphTDB(getGraphName()).size();
+ }
+
+ private DatasetGraphTDB getDSG() {
+ return ((DatasetGraphTDB)(getx().get()));
+ }
+
// DatasetPrefixStorage specific with getting the DatasetPrefixStorage
// done at the point the operation happens.
// Long term: Function to get DatasetPrefixStorage
@@ -111,9 +123,7 @@ public class GraphViewSwitchable extends GraphView {
gn = "";
}
- private DatasetPrefixStorage dps() {
- return ((DatasetGraphTDB)(getx().get())).getPrefixes();
- }
+ private DatasetPrefixStorage dps() { return getDSG().getPrefixes(); }
private PrefixMapping prefixMapping() {
if ( gn == null )
[2/2] jena git commit: JENA-1562: Merge commit 'refs/pull/434/head'
of https://github.com/apache/jena
Posted by an...@apache.org.
JENA-1562: Merge commit 'refs/pull/434/head' of https://github.com/apache/jena
This closes #434.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/874ad4ed
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/874ad4ed
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/874ad4ed
Branch: refs/heads/master
Commit: 874ad4edca94f462c549b2c93f27e5d83315cefb
Parents: 4db45da 074c117
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Jun 13 12:41:50 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Jun 13 12:41:50 2018 +0100
----------------------------------------------------------------------
.../org/apache/jena/sparql/core/GraphView.java | 8 +++--
.../jena/tdb2/store/GraphViewSwitchable.java | 36 +++++++++++++-------
2 files changed, 28 insertions(+), 16 deletions(-)
----------------------------------------------------------------------