This is an automated email from the ASF dual-hosted git repository.
timoninmaxim 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 58e2abd8ff4 IGNITE-26120 Use MessageSerializer for
GridTaskCancelRequest (#12244)
58e2abd8ff4 is described below
commit 58e2abd8ff40bfa71c9523d159969b6cfb65511b
Author: Denis <[email protected]>
AuthorDate: Fri Aug 15 16:18:43 2025 +1000
IGNITE-26120 Use MessageSerializer for GridTaskCancelRequest (#12244)
---
.../ignite/internal/GridTaskCancelRequest.java | 52 ++++------------------
.../communication/GridIoMessageFactory.java | 3 +-
2 files changed, 10 insertions(+), 45 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java
index 18c57925a25..4c0e994927d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java
@@ -17,18 +17,16 @@
package org.apache.ignite.internal;
-import java.nio.ByteBuffer;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.plugin.extensions.communication.Message;
-import org.apache.ignite.plugin.extensions.communication.MessageReader;
-import org.apache.ignite.plugin.extensions.communication.MessageWriter;
/**
* Request for cancelling tasks.
*/
public class GridTaskCancelRequest implements Message {
/** */
+ @Order(value = 0, method = "sessionId")
private IgniteUuid sesId;
/**
@@ -56,50 +54,16 @@ public class GridTaskCancelRequest implements Message {
return sesId;
}
- /** {@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.writeIgniteUuid(sesId))
- return false;
-
- writer.incrementState();
-
- }
-
- return true;
+ /**
+ * @param sesId New session ID.
+ */
+ public void sessionId(IgniteUuid sesId) {
+ this.sesId = sesId;
}
/** {@inheritDoc} */
- @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
- reader.setBuffer(buf);
-
- switch (reader.state()) {
- case 0:
- sesId = reader.readIgniteUuid();
-
- 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/managers/communication/GridIoMessageFactory.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index fa145c802d4..84cf72a4e5e 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
@@ -38,6 +38,7 @@ import
org.apache.ignite.internal.codegen.GridJobSiblingsRequestSerializer;
import org.apache.ignite.internal.codegen.GridQueryKillRequestSerializer;
import org.apache.ignite.internal.codegen.GridQueryKillResponseSerializer;
import org.apache.ignite.internal.codegen.GridQueryNextPageRequestSerializer;
+import org.apache.ignite.internal.codegen.GridTaskCancelRequestSerializer;
import org.apache.ignite.internal.codegen.GridTaskResultRequestSerializer;
import org.apache.ignite.internal.codegen.IgniteTxKeySerializer;
import org.apache.ignite.internal.codegen.JobStealingRequestSerializer;
@@ -229,7 +230,7 @@ public class GridIoMessageFactory implements
MessageFactoryProvider {
factory.register((short)2, GridJobExecuteResponse::new);
factory.register((short)3, GridJobSiblingsRequest::new, new
GridJobSiblingsRequestSerializer());
factory.register((short)4, GridJobSiblingsResponse::new);
- factory.register((short)5, GridTaskCancelRequest::new);
+ factory.register((short)5, GridTaskCancelRequest::new, new
GridTaskCancelRequestSerializer());
factory.register((short)6, GridTaskSessionRequest::new);
factory.register((short)7, GridCheckpointRequest::new);
factory.register((short)8, GridIoMessage::new);