This is an automated email from the ASF dual-hosted git repository.
sergeychugunov 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 40506167234 IGNITE-25971 Use MessageSerializer for
GridQueryKillRequest and GridQueryKillResponse (#12207)
40506167234 is described below
commit 40506167234f6458d7a4a70743ec515a76cdcad0
Author: Dmitry Werner <[email protected]>
AuthorDate: Fri Jul 25 18:30:25 2025 +0500
IGNITE-25971 Use MessageSerializer for GridQueryKillRequest and
GridQueryKillResponse (#12207)
---
.../communication/GridIoMessageFactory.java | 6 +-
.../query/messages/GridQueryKillRequest.java | 97 ++++++----------------
.../query/messages/GridQueryKillResponse.java | 74 ++++-------------
3 files changed, 45 insertions(+), 132 deletions(-)
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 1fb35c092f9..bc1e0283134 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
@@ -29,6 +29,8 @@ import org.apache.ignite.internal.binary.BinaryUtils;
import org.apache.ignite.internal.codegen.GridCacheEntryInfoSerializer;
import org.apache.ignite.internal.codegen.GridIntListSerializer;
import org.apache.ignite.internal.codegen.GridJobCancelRequestSerializer;
+import org.apache.ignite.internal.codegen.GridQueryKillRequestSerializer;
+import org.apache.ignite.internal.codegen.GridQueryKillResponseSerializer;
import
org.apache.ignite.internal.codegen.MissingMappingRequestMessageSerializer;
import
org.apache.ignite.internal.codegen.MissingMappingResponseMessageSerializer;
import org.apache.ignite.internal.codegen.SessionChannelMessageSerializer;
@@ -328,8 +330,8 @@ public class GridIoMessageFactory implements
MessageFactoryProvider {
factory.register((short)167, ServiceDeploymentProcessId::new);
factory.register((short)168,
ServiceSingleNodeDeploymentResultBatch::new);
factory.register((short)169, ServiceSingleNodeDeploymentResult::new);
- factory.register(GridQueryKillRequest.TYPE_CODE,
GridQueryKillRequest::new);
- factory.register(GridQueryKillResponse.TYPE_CODE,
GridQueryKillResponse::new);
+ factory.register(GridQueryKillRequest.TYPE_CODE,
GridQueryKillRequest::new, new GridQueryKillRequestSerializer());
+ factory.register(GridQueryKillResponse.TYPE_CODE,
GridQueryKillResponse::new, new GridQueryKillResponseSerializer());
factory.register(GridIoSecurityAwareMessage.TYPE_CODE,
GridIoSecurityAwareMessage::new);
factory.register(SessionChannelMessage.TYPE_CODE,
SessionChannelMessage::new, new SessionChannelMessageSerializer());
factory.register(SingleNodeMessage.TYPE_CODE, SingleNodeMessage::new);
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 7e2dc534e14..7723312c939 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
@@ -18,11 +18,9 @@
package org.apache.ignite.internal.processors.query.messages;
-import java.nio.ByteBuffer;
+import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.plugin.extensions.communication.Message;
-import org.apache.ignite.plugin.extensions.communication.MessageReader;
-import org.apache.ignite.plugin.extensions.communication.MessageWriter;
/**
* Query kill request.
@@ -32,12 +30,15 @@ public class GridQueryKillRequest implements Message {
public static final short TYPE_CODE = 172;
/** Request id. */
+ @Order(value = 0, method = "requestId")
private long reqId;
/** Query id on a node. */
+ @Order(1)
private long nodeQryId;
/** Async response flag. */
+ @Order(value = 2, method = "asyncResponse")
private boolean asyncRes;
/**
@@ -65,6 +66,13 @@ public class GridQueryKillRequest implements Message {
return reqId;
}
+ /**
+ * @param reqId New request id.
+ */
+ public void requestId(long reqId) {
+ this.reqId = reqId;
+ }
+
/**
* @return Query id on a node.
*/
@@ -72,6 +80,13 @@ public class GridQueryKillRequest implements Message {
return nodeQryId;
}
+ /**
+ * @param nodeQryId New query id on a node.
+ */
+ public void nodeQryId(long nodeQryId) {
+ this.nodeQryId = nodeQryId;
+ }
+
/**
* @return {@code true} in case response should be send back asynchronous.
*/
@@ -79,78 +94,16 @@ public class GridQueryKillRequest implements Message {
return asyncRes;
}
- /** {@inheritDoc} */
- @Override public void onAckReceived() {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
- writer.setBuffer(buf);
-
- if (!writer.isHeaderWritten()) {
- if (!writer.writeHeader(directType()))
- return false;
-
- writer.onHeaderWritten();
- }
-
- switch (writer.state()) {
- case 0:
- if (!writer.writeBoolean(asyncRes))
- return false;
-
- writer.incrementState();
-
- case 1:
- if (!writer.writeLong(nodeQryId))
- return false;
-
- writer.incrementState();
-
- case 2:
- if (!writer.writeLong(reqId))
- return false;
-
- writer.incrementState();
-
- }
-
- return true;
+ /**
+ * @param asyncRes New async response flag.
+ */
+ public void asyncResponse(boolean asyncRes) {
+ this.asyncRes = asyncRes;
}
/** {@inheritDoc} */
- @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
- reader.setBuffer(buf);
-
- switch (reader.state()) {
- case 0:
- asyncRes = reader.readBoolean();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 1:
- nodeQryId = reader.readLong();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 2:
- reqId = reader.readLong();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- }
-
- return true;
+ @Override public void onAckReceived() {
+ // No-op.
}
/** {@inheritDoc} */
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 ed174404b34..41198f3f145 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
@@ -18,11 +18,9 @@
package org.apache.ignite.internal.processors.query.messages;
-import java.nio.ByteBuffer;
+import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.plugin.extensions.communication.Message;
-import org.apache.ignite.plugin.extensions.communication.MessageReader;
-import org.apache.ignite.plugin.extensions.communication.MessageWriter;
/**
* Query kill response.
@@ -32,9 +30,11 @@ public class GridQueryKillResponse implements Message {
public static final short TYPE_CODE = 173;
/** Error text. */
+ @Order(value = 0, method = "error")
private String errMsg;
/** Request id.*/
+ @Order(value = 1, method = "requestId")
private long reqId;
/**
@@ -60,6 +60,13 @@ public class GridQueryKillResponse implements Message {
return reqId;
}
+ /**
+ * @param reqId New request id.
+ */
+ public void requestId(long reqId) {
+ this.reqId = reqId;
+ }
+
/**
* @return Error text or {@code null} if no error.
*/
@@ -67,67 +74,18 @@ public class GridQueryKillResponse implements Message {
return errMsg;
}
+ /**
+ * @param errMsg New error text.
+ */
+ public void error(String errMsg) {
+ this.errMsg = errMsg;
+ }
/** {@inheritDoc} */
@Override public void onAckReceived() {
// No-op.
}
- /** {@inheritDoc} */
- @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
- writer.setBuffer(buf);
-
- if (!writer.isHeaderWritten()) {
- if (!writer.writeHeader(directType()))
- return false;
-
- writer.onHeaderWritten();
- }
-
- switch (writer.state()) {
- case 0:
- if (!writer.writeString(errMsg))
- return false;
-
- writer.incrementState();
-
- case 1:
- if (!writer.writeLong(reqId))
- return false;
-
- writer.incrementState();
-
- }
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
- reader.setBuffer(buf);
-
- switch (reader.state()) {
- case 0:
- errMsg = reader.readString();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 1:
- reqId = reader.readLong();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- }
-
- return true;
- }
-
/** {@inheritDoc} */
@Override public short directType() {
return TYPE_CODE;
