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 2015/09/03 03:03:25 UTC
[16/50] [abbrv] ignite git commit: IGNITE-264 - Regenerated messages.
http://git-wip-us.apache.org/repos/asf/ignite/blob/4bc5d509/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 517a0bb..80652ac 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
@@ -83,7 +83,7 @@ public class GridNearUnlockRequest extends GridDistributedUnlockRequest {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 7;
+ return 6;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/4bc5d509/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java
index 0f62ae9..95bde28 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java
@@ -186,13 +186,13 @@ public class GridQueryNextPageResponse implements Message {
writer.incrementState();
case 5:
- if (!writer.writeCollection("vals", vals, MessageCollectionItemType.MSG))
+ if (!writer.writeMessage("retry", retry))
return false;
writer.incrementState();
case 6:
- if (!writer.writeMessage("retry", retry))
+ if (!writer.writeCollection("vals", vals, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
@@ -251,7 +251,7 @@ public class GridQueryNextPageResponse implements Message {
reader.incrementState();
case 5:
- vals = reader.readCollection("vals", MessageCollectionItemType.MSG);
+ retry = reader.readMessage("retry");
if (!reader.isLastRead())
return false;
@@ -259,7 +259,7 @@ public class GridQueryNextPageResponse implements Message {
reader.incrementState();
case 6:
- retry = reader.readMessage("retry");
+ vals = reader.readCollection("vals", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
return false;
http://git-wip-us.apache.org/repos/asf/ignite/blob/4bc5d509/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
index 47d1f44..95060e4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
@@ -182,43 +182,43 @@ public class GridQueryRequest implements Message {
switch (writer.state()) {
case 0:
- if (!writer.writeInt("pageSize", pageSize))
+ if (!writer.writeCollection("extraSpaces", extraSpaces, MessageCollectionItemType.STRING))
return false;
writer.incrementState();
case 1:
- if (!writer.writeCollection("qrys", qrys, MessageCollectionItemType.MSG))
+ if (!writer.writeInt("pageSize", pageSize))
return false;
writer.incrementState();
case 2:
- if (!writer.writeLong("reqId", reqId))
+ if (!writer.writeIntArray("parts", parts))
return false;
writer.incrementState();
case 3:
- if (!writer.writeString("space", space))
+ if (!writer.writeCollection("qrys", qrys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
case 4:
- if (!writer.writeMessage("topVer", topVer))
+ if (!writer.writeLong("reqId", reqId))
return false;
writer.incrementState();
case 5:
- if (!writer.writeCollection("extraSpaces", extraSpaces, MessageCollectionItemType.STRING))
+ if (!writer.writeString("space", space))
return false;
writer.incrementState();
case 6:
- if (!writer.writeIntArray("parts", parts))
+ if (!writer.writeMessage("topVer", topVer))
return false;
writer.incrementState();
@@ -236,7 +236,7 @@ public class GridQueryRequest implements Message {
switch (reader.state()) {
case 0:
- pageSize = reader.readInt("pageSize");
+ extraSpaces = reader.readCollection("extraSpaces", MessageCollectionItemType.STRING);
if (!reader.isLastRead())
return false;
@@ -244,7 +244,7 @@ public class GridQueryRequest implements Message {
reader.incrementState();
case 1:
- qrys = reader.readCollection("qrys", MessageCollectionItemType.MSG);
+ pageSize = reader.readInt("pageSize");
if (!reader.isLastRead())
return false;
@@ -252,7 +252,7 @@ public class GridQueryRequest implements Message {
reader.incrementState();
case 2:
- reqId = reader.readLong("reqId");
+ parts = reader.readIntArray("parts");
if (!reader.isLastRead())
return false;
@@ -260,7 +260,7 @@ public class GridQueryRequest implements Message {
reader.incrementState();
case 3:
- space = reader.readString("space");
+ qrys = reader.readCollection("qrys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
return false;
@@ -268,7 +268,7 @@ public class GridQueryRequest implements Message {
reader.incrementState();
case 4:
- topVer = reader.readMessage("topVer");
+ reqId = reader.readLong("reqId");
if (!reader.isLastRead())
return false;
@@ -276,7 +276,7 @@ public class GridQueryRequest implements Message {
reader.incrementState();
case 5:
- extraSpaces = reader.readCollection("extraSpaces", MessageCollectionItemType.STRING);
+ space = reader.readString("space");
if (!reader.isLastRead())
return false;
@@ -284,7 +284,7 @@ public class GridQueryRequest implements Message {
reader.incrementState();
case 6:
- parts = reader.readIntArray("parts");
+ topVer = reader.readMessage("topVer");
if (!reader.isLastRead())
return false;