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/05/09 12:06:12 UTC

jena git commit: Update to promotion modes: TransactionMonitor.promote(Promote).

Repository: jena
Updated Branches:
  refs/heads/master 3b3c469ad -> c47a3da92


Update to promotion modes: TransactionMonitor.promote(Promote).

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c47a3da9
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c47a3da9
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c47a3da9

Branch: refs/heads/master
Commit: c47a3da927cfecc935360588f4c641d562e44531
Parents: 3b3c469
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 9 13:05:56 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 9 13:05:56 2018 +0100

----------------------------------------------------------------------
 .../jena/dboe/transaction/TransactionalMonitor.java   |  5 +++--
 .../org/apache/jena/tdb2/store/DatasetGraphTDB.java   | 14 ++------------
 2 files changed, 5 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/c47a3da9/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/TransactionalMonitor.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/TransactionalMonitor.java b/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/TransactionalMonitor.java
index 6b05410..515ad4b 100644
--- a/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/TransactionalMonitor.java
+++ b/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/TransactionalMonitor.java
@@ -19,14 +19,15 @@
 package org.apache.jena.dboe.transaction;
 
 import org.apache.jena.query.TxnType;
+import org.apache.jena.sparql.core.Transactional.Promote;
 
 /** Interface for the Transactional transitions. */
 public interface TransactionalMonitor {
     default void startBegin(TxnType txnType)     {}
     default void finishBegin(TxnType txnType)    {}
 
-    default void startPromote()     {}
-    default void finishPromote()    {}
+    default void startPromote(Promote mode)     {}
+    default void finishPromote(Promote mode)    {}
 
     default void startCommit()      {}
     default void finishCommit()     {}

http://git-wip-us.apache.org/repos/asf/jena/blob/c47a3da9/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/DatasetGraphTDB.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/DatasetGraphTDB.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/DatasetGraphTDB.java
index 8a37f74..3ee3276 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/DatasetGraphTDB.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/DatasetGraphTDB.java
@@ -449,22 +449,12 @@ public class DatasetGraphTDB extends DatasetGraphTriplesQuads
     }
 
     @Override
-    public boolean promote() {
-        if ( txnMonitor != null ) txnMonitor.startPromote();
-        try { 
-            return txnSystem.promote() ;
-        } finally { 
-            if ( txnMonitor != null ) txnMonitor.finishPromote();
-        }
-    }
-
-    @Override
     public boolean promote(Promote txnType) {
-        if ( txnMonitor != null ) txnMonitor.startPromote();
+        if ( txnMonitor != null ) txnMonitor.startPromote(txnType);
         try { 
             return txnSystem.promote(txnType) ;
         } finally { 
-            if ( txnMonitor != null ) txnMonitor.finishPromote();
+            if ( txnMonitor != null ) txnMonitor.finishPromote(txnType);
         }
     }