Reworked "remapKey" - now it is a flag.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e5223202 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e5223202 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e5223202 Branch: refs/heads/ignite-2523-1 Commit: e5223202c81ee887a862d27d74aaec89e85421c4 Parents: 4372eb5 Author: vozerov-gridgain <[email protected]> Authored: Tue Apr 26 16:38:34 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Tue Apr 26 16:38:34 2016 +0300 ---------------------------------------------------------------------- .../GridNearAtomicAbstractUpdateResponse.java | 2 +- .../atomic/GridNearAtomicSingleUpdateResponse.java | 16 +++++++--------- .../dht/atomic/GridNearAtomicUpdateFuture.java | 2 +- .../dht/atomic/GridNearAtomicUpdateResponse.java | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e5223202/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateResponse.java index 4fb6b32..91b1ac5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateResponse.java @@ -103,7 +103,7 @@ public abstract class GridNearAtomicAbstractUpdateResponse extends GridCacheMess * @param idx Index. * @return Remap key. */ - public abstract KeyCacheObject remapKey(int idx); + public abstract KeyCacheObject remapKey(GridNearAtomicAbstractUpdateRequest req, int idx); /** * @return Remap keys count. http://git-wip-us.apache.org/repos/asf/ignite/blob/e5223202/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateResponse.java index 41fa699..b807896 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateResponse.java @@ -68,7 +68,7 @@ public class GridNearAtomicSingleUpdateResponse extends GridNearAtomicAbstractUp /** Keys that should be remapped. */ @GridToStringInclude - private KeyCacheObject remapKey; + private boolean remapKey; /** Indexes of keys for which values were generated on primary node (used if originating node has near cache). */ private boolean nearValsIdx; @@ -167,19 +167,19 @@ public class GridNearAtomicSingleUpdateResponse extends GridNearAtomicAbstractUp @Override public void remapKeys(GridNearAtomicAbstractUpdateRequest req) { assert req instanceof GridNearAtomicSingleUpdateRequest; - remapKey = req.key(0); + remapKey = true; } /** {@inheritDoc} */ - @Override public KeyCacheObject remapKey(int idx) { + @Override public KeyCacheObject remapKey(GridNearAtomicAbstractUpdateRequest req, int idx) { assert idx == 0; - return remapKey; + return req.key(0); } /** {@inheritDoc} */ @Override public int remapKeysCount() { - return remapKey == null ? 0 : 1; + return remapKey ? 1 : 0; } /** {@inheritDoc} */ @@ -309,7 +309,6 @@ public class GridNearAtomicSingleUpdateResponse extends GridNearAtomicAbstractUp GridCacheContext cctx = ctx.cacheContext(cacheId); - prepareMarshalCacheObject(remapKey, cctx); prepareMarshalCacheObject(nearVal, cctx); if (ret != null) @@ -325,7 +324,6 @@ public class GridNearAtomicSingleUpdateResponse extends GridNearAtomicAbstractUp GridCacheContext cctx = ctx.cacheContext(cacheId); - finishUnmarshalCacheObject(remapKey, cctx, ldr); finishUnmarshalCacheObject(nearVal, cctx, ldr); if (ret != null) @@ -404,7 +402,7 @@ public class GridNearAtomicSingleUpdateResponse extends GridNearAtomicAbstractUp writer.incrementState(); case 12: - if (!writer.writeMessage("remapKey", remapKey)) + if (!writer.writeBoolean("remapKey", remapKey)) return false; writer.incrementState(); @@ -504,7 +502,7 @@ public class GridNearAtomicSingleUpdateResponse extends GridNearAtomicAbstractUp reader.incrementState(); case 12: - remapKey = reader.readMessage("remapKey"); + remapKey = reader.readBoolean("remapKey"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/ignite/blob/e5223202/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java index a858bca..7080609 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java @@ -305,7 +305,7 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu remapKeys = U.newHashSet(res.remapKeysCount()); for (int i = 0; i < res.remapKeysCount(); i++) - remapKeys.add(res.remapKey(i)); + remapKeys.add(res.remapKey(req, i)); if (mapErrTopVer == null || mapErrTopVer.compareTo(req.topologyVersion()) < 0) mapErrTopVer = req.topologyVersion(); http://git-wip-us.apache.org/repos/asf/ignite/blob/e5223202/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java index c14e376..6654265 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java @@ -178,7 +178,7 @@ public class GridNearAtomicUpdateResponse extends GridNearAtomicAbstractUpdateRe } /** {@inheritDoc} */ - @Override public KeyCacheObject remapKey(int idx) { + @Override public KeyCacheObject remapKey(GridNearAtomicAbstractUpdateRequest req, int idx) { return remapKeys.get(idx); }
