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 4cae5385b58 IGNITE-27992 Use MessageSerializer for
WalStateAbstractMessage and successors (#12822)
4cae5385b58 is described below
commit 4cae5385b58af6281037b1fa80dce908832970e5
Author: Dmitry Werner <[email protected]>
AuthorDate: Tue Mar 3 20:28:10 2026 +0500
IGNITE-27992 Use MessageSerializer for WalStateAbstractMessage and
successors (#12822)
---
.../discovery/DiscoveryMessageFactory.java | 6 ++++++
.../processors/cache/WalStateAbstractMessage.java | 22 +++++++++++++++++-----
.../processors/cache/WalStateFinishMessage.java | 17 +++++++++++++++--
.../processors/cache/WalStateProposeMessage.java | 20 ++++++++++++++++----
4 files changed, 54 insertions(+), 11 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 db8a07604b5..ed1fa6e03ea 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
@@ -19,6 +19,10 @@ package org.apache.ignite.internal.managers.discovery;
import
org.apache.ignite.internal.processors.cache.CacheStatisticsModeChangeMessage;
import
org.apache.ignite.internal.processors.cache.CacheStatisticsModeChangeMessageSerializer;
+import org.apache.ignite.internal.processors.cache.WalStateFinishMessage;
+import
org.apache.ignite.internal.processors.cache.WalStateFinishMessageSerializer;
+import org.apache.ignite.internal.processors.cache.WalStateProposeMessage;
+import
org.apache.ignite.internal.processors.cache.WalStateProposeMessageSerializer;
import
org.apache.ignite.internal.processors.cache.binary.MetadataRemoveAcceptedMessage;
import
org.apache.ignite.internal.processors.cache.binary.MetadataRemoveAcceptedMessageSerializer;
import
org.apache.ignite.internal.processors.cache.binary.MetadataRemoveProposedMessage;
@@ -139,5 +143,7 @@ public class DiscoveryMessageFactory implements
MessageFactoryProvider {
factory.register((short)503, MetadataRemoveProposedMessage::new, new
MetadataRemoveProposedMessageSerializer());
factory.register((short)504, SchemaProposeDiscoveryMessage::new, new
SchemaProposeDiscoveryMessageSerializer());
factory.register((short)505, SchemaFinishDiscoveryMessage::new, new
SchemaFinishDiscoveryMessageSerializer());
+ factory.register((short)506, WalStateFinishMessage::new, new
WalStateFinishMessageSerializer());
+ factory.register((short)507, WalStateProposeMessage::new, new
WalStateProposeMessageSerializer());
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAbstractMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAbstractMessage.java
index ef5e30edb49..d079905ae7b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAbstractMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAbstractMessage.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.cache;
import java.util.UUID;
+import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.managers.discovery.DiscoCache;
import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
@@ -25,28 +26,38 @@ import
org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
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.jetbrains.annotations.Nullable;
/**
* WAL state change abstract message.
*/
-public abstract class WalStateAbstractMessage implements
DiscoveryCustomMessage {
+public abstract class WalStateAbstractMessage implements
DiscoveryCustomMessage, Message {
/** Message ID */
- private final IgniteUuid id = IgniteUuid.randomUuid();
+ @Order(0)
+ IgniteUuid id;
/** Unique operation ID. */
- private final UUID opId;
+ @Order(1)
+ UUID opId;
/** Group ID. */
- private int grpId;
+ @Order(2)
+ int grpId;
/** Group deployment ID. */
- private IgniteUuid grpDepId;
+ @Order(3)
+ IgniteUuid grpDepId;
/** Message that should be processed through exchange thread. */
@GridToStringExclude
private transient WalStateProposeMessage exchangeMsg;
+ /** Constructor. */
+ protected WalStateAbstractMessage() {
+ // No-op.
+ }
+
/**
* Constructor.
*
@@ -55,6 +66,7 @@ public abstract class WalStateAbstractMessage implements
DiscoveryCustomMessage
* @param grpDepId Group deployment ID.
*/
protected WalStateAbstractMessage(UUID opId, int grpId, IgniteUuid
grpDepId) {
+ id = IgniteUuid.randomUuid();
this.opId = opId;
this.grpId = grpId;
this.grpDepId = grpDepId;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateFinishMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateFinishMessage.java
index eca6aca017c..43862e25f52 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateFinishMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateFinishMessage.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.cache;
import java.util.UUID;
+import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.lang.IgniteUuid;
import org.jetbrains.annotations.Nullable;
@@ -30,10 +31,17 @@ public class WalStateFinishMessage extends
WalStateAbstractMessage {
private static final long serialVersionUID = 0L;
/** Whether WAL state was changed as a result of this call. */
- private final boolean changed;
+ @Order(0)
+ boolean changed;
/** Error message. */
- private final String errMsg;
+ @Order(1)
+ String errMsg;
+
+ /** Constructor. */
+ public WalStateFinishMessage() {
+ // No-op.
+ }
/**
* Constructor.
@@ -69,4 +77,9 @@ public class WalStateFinishMessage extends
WalStateAbstractMessage {
@Override public String toString() {
return S.toString(WalStateFinishMessage.class, this, "super",
super.toString());
}
+
+ /** {@inheritDoc} */
+ @Override public short directType() {
+ return 506;
+ }
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateProposeMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateProposeMessage.java
index e8e56dc4d02..9d0e6931c3c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateProposeMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateProposeMessage.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache;
import java.util.Map;
import java.util.UUID;
+import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.lang.IgniteUuid;
@@ -30,23 +31,29 @@ public class WalStateProposeMessage extends
WalStateAbstractMessage {
private static final long serialVersionUID = 0L;
/** Cache names which are expected to be in the group along with their
deployment IDs. */
- private Map<String, IgniteUuid> caches;
+ @Order(0)
+ Map<String, IgniteUuid> caches;
/** Whether WAL should be enabled or disabled. */
- private final boolean enable;
+ @Order(1)
+ boolean enable;
/** Whether message is being handled on cache affinity node. */
private transient boolean affNode;
+ /** Constructor. */
+ public WalStateProposeMessage() {
+ // No-op.
+ }
+
/**
* Constructor.
*
- * @param opId Operation IDs.
+ * @param opId Operation ID.
* @param grpId Expected group ID.
* @param grpDepId Expected group deployment ID.
* @param nodeId Node ID.
* @param caches Expected cache names and their relevant deployment IDs.
- *
* @param enable WAL state flag.
*/
public WalStateProposeMessage(UUID opId, int grpId, IgniteUuid grpDepId,
UUID nodeId,
@@ -89,4 +96,9 @@ public class WalStateProposeMessage extends
WalStateAbstractMessage {
@Override public String toString() {
return S.toString(WalStateProposeMessage.class, this, "super",
super.toString());
}
+
+ /** {@inheritDoc} */
+ @Override public short directType() {
+ return 507;
+ }
}
