Completely rmeoved "remap" stuff.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c8b1bb1e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c8b1bb1e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c8b1bb1e Branch: refs/heads/ignite-2926 Commit: c8b1bb1e4ce2ddc4ceb5d70f6a99fef1f8139a75 Parents: 2ff6fef Author: vozerov-gridgain <[email protected]> Authored: Fri Apr 15 12:46:50 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Fri Apr 15 12:46:50 2016 +0300 ---------------------------------------------------------------------- .../dht/atomic/GridNearAtomicSingleUpdateFuture.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c8b1bb1e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java index 0b8aaf7..ce5b41a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java @@ -76,9 +76,6 @@ public class GridNearAtomicSingleUpdateFuture extends GridAbstractNearAtomicUpda @GridToStringInclude private Map<UUID, GridNearAtomicUpdateRequest> mappings; - /** Keys to remap. */ - private boolean remapKey; - /** Not null is operation is mapped to single node. */ private GridNearAtomicUpdateRequest singleReq; @@ -299,8 +296,6 @@ public class GridNearAtomicSingleUpdateFuture extends GridAbstractNearAtomicUpda if (res.remapKeys() != null) { assert !fastMap || cctx.kernalContext().clientNode(); - remapKey = true; - if (mapErrTopVer == null || mapErrTopVer.compareTo(req.topologyVersion()) < 0) mapErrTopVer = req.topologyVersion(); } @@ -340,7 +335,7 @@ public class GridNearAtomicSingleUpdateFuture extends GridAbstractNearAtomicUpda } if (rcvAll) { - if (remapKey) { + if (res.remapKeys() != null) { assert mapErrTopVer != null; remapTopVer = cctx.shared().exchange().topologyVersion(); @@ -365,8 +360,6 @@ public class GridNearAtomicSingleUpdateFuture extends GridAbstractNearAtomicUpda err = null; - remapKey = true; - updVer = null; } } @@ -420,8 +413,6 @@ public class GridNearAtomicSingleUpdateFuture extends GridAbstractNearAtomicUpda } if (topLocked) { - assert remapKey; - CachePartialUpdateCheckedException e = new CachePartialUpdateCheckedException("Failed to update keys (retry update if possible)."); @@ -706,8 +697,6 @@ public class GridNearAtomicSingleUpdateFuture extends GridAbstractNearAtomicUpda singleReq = singleReq0; mappings = mappings0; - - this.remapKey = false; } } catch (Exception e) {
