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:02 UTC
[2/2] ignite git commit: IGNITE-3477 - Regenerate NearGetRequest
after merge from master
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} */