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 29f5f27ebda IGNITE-28038 Use MessageSerializer for
StopRoutineAckDiscoveryMessage, StopRoutineDiscoveryMessage (#12847)
29f5f27ebda is described below
commit 29f5f27ebdab8bf5654ce1e27c5d99aadceddb2b
Author: Aleksandr Chesnokov <[email protected]>
AuthorDate: Fri Mar 6 16:08:17 2026 +0300
IGNITE-28038 Use MessageSerializer for StopRoutineAckDiscoveryMessage,
StopRoutineDiscoveryMessage (#12847)
---
.../managers/discovery/DiscoveryMessageFactory.java | 6 ++++++
.../processors/continuous/AbstractContinuousMessage.java | 13 +++++++++++--
.../continuous/StopRoutineAckDiscoveryMessage.java | 13 ++++++++++++-
.../processors/continuous/StopRoutineDiscoveryMessage.java | 13 ++++++++++++-
4 files changed, 41 insertions(+), 4 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
index 66189823f4a..943291439f9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
@@ -43,6 +43,10 @@ import
org.apache.ignite.internal.processors.cache.binary.MetadataUpdateAccepted
import
org.apache.ignite.internal.processors.cache.binary.MetadataUpdateAcceptedMessageSerializer;
import
org.apache.ignite.internal.processors.cluster.ChangeGlobalStateFinishMessage;
import
org.apache.ignite.internal.processors.cluster.ChangeGlobalStateFinishMessageSerializer;
+import
org.apache.ignite.internal.processors.continuous.StopRoutineAckDiscoveryMessage;
+import
org.apache.ignite.internal.processors.continuous.StopRoutineAckDiscoveryMessageSerializer;
+import
org.apache.ignite.internal.processors.continuous.StopRoutineDiscoveryMessage;
+import
org.apache.ignite.internal.processors.continuous.StopRoutineDiscoveryMessageSerializer;
import
org.apache.ignite.internal.processors.query.schema.message.SchemaFinishDiscoveryMessage;
import
org.apache.ignite.internal.processors.query.schema.message.SchemaFinishDiscoveryMessageSerializer;
import
org.apache.ignite.internal.processors.query.schema.message.SchemaProposeDiscoveryMessage;
@@ -174,5 +178,7 @@ public class DiscoveryMessageFactory implements
MessageFactoryProvider {
factory.register((short)510, UserAcceptedMessage::new, new
UserAcceptedMessageSerializer());
factory.register((short)511, UserProposedMessage::new, new
UserProposedMessageSerializer());
factory.register((short)512, ChangeGlobalStateFinishMessage::new, new
ChangeGlobalStateFinishMessageSerializer());
+ factory.register((short)513, StopRoutineAckDiscoveryMessage::new, new
StopRoutineAckDiscoveryMessageSerializer());
+ factory.register((short)514, StopRoutineDiscoveryMessage::new, new
StopRoutineDiscoveryMessageSerializer());
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java
index eab346afd7b..64d3f98fb1c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.continuous;
import java.util.UUID;
+import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
import org.apache.ignite.lang.IgniteUuid;
@@ -29,16 +30,24 @@ public abstract class AbstractContinuousMessage implements
DiscoveryCustomMessag
private static final long serialVersionUID = 2781778657738703012L;
/** Routine ID. */
- protected final UUID routineId;
+ @Order(0)
+ UUID routineId;
/** Custom message ID. */
- private final IgniteUuid id = IgniteUuid.randomUuid();
+ @Order(1)
+ IgniteUuid id;
+
+ /** */
+ protected AbstractContinuousMessage() {
+ // No-op.
+ }
/**
* @param id Id.
*/
protected AbstractContinuousMessage(UUID id) {
routineId = id;
+ this.id = IgniteUuid.randomUuid();
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
index 79d8b29a240..3ffd004bbc2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
@@ -20,15 +20,21 @@ package org.apache.ignite.internal.processors.continuous;
import java.util.UUID;
import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.Message;
import org.jetbrains.annotations.Nullable;
/**
*
*/
-public class StopRoutineAckDiscoveryMessage extends AbstractContinuousMessage {
+public class StopRoutineAckDiscoveryMessage extends AbstractContinuousMessage
implements Message {
/** */
private static final long serialVersionUID = 0L;
+ /** */
+ public StopRoutineAckDiscoveryMessage() {
+ // No-op.
+ }
+
/**
* @param routineId Routine id.
*/
@@ -45,4 +51,9 @@ public class StopRoutineAckDiscoveryMessage extends
AbstractContinuousMessage {
@Override public String toString() {
return S.toString(StopRoutineAckDiscoveryMessage.class, this,
"routineId", routineId());
}
+
+ /** {@inheritDoc} */
+ @Override public short directType() {
+ return 513;
+ }
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
index f6b18fd1aaa..0783793c661 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
@@ -20,15 +20,21 @@ package org.apache.ignite.internal.processors.continuous;
import java.util.UUID;
import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.plugin.extensions.communication.Message;
import org.jetbrains.annotations.Nullable;
/**
*
*/
-public class StopRoutineDiscoveryMessage extends AbstractContinuousMessage {
+public class StopRoutineDiscoveryMessage extends AbstractContinuousMessage
implements Message {
/** */
private static final long serialVersionUID = 0L;
+ /** */
+ public StopRoutineDiscoveryMessage() {
+ // No-op.
+ }
+
/**
* @param routineId Routine id.
*/
@@ -45,4 +51,9 @@ public class StopRoutineDiscoveryMessage extends
AbstractContinuousMessage {
@Override public String toString() {
return S.toString(StopRoutineDiscoveryMessage.class, this,
"routineId", routineId());
}
+
+ /** {@inheritDoc} */
+ @Override public short directType() {
+ return 514;
+ }
}
