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 2016/08/20 18:39:15 UTC
[4/5] jena git commit: JENA-1225: remove prefixes when removing graph.
JENA-1225: remove prefixes when removing graph.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0f40e434
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0f40e434
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0f40e434
Branch: refs/heads/master
Commit: 0f40e4340279794b53b746f2a6e66daf1aeff53c
Parents: 87f1aaa
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Aug 20 18:25:27 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Aug 20 18:25:27 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/sparql/core/DatasetGraph.java | 4 +++-
.../org/apache/jena/sparql/core/mem/DatasetGraphInMemory.java | 2 +-
.../main/java/org/apache/jena/tdb/store/DatasetGraphTDB.java | 7 +++++++
3 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0f40e434/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraph.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraph.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraph.java
index 04d277e..d772624 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraph.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraph.java
@@ -73,7 +73,9 @@ public interface DatasetGraph extends Transactional, Closeable
*/
public void addGraph(Node graphName, Graph graph) ;
- /** Remove all data associated with the named graph */
+ /** Remove all data associated with the named graph.
+ * This will include prefixes associated with the graph.
+ */
public void removeGraph(Node graphName) ;
/** Iterate over all names of named graphs */
http://git-wip-us.apache.org/repos/asf/jena/blob/0f40e434/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/DatasetGraphInMemory.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/DatasetGraphInMemory.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/DatasetGraphInMemory.java
index d7e83de..8af0734 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/DatasetGraphInMemory.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/mem/DatasetGraphInMemory.java
@@ -288,7 +288,7 @@ public class DatasetGraphInMemory extends DatasetGraphTriplesQuads implements Tr
@Override
public void removeGraph(final Node graphName) {
mutate(removeGraph, getGraph(graphName));
- prefixes().getPrefixMapping(graphName.getURI()).clearNsPrefixMap();
+ prefixes().removeAllFromPrefixMap(graphName.getURI()) ;
}
/**
http://git-wip-us.apache.org/repos/asf/jena/blob/0f40e434/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 d2a6127..a1af430 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
@@ -153,6 +153,13 @@ public class DatasetGraphTDB extends DatasetGraphTriplesQuads
public Graph getGraph(Node graphNode)
{ return new GraphNonTxnTDB(this, graphNode) ; }
+ @Override
+ public void removeGraph(Node graphNode) {
+ deleteAny(graphNode, Node.ANY, Node.ANY, Node.ANY) ;
+ if ( graphNode.isURI() )
+ getPrefixes().removeAllFromPrefixMap(graphNode.getURI());
+ }
+
public StorageConfig getConfig() { return config ; }
public ReorderTransformation getReorderTransform() { return transform ; }