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/10/26 21:43:33 UTC
[6/8] jena git commit: Move initialization into
GraphPrefixesProjection constructor.
Move initialization into GraphPrefixesProjection constructor.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e5214368
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e5214368
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e5214368
Branch: refs/heads/master
Commit: e5214368a22135d1d48ad3ac133caf0a95e24b5e
Parents: d865a83
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Oct 25 15:46:48 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Oct 25 15:46:48 2016 +0100
----------------------------------------------------------------------
.../apache/jena/sparql/graph/GraphPrefixesProjection.java | 10 ++++++++--
.../org/apache/jena/tdb/store/DatasetPrefixesTDB.java | 6 +-----
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/e5214368/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphPrefixesProjection.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphPrefixesProjection.java b/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphPrefixesProjection.java
index 5b51879..345f204 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphPrefixesProjection.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphPrefixesProjection.java
@@ -28,7 +28,11 @@ import org.apache.jena.sparql.core.DatasetPrefixStorage ;
public class GraphPrefixesProjection extends PrefixMappingImpl
{
- // Own cache and completely replace PrefixMappingImpl?
+ // super.PrefixMappingImpl is the in-memory copy of the prefixes.
+ // It is a complete copy, rather than a cache.
+ // See JENA-81.
+
+ // Maybe we should have own cache and completely replace using storage from PrefixMappingImpl?
private String graphName ;
private DatasetPrefixStorage prefixes ;
@@ -37,6 +41,9 @@ public class GraphPrefixesProjection extends PrefixMappingImpl
{
this.graphName = graphName ;
this.prefixes = prefixes ;
+ // Force into in-memory copy.
+ // See JENA-81
+ getNsPrefixMap() ;
}
//@Override protected void regenerateReverseMapping() {}
@@ -65,7 +72,6 @@ public class GraphPrefixesProjection extends PrefixMappingImpl
return m ;
}
-
@Override
protected void set(String prefix, String uri)
{
http://git-wip-us.apache.org/repos/asf/jena/blob/e5214368/jena-tdb/src/main/java/org/apache/jena/tdb/store/DatasetPrefixesTDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/store/DatasetPrefixesTDB.java b/jena-tdb/src/main/java/org/apache/jena/tdb/store/DatasetPrefixesTDB.java
index 0e17208..517f7b1 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/store/DatasetPrefixesTDB.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/store/DatasetPrefixesTDB.java
@@ -171,11 +171,7 @@ public class DatasetPrefixesTDB implements DatasetPrefixStorage
/** Return a PrefixMapping for a named graph */
@Override
public PrefixMapping getPrefixMapping(String graphName) {
- PrefixMapping pm = new GraphPrefixesProjection(graphName, this) ;
- // Force into cache.
- // See JENA-81
- pm.getNsPrefixMap() ;
- return pm ;
+ return new GraphPrefixesProjection(graphName, this) ;
}
@Override