ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [01/22] ignite git commit: Minors.
Date Thu, 28 Apr 2016 11:28:02 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-2523-1 e531d5a90 -> fa3bc450b


Minors.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/10387a7d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/10387a7d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/10387a7d

Branch: refs/heads/ignite-2523-1
Commit: 10387a7d07348e1b89e2466915a9bb0ecb1efe79
Parents: e531d5a
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Tue Apr 26 11:46:21 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Tue Apr 26 11:46:21 2016 +0300

----------------------------------------------------------------------
 .../GridNearAtomicAbstractUpdateRequest.java    | 29 ++------------------
 .../GridNearAtomicSingleUpdateRequest.java      | 17 ++++++++++--
 .../dht/atomic/GridNearAtomicUpdateRequest.java | 17 ++++++++++--
 3 files changed, 32 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/10387a7d/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 8f4a130..b78a70a 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,7 +18,6 @@
 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;
@@ -43,26 +42,6 @@ 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;
@@ -71,16 +50,12 @@ public abstract class GridNearAtomicAbstractUpdateRequest extends GridCacheMessa
     /**
      * @return Mapped node ID.
      */
-    public UUID nodeId() {
-        return nodeId;
-    }
+    public abstract UUID nodeId();
 
     /**
      * @param nodeId Node ID.
      */
-    public void nodeId(UUID nodeId) {
-        this.nodeId = nodeId;
-    }
+    public abstract void nodeId(UUID nodeId);
 
     /**
      * @return Subject ID.

http://git-wip-us.apache.org/repos/asf/ignite/blob/10387a7d/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 d34a7c5..d2a3034 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
@@ -154,6 +154,10 @@ public class GridNearAtomicSingleUpdateRequest extends GridNearAtomicAbstractUpd
     @GridDirectTransient
     private GridNearAtomicUpdateResponse res;
 
+    /** Target node ID. */
+    @GridDirectTransient
+    private UUID nodeId;
+
     /**
      * Empty constructor required by {@link Externalizable}.
      */
@@ -211,11 +215,10 @@ 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;
@@ -259,6 +262,16 @@ public class GridNearAtomicSingleUpdateRequest extends GridNearAtomicAbstractUpd
     }
 
     /** {@inheritDoc} */
+    public UUID nodeId() {
+        return nodeId;
+    }
+
+    /** {@inheritDoc} */
+    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/10387a7d/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 91aa4a8..706190a 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
@@ -151,6 +151,10 @@ public class GridNearAtomicUpdateRequest extends GridNearAtomicAbstractUpdateReq
     @GridDirectTransient
     private GridNearAtomicUpdateResponse res;
 
+    /** Target node ID. */
+    @GridDirectTransient
+    private UUID nodeId;
+
     /** Maximum possible size of inner collections. */
     @GridDirectTransient
     private int initSize;
@@ -208,11 +212,10 @@ 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;
@@ -242,6 +245,16 @@ public class GridNearAtomicUpdateRequest extends GridNearAtomicAbstractUpdateReq
     }
 
     /** {@inheritDoc} */
+    public UUID nodeId() {
+        return nodeId;
+    }
+
+    /** {@inheritDoc} */
+    public void nodeId(UUID nodeId) {
+        this.nodeId = nodeId;
+    }
+
+    /** {@inheritDoc} */
     @Override public UUID subjectId() {
         return subjId;
     }


Mime
View raw message