You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2017/03/23 07:16:22 UTC
[47/51] [abbrv] ignite git commit: Fixed javadoc.
Fixed javadoc.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0765ad32
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0765ad32
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0765ad32
Branch: refs/heads/ignite-4829
Commit: 0765ad32006cbb0ef11669b720e0603b8c6d138f
Parents: 5555bc6
Author: sboikov <sb...@gridgain.com>
Authored: Wed Mar 22 19:54:14 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Mar 22 19:54:14 2017 +0300
----------------------------------------------------------------------
.../dht/atomic/GridNearAtomicFullUpdateRequest.java | 1 +
.../GridNearAtomicSingleUpdateFilterRequest.java | 1 +
.../dht/atomic/GridNearAtomicSingleUpdateFuture.java | 14 +++++---------
.../GridNearAtomicSingleUpdateInvokeRequest.java | 1 +
.../dht/atomic/GridNearAtomicSingleUpdateRequest.java | 1 +
5 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0765ad32/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
index c381333..ade9976 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
@@ -132,6 +132,7 @@ public class GridNearAtomicFullUpdateRequest extends GridNearAtomicAbstractUpdat
* @param filter Optional filter for atomic check.
* @param subjId Subject ID.
* @param taskNameHash Task name hash code.
+ * @param needPrimaryRes {@code True} if client expects primary node response.
* @param skipStore Skip write-through to a persistent storage.
* @param keepBinary Keep binary flag.
* @param addDepInfo Deployment info flag.
http://git-wip-us.apache.org/repos/asf/ignite/blob/0765ad32/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
index 78582b0..c32501a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
@@ -67,6 +67,7 @@ public class GridNearAtomicSingleUpdateFilterRequest extends GridNearAtomicSingl
* @param filter Optional filter for atomic check.
* @param subjId Subject ID.
* @param taskNameHash Task name hash code.
+ * @param needPrimaryRes {@code True} if client expects primary node response.
* @param skipStore Skip write-through to a persistent storage.
* @param keepBinary Keep binary flag.
* @param addDepInfo Deployment info flag.
http://git-wip-us.apache.org/repos/asf/ignite/blob/0765ad32/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 930c4af..c2372d1 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
@@ -527,10 +527,9 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
}
/**
- * @param futId
- * @return
+ * @param futId Future ID.
*/
- private boolean checkDhtNodes(Long futId) {
+ private void checkDhtNodes(Long futId) {
GridCacheReturn opRes0 = null;
CachePartialUpdateCheckedException err0 = null;
AffinityTopologyVersion remapTopVer0 = null;
@@ -539,7 +538,7 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
synchronized (mux) {
if (this.futId == null || !this.futId.equals(futId))
- return false;
+ return;
assert reqState != null;
@@ -550,19 +549,16 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
err0 = err;
remapTopVer0 = onAllReceived();
}
- else if (res == DhtLeftResult.ALL_RCVD_CHECK_PRIMARY){
+ else if (res == DhtLeftResult.ALL_RCVD_CHECK_PRIMARY)
checkReq = new GridNearAtomicCheckUpdateRequest(reqState.req);
- }
else
- return true;
+ return;
}
if (checkReq != null)
sendCheckUpdateRequest(checkReq);
else
finishUpdateFuture(opRes0, err0, remapTopVer0);
-
- return false;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/0765ad32/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
index f8b3984..298ea05 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
@@ -85,6 +85,7 @@ public class GridNearAtomicSingleUpdateInvokeRequest extends GridNearAtomicSingl
* @param invokeArgs Optional arguments for entry processor.
* @param subjId Subject ID.
* @param taskNameHash Task name hash code.
+ * @param needPrimaryRes {@code True} if client expects primary node response.
* @param skipStore Skip write-through to a persistent storage.
* @param keepBinary Keep binary flag.
* @param addDepInfo Deployment info flag.
http://git-wip-us.apache.org/repos/asf/ignite/blob/0765ad32/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 b9a1fc6..14c70aa 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,6 +77,7 @@ public class GridNearAtomicSingleUpdateRequest extends GridNearAtomicAbstractSin
* @param retval Return value required flag.
* @param subjId Subject ID.
* @param taskNameHash Task name hash code.
+ * @param needPrimaryRes {@code True} if client expects primary node response.
* @param skipStore Skip write-through to a persistent storage.
* @param keepBinary Keep binary flag.
* @param addDepInfo Deployment info flag.