ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-4984
Date Thu, 20 Apr 2017 07:54:46 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-4984 14582779f -> 75ca6a56d


ignite-4984


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

Branch: refs/heads/ignite-4984
Commit: 75ca6a56dc747a8e8257763489f5e702d09f9210
Parents: 1458277
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Apr 20 10:54:39 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Apr 20 10:54:39 2017 +0300

----------------------------------------------------------------------
 .../distributed/dht/GridPartitionedSingleGetFuture.java  |  3 ---
 .../dht/atomic/GridDhtAtomicAbstractUpdateFuture.java    |  3 ---
 .../dht/atomic/GridDhtAtomicSingleUpdateFuture.java      |  3 ---
 .../dht/atomic/GridDhtAtomicUpdateFuture.java            |  3 ---
 .../dht/atomic/GridNearAtomicAbstractUpdateFuture.java   | 11 +++++++++--
 .../dht/atomic/GridNearAtomicUpdateFuture.java           |  1 +
 .../processors/cache/local/GridLocalLockFuture.java      |  3 ---
 7 files changed, 10 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/75ca6a56/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
index 3dfae6f..dbf1fe1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
@@ -63,9 +63,6 @@ import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDh
  */
 public class GridPartitionedSingleGetFuture extends GridCacheFutureAdapter<Object>
implements GridCacheFuture<Object>,
     CacheGetFuture {
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /** Logger reference. */
     private static final AtomicReference<IgniteLogger> logRef = new AtomicReference<>();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/75ca6a56/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
index 87ef091..5c7c027 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
@@ -60,9 +60,6 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC
  */
 public abstract class GridDhtAtomicAbstractUpdateFuture extends GridCacheFutureAdapter<Void>
     implements GridCacheAtomicFuture<Void> {
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /** Logger. */
     protected static IgniteLogger log;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/75ca6a56/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java
index 8ebe9c3..f053d21 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java
@@ -37,9 +37,6 @@ import org.jetbrains.annotations.Nullable;
  */
 class GridDhtAtomicSingleUpdateFuture extends GridDhtAtomicAbstractUpdateFuture {
     /** */
-    private static final long serialVersionUID = 0L;
-
-    /** */
     private boolean allUpdated;
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/75ca6a56/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 5d5ddf0..2a84445 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
@@ -36,9 +36,6 @@ import org.jetbrains.annotations.Nullable;
  */
 class GridDhtAtomicUpdateFuture extends GridDhtAtomicAbstractUpdateFuture {
     /** */
-    private static final long serialVersionUID = 0L;
-
-    /** */
     private int updateCntr;
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/75ca6a56/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
index 9d0d345..6969971 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
@@ -135,7 +135,7 @@ public abstract class GridNearAtomicAbstractUpdateFuture extends GridCacheFuture
     @GridToStringInclude
     protected CachePartialUpdateCheckedException err;
 
-    /** Future ID. */
+    /** Future ID, changes when operation is remapped. */
     @GridToStringInclude
     protected long futId;
 
@@ -203,10 +203,17 @@ public abstract class GridNearAtomicAbstractUpdateFuture extends GridCacheFuture
         this.remapCnt = remapCnt;
     }
 
+    /**
+     * @return {@code True} if future was initialized and waits for responses.
+     */
     final boolean futureMapped() {
         return topVer != AffinityTopologyVersion.ZERO;
     }
 
+    /**
+     * @param futId Expected future ID.
+     * @return {@code True} if future was initialized with the same ID.
+     */
     final boolean checkFutureId(long futId) {
         return topVer != AffinityTopologyVersion.ZERO && this.futId == futId;
     }
@@ -356,7 +363,7 @@ public abstract class GridNearAtomicAbstractUpdateFuture extends GridCacheFuture
     /** {@inheritDoc} */
     @SuppressWarnings("ConstantConditions")
     @Override public final boolean onDone(@Nullable Object res, @Nullable Throwable err)
{
-        assert err != null;
+        assert err != null : "onDone should be called only to finish future with error on
cache/node stop";
 
         Long futId = null;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/75ca6a56/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 581e235..46a3c34 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
@@ -566,6 +566,7 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
     /**
      * @param opRes Operation result.
      * @param err Operation error.
+     * @param remapTopVer Not-null topology version if need remap update.
      * @param futId Future ID.
      */
     private void finishUpdateFuture(GridCacheReturn opRes,

http://git-wip-us.apache.org/repos/asf/ignite/blob/75ca6a56/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
index d8e95b9..59d0adb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
@@ -55,9 +55,6 @@ import org.jetbrains.annotations.Nullable;
  */
 public final class GridLocalLockFuture<K, V> extends GridCacheFutureAdapter<Boolean>
     implements GridCacheMvccFuture<Boolean> {
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /** Logger reference. */
     private static final AtomicReference<IgniteLogger> logRef = new AtomicReference<>();
 


Mime
View raw message