Merge branch 'master' into ignite-2004
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/12c881c4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/12c881c4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/12c881c4 Branch: refs/heads/ignite-2004 Commit: 12c881c4296d1df821c9870c8eba7489b8a7102d Parents: 9a456e4 e833eb2 Author: nikolay_tikhonov <[email protected]> Authored: Wed Apr 20 13:20:23 2016 +0300 Committer: nikolay_tikhonov <[email protected]> Committed: Wed Apr 20 13:20:23 2016 +0300 ---------------------------------------------------------------------- .../processors/cache/CacheOperationFilter.java | 61 ++ .../processors/cache/GridCacheAtomicFuture.java | 5 - .../dht/atomic/GridDhtAtomicCache.java | 107 ++- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 5 - .../GridNearAtomicAbstractUpdateFuture.java | 244 +++++++ .../GridNearAtomicSingleUpdateFuture.java | 645 +++++++++++++++++++ .../dht/atomic/GridNearAtomicUpdateFuture.java | 319 ++------- 7 files changed, 1085 insertions(+), 301 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/12c881c4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/12c881c4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java ----------------------------------------------------------------------
