You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/03/21 10:23:01 UTC
[1/2] ignite git commit: IGNITE-3477 - Regenerate messages after
merge from master
Repository: ignite
Updated Branches:
refs/heads/ignite-3477-master df265c4db -> f47522211
IGNITE-3477 - Regenerate messages after merge from master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f4752221
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f4752221
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f4752221
Branch: refs/heads/ignite-3477-master
Commit: f475222110e45c9160274a62960d53559fd93b7e
Parents: e561069
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Mar 21 13:19:30 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Mar 21 13:21:36 2017 +0300
----------------------------------------------------------------------
.../distributed/GridDistributedLockRequest.java | 28 ++++++--
.../GridDistributedUnlockRequest.java | 16 ++++-
.../distributed/dht/GridDhtLockRequest.java | 54 ++++++--------
.../distributed/dht/GridDhtUnlockRequest.java | 17 +----
.../distributed/near/GridNearLockRequest.java | 74 ++++++++------------
.../distributed/near/GridNearUnlockRequest.java | 18 -----
.../internal/processors/hadoop/HadoopJobId.java | 10 +--
.../shuffle/HadoopDirectShuffleMessage.java | 22 +++---
.../hadoop/shuffle/HadoopShuffleAck.java | 10 +--
.../hadoop/shuffle/HadoopShuffleMessage.java | 18 ++---
.../twostep/messages/GridQueryFailResponse.java | 10 +--
11 files changed, 122 insertions(+), 155 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f4752221/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
index a671296..2bfa996 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
@@ -423,24 +423,30 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage {
writer.incrementState();
case 16:
- if (!writer.writeBooleanArray("retVals", retVals))
+ if (!writer.writeCollection("partIds", partIds, MessageCollectionItemType.INT))
return false;
writer.incrementState();
case 17:
- if (!writer.writeLong("threadId", threadId))
+ if (!writer.writeBooleanArray("retVals", retVals))
return false;
writer.incrementState();
case 18:
- if (!writer.writeLong("timeout", timeout))
+ if (!writer.writeLong("threadId", threadId))
return false;
writer.incrementState();
case 19:
+ if (!writer.writeLong("timeout", timeout))
+ return false;
+
+ writer.incrementState();
+
+ case 20:
if (!writer.writeInt("txSize", txSize))
return false;
@@ -539,7 +545,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage {
reader.incrementState();
case 16:
- retVals = reader.readBooleanArray("retVals");
+ partIds = reader.readCollection("partIds", MessageCollectionItemType.INT);
if (!reader.isLastRead())
return false;
@@ -547,7 +553,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage {
reader.incrementState();
case 17:
- threadId = reader.readLong("threadId");
+ retVals = reader.readBooleanArray("retVals");
if (!reader.isLastRead())
return false;
@@ -555,7 +561,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage {
reader.incrementState();
case 18:
- timeout = reader.readLong("timeout");
+ threadId = reader.readLong("threadId");
if (!reader.isLastRead())
return false;
@@ -563,6 +569,14 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage {
reader.incrementState();
case 19:
+ timeout = reader.readLong("timeout");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 20:
txSize = reader.readInt("txSize");
if (!reader.isLastRead())
@@ -582,7 +596,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 20;
+ return 21;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/f4752221/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
index 5d70ec1..fcb2dcc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
@@ -142,6 +142,12 @@ public class GridDistributedUnlockRequest extends GridDistributedBaseMessage {
writer.incrementState();
+ case 8:
+ if (!writer.writeCollection("partIds", partIds, MessageCollectionItemType.INT))
+ return false;
+
+ writer.incrementState();
+
}
return true;
@@ -166,6 +172,14 @@ public class GridDistributedUnlockRequest extends GridDistributedBaseMessage {
reader.incrementState();
+ case 8:
+ partIds = reader.readCollection("partIds", MessageCollectionItemType.INT);
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
}
return reader.afterMessageRead(GridDistributedUnlockRequest.class);
@@ -178,7 +192,7 @@ public class GridDistributedUnlockRequest extends GridDistributedBaseMessage {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 8;
+ return 9;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/f4752221/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
index 95c6dfc..8eac823 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
@@ -359,68 +359,62 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
}
switch (writer.state()) {
- case 20:
- if (!writer.writeLong("accessTtl", accessTtl))
- return false;
-
- writer.incrementState();
-
case 21:
- if (!writer.writeBitSet("invalidateEntries", invalidateEntries))
+ if (!writer.writeLong("accessTtl", accessTtl))
return false;
writer.incrementState();
case 22:
- if (!writer.writeIgniteUuid("miniId", miniId))
+ if (!writer.writeBitSet("invalidateEntries", invalidateEntries))
return false;
writer.incrementState();
case 23:
- if (!writer.writeCollection("nearKeys", nearKeys, MessageCollectionItemType.MSG))
+ if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
case 24:
- if (!writer.writeObjectArray("ownedKeys", ownedKeys, MessageCollectionItemType.MSG))
+ if (!writer.writeCollection("nearKeys", nearKeys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
case 25:
- if (!writer.writeObjectArray("ownedValues", ownedValues, MessageCollectionItemType.MSG))
+ if (!writer.writeObjectArray("ownedKeys", ownedKeys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
case 26:
- if (!writer.writeBitSet("preloadKeys", preloadKeys))
+ if (!writer.writeObjectArray("ownedValues", ownedValues, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
case 27:
- if (!writer.writeUuid("subjId", subjId))
+ if (!writer.writeBitSet("preloadKeys", preloadKeys))
return false;
writer.incrementState();
case 28:
- if (!writer.writeInt("taskNameHash", taskNameHash))
+ if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
case 29:
- if (!writer.writeMessage("topVer", topVer))
+ if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
case 30:
- if (!writer.writeCollection("partIds", partIds, MessageCollectionItemType.INT))
+ if (!writer.writeMessage("topVer", topVer))
return false;
writer.incrementState();
@@ -441,16 +435,8 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
return false;
switch (reader.state()) {
- case 20:
- accessTtl = reader.readLong("accessTtl");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
case 21:
- invalidateEntries = reader.readBitSet("invalidateEntries");
+ accessTtl = reader.readLong("accessTtl");
if (!reader.isLastRead())
return false;
@@ -458,7 +444,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 22:
- miniId = reader.readIgniteUuid("miniId");
+ invalidateEntries = reader.readBitSet("invalidateEntries");
if (!reader.isLastRead())
return false;
@@ -466,7 +452,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 23:
- nearKeys = reader.readCollection("nearKeys", MessageCollectionItemType.MSG);
+ miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
return false;
@@ -474,7 +460,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 24:
- ownedKeys = reader.readObjectArray("ownedKeys", MessageCollectionItemType.MSG, KeyCacheObject.class);
+ nearKeys = reader.readCollection("nearKeys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
return false;
@@ -482,7 +468,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 25:
- ownedValues = reader.readObjectArray("ownedValues", MessageCollectionItemType.MSG, GridCacheVersion.class);
+ ownedKeys = reader.readObjectArray("ownedKeys", MessageCollectionItemType.MSG, KeyCacheObject.class);
if (!reader.isLastRead())
return false;
@@ -490,7 +476,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 26:
- preloadKeys = reader.readBitSet("preloadKeys");
+ ownedValues = reader.readObjectArray("ownedValues", MessageCollectionItemType.MSG, GridCacheVersion.class);
if (!reader.isLastRead())
return false;
@@ -498,7 +484,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 27:
- subjId = reader.readUuid("subjId");
+ preloadKeys = reader.readBitSet("preloadKeys");
if (!reader.isLastRead())
return false;
@@ -506,7 +492,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 28:
- taskNameHash = reader.readInt("taskNameHash");
+ subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
return false;
@@ -514,7 +500,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 29:
- topVer = reader.readMessage("topVer");
+ taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
return false;
@@ -522,7 +508,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 30:
- partIds = reader.readCollection("partIds", MessageCollectionItemType.INT);
+ topVer = reader.readMessage("topVer");
if (!reader.isLastRead())
return false;
http://git-wip-us.apache.org/repos/asf/ignite/blob/f4752221/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
index 3737295..0c273f1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
@@ -113,17 +113,12 @@ public class GridDhtUnlockRequest extends GridDistributedUnlockRequest {
}
switch (writer.state()) {
- case 8:
+ case 9:
if (!writer.writeCollection("nearKeys", nearKeys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 9:
- if (!writer.writeCollection("partIds", partIds, MessageCollectionItemType.INT))
- return false;
-
- writer.incrementState();
}
return true;
@@ -140,16 +135,8 @@ public class GridDhtUnlockRequest extends GridDistributedUnlockRequest {
return false;
switch (reader.state()) {
- case 8:
- nearKeys = reader.readCollection("nearKeys", MessageCollectionItemType.MSG);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
case 9:
- partIds = reader.readCollection("partIds", MessageCollectionItemType.INT);
+ nearKeys = reader.readCollection("nearKeys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
return false;
http://git-wip-us.apache.org/repos/asf/ignite/blob/f4752221/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
index 9e12153..ec4b9e5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
@@ -374,98 +374,92 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
}
switch (writer.state()) {
- case 20:
- if (!writer.writeLong("accessTtl", accessTtl))
- return false;
-
- writer.incrementState();
-
case 21:
- if (!writer.writeLong("createTtl", createTtl))
+ if (!writer.writeLong("accessTtl", accessTtl))
return false;
writer.incrementState();
case 22:
- if (!writer.writeObjectArray("dhtVers", dhtVers, MessageCollectionItemType.MSG))
+ if (!writer.writeLong("createTtl", createTtl))
return false;
writer.incrementState();
case 23:
- if (!writer.writeObjectArray("filter", filter, MessageCollectionItemType.MSG))
+ if (!writer.writeObjectArray("dhtVers", dhtVers, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
case 24:
- if (!writer.writeBoolean("firstClientReq", firstClientReq))
+ if (!writer.writeObjectArray("filter", filter, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
case 25:
- if (!writer.writeBoolean("hasTransforms", hasTransforms))
+ if (!writer.writeBoolean("firstClientReq", firstClientReq))
return false;
writer.incrementState();
case 26:
- if (!writer.writeBoolean("implicitSingleTx", implicitSingleTx))
+ if (!writer.writeBoolean("hasTransforms", hasTransforms))
return false;
writer.incrementState();
case 27:
- if (!writer.writeBoolean("implicitTx", implicitTx))
+ if (!writer.writeBoolean("implicitSingleTx", implicitSingleTx))
return false;
writer.incrementState();
case 28:
- if (!writer.writeIgniteUuid("miniId", miniId))
+ if (!writer.writeBoolean("implicitTx", implicitTx))
return false;
writer.incrementState();
case 29:
- if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit))
+ if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
case 30:
- if (!writer.writeBoolean("retVal", retVal))
+ if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit))
return false;
writer.incrementState();
case 31:
- if (!writer.writeUuid("subjId", subjId))
+ if (!writer.writeBoolean("retVal", retVal))
return false;
writer.incrementState();
case 32:
- if (!writer.writeBoolean("syncCommit", syncCommit))
+ if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
case 33:
- if (!writer.writeInt("taskNameHash", taskNameHash))
+ if (!writer.writeBoolean("syncCommit", syncCommit))
return false;
writer.incrementState();
case 34:
- if (!writer.writeMessage("topVer", topVer))
+ if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
case 35:
- if (!writer.writeCollection("partIds", partIds, MessageCollectionItemType.INT))
+ if (!writer.writeMessage("topVer", topVer))
return false;
writer.incrementState();
@@ -486,16 +480,8 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
return false;
switch (reader.state()) {
- case 20:
- accessTtl = reader.readLong("accessTtl");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
case 21:
- createTtl = reader.readLong("createTtl");
+ accessTtl = reader.readLong("accessTtl");
if (!reader.isLastRead())
return false;
@@ -503,7 +489,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 22:
- dhtVers = reader.readObjectArray("dhtVers", MessageCollectionItemType.MSG, GridCacheVersion.class);
+ createTtl = reader.readLong("createTtl");
if (!reader.isLastRead())
return false;
@@ -511,7 +497,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 23:
- filter = reader.readObjectArray("filter", MessageCollectionItemType.MSG, CacheEntryPredicate.class);
+ dhtVers = reader.readObjectArray("dhtVers", MessageCollectionItemType.MSG, GridCacheVersion.class);
if (!reader.isLastRead())
return false;
@@ -519,7 +505,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 24:
- firstClientReq = reader.readBoolean("firstClientReq");
+ filter = reader.readObjectArray("filter", MessageCollectionItemType.MSG, CacheEntryPredicate.class);
if (!reader.isLastRead())
return false;
@@ -527,7 +513,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 25:
- hasTransforms = reader.readBoolean("hasTransforms");
+ firstClientReq = reader.readBoolean("firstClientReq");
if (!reader.isLastRead())
return false;
@@ -535,7 +521,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 26:
- implicitSingleTx = reader.readBoolean("implicitSingleTx");
+ hasTransforms = reader.readBoolean("hasTransforms");
if (!reader.isLastRead())
return false;
@@ -543,7 +529,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 27:
- implicitTx = reader.readBoolean("implicitTx");
+ implicitSingleTx = reader.readBoolean("implicitSingleTx");
if (!reader.isLastRead())
return false;
@@ -551,7 +537,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 28:
- miniId = reader.readIgniteUuid("miniId");
+ implicitTx = reader.readBoolean("implicitTx");
if (!reader.isLastRead())
return false;
@@ -559,7 +545,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 29:
- onePhaseCommit = reader.readBoolean("onePhaseCommit");
+ miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
return false;
@@ -567,7 +553,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 30:
- retVal = reader.readBoolean("retVal");
+ onePhaseCommit = reader.readBoolean("onePhaseCommit");
if (!reader.isLastRead())
return false;
@@ -575,7 +561,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 31:
- subjId = reader.readUuid("subjId");
+ retVal = reader.readBoolean("retVal");
if (!reader.isLastRead())
return false;
@@ -583,7 +569,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 32:
- syncCommit = reader.readBoolean("syncCommit");
+ subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
return false;
@@ -591,7 +577,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 33:
- taskNameHash = reader.readInt("taskNameHash");
+ syncCommit = reader.readBoolean("syncCommit");
if (!reader.isLastRead())
return false;
@@ -599,7 +585,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 34:
- topVer = reader.readMessage("topVer");
+ taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
return false;
@@ -607,7 +593,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 35:
- partIds = reader.readCollection("partIds", MessageCollectionItemType.INT);
+ topVer = reader.readMessage("topVer");
if (!reader.isLastRead())
return false;
http://git-wip-us.apache.org/repos/asf/ignite/blob/f4752221/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java
index be78868..79eb5cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java
@@ -62,14 +62,6 @@ public class GridNearUnlockRequest extends GridDistributedUnlockRequest {
writer.onHeaderWritten();
}
- switch (writer.state()) {
- case 8:
- if (!writer.writeCollection("partIds", partIds, MessageCollectionItemType.INT))
- return false;
-
- writer.incrementState();
- }
-
return true;
}
@@ -83,16 +75,6 @@ public class GridNearUnlockRequest extends GridDistributedUnlockRequest {
if (!super.readFrom(buf, reader))
return false;
- switch (reader.state()) {
- case 8:
- partIds = reader.readCollection("partIds", MessageCollectionItemType.INT);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
- }
-
return reader.afterMessageRead(GridNearUnlockRequest.class);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f4752221/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobId.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobId.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobId.java
index 761b904..7389a7a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobId.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobId.java
@@ -79,13 +79,13 @@ public class HadoopJobId implements Message, GridCacheInternal, Externalizable {
switch (writer.state()) {
case 0:
- if (!writer.writeUuid("nodeId", nodeId))
+ if (!writer.writeInt("jobId", jobId))
return false;
writer.incrementState();
case 1:
- if (!writer.writeInt("localId", jobId))
+ if (!writer.writeUuid("nodeId", nodeId))
return false;
writer.incrementState();
@@ -104,7 +104,7 @@ public class HadoopJobId implements Message, GridCacheInternal, Externalizable {
switch (reader.state()) {
case 0:
- nodeId = reader.readUuid("nodeId");
+ jobId = reader.readInt("jobId");
if (!reader.isLastRead())
return false;
@@ -112,7 +112,7 @@ public class HadoopJobId implements Message, GridCacheInternal, Externalizable {
reader.incrementState();
case 1:
- jobId = reader.readInt("jobId");
+ nodeId = reader.readUuid("nodeId");
if (!reader.isLastRead())
return false;
@@ -179,4 +179,4 @@ public class HadoopJobId implements Message, GridCacheInternal, Externalizable {
@Override public String toString() {
return nodeId + "_" + jobId;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f4752221/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopDirectShuffleMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopDirectShuffleMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopDirectShuffleMessage.java
index f596100..2056aba 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopDirectShuffleMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopDirectShuffleMessage.java
@@ -136,31 +136,31 @@ public class HadoopDirectShuffleMessage implements Message, HadoopMessage {
switch (writer.state()) {
case 0:
- if (!writer.writeMessage("jobId", jobId))
+ if (!writer.writeByteArray("buf", this.buf))
return false;
writer.incrementState();
case 1:
- if (!writer.writeInt("reducer", reducer))
+ if (!writer.writeInt("cnt", cnt))
return false;
writer.incrementState();
case 2:
- if (!writer.writeInt("cnt", cnt))
+ if (!writer.writeInt("dataLen", dataLen))
return false;
writer.incrementState();
case 3:
- if (!writer.writeByteArray("buf", this.buf, 0, bufLen))
+ if (!writer.writeMessage("jobId", jobId))
return false;
writer.incrementState();
case 4:
- if (!writer.writeInt("dataLen", dataLen))
+ if (!writer.writeInt("reducer", reducer))
return false;
writer.incrementState();
@@ -179,7 +179,7 @@ public class HadoopDirectShuffleMessage implements Message, HadoopMessage {
switch (reader.state()) {
case 0:
- jobId = reader.readMessage("jobId");
+ this.buf = reader.readByteArray("buf");
if (!reader.isLastRead())
return false;
@@ -187,7 +187,7 @@ public class HadoopDirectShuffleMessage implements Message, HadoopMessage {
reader.incrementState();
case 1:
- reducer = reader.readInt("reducer");
+ cnt = reader.readInt("cnt");
if (!reader.isLastRead())
return false;
@@ -195,7 +195,7 @@ public class HadoopDirectShuffleMessage implements Message, HadoopMessage {
reader.incrementState();
case 2:
- cnt = reader.readInt("cnt");
+ dataLen = reader.readInt("dataLen");
if (!reader.isLastRead())
return false;
@@ -203,17 +203,15 @@ public class HadoopDirectShuffleMessage implements Message, HadoopMessage {
reader.incrementState();
case 3:
- this.buf = reader.readByteArray("buf");
+ jobId = reader.readMessage("jobId");
if (!reader.isLastRead())
return false;
- bufLen = this.buf != null ? this.buf.length : 0;
-
reader.incrementState();
case 4:
- dataLen = reader.readInt("dataLen");
+ reducer = reader.readInt("reducer");
if (!reader.isLastRead())
return false;
http://git-wip-us.apache.org/repos/asf/ignite/blob/f4752221/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleAck.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleAck.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleAck.java
index 9a03f99..fad1d63 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleAck.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleAck.java
@@ -89,13 +89,13 @@ public class HadoopShuffleAck implements HadoopMessage, Message {
switch (writer.state()) {
case 0:
- if (!writer.writeLong("msgId", msgId))
+ if (!writer.writeMessage("jobId", jobId))
return false;
writer.incrementState();
case 1:
- if (!writer.writeMessage("jobId", jobId))
+ if (!writer.writeLong("msgId", msgId))
return false;
writer.incrementState();
@@ -114,7 +114,7 @@ public class HadoopShuffleAck implements HadoopMessage, Message {
switch (reader.state()) {
case 0:
- msgId = reader.readLong("msgId");
+ jobId = reader.readMessage("jobId");
if (!reader.isLastRead())
return false;
@@ -122,7 +122,7 @@ public class HadoopShuffleAck implements HadoopMessage, Message {
reader.incrementState();
case 1:
- jobId = reader.readMessage("jobId");
+ msgId = reader.readLong("msgId");
if (!reader.isLastRead())
return false;
@@ -167,4 +167,4 @@ public class HadoopShuffleAck implements HadoopMessage, Message {
@Override public String toString() {
return S.toString(HadoopShuffleAck.class, this);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f4752221/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleMessage.java
index af54dcc..222448b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleMessage.java
@@ -213,7 +213,7 @@ public class HadoopShuffleMessage implements Message, HadoopMessage {
switch (writer.state()) {
case 0:
- if (!writer.writeLong("msgId", msgId))
+ if (!writer.writeByteArray("buf", this.buf))
return false;
writer.incrementState();
@@ -225,19 +225,19 @@ public class HadoopShuffleMessage implements Message, HadoopMessage {
writer.incrementState();
case 2:
- if (!writer.writeInt("reducer", reducer))
+ if (!writer.writeLong("msgId", msgId))
return false;
writer.incrementState();
case 3:
- if (!writer.writeByteArray("buf", this.buf))
+ if (!writer.writeInt("off", off))
return false;
writer.incrementState();
case 4:
- if (!writer.writeInt("off", off))
+ if (!writer.writeInt("reducer", reducer))
return false;
writer.incrementState();
@@ -256,7 +256,7 @@ public class HadoopShuffleMessage implements Message, HadoopMessage {
switch (reader.state()) {
case 0:
- msgId = reader.readLong("msgId");
+ this.buf = reader.readByteArray("buf");
if (!reader.isLastRead())
return false;
@@ -272,7 +272,7 @@ public class HadoopShuffleMessage implements Message, HadoopMessage {
reader.incrementState();
case 2:
- reducer = reader.readInt("reducer");
+ msgId = reader.readLong("msgId");
if (!reader.isLastRead())
return false;
@@ -280,7 +280,7 @@ public class HadoopShuffleMessage implements Message, HadoopMessage {
reader.incrementState();
case 3:
- this.buf = reader.readByteArray("buf");
+ off = reader.readInt("off");
if (!reader.isLastRead())
return false;
@@ -288,7 +288,7 @@ public class HadoopShuffleMessage implements Message, HadoopMessage {
reader.incrementState();
case 4:
- off = reader.readInt("off");
+ reducer = reader.readInt("reducer");
if (!reader.isLastRead())
return false;
@@ -358,4 +358,4 @@ public class HadoopShuffleMessage implements Message, HadoopMessage {
*/
public void onValue(byte[] buf, int off, int len) throws IgniteCheckedException;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f4752221/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
index 0baf6ea..261241e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
@@ -113,13 +113,13 @@ public class GridQueryFailResponse implements Message {
writer.incrementState();
case 1:
- if (!writer.writeLong("qryReqId", qryReqId))
+ if (!writer.writeByte("failCode", failCode))
return false;
writer.incrementState();
case 2:
- if (!writer.writeByte("failCode", failCode))
+ if (!writer.writeLong("qryReqId", qryReqId))
return false;
writer.incrementState();
@@ -146,7 +146,7 @@ public class GridQueryFailResponse implements Message {
reader.incrementState();
case 1:
- qryReqId = reader.readLong("qryReqId");
+ failCode = reader.readByte("failCode");
if (!reader.isLastRead())
return false;
@@ -154,7 +154,7 @@ public class GridQueryFailResponse implements Message {
reader.incrementState();
case 2:
- failCode = reader.readByte("failCode");
+ qryReqId = reader.readLong("qryReqId");
if (!reader.isLastRead())
return false;
@@ -175,4 +175,4 @@ public class GridQueryFailResponse implements Message {
@Override public byte fieldsCount() {
return 3;
}
-}
\ No newline at end of file
+}
[2/2] ignite git commit: IGNITE-3477 - Regenerate NearGetRequest
after merge from master
Posted by ag...@apache.org.
IGNITE-3477 - Regenerate NearGetRequest after merge from master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e561069c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e561069c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e561069c
Branch: refs/heads/ignite-3477-master
Commit: e561069c9f4acfa7d8d133573304e5c58679625f
Parents: df265c4
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Mar 21 13:06:51 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Mar 21 13:21:36 2017 +0300
----------------------------------------------------------------------
.../communication/GridIoMessageFactory.java | 1 -
.../distributed/near/GridNearGetRequest.java | 38 +++++++++++++-------
2 files changed, 26 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e561069c/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 979e8db..afe4a8e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -179,7 +179,6 @@ public class GridIoMessageFactory implements MessageFactory {
break;
-
case -46:
msg = new GridChangeGlobalStateMessageResponse();
http://git-wip-us.apache.org/repos/asf/ignite/blob/e561069c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
index dbf8391..12b5204 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
@@ -392,36 +392,42 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
writer.incrementState();
case 11:
- if (!writer.writeBoolean("reload", reload))
+ if (!writer.writeBoolean("recovery", recovery))
return false;
writer.incrementState();
case 12:
- if (!writer.writeBoolean("skipVals", skipVals))
+ if (!writer.writeBoolean("reload", reload))
return false;
writer.incrementState();
case 13:
- if (!writer.writeUuid("subjId", subjId))
+ if (!writer.writeBoolean("skipVals", skipVals))
return false;
writer.incrementState();
case 14:
- if (!writer.writeInt("taskNameHash", taskNameHash))
+ if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
case 15:
- if (!writer.writeMessage("topVer", topVer))
+ if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
case 16:
+ if (!writer.writeMessage("topVer", topVer))
+ return false;
+
+ writer.incrementState();
+
+ case 17:
if (!writer.writeMessage("ver", ver))
return false;
@@ -484,7 +490,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
reader.incrementState();
case 8:
- partIds = reader.readCollection("partIds", MessageCollectionItemType.INT);
+ miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
return false;
@@ -508,7 +514,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
reader.incrementState();
case 11:
- reload = reader.readBoolean("reload");
+ recovery = reader.readBoolean("recovery");
if (!reader.isLastRead())
return false;
@@ -516,7 +522,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
reader.incrementState();
case 12:
- skipVals = reader.readBoolean("skipVals");
+ reload = reader.readBoolean("reload");
if (!reader.isLastRead())
return false;
@@ -524,7 +530,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
reader.incrementState();
case 13:
- subjId = reader.readUuid("subjId");
+ skipVals = reader.readBoolean("skipVals");
if (!reader.isLastRead())
return false;
@@ -532,7 +538,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
reader.incrementState();
case 14:
- taskNameHash = reader.readInt("taskNameHash");
+ subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
return false;
@@ -540,7 +546,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
reader.incrementState();
case 15:
- topVer = reader.readMessage("topVer");
+ taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
return false;
@@ -548,6 +554,14 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
reader.incrementState();
case 16:
+ topVer = reader.readMessage("topVer");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 17:
ver = reader.readMessage("ver");
if (!reader.isLastRead())
@@ -567,7 +581,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 17;
+ return 18;
}
/** {@inheritDoc} */