Merge remote-tracking branch 'remotes/origin/ignite-157' into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bbc21a6a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bbc21a6a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bbc21a6a Branch: refs/heads/ignite-430 Commit: bbc21a6acba0193695e8b924b540bae4a647f3b8 Parents: 3861fbd ab1f9dd Author: sboikov <sboi...@gridgain.com> Authored: Wed May 13 10:04:14 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed May 13 10:04:14 2015 +0300 ---------------------------------------------------------------------- .../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 +- .../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 + 29 files changed, 1759 insertions(+), 1267 deletions(-) ----------------------------------------------------------------------
