Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-882
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f2871a76 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f2871a76 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f2871a76 Branch: refs/heads/ignite-882 Commit: f2871a765a4cab0e1cdd542c78bdeca59905d826 Parents: aa98688 ea90d86 Author: Denis Magda <dma...@gridgain.com> Authored: Fri Jul 3 12:23:37 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Fri Jul 3 12:23:37 2015 +0300 ---------------------------------------------------------------------- .../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/GridCacheSwapManager.java | 257 ++++++++++++------- .../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 +- .../GridCacheEvictionFilterSelfTest.java | 2 - .../inmemory/GridTestSwapSpaceSpi.java | 3 +- .../IgniteCacheFailoverTestSuite.java | 3 + .../query/h2/opt/GridH2KeyValueRowOffheap.java | 8 +- .../processors/query/h2/opt/GridH2Table.java | 2 +- .../cache/IgniteCacheOffheapEvictQueryTest.java | 2 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 4 +- ...QueryOffheapEvictsMultiThreadedSelfTest.java | 5 - .../IgniteCacheQueryNodeRestartSelfTest2.java | 5 + 31 files changed, 844 insertions(+), 243 deletions(-) ----------------------------------------------------------------------
