This is an automated email from the ASF dual-hosted git repository.
sergeychugunov 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 1ba0780e216 IGNITE-25969 Use MessageSerializer for WalStateAckMessage
(#12205)
1ba0780e216 is described below
commit 1ba0780e216ff90427aff5b9395e012ac30f6c2b
Author: Dmitry Werner <grimekil...@gmail.com>
AuthorDate: Tue Jul 22 15:42:41 2025 +0500
IGNITE-25969 Use MessageSerializer for WalStateAckMessage (#12205)
---
.../communication/GridIoMessageFactory.java | 3 +-
.../processors/cache/WalStateAckMessage.java | 119 ++++++---------------
2 files changed, 35 insertions(+), 87 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 082bdf08567..b56e5fb4069 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
@@ -32,6 +32,7 @@ import
org.apache.ignite.internal.codegen.GridJobCancelRequestSerializer;
import org.apache.ignite.internal.codegen.SessionChannelMessageSerializer;
import
org.apache.ignite.internal.codegen.UserAuthenticateRequestMessageSerializer;
import
org.apache.ignite.internal.codegen.UserAuthenticateResponseMessageSerializer;
+import org.apache.ignite.internal.codegen.WalStateAckMessageSerializer;
import org.apache.ignite.internal.managers.checkpoint.GridCheckpointRequest;
import org.apache.ignite.internal.managers.deployment.GridDeploymentInfoBean;
import org.apache.ignite.internal.managers.deployment.GridDeploymentRequest;
@@ -311,7 +312,7 @@ public class GridIoMessageFactory implements
MessageFactoryProvider {
factory.register((short)126,
GridNearAtomicSingleUpdateInvokeRequest::new);
factory.register((short)127,
GridNearAtomicSingleUpdateFilterRequest::new);
factory.register((short)128, CacheGroupAffinityMessage::new);
- factory.register((short)129, WalStateAckMessage::new);
+ factory.register((short)129, WalStateAckMessage::new, new
WalStateAckMessageSerializer());
factory.register((short)130,
UserManagementOperationFinishedMessage::new);
factory.register((short)131, UserAuthenticateRequestMessage::new, new
UserAuthenticateRequestMessageSerializer());
factory.register((short)132, UserAuthenticateResponseMessage::new, new
UserAuthenticateResponseMessageSerializer());
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java
index 5459c7c29bb..a3d7c19804a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java
@@ -17,14 +17,11 @@
package org.apache.ignite.internal.processors.cache;
-import java.nio.ByteBuffer;
import java.util.UUID;
-import org.apache.ignite.internal.GridDirectTransient;
import org.apache.ignite.internal.IgniteCodeGeneratingFail;
+import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.plugin.extensions.communication.Message;
-import org.apache.ignite.plugin.extensions.communication.MessageReader;
-import org.apache.ignite.plugin.extensions.communication.MessageWriter;
import org.jetbrains.annotations.Nullable;
/**
@@ -33,19 +30,22 @@ import org.jetbrains.annotations.Nullable;
@IgniteCodeGeneratingFail
public class WalStateAckMessage implements Message {
/** Operation ID. */
+ @Order(value = 0, method = "operationId")
private UUID opId;
/** Affinity node flag. */
+ @Order(1)
private boolean affNode;
/** Operation result. */
+ @Order(2)
private boolean changed;
/** Error message. */
+ @Order(value = 3, method = "errorMessage")
private String errMsg;
/** Sender node ID. */
- @GridDirectTransient
private UUID sndNodeId;
/**
@@ -77,6 +77,13 @@ public class WalStateAckMessage implements Message {
return opId;
}
+ /**
+ * @param opId New operation ID.
+ */
+ public void operationId(UUID opId) {
+ this.opId = opId;
+ }
+
/**
* @return Affinity node flag.
*/
@@ -84,6 +91,13 @@ public class WalStateAckMessage implements Message {
return affNode;
}
+ /**
+ * @param affNode New affinity node flag.
+ */
+ public void affNode(boolean affNode) {
+ this.affNode = affNode;
+ }
+
/**
* @return Result.
*/
@@ -91,6 +105,13 @@ public class WalStateAckMessage implements Message {
return changed;
}
+ /**
+ * @param changed New operation result.
+ */
+ public void changed(boolean changed) {
+ this.changed = changed;
+ }
+
/**
* @return Error message.
*/
@@ -98,6 +119,13 @@ public class WalStateAckMessage implements Message {
return errMsg;
}
+ /**
+ * @param errMsg New error message.
+ */
+ public void errorMessage(String errMsg) {
+ this.errMsg = errMsg;
+ }
+
/**
* @return Sender node ID.
*/
@@ -112,87 +140,6 @@ public class WalStateAckMessage implements Message {
this.sndNodeId = sndNodeId;
}
- /** {@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(opId))
- return false;
-
- writer.incrementState();
-
- case 1:
- if (!writer.writeBoolean(affNode))
- return false;
-
- writer.incrementState();
-
- case 2:
- if (!writer.writeBoolean(changed))
- return false;
-
- writer.incrementState();
-
- case 3:
- if (!writer.writeString(errMsg))
- return false;
-
- writer.incrementState();
- }
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
- reader.setBuffer(buf);
-
- switch (reader.state()) {
- case 0:
- opId = reader.readUuid();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 1:
- affNode = reader.readBoolean();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 2:
- changed = reader.readBoolean();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 3:
- errMsg = reader.readString();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
- }
-
- return true;
- }
-
/** {@inheritDoc} */
@Override public short directType() {
return 129;
