You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/02/25 13:31:21 UTC
[22/51] [abbrv] ignite git commit: ignite-2523 : Generalized usage of
GridNearAtomicUpdateRequest/Response.
ignite-2523 : Generalized usage of GridNearAtomicUpdateRequest/Response.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3c8d02a0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3c8d02a0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3c8d02a0
Branch: refs/heads/ignite-2523
Commit: 3c8d02a00b2bcbc194fd2112d9f8cb58ab7d571a
Parents: c39410a
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Mon Feb 8 18:25:21 2016 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Mon Feb 8 18:25:21 2016 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheIoManager.java | 3 ++-
.../GridNearAtomicMultipleUpdateRequest.java | 6 +++---
.../GridNearAtomicSingleUpdateRequest.java | 6 +++---
.../dht/atomic/GridNearAtomicUpdateFuture.java | 22 +++++++++++++-------
.../dht/atomic/GridNearAtomicUpdateRequest.java | 4 ++--
.../distributed/near/GridNearAtomicCache.java | 3 ++-
6 files changed, 26 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3c8d02a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index ea97277..7ba9542 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -47,6 +47,7 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDh
import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicSingleUpdateRequest;
import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicMultipleUpdateRequest;
import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicMultipleUpdateResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicSingleUpdateResponse;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtForceKeysRequest;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtForceKeysResponse;
import org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetRequest;
@@ -590,7 +591,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
case -23: {
GridNearAtomicSingleUpdateRequest req = (GridNearAtomicSingleUpdateRequest)msg;
- GridNearAtomicMultipleUpdateResponse res = new GridNearAtomicMultipleUpdateResponse(
+ GridNearAtomicSingleUpdateResponse res = new GridNearAtomicSingleUpdateResponse(
ctx.cacheId(),
nodeId,
req.futureVersion(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/3c8d02a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicMultipleUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicMultipleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicMultipleUpdateRequest.java
index 6f109be..650d350 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicMultipleUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicMultipleUpdateRequest.java
@@ -157,7 +157,7 @@ public class GridNearAtomicMultipleUpdateRequest extends GridCacheMessage
/** */
@GridDirectTransient
- private GridNearAtomicMultipleUpdateResponse res;
+ private GridNearAtomicUpdateResponse res;
/** Maximum possible size of inner collections. */
@GridDirectTransient
@@ -502,7 +502,7 @@ public class GridNearAtomicMultipleUpdateRequest extends GridCacheMessage
}
/** {@inheritDoc} */
- @Override public boolean onResponse(GridNearAtomicMultipleUpdateResponse res) {
+ @Override public boolean onResponse(GridNearAtomicUpdateResponse res) {
if (this.res == null) {
this.res = res;
@@ -513,7 +513,7 @@ public class GridNearAtomicMultipleUpdateRequest extends GridCacheMessage
}
/** {@inheritDoc} */
- @Override @Nullable public GridNearAtomicMultipleUpdateResponse response() {
+ @Override @Nullable public GridNearAtomicUpdateResponse response() {
return res;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/3c8d02a0/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 8714010..1e981af 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
@@ -149,7 +149,7 @@ public class GridNearAtomicSingleUpdateRequest extends GridCacheMessage
/** */
@GridDirectTransient
- private GridNearAtomicMultipleUpdateResponse res;
+ private GridNearAtomicUpdateResponse res;
/**
* Empty constructor required by {@link Externalizable}.
@@ -427,7 +427,7 @@ public class GridNearAtomicSingleUpdateRequest extends GridCacheMessage
}
/** {@inheritDoc} */
- @Override public boolean onResponse(GridNearAtomicMultipleUpdateResponse res) {
+ @Override public boolean onResponse(GridNearAtomicUpdateResponse res) {
if (this.res == null) {
this.res = res;
@@ -438,7 +438,7 @@ public class GridNearAtomicSingleUpdateRequest extends GridCacheMessage
}
/** {@inheritDoc} */
- @Override @Nullable public GridNearAtomicMultipleUpdateResponse response() {
+ @Override @Nullable public GridNearAtomicUpdateResponse response() {
return res;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/3c8d02a0/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 68ee67b..682935f 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
@@ -349,7 +349,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> implem
* @param req Update request.
* @param res Update response.
*/
- private void updateNear(GridNearAtomicUpdateRequest req, GridNearAtomicMultipleUpdateResponse res) {
+ private void updateNear(GridNearAtomicUpdateRequest req, GridNearAtomicUpdateResponse res) {
assert nearEnabled;
if (res.remapKeys() != null || !req.hasPrimary())
@@ -570,7 +570,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> implem
* @param nodeId Left node ID.
*/
void onNodeLeft(UUID nodeId) {
- GridNearAtomicMultipleUpdateResponse res = null;
+ GridNearAtomicUpdateResponse res = null;
synchronized (this) {
GridNearAtomicUpdateRequest req;
@@ -581,10 +581,16 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> implem
req = mappings != null ? mappings.get(nodeId) : null;
if (req != null && req.response() == null) {
- res = new GridNearAtomicMultipleUpdateResponse(cctx.cacheId(),
- nodeId,
- req.futureVersion(),
- cctx.deploymentEnabled());
+ if (req instanceof GridNearAtomicSingleUpdateRequest)
+ res = new GridNearAtomicSingleUpdateResponse(cctx.cacheId(),
+ nodeId,
+ req.futureVersion(),
+ cctx.deploymentEnabled());
+ else
+ res = new GridNearAtomicMultipleUpdateResponse(cctx.cacheId(),
+ nodeId,
+ req.futureVersion(),
+ cctx.deploymentEnabled());
ClusterTopologyCheckedException e = new ClusterTopologyCheckedException("Primary node left grid " +
"before response is received: " + nodeId);
@@ -605,7 +611,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> implem
* @param nodeErr {@code True} if response was created on node failure.
*/
@SuppressWarnings({"unchecked", "ThrowableResultOfMethodCallIgnored"})
- void onResult(UUID nodeId, GridNearAtomicMultipleUpdateResponse res, boolean nodeErr) {
+ void onResult(UUID nodeId, GridNearAtomicUpdateResponse res, boolean nodeErr) {
GridNearAtomicUpdateRequest req;
AffinityTopologyVersion remapTopVer = null;
@@ -737,7 +743,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> implem
if (rcvAll && nearEnabled) {
if (mappings != null) {
for (GridNearAtomicMultipleUpdateRequest req0 : mappings.values()) {
- GridNearAtomicMultipleUpdateResponse res0 = req0.response();
+ GridNearAtomicUpdateResponse res0 = req0.response();
assert res0 != null : req0;
http://git-wip-us.apache.org/repos/asf/ignite/blob/3c8d02a0/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 c1977bf..960add7 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
@@ -190,10 +190,10 @@ public interface GridNearAtomicUpdateRequest {
* @param res Response.
* @return {@code True} if current response was {@code null}.
*/
- public boolean onResponse(GridNearAtomicMultipleUpdateResponse res);
+ public boolean onResponse(GridNearAtomicUpdateResponse res);
/**
* @return Response.
*/
- @Nullable public GridNearAtomicMultipleUpdateResponse response();
+ @Nullable public GridNearAtomicUpdateResponse response();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/3c8d02a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
index 2546691..5aef8e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -47,6 +47,7 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDh
import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateResponse;
import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicMultipleUpdateResponse;
import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateRequest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateResponse;
import org.apache.ignite.internal.processors.cache.dr.GridCacheDrInfo;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalEx;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
@@ -128,7 +129,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> {
*/
public void processNearAtomicUpdateResponse(
GridNearAtomicUpdateRequest req,
- GridNearAtomicMultipleUpdateResponse res
+ GridNearAtomicUpdateResponse res
) {
if (F.size(res.failedKeys()) == req.keys().size())
return;