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/04/19 11:10:43 UTC
[1/3] jena git commit: JENA-1527: Create PrefixMap on each
getPrefixMapping
Repository: jena
Updated Branches:
refs/heads/master 928e70ff1 -> b9051fced
JENA-1527: Create PrefixMap on each getPrefixMapping
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ec67a007
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ec67a007
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ec67a007
Branch: refs/heads/master
Commit: ec67a007074b6beb42c72ae9a257e1876dd4a8b1
Parents: 928e70f
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Apr 18 22:14:09 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Apr 18 22:43:37 2018 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/tdb/store/GraphTDB.java | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ec67a007/jena-tdb/src/main/java/org/apache/jena/tdb/store/GraphTDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/store/GraphTDB.java b/jena-tdb/src/main/java/org/apache/jena/tdb/store/GraphTDB.java
index 152fa16..c62b57d 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/store/GraphTDB.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/store/GraphTDB.java
@@ -73,6 +73,17 @@ public abstract class GraphTDB extends GraphView implements Closeable, Sync {
public NodeTupleTable getNodeTupleTable() {
return getDatasetGraphTDB().chooseNodeTupleTable(getGraphName()) ;
}
+
+ // JENA-1527. Don't let GraphBase cache.
+ // Normally, GraphBase calls createPrefixMapping once and reuses that object.
+ // This causes it to be passed across transaction boundaries.
+ // in the case of fetching, then not using for update in a W transaction,
+ // errors occur.
+
+ @Override
+ public PrefixMapping getPrefixMapping() {
+ return createPrefixMapping();
+ }
@Override
protected PrefixMapping createPrefixMapping() {
[3/3] jena git commit: JENA-1527: Merge commit 'refs/pull/402/head'
of https://github.com/apache/jena
Posted by an...@apache.org.
JENA-1527: Merge commit 'refs/pull/402/head' of https://github.com/apache/jena
This closes #402.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b9051fce
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b9051fce
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b9051fce
Branch: refs/heads/master
Commit: b9051fced59ec8a78e30ea6f9047b52513f2430d
Parents: d077e2c ec67a00
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Apr 19 12:07:27 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Apr 19 12:07:27 2018 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/tdb/store/GraphTDB.java | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
[2/3] jena git commit: JENA-1482: Copy change in TDB1 to TDB2
Posted by an...@apache.org.
JENA-1482: Copy change in TDB1 to TDB2
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d077e2cd
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d077e2cd
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d077e2cd
Branch: refs/heads/master
Commit: d077e2cdf286f2f088f6a35d45244fa2425cc818
Parents: 928e70f
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Apr 19 10:44:14 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Apr 19 10:44:14 2018 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/tdb2/solver/BindingTDB.java | 4 +++-
.../src/main/java/org/apache/jena/tdb/solver/BindingTDB.java | 6 +++---
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/d077e2cd/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/BindingTDB.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/BindingTDB.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/BindingTDB.java
index 194cb44..810d5cd 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/BindingTDB.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/BindingTDB.java
@@ -120,7 +120,9 @@ public class BindingTDB extends BindingBase
NodeId id = idBinding.get(var) ;
if ( id == null )
- return null ;
+ return null ;
+ if ( NodeId.isDoesNotExist(id) )
+ return null;
n = nodeTable.getNodeForNodeId(id) ;
if ( n == null )
// But there was to put it in the BindingNodeId.
http://git-wip-us.apache.org/repos/asf/jena/blob/d077e2cd/jena-tdb/src/main/java/org/apache/jena/tdb/solver/BindingTDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/solver/BindingTDB.java b/jena-tdb/src/main/java/org/apache/jena/tdb/solver/BindingTDB.java
index 26a36c9..a80faa0 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/solver/BindingTDB.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/solver/BindingTDB.java
@@ -102,9 +102,9 @@ public class BindingTDB extends BindingBase
// In case we are inserting known missing nodes.
if ( NodeId.isDoesNotExist(id) )
return null ;
-
+
if ( parent == null )
- return null ;
+ return null ;
if ( parent instanceof BindingTDB )
return ((BindingTDB)parent).getNodeId(var) ;
return null ;
@@ -120,7 +120,7 @@ public class BindingTDB extends BindingBase
NodeId id = idBinding.get(var) ;
if ( id == null )
- return null ;
+ return null ;
if ( NodeId.isDoesNotExist(id) )
return null;
n = nodeTable.getNodeForNodeId(id) ;