JENA-1483: Merge commit 'refs/pull/355/head' of https://github.com/apache/jena
This closes #355. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/48c6dc64 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/48c6dc64 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/48c6dc64 Branch: refs/heads/master Commit: 48c6dc64539c4af3427017a656993f5e034728e4 Parents: cfad342 e44ca81 Author: Andy Seaborne <a...@apache.org> Authored: Mon Feb 12 08:52:15 2018 +0000 Committer: Andy Seaborne <a...@apache.org> Committed: Mon Feb 12 08:52:15 2018 +0000 ---------------------------------------------------------------------- .../java/org/apache/jena/query/TxnType.java | 7 + .../jena/sparql/core/DatasetGraphMap.java | 2 +- .../jena/sparql/core/DatasetGraphMapLink.java | 2 +- .../jena/sparql/core/DatasetGraphOne.java | 2 +- .../jena/sparql/core/DatasetGraphSink.java | 2 +- .../sparql/core/DatasetGraphTrackActive.java | 6 +- .../jena/sparql/core/DatasetGraphWithLock.java | 2 +- .../jena/sparql/core/DatasetGraphWrapper.java | 4 + .../jena/sparql/core/DatasetGraphZero.java | 2 +- .../apache/jena/sparql/core/DatasetImpl.java | 6 +- .../apache/jena/sparql/core/Transactional.java | 73 ++- .../jena/sparql/core/TransactionalLock.java | 3 +- .../sparql/core/TransactionalNotSupported.java | 5 +- .../core/TransactionalNotSupportedMixin.java | 15 +- .../jena/sparql/core/TransactionalNull.java | 5 +- .../sparql/core/mem/DatasetGraphInMemory.java | 30 +- .../engine/QueryEngineFactoryWrapper.java | 8 +- .../sparql/util/DifferenceDatasetGraph.java | 2 +- .../jena/sparql/util/DyadicDatasetGraph.java | 30 +- .../java/org/apache/jena/system/TxnCounter.java | 10 +- .../org/apache/jena/sparql/ARQTestSuite.java | 5 +- .../jena/sparql/core/DatasetGraphSimpleMem.java | 227 ++++---- .../jena/sparql/graph/TestGraphUnionRead.java | 149 +++--- .../AbstractTestTransactionLifecycle.java | 523 +++++++++++-------- .../sparql/util/TestDyadicDatasetGraph.java | 66 ++- .../main/java/org/apache/jena/shared/Lock.java | 2 +- .../java/org/apache/jena/system/JenaSystem.java | 2 +- .../jena/dboe/transaction/txn/Transaction.java | 17 +- .../transaction/txn/TransactionCoordinator.java | 70 +-- .../dboe/transaction/txn/TransactionalBase.java | 24 +- .../transaction/TestTransactionLifecycle.java | 5 +- .../transaction/TestTransactionLifecycle2.java | 15 +- .../jena/tdb2/setup/AbstractTDBBuilder.java | 4 +- .../apache/jena/tdb2/solver/OpExecutorTDB1.java | 428 --------------- .../apache/jena/tdb2/solver/OpExecutorTDB2.java | 428 +++++++++++++++ .../jena/tdb2/store/DatasetGraphSwitchable.java | 3 +- .../apache/jena/tdb2/store/DatasetGraphTDB.java | 13 +- .../jena/tdb2/store/DatasetGraphWrapperTxn.java | 34 -- .../jena/tdb2/store/GraphViewSwitchable.java | 20 +- .../apache/jena/tdb2/store/TestDatasetTDB.java | 7 + .../jena/rdfconnection/RDFConnectionLocal.java | 2 +- .../rdfconnection/RDFConnectionModular.java | 2 +- .../jena/rdfconnection/RDFConnectionRemote.java | 2 +- .../apache/jena/sdb/store/DatasetGraphSDB.java | 2 +- .../apache/jena/tdb/store/DatasetGraphTDB.java | 2 +- .../transaction/DatasetGraphTransaction.java | 17 +- .../tdb/transaction/TransactionManager.java | 22 +- pom.xml | 1 + 48 files changed, 1222 insertions(+), 1086 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/48c6dc64/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetImpl.java ---------------------------------------------------------------------- diff --cc jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetImpl.java index 3ee9228,dc6a7f2..7e115e8 --- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetImpl.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetImpl.java @@@ -125,14 -115,12 +125,14 @@@ public class DatasetImpl implements Dat } @Override - public boolean promote() { + public boolean promote(Promote txnType) { + checkTransactional(); - return transactional.promote(); + return transactional.promote(txnType); } - + @Override public ReadWrite transactionMode() { + checkTransactional(); return transactional.transactionMode(); } @@@ -170,7 -168,7 +170,7 @@@ if ( ! supportsTransactions() ) throw new UnsupportedOperationException("Transactions not supported") ; } -- ++ @Override public DatasetGraph asDatasetGraph() { return dsg ; } http://git-wip-us.apache.org/repos/asf/jena/blob/48c6dc64/jena-arq/src/main/java/org/apache/jena/sparql/core/TransactionalNotSupported.java ----------------------------------------------------------------------
