Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-714
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/48667e07 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/48667e07 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/48667e07 Branch: refs/heads/ignite-743 Commit: 48667e075112046bcb0397564175029fb9b5b97b Parents: d54b74b 9e79a2d Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Thu Apr 9 23:52:04 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Thu Apr 9 23:52:04 2015 -0700 ---------------------------------------------------------------------- .../ignite/codegen/MessageCodeGenerator.java | 1 - .../java/org/apache/ignite/IgniteCache.java | 9 + .../processors/cache/GridCacheContext.java | 58 ++++- .../cache/GridCacheEvictionManager.java | 6 +- .../cache/GridCacheExplicitLockSpan.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 6 +- .../processors/cache/GridCacheMvcc.java | 2 +- .../cache/GridCacheMvccCandidate.java | 50 ++++- .../processors/cache/GridCacheMvccManager.java | 44 +++- .../distributed/GridDistributedCacheEntry.java | 12 +- .../distributed/dht/GridDhtCacheEntry.java | 36 ++- .../distributed/dht/GridDhtLockFuture.java | 15 +- .../dht/GridDhtTransactionalCacheAdapter.java | 14 +- .../distributed/dht/GridDhtTxFinishFuture.java | 22 +- .../cache/distributed/dht/GridDhtTxLocal.java | 2 + .../distributed/dht/GridDhtTxLocalAdapter.java | 30 ++- .../distributed/dht/GridDhtTxPrepareFuture.java | 28 ++- .../dht/colocated/GridDhtColocatedCache.java | 32 ++- .../colocated/GridDhtColocatedLockFuture.java | 46 +++- .../GridDhtPartitionsExchangeFuture.java | 39 +++- .../distributed/near/GridNearCacheEntry.java | 10 +- .../distributed/near/GridNearLockFuture.java | 13 +- .../near/GridNearTxFinishFuture.java | 8 +- .../cache/distributed/near/GridNearTxLocal.java | 7 + .../near/GridNearTxPrepareFuture.java | 122 +++++++---- .../near/GridNearTxPrepareRequest.java | 64 ++++-- .../cache/transactions/IgniteTxAdapter.java | 3 +- .../cache/transactions/IgniteTxHandler.java | 120 +++++++--- .../transactions/IgniteTxLocalAdapter.java | 76 ++++--- .../cache/transactions/IgniteTxManager.java | 7 + .../internal/util/future/GridFutureAdapter.java | 20 +- .../ignite/internal/util/worker/GridWorker.java | 6 +- .../cache/GridCacheBasicApiAbstractTest.java | 4 +- .../dht/IgniteCacheLockFailoverSelfTest.java | 156 +++++++++++++ .../dht/IgniteCacheMultiTxLockSelfTest.java | 219 +++++++++++++++++++ .../testframework/junits/GridAbstractTest.java | 4 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 + 37 files changed, 1061 insertions(+), 235 deletions(-) ----------------------------------------------------------------------
