Merge remote-tracking branch 'origin/ignite-sprint-4' 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/a9c3aa47 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a9c3aa47 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a9c3aa47 Branch: refs/heads/ignite-646 Commit: a9c3aa471f1589de346806d297d20022316f8837 Parents: ef29f79 b08acc5 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Fri Apr 24 09:54:27 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Fri Apr 24 09:54:27 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 9 +- .../processors/cache/GridCacheEntryEx.java | 4 + .../processors/cache/GridCacheMapEntry.java | 20 +- .../processors/cache/GridCacheUtils.java | 3 + .../GridDistributedCacheAdapter.java | 20 +- .../distributed/GridDistributedLockRequest.java | 99 +++- .../distributed/dht/GridDhtCacheAdapter.java | 4 +- .../cache/distributed/dht/GridDhtGetFuture.java | 9 +- .../distributed/dht/GridDhtLockFuture.java | 20 +- .../distributed/dht/GridDhtLockRequest.java | 7 +- .../dht/GridDhtTransactionalCacheAdapter.java | 21 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 26 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 6 +- .../cache/distributed/dht/GridDhtTxRemote.java | 7 +- .../dht/atomic/GridDhtAtomicCache.java | 41 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 14 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 49 +- .../dht/colocated/GridDhtColocatedCache.java | 36 +- .../colocated/GridDhtColocatedLockFuture.java | 14 +- .../distributed/near/GridNearAtomicCache.java | 5 +- .../distributed/near/GridNearCacheAdapter.java | 10 +- .../distributed/near/GridNearCacheEntry.java | 3 +- .../distributed/near/GridNearLockFuture.java | 11 +- .../distributed/near/GridNearLockRequest.java | 7 +- .../near/GridNearTransactionalCache.java | 25 +- .../cache/distributed/near/GridNearTxLocal.java | 7 +- .../distributed/near/GridNearTxRemote.java | 7 +- .../local/atomic/GridLocalAtomicCache.java | 59 ++- .../cache/transactions/IgniteTxEntry.java | 74 ++- .../transactions/IgniteTxLocalAdapter.java | 94 ++-- .../cache/transactions/IgniteTxLocalEx.java | 4 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 514 ++++++++++++++++++- .../processors/cache/GridCacheTestEntryEx.java | 2 + .../ignite/testsuites/IgniteCacheTestSuite.java | 2 +- 34 files changed, 1031 insertions(+), 202 deletions(-) ----------------------------------------------------------------------
