You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2019/06/19 11:14:32 UTC
[ignite] branch master updated: IGNITE-11916: SQL: Reorder fields
for GridQueryKillResponse and GridQueryKillRequest. This closes #6610.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new f4d0330 IGNITE-11916: SQL: Reorder fields for GridQueryKillResponse and GridQueryKillRequest. This closes #6610.
f4d0330 is described below
commit f4d0330a72c484a9903b0a458a8a9ca3c167db1e
Author: Pavel Kuznetsov <pa...@gmail.com>
AuthorDate: Wed Jun 19 14:14:13 2019 +0300
IGNITE-11916: SQL: Reorder fields for GridQueryKillResponse and GridQueryKillRequest. This closes #6610.
---
.../query/messages/GridQueryKillRequest.java | 10 ++++++----
.../query/messages/GridQueryKillResponse.java | 18 +++++++++++-------
2 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java
index 23e79d5..0c968a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java
@@ -100,7 +100,7 @@ public class GridQueryKillRequest implements Message {
switch (writer.state()) {
case 0:
- if (!writer.writeLong("reqId", reqId))
+ if (!writer.writeBoolean("asyncRes", asyncRes))
return false;
writer.incrementState();
@@ -112,10 +112,11 @@ public class GridQueryKillRequest implements Message {
writer.incrementState();
case 2:
- if(!writer.writeBoolean("asyncRes", asyncRes))
+ if (!writer.writeLong("reqId", reqId))
return false;
writer.incrementState();
+
}
return true;
@@ -130,7 +131,7 @@ public class GridQueryKillRequest implements Message {
switch (reader.state()) {
case 0:
- reqId = reader.readLong("reqId");
+ asyncRes = reader.readBoolean("asyncRes");
if (!reader.isLastRead())
return false;
@@ -146,12 +147,13 @@ public class GridQueryKillRequest implements Message {
reader.incrementState();
case 2:
- asyncRes = reader.readBoolean("asyncRes");
+ reqId = reader.readLong("reqId");
if (!reader.isLastRead())
return false;
reader.incrementState();
+
}
return reader.afterMessageRead(GridQueryKillRequest.class);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java
index e292a31..835a53b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java
@@ -34,11 +34,12 @@ public class GridQueryKillResponse implements Message {
/** */
private static final long serialVersionUID = 0L;
+ /** Error text. */
+ private String errMsg;
+
/** Request id.*/
private long reqId;
- /** Error text. */
- private String errMsg;
/**
* Default constructor.
@@ -89,15 +90,17 @@ public class GridQueryKillResponse implements Message {
switch (writer.state()) {
case 0:
- if (!writer.writeLong("reqId", reqId))
+ if (!writer.writeString("errMsg", errMsg))
return false;
writer.incrementState();
+
case 1:
- if (!writer.writeString("errMsg", errMsg))
+ if (!writer.writeLong("reqId", reqId))
return false;
writer.incrementState();
+
}
return true;
@@ -112,7 +115,7 @@ public class GridQueryKillResponse implements Message {
switch (reader.state()) {
case 0:
- reqId = reader.readLong("reqId");
+ errMsg = reader.readString("errMsg");
if (!reader.isLastRead())
return false;
@@ -120,12 +123,13 @@ public class GridQueryKillResponse implements Message {
reader.incrementState();
case 1:
- errMsg = reader.readString("errMsg");
+ reqId = reader.readLong("reqId");
- if(!reader.isLastRead())
+ if (!reader.isLastRead())
return false;
reader.incrementState();
+
}
return reader.afterMessageRead(GridQueryKillResponse.class);