This is an automated email from the ASF dual-hosted git repository.
av 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 a2b257cc7f5 IGNITE-27936 Use MessageSerializer for
GridContinuousMessage (#12787)
a2b257cc7f5 is described below
commit a2b257cc7f582ad3ccb79088292e926fdec9a107
Author: Dmitry Werner <[email protected]>
AuthorDate: Tue Feb 24 12:40:52 2026 +0500
IGNITE-27936 Use MessageSerializer for GridContinuousMessage (#12787)
---
.../communication/GridIoMessageFactory.java | 3 +-
.../continuous/GridContinuousMessage.java | 125 ++-------------------
2 files changed, 13 insertions(+), 115 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 82782d56a74..222562a4b4e 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
@@ -270,6 +270,7 @@ import
org.apache.ignite.internal.processors.cluster.NodeMetricsMessageSerialize
import
org.apache.ignite.internal.processors.continuous.ContinuousRoutineStartResultMessage;
import
org.apache.ignite.internal.processors.continuous.ContinuousRoutineStartResultMessageSerializer;
import org.apache.ignite.internal.processors.continuous.GridContinuousMessage;
+import
org.apache.ignite.internal.processors.continuous.GridContinuousMessageSerializer;
import org.apache.ignite.internal.processors.datastreamer.DataStreamerEntry;
import org.apache.ignite.internal.processors.datastreamer.DataStreamerRequest;
import org.apache.ignite.internal.processors.datastreamer.DataStreamerResponse;
@@ -417,7 +418,7 @@ public class GridIoMessageFactory implements
MessageFactoryProvider {
factory.register((short)57, GridNearUnlockRequest::new, new
GridNearUnlockRequestSerializer());
factory.register((short)58, GridCacheQueryRequest::new, new
GridCacheQueryRequestSerializer());
factory.register((short)59, GridCacheQueryResponse::new, new
GridCacheQueryResponseSerializer());
- factory.register((short)61, GridContinuousMessage::new);
+ factory.register((short)61, GridContinuousMessage::new, new
GridContinuousMessageSerializer());
factory.register((short)62, DataStreamerRequest::new);
factory.register((short)63, DataStreamerResponse::new, new
DataStreamerResponseSerializer());
factory.register((short)76, GridTaskResultRequest::new, new
GridTaskResultRequestSerializer());
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java
index 03227406708..67e9b9f18ea 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java
@@ -17,18 +17,13 @@
package org.apache.ignite.internal.processors.continuous;
-import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.UUID;
-import org.apache.ignite.internal.GridDirectCollection;
-import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
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.MessageCollectionItemType;
-import org.apache.ignite.plugin.extensions.communication.MessageReader;
-import org.apache.ignite.plugin.extensions.communication.MessageWriter;
import org.jetbrains.annotations.Nullable;
import static
org.apache.ignite.internal.processors.continuous.GridContinuousMessageType.MSG_EVT_ACK;
@@ -38,25 +33,28 @@ import static
org.apache.ignite.internal.processors.continuous.GridContinuousMes
*/
public class GridContinuousMessage implements Message {
/** Message type. */
- private GridContinuousMessageType type;
+ @Order(0)
+ GridContinuousMessageType type;
/** Routine ID. */
- private UUID routineId;
+ @Order(1)
+ UUID routineId;
/** Optional message data. */
@GridToStringInclude(sensitive = true)
- @GridDirectTransient
private Object data;
/** */
- @GridDirectCollection(Message.class)
- private Collection<Message> msgs;
+ @Order(2)
+ Collection<Message> msgs;
/** Serialized message data. */
- private byte[] dataBytes;
+ @Order(3)
+ byte[] dataBytes;
/** Future ID for synchronous event notifications. */
- private IgniteUuid futId;
+ @Order(4)
+ IgniteUuid futId;
/**
* Empty constructor.
@@ -146,107 +144,6 @@ public class GridContinuousMessage implements Message {
return futId;
}
- /** {@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.writeByteArray(dataBytes))
- return false;
-
- writer.incrementState();
-
- case 1:
- if (!writer.writeIgniteUuid(futId))
- return false;
-
- writer.incrementState();
-
- case 2:
- if (!writer.writeCollection(msgs,
MessageCollectionItemType.MSG))
- return false;
-
- writer.incrementState();
-
- case 3:
- if (!writer.writeUuid(routineId))
- return false;
-
- writer.incrementState();
-
- case 4:
- if (!writer.writeByte(type != null ? (byte)type.ordinal() :
-1))
- return false;
-
- writer.incrementState();
-
- }
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
- reader.setBuffer(buf);
-
- switch (reader.state()) {
- case 0:
- dataBytes = reader.readByteArray();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 1:
- futId = reader.readIgniteUuid();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 2:
- msgs = reader.readCollection(MessageCollectionItemType.MSG);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 3:
- routineId = reader.readUuid();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 4:
- byte typeOrd;
-
- typeOrd = reader.readByte();
-
- if (!reader.isLastRead())
- return false;
-
- type = GridContinuousMessageType.fromOrdinal(typeOrd);
-
- reader.incrementState();
-
- }
-
- return true;
- }
-
/** {@inheritDoc} */
@Override public short directType() {
return 61;
