Merge commit 'refs/pull/336/head' of github.com:apache/jena This closes #336.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0ca10b77 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0ca10b77 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0ca10b77 Branch: refs/heads/master Commit: 0ca10b775b512db50c36efba17cba24348d72452 Parents: 0366da2 ddfb3e4 Author: Andy Seaborne <[email protected]> Authored: Thu Jan 4 20:39:35 2018 +0000 Committer: Andy Seaborne <[email protected]> Committed: Thu Jan 4 20:39:35 2018 +0000 ---------------------------------------------------------------------- .../java/org/apache/jena/query/TxnType.java | 77 +++ .../jena/sparql/core/DatasetGraphMap.java | 18 +- .../jena/sparql/core/DatasetGraphMapLink.java | 17 +- .../jena/sparql/core/DatasetGraphOne.java | 20 +- .../jena/sparql/core/DatasetGraphSink.java | 6 +- .../sparql/core/DatasetGraphTrackActive.java | 18 +- .../jena/sparql/core/DatasetGraphWithLock.java | 14 +- .../jena/sparql/core/DatasetGraphWrapper.java | 128 ++-- .../jena/sparql/core/DatasetGraphZero.java | 8 +- .../apache/jena/sparql/core/DatasetImpl.java | 36 +- .../sparql/core/TransactionHandlerView.java | 7 +- .../apache/jena/sparql/core/Transactional.java | 111 ++- .../jena/sparql/core/TransactionalLock.java | 95 ++- .../jena/sparql/core/TransactionalMutex.java | 63 -- .../sparql/core/TransactionalNotSupported.java | 44 +- .../core/TransactionalNotSupportedMixin.java | 37 +- .../jena/sparql/core/TransactionalNull.java | 60 +- .../sparql/core/mem/DatasetGraphInMemory.java | 154 +++-- .../java/org/apache/jena/system/ThreadTxn.java | 36 +- .../main/java/org/apache/jena/system/Txn.java | 127 ++-- .../java/org/apache/jena/system/TxnCounter.java | 194 ++++-- .../jena/sparql/core/DatasetGraphSimpleMem.java | 5 + .../org/apache/jena/sparql/core/TS_Core.java | 1 - .../sparql/core/TestDatasetGraphWithLock.java | 30 - .../jena/sparql/core/mem/TS_DatasetTxnMem.java | 2 +- .../core/mem/TestDatasetGraphInMemoryLock.java | 4 +- .../mem/TestDatasetGraphInMemoryPromote.java | 25 - .../transaction/AbstractTestTransPromote.java | 202 +++--- .../AbstractTestTransactionLifecycle.java | 187 ++++- .../jena/sparql/transaction/TS_Transaction.java | 2 - .../TestTransactionDSGWithLockNoAbort.java | 41 -- .../TestTransactionDSGWithLockWithAbort.java | 38 -- .../transaction/TestTransactionSupport.java | 6 +- .../java/org/apache/jena/system/TestTxn.java | 139 +++- .../apache/jena/system/TestTxnLifecycle.java | 21 + .../java/org/apache/jena/atlas/lib/Lib.java | 11 + jena-cmds/src/main/java/tdb2/tdbdump.java | 2 +- jena-cmds/src/main/java/tdb2/tdbstats.java | 2 +- .../java/org/apache/jena/dboe/jenax/Txn.java | 42 -- .../dboe/trans/bplustree/TestBPlusTreeTxn.java | 2 +- .../trans/data/TestTransBinaryDataFile.java | 7 +- .../jena/dboe/trans/data/TestTransBlob.java | 7 +- .../trans/data/TestTransBlobPersistent.java | 2 +- .../apache/jena/dboe/transaction/ThreadTxn.java | 144 ---- .../jena/dboe/transaction/TransInteger.java | 6 + .../jena/dboe/transaction/Transactional.java | 78 +-- .../dboe/transaction/TransactionalMonitor.java | 8 +- .../dboe/transaction/txn/QuorumGenerator.java | 6 +- .../jena/dboe/transaction/txn/Transaction.java | 27 +- .../transaction/txn/TransactionCoordinator.java | 167 +++-- .../dboe/transaction/txn/TransactionInfo.java | 15 +- .../dboe/transaction/txn/TransactionalBase.java | 47 +- .../transaction/txn/TransactionalSystem.java | 9 - .../transaction/TestThreadingTransactions.java | 19 +- .../TestTransactionCoordinatorControl.java | 36 +- .../transaction/TestTransactionLifecycle.java | 179 ++++- .../transaction/TestTransactionLifecycle2.java | 69 +- .../jena/dboe/transaction/TestTxnLib.java | 25 +- .../jena/dboe/transaction/TestTxnLib2.java | 2 +- .../jena/dboe/transaction/TestTxnSwitching.java | 19 +- .../org/apache/jena/tdb2/loader/Loader.java | 2 +- .../apache/jena/tdb2/store/DatasetGraphTDB.java | 31 +- .../jena/tdb2/store/GraphViewSwitchable.java | 32 +- .../java/org/apache/jena/tdb2/sys/CopyDSG.java | 2 +- .../org/apache/jena/tdb2/sys/DatabaseOps.java | 2 +- .../org/apache/jena/tdb2/TestDatabaseMgr.java | 2 +- .../org/apache/jena/tdb2/TestTDBFactory.java | 2 +- .../apache/jena/tdb2/graph/TestGraphsTDB2.java | 2 +- .../apache/jena/tdb2/junit/QueryTestTDB.java | 2 +- .../org/apache/jena/tdb2/solver/TestStats.java | 2 +- .../AbstractTestStoreConnectionBasics.java | 2 +- .../store/AbstractTestTransPromoteTDB2.java | 67 -- .../jena/tdb2/store/TestTransPromoteTDB.java | 29 +- .../jena/tdb2/store/TestTransactions.java | 2 +- .../apache/jena/tdb2/store/Test_SPARQL_TDB.java | 2 +- .../apache/jena/tdb2/sys/TestDatabaseOps.java | 2 +- .../apache/jena/fuseki/servlets/HttpAction.java | 2 +- .../jena/rdfconnection/RDFConnectionLocal.java | 26 +- .../rdfconnection/RDFConnectionModular.java | 27 +- .../jena/rdfconnection/RDFConnectionRemote.java | 71 +- .../apache/jena/sdb/store/DatasetGraphSDB.java | 25 +- .../org/apache/jena/tdb/StoreConnection.java | 31 +- .../java/org/apache/jena/tdb/TDBBackup.java | 4 +- .../apache/jena/tdb/store/DatasetGraphTDB.java | 18 +- .../jena/tdb/transaction/BlockMgrJournal.java | 2 +- .../transaction/DatasetGraphTransaction.java | 81 ++- .../jena/tdb/transaction/DatasetGraphTxn.java | 7 + .../jena/tdb/transaction/Transaction.java | 11 +- .../tdb/transaction/TransactionManager.java | 144 ++-- .../jena/tdb/extra/T_TDBWriteTransaction.java | 151 ----- .../jena/tdb/extra/T_TimeoutTDBPattern.java | 112 --- .../apache/jena/tdb/extra/T_TransSystem.java | 674 ------------------- .../tdb/extra/T_TransSystemMultiDatasets.java | 553 --------------- .../jena/tdb/extra/T_TxnDeadlockTest.java | 141 ---- .../tdb/store/AbstractStoreConnections.java | 30 +- .../AbstractTestObjectFileTrans.java | 3 +- .../AbstractTestObjectFileTransComplex.java | 3 +- .../tdb/transaction/AbstractTestTransSeq.java | 116 ++-- .../tdb/transaction/TestTransPromoteTDB.java | 33 +- .../jena/tdb/transaction/TestTransRestart.java | 8 +- .../tdb/transaction/TestTransactionTDB.java | 3 +- .../jena/query/text/DatasetGraphText.java | 12 + 102 files changed, 2108 insertions(+), 3267 deletions(-) ----------------------------------------------------------------------
