Repository: ignite Updated Branches: refs/heads/ignite-2523-1 0a2755ff3 -> 02fbde0f6
Minor refactoring. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/98d23e0e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/98d23e0e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/98d23e0e Branch: refs/heads/ignite-2523-1 Commit: 98d23e0efe68f1665910823d6484fc9b3075d098 Parents: 0a2755f Author: vozerov-gridgain <[email protected]> Authored: Tue Apr 26 09:13:24 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Tue Apr 26 09:13:24 2016 +0300 ---------------------------------------------------------------------- .../GridNearAtomicAbstractUpdateRequest.java | 29 ++++++++++++++++++-- .../GridNearAtomicSingleUpdateRequest.java | 17 ++---------- .../dht/atomic/GridNearAtomicUpdateRequest.java | 17 ++---------- 3 files changed, 31 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/98d23e0e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java index a12c2dc..84077e5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.atomic; import org.apache.ignite.cache.CacheWriteSynchronizationMode; +import org.apache.ignite.internal.GridDirectTransient; import org.apache.ignite.internal.processors.cache.CacheEntryPredicate; import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.GridCacheDeployable; @@ -42,6 +43,26 @@ public abstract class GridNearAtomicAbstractUpdateRequest extends GridCacheMessa /** Message index. */ public static final int CACHE_MSG_IDX = nextIndexId(); + /** Target node ID. */ + @GridDirectTransient + private UUID nodeId; + + /** + * Default constructor. + */ + protected GridNearAtomicAbstractUpdateRequest() { + // No-op. + } + + /** + * Constructor. + * + * @param nodeId Node ID. + */ + protected GridNearAtomicAbstractUpdateRequest(UUID nodeId) { + this.nodeId = nodeId; + } + /** {@inheritDoc} */ @Override public int lookupIndex() { return CACHE_MSG_IDX; @@ -50,12 +71,16 @@ public abstract class GridNearAtomicAbstractUpdateRequest extends GridCacheMessa /** * @return Mapped node ID. */ - public abstract UUID nodeId(); + public UUID nodeId() { + return nodeId; + } /** * @param nodeId Node ID. */ - public abstract void nodeId(UUID nodeId); + public void nodeId(UUID nodeId) { + this.nodeId = nodeId; + } /** * @return Subject ID. http://git-wip-us.apache.org/repos/asf/ignite/blob/98d23e0e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java index 485a974..745fe02 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java @@ -77,10 +77,6 @@ public class GridNearAtomicSingleUpdateRequest extends GridNearAtomicAbstractUpd /** Flag: keep binary. */ private static final byte FLAG_KEEP_BINARY = 0x20; - /** Target node ID. */ - @GridDirectTransient - private UUID nodeId; - /** Future version. */ private GridCacheVersion futVer; @@ -215,10 +211,11 @@ public class GridNearAtomicSingleUpdateRequest extends GridNearAtomicAbstractUpd KeyCacheObject key, Object val ) { + super(nodeId); + assert futVer != null; this.cacheId = cacheId; - this.nodeId = nodeId; this.futVer = futVer; this.fastMap = fastMap; this.updateVer = updateVer; @@ -262,16 +259,6 @@ public class GridNearAtomicSingleUpdateRequest extends GridNearAtomicAbstractUpd } /** {@inheritDoc} */ - @Override public UUID nodeId() { - return nodeId; - } - - /** {@inheritDoc} */ - @Override public void nodeId(UUID nodeId) { - this.nodeId = nodeId; - } - - /** {@inheritDoc} */ @Override public UUID subjectId() { return subjId; } http://git-wip-us.apache.org/repos/asf/ignite/blob/98d23e0e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java index f061868..5a99147 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java @@ -61,10 +61,6 @@ public class GridNearAtomicUpdateRequest extends GridNearAtomicAbstractUpdateReq /** */ private static final long serialVersionUID = 0L; - /** Target node ID. */ - @GridDirectTransient - private UUID nodeId; - /** Future version. */ private GridCacheVersion futVer; @@ -212,10 +208,11 @@ public class GridNearAtomicUpdateRequest extends GridNearAtomicAbstractUpdateReq boolean addDepInfo, int maxEntryCnt ) { + super(nodeId); + assert futVer != null; this.cacheId = cacheId; - this.nodeId = nodeId; this.futVer = futVer; this.fastMap = fastMap; this.updateVer = updateVer; @@ -245,16 +242,6 @@ public class GridNearAtomicUpdateRequest extends GridNearAtomicAbstractUpdateReq } /** {@inheritDoc} */ - @Override public UUID nodeId() { - return nodeId; - } - - /** {@inheritDoc} */ - @Override public void nodeId(UUID nodeId) { - this.nodeId = nodeId; - } - - /** {@inheritDoc} */ @Override public UUID subjectId() { return subjId; }
