You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/03/06 13:55:52 UTC
ignite git commit: ignite-4705-2
Repository: ignite
Updated Branches:
refs/heads/ignite-4705-2 25f2cedc2 -> 8961e46d8
ignite-4705-2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8961e46d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8961e46d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8961e46d
Branch: refs/heads/ignite-4705-2
Commit: 8961e46d8f9b261829978f4c3e8d9d0574c14f48
Parents: 25f2ced
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 6 16:55:45 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 6 16:55:45 2017 +0300
----------------------------------------------------------------------
.../distributed/dht/atomic/GridDhtAtomicCache.java | 9 +++------
.../dht/atomic/GridNearAtomicCheckUpdateRequest.java | 14 +++++++++++++-
2 files changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8961e46d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 5af82b3..d6fdd10 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -3085,16 +3085,13 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
checkReq.futureId(),
false);
+ res.partition(checkReq.partition());
+
GridCacheReturn ret = new GridCacheReturn(false, true);
res.returnValue(ret);
- try {
- ctx.io().send(nodeId, res, ctx.ioPolicy());
- }
- catch (IgniteCheckedException e) {
- e.printStackTrace();
- }
+ sendNearUpdateReply(nodeId, res);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/8961e46d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java
index a30269b..56c1280 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java
@@ -35,6 +35,7 @@ public class GridNearAtomicCheckUpdateRequest extends GridCacheMessage {
/** Cache message index. */
public static final int CACHE_MSG_IDX = nextIndexId();
+ /** */
@GridDirectTransient
private GridNearAtomicAbstractUpdateRequest updateReq;
@@ -51,19 +52,30 @@ public class GridNearAtomicCheckUpdateRequest extends GridCacheMessage {
// No-op.
}
+ /**
+ * @param updateReq Related update request.
+ */
GridNearAtomicCheckUpdateRequest(GridNearAtomicAbstractUpdateRequest updateReq) {
- assert updateReq != null;
+ assert updateReq != null && updateReq.fullSync() : updateReq;
this.updateReq = updateReq;
this.cacheId = updateReq.cacheId();
this.partId = updateReq.partition();
this.futId = updateReq.futureId();
+
+ assert partId >= 0;
}
+ /**
+ * @return Future ID on near node.
+ */
long futureId() {
return futId;
}
+ /**
+ * @return Related update request.
+ */
GridNearAtomicAbstractUpdateRequest updateRequest() {
return updateReq;
}