Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-835
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/96ff8f2f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/96ff8f2f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/96ff8f2f Branch: refs/heads/ignite-836_2 Commit: 96ff8f2fc6521f55300ab634584f8f25c6edfdf2 Parents: 9e670b8 bbc21a6 Author: sboikov <sboi...@gridgain.com> Authored: Wed May 13 11:23:20 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed May 13 11:23:20 2015 +0300 ---------------------------------------------------------------------- bin/include/functions.sh | 2 +- .../internal/direct/DirectByteBufferStream.java | 4 +- .../eventstorage/GridEventStorageManager.java | 5 +- .../processors/cache/GridCacheMvccManager.java | 4 +- .../cache/distributed/dht/GridDhtTxLocal.java | 32 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 27 + .../cache/distributed/dht/GridDhtTxMapping.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 81 +- .../colocated/GridDhtColocatedLockFuture.java | 25 +- .../colocated/GridDhtDetachedCacheEntry.java | 4 +- .../distributed/near/GridNearCacheEntry.java | 4 +- .../distributed/near/GridNearLockFuture.java | 5 - .../near/GridNearOptimisticTxPrepareFuture.java | 779 +++++++++++++ .../GridNearPessimisticTxPrepareFuture.java | 349 ++++++ .../cache/distributed/near/GridNearTxLocal.java | 84 +- .../near/GridNearTxPrepareFuture.java | 1050 ------------------ .../near/GridNearTxPrepareFutureAdapter.java | 226 ++++ .../cache/transactions/IgniteInternalTx.java | 4 +- .../cache/transactions/IgniteTxAdapter.java | 2 +- .../cache/transactions/IgniteTxHandler.java | 68 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../cache/transactions/IgniteTxManager.java | 12 +- .../ignite/internal/util/IgniteUtils.java | 4 +- .../GridCacheAbstractFailoverSelfTest.java | 8 +- .../GridCacheAbstractNodeRestartSelfTest.java | 11 +- .../distributed/IgniteTxGetAfterStopTest.java | 131 +++ ...ePrimaryNodeFailureRecoveryAbstractTest.java | 4 +- ...idCacheAtomicReplicatedFailoverSelfTest.java | 6 + .../GridCacheReplicatedFailoverSelfTest.java | 6 + .../GridCacheReplicatedNodeRestartSelfTest.java | 80 ++ .../IgniteCacheFailoverTestSuite.java | 10 +- .../testsuites/IgniteCacheRestartTestSuite.java | 8 +- .../testsuites/IgniteCacheTestSuite3.java | 2 + 33 files changed, 1765 insertions(+), 1276 deletions(-) ----------------------------------------------------------------------
