IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f187add2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f187add2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f187add2 Branch: refs/heads/ignite-426 Commit: f187add2d9e96fda1da4ea5a98940cd4663ee355 Parents: 2d16d99 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Thu Jul 30 16:59:48 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Thu Jul 30 16:59:48 2015 -0700 ---------------------------------------------------------------------- .../distributed/dht/atomic/GridDhtAtomicCache.java | 5 +---- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 12 ------------ 2 files changed, 1 insertion(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f187add2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index a010baa..19c89e7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -1182,9 +1182,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { e.printStackTrace(); } finally { - if (dhtFut != null && !remap) - dhtFut.map(); - if (locked != null) unlockEntries(locked, req.topologyVersion()); @@ -1228,7 +1225,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { else { // If there are backups, map backup update future. if (dhtFut != null) - dhtFut.onMapped(); + dhtFut.map(); // Otherwise, complete the call. else completionCb.apply(req, res); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f187add2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java index c05f4c6..eb1b42c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java @@ -90,9 +90,6 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter<Void> /** */ private boolean waitForExchange; - /** */ - private boolean mapped; - /** * @param cctx Cache context. * @param completionCb Callback to invoke when future is completed. @@ -385,15 +382,6 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter<Void> } } - mapped = true; - } - - /** - * On mapped callback. - */ - public void onMapped() { - assert mapped; - checkComplete(); // Send response right away if no ACKs from backup is required.
