Merge remote-tracking branch 'remotes/origin/ignite-157-2' into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2a68725e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2a68725e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2a68725e Branch: refs/heads/ignite-545 Commit: 2a68725ed9475aa74a9db222169073da2dca2159 Parents: f0000bd 2ea83ce Author: sboikov <sboi...@gridgain.com> Authored: Tue Apr 28 16:51:53 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Apr 28 16:51:53 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheMvccManager.java | 2 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 59 +++++- .../distributed/dht/GridDhtLockFuture.java | 18 +- .../distributed/dht/GridDhtTxFinishFuture.java | 102 +++++++++- .../cache/distributed/dht/GridDhtTxLocal.java | 6 + .../distributed/dht/GridDhtTxLocalAdapter.java | 23 +++ .../cache/distributed/dht/GridDhtTxRemote.java | 7 + .../cache/distributed/near/GridNearTxLocal.java | 6 + .../cache/transactions/IgniteInternalTx.java | 5 + .../cache/transactions/IgniteTxAdapter.java | 10 + .../cache/transactions/IgniteTxHandler.java | 57 +++++- .../cache/transactions/IgniteTxManager.java | 117 +++++++++-- .../cache/IgniteCachePutAllRestartTest.java | 203 +++++++++++++++++++ .../cache/IgniteCacheTxPreloadNoWriteTest.java | 29 ++- ...xOriginatingNodeFailureAbstractSelfTest.java | 6 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 7 +- ...itionedTxOriginatingNodeFailureSelfTest.java | 2 - .../near/IgniteCacheNearTxRollbackTest.java | 133 ++++++++++++ .../IgniteCacheFailoverTestSuite.java | 8 +- .../testsuites/IgniteCacheRestartTestSuite.java | 3 +- 20 files changed, 747 insertions(+), 56 deletions(-) ----------------------------------------------------------------------
