(ignite) branch master updated: IGNITE-26660 Use MessageSerializer for QueryCloseMessage (#12414)

[shishkovilja]

This is an automated email from the ASF dual-hosted git repository.

shishkovilja 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 b825740b668 IGNITE-26660 Use MessageSerializer for QueryCloseMessage 
(#12414)
b825740b668 is described below

commit b825740b668199fe875238b9ac89fdaa0e1e10cc
Author: Denis <116185428+denisp...@users.noreply.github.com>
AuthorDate: Wed Oct 22 16:55:26 2025 +1000

    IGNITE-26660 Use MessageSerializer for QueryCloseMessage (#12414)
---
 .../query/calcite/message/MessageType.java         |  3 +-
 .../query/calcite/message/QueryCloseMessage.java   | 48 ++++------------------
 2 files changed, 9 insertions(+), 42 deletions(-)

diff --git 
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageType.java
 
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageType.java
index a86ec3dcf65..abafc9aba1a 100644
--- 
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageType.java
+++ 
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageType.java
@@ -19,6 +19,7 @@ package 
org.apache.ignite.internal.processors.query.calcite.message;
 
 import java.util.function.Supplier;
 import org.apache.ignite.internal.codegen.FragmentDescriptionSerializer;
+import org.apache.ignite.internal.codegen.QueryCloseMessageSerializer;
 import org.apache.ignite.internal.codegen.QueryTxEntrySerializer;
 import 
org.apache.ignite.internal.processors.query.calcite.metadata.ColocationGroup;
 import 
org.apache.ignite.internal.processors.query.calcite.metadata.FragmentDescription;
@@ -48,7 +49,7 @@ public enum MessageType {
     QUERY_INBOX_CANCEL_MESSAGE(305, InboxCloseMessage::new),
 
     /** */
-    QUERY_CLOSE_MESSAGE(306, QueryCloseMessage::new),
+    QUERY_CLOSE_MESSAGE(306, QueryCloseMessage::new, new 
QueryCloseMessageSerializer()),
 
     /** */
     GENERIC_VALUE_MESSAGE(307, GenericValueMessage::new),
diff --git 
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryCloseMessage.java
 
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryCloseMessage.java
index 92e10a4137b..b0544ddd264 100644
--- 
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryCloseMessage.java
+++ 
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryCloseMessage.java
@@ -17,16 +17,15 @@
 
 package org.apache.ignite.internal.processors.query.calcite.message;
 
-import java.nio.ByteBuffer;
 import java.util.UUID;
-import org.apache.ignite.plugin.extensions.communication.MessageReader;
-import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.apache.ignite.internal.Order;
 
 /**
  *
  */
 public class QueryCloseMessage implements CalciteMessage {
     /** */
+    @Order(value = 0, method = "queryId")
     private UUID qryId;
 
     /** */
@@ -46,44 +45,11 @@ public class QueryCloseMessage implements CalciteMessage {
         return qryId;
     }
 
-    /** {@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.writeUuid(qryId))
-                    return false;
-
-                writer.incrementState();
-        }
-
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
-        reader.setBuffer(buf);
-
-        switch (reader.state()) {
-            case 0:
-                qryId = reader.readUuid();
-
-                if (!reader.isLastRead())
-                    return false;
-
-                reader.incrementState();
-
-        }
-
-        return true;
+    /**
+     * @param qryId New query ID.
+     */
+    public void queryId(UUID qryId) {
+        this.qryId = qryId;
     }
 
     /** {@inheritDoc} */