IGNITE-621 - Merge branch ignite-621 into sprint-7
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1427d75b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1427d75b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1427d75b Branch: refs/heads/ignite-950 Commit: 1427d75b9ea46d3044caddc51b44c03abc71901d Parents: c866902 ac93958 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Thu Jul 2 12:10:09 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Thu Jul 2 12:10:09 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCache.java | 5 + .../apache/ignite/IgniteSystemProperties.java | 3 + .../processors/cache/CacheOperationContext.java | 44 ++++- .../processors/cache/GridCacheAdapter.java | 91 ++++++---- .../processors/cache/GridCacheAtomicFuture.java | 12 +- .../processors/cache/GridCacheMvccManager.java | 8 +- .../processors/cache/GridCacheProxyImpl.java | 10 +- .../processors/cache/GridCacheUtils.java | 42 +++++ .../processors/cache/IgniteCacheProxy.java | 36 +++- .../dht/atomic/GridDhtAtomicCache.java | 18 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 15 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 177 +++++++++++++++++-- .../datastructures/GridCacheAtomicLongImpl.java | 25 +-- .../GridCacheAtomicSequenceImpl.java | 11 +- .../GridCacheAtomicStampedImpl.java | 21 +-- .../GridCacheCountDownLatchImpl.java | 16 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../IgniteCachePutRetryAbstractSelfTest.java | 147 +++++++++++++++ .../dht/IgniteCachePutRetryAtomicSelfTest.java | 34 ++++ ...gniteCachePutRetryTransactionalSelfTest.java | 74 ++++++++ ...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +- .../IgniteCacheFailoverTestSuite.java | 3 + 22 files changed, 665 insertions(+), 134 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1427d75b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ----------------------------------------------------------------------
