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/02/20 12:27:33 UTC
[31/32] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-2.0' into ignite-4705
Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-4705
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e0ed94fe
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e0ed94fe
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e0ed94fe
Branch: refs/heads/ignite-4705
Commit: e0ed94fe0627f58c25f3d1ed8de03ff3ebed8e0c
Parents: 0ef8959
Author: sboikov <sb...@gridgain.com>
Authored: Mon Feb 20 15:08:39 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Feb 20 15:08:39 2017 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheIoManager.java | 2 ++
.../dht/atomic/GridDhtAtomicCache.java | 9 ++++---
.../dht/atomic/GridDhtAtomicNearResponse.java | 27 ++++++++++++++++++--
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 13 +++-------
.../GridNearAtomicSingleUpdateFuture.java | 5 +---
.../atomic/GridNearAtomicUpdateResponse.java | 20 ++++++++++++---
6 files changed, 54 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e0ed94fe/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 82510b2..1d3b714 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
@@ -562,6 +562,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
GridDhtAtomicUpdateResponse res = new GridDhtAtomicUpdateResponse(
ctx.cacheId(),
+ req.partition(),
req.futureId(),
ctx.deploymentEnabled());
@@ -803,6 +804,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
GridDhtAtomicUpdateResponse res = new GridDhtAtomicUpdateResponse(
ctx.cacheId(),
+ req.partition(),
req.futureId(),
ctx.deploymentEnabled());
http://git-wip-us.apache.org/repos/asf/ignite/blob/e0ed94fe/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 eb44414..0bacc2a 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
@@ -3240,7 +3240,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
GridCacheVersion ver = req.writeVersion();
GridDhtAtomicNearResponse nearRes = ctx.config().getWriteSynchronizationMode() == FULL_SYNC ?
- new GridDhtAtomicNearResponse(ctx.cacheId(), req.nearFutureId(), req.dhtNodes(), req.flags()) : null;
+ new GridDhtAtomicNearResponse(req.partition(), ctx.cacheId(), req.nearFutureId(), req.dhtNodes(), req.flags()) : null;
boolean replicate = ctx.isDrEnabled();
@@ -3337,11 +3337,12 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
List<KeyCacheObject> nearEvicted =
((GridNearAtomicCache<K, V>)near()).processDhtAtomicUpdateRequest(nodeId, req, nearRes);
- dhtRes = new GridDhtAtomicUpdateResponse(ctx.cacheId(), req.futureId(), ctx.deploymentEnabled());
+ dhtRes = new GridDhtAtomicUpdateResponse(ctx.cacheId(),
+ req.partition(),
+ req.futureId(),
+ ctx.deploymentEnabled());
dhtRes.nearEvicted(nearEvicted);
-
- dhtRes.partition(req.partition());
}
final boolean RES_AFTER_ACK = false;
http://git-wip-us.apache.org/repos/asf/ignite/blob/e0ed94fe/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java
index 4110b5d..c88e6f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java
@@ -44,6 +44,9 @@ public class GridDhtAtomicNearResponse extends GridCacheMessage {
public static final int CACHE_MSG_IDX = nextIndexId();
/** */
+ private int partId;
+
+ /** */
private long futId;
/** */
@@ -69,13 +72,19 @@ public class GridDhtAtomicNearResponse extends GridCacheMessage {
* @param mapping Update mapping.
* @param flags Flags.
*/
- public GridDhtAtomicNearResponse(int cacheId, long futId, List<UUID> mapping, byte flags) {
+ public GridDhtAtomicNearResponse(int cacheId, int partId, long futId, List<UUID> mapping, byte flags) {
this.cacheId = cacheId;
+ this.partId = partId;
this.futId = futId;
this.mapping = mapping;
this.flags = flags;
}
+ /** {@inheritDoc} */
+ @Override public int partition() {
+ return partId;
+ }
+
/**
* @param key Key.
* @param e Error.
@@ -147,7 +156,7 @@ public class GridDhtAtomicNearResponse extends GridCacheMessage {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 7;
+ return 8;
}
/** {@inheritDoc} */
@@ -210,6 +219,12 @@ public class GridDhtAtomicNearResponse extends GridCacheMessage {
writer.incrementState();
+ case 7:
+ if (!writer.writeInt("partId", partId))
+ return false;
+
+ writer.incrementState();
+
}
return true;
@@ -258,6 +273,14 @@ public class GridDhtAtomicNearResponse extends GridCacheMessage {
reader.incrementState();
+ case 7:
+ partId = reader.readInt("partId");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
}
return reader.afterMessageRead(GridDhtAtomicNearResponse.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/e0ed94fe/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
index 6990409..6d5cef3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
@@ -69,7 +69,7 @@ public class GridDhtAtomicUpdateResponse extends GridCacheMessage implements Gri
private List<KeyCacheObject> nearEvicted;
/** */
- private int partId = -1;
+ private int partId;
/**
* Empty constructor required by {@link Externalizable}.
@@ -80,11 +80,13 @@ public class GridDhtAtomicUpdateResponse extends GridCacheMessage implements Gri
/**
* @param cacheId Cache ID.
+ * @param partId Partition.
* @param futId Future ID.
* @param addDepInfo Deployment info.
*/
- public GridDhtAtomicUpdateResponse(int cacheId, long futId, boolean addDepInfo) {
+ public GridDhtAtomicUpdateResponse(int cacheId, int partId, long futId, boolean addDepInfo) {
this.cacheId = cacheId;
+ this.partId = partId;
this.futId = futId;
this.addDepInfo = addDepInfo;
}
@@ -166,13 +168,6 @@ public class GridDhtAtomicUpdateResponse extends GridCacheMessage implements Gri
this.nearEvicted = nearEvicted;
}
- /**
- * @param partId Partition ID to set.
- */
- public void partition(int partId) {
- this.partId = partId;
- }
-
/** {@inheritDoc} */
@Override public int partition() {
return partId;
http://git-wip-us.apache.org/repos/asf/ignite/blob/e0ed94fe/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 adb6a1c..bc74229 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
@@ -473,15 +473,12 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
/** {@inheritDoc} */
@Override protected void mapOnTopology() {
- // TODO IGNITE-4705: primary should block topology change, so it seem read lock is not needed.
+ // TODO IGNITE-4705: primary should block topology change, so it seems read lock is not needed.
cache.topology().readLock();
AffinityTopologyVersion topVer;
-
Long futId;
- cache.topology().readLock();
-
try {
if (cache.topology().stopping()) {
onDone(new IgniteCheckedException("Failed to perform cache operation (cache is stopped): " +
http://git-wip-us.apache.org/repos/asf/ignite/blob/e0ed94fe/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
index ecb5e1e..1fabead 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
@@ -547,12 +547,18 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr
writer.incrementState();
case 13:
- if (!writer.writeCollection("remapKeys", remapKeys, MessageCollectionItemType.MSG))
+ if (!writer.writeInt("partId", partId))
return false;
writer.incrementState();
case 14:
+ if (!writer.writeCollection("remapKeys", remapKeys, MessageCollectionItemType.MSG))
+ return false;
+
+ writer.incrementState();
+
+ case 15:
if (!writer.writeMessage("ret", ret))
return false;
@@ -655,7 +661,7 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr
reader.incrementState();
case 13:
- remapKeys = reader.readCollection("remapKeys", MessageCollectionItemType.MSG);
+ partId = reader.readInt("partId");
if (!reader.isLastRead())
return false;
@@ -663,6 +669,14 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr
reader.incrementState();
case 14:
+ remapKeys = reader.readCollection("remapKeys", MessageCollectionItemType.MSG);
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 15:
ret = reader.readMessage("ret");
if (!reader.isLastRead())
@@ -682,7 +696,7 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 15;
+ return 16;
}
/** {@inheritDoc} */