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 4826f7cff13 IGNITE-25970 Use MessageSerializer for
MissingMappingRequestMessage and MissingMappingResponseMessage (#12206)
4826f7cff13 is described below
commit 4826f7cff132e4e0354e21162252dc38abe105d2
Author: Dmitry Werner <[email protected]>
AuthorDate: Wed Jul 23 13:36:21 2025 +0500
IGNITE-25970 Use MessageSerializer for MissingMappingRequestMessage and
MissingMappingResponseMessage (#12206)
---
.../communication/GridIoMessageFactory.java | 6 +-
.../marshaller/MissingMappingRequestMessage.java | 71 ++++-------------
.../marshaller/MissingMappingResponseMessage.java | 91 +++++-----------------
3 files changed, 36 insertions(+), 132 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 b56e5fb4069..1fb35c092f9 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
@@ -29,6 +29,8 @@ import org.apache.ignite.internal.binary.BinaryUtils;
import org.apache.ignite.internal.codegen.GridCacheEntryInfoSerializer;
import org.apache.ignite.internal.codegen.GridIntListSerializer;
import org.apache.ignite.internal.codegen.GridJobCancelRequestSerializer;
+import
org.apache.ignite.internal.codegen.MissingMappingRequestMessageSerializer;
+import
org.apache.ignite.internal.codegen.MissingMappingResponseMessageSerializer;
import org.apache.ignite.internal.codegen.SessionChannelMessageSerializer;
import
org.apache.ignite.internal.codegen.UserAuthenticateRequestMessageSerializer;
import
org.apache.ignite.internal.codegen.UserAuthenticateResponseMessageSerializer;
@@ -264,8 +266,8 @@ public class GridIoMessageFactory implements
MessageFactoryProvider {
factory.register((short)63, DataStreamerResponse::new);
factory.register((short)76, GridTaskResultRequest::new);
factory.register((short)77, GridTaskResultResponse::new);
- factory.register((short)78, MissingMappingRequestMessage::new);
- factory.register((short)79, MissingMappingResponseMessage::new);
+ factory.register((short)78, MissingMappingRequestMessage::new, new
MissingMappingRequestMessageSerializer());
+ factory.register((short)79, MissingMappingResponseMessage::new, new
MissingMappingResponseMessageSerializer());
factory.register((short)80, MetadataRequestMessage::new);
factory.register((short)81, MetadataResponseMessage::new);
factory.register((short)82, JobStealingRequest::new);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java
index 3d9572495a3..b18569912b0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java
@@ -16,11 +16,9 @@
*/
package org.apache.ignite.internal.processors.marshaller;
-import java.nio.ByteBuffer;
+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;
/**
* Client node receives discovery messages in asynchronous mode
@@ -36,9 +34,11 @@ import
org.apache.ignite.plugin.extensions.communication.MessageWriter;
*/
public class MissingMappingRequestMessage implements Message {
/** */
+ @Order(0)
private byte platformId;
/** */
+ @Order(1)
private int typeId;
/**
@@ -57,61 +57,6 @@ public class MissingMappingRequestMessage implements Message
{
this.typeId = typeId;
}
- /** {@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.writeByte(platformId))
- return false;
-
- writer.incrementState();
-
- case 1:
- if (!writer.writeInt(typeId))
- return false;
-
- writer.incrementState();
-
- }
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
- reader.setBuffer(buf);
-
- switch (reader.state()) {
- case 0:
- platformId = reader.readByte();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 1:
- typeId = reader.readInt();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- }
-
- return true;
- }
-
/** {@inheritDoc} */
@Override public short directType() {
return 78;
@@ -127,11 +72,21 @@ public class MissingMappingRequestMessage implements
Message {
return platformId;
}
+ /** */
+ public void platformId(byte platformId) {
+ this.platformId = platformId;
+ }
+
/** */
public int typeId() {
return typeId;
}
+ /** */
+ public void typeId(int typeId) {
+ this.typeId = typeId;
+ }
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(MissingMappingRequestMessage.class, this);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java
index 8ba43842cf8..a7d6935eb3a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java
@@ -16,11 +16,9 @@
*/
package org.apache.ignite.internal.processors.marshaller;
-import java.nio.ByteBuffer;
+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;
/**
* On receiving a {@link MissingMappingRequestMessage} mapping request server
node looks up class name
@@ -29,12 +27,15 @@ import
org.apache.ignite.plugin.extensions.communication.MessageWriter;
*/
public class MissingMappingResponseMessage implements Message {
/** */
+ @Order(0)
private byte platformId;
/** */
+ @Order(1)
private int typeId;
/** */
+ @Order(value = 2, method = "className")
private String clsName;
/**
@@ -54,75 +55,6 @@ public class MissingMappingResponseMessage implements
Message {
this.clsName = clsName;
}
- /** {@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.writeString(clsName))
- return false;
-
- writer.incrementState();
-
- case 1:
- if (!writer.writeByte(platformId))
- return false;
-
- writer.incrementState();
-
- case 2:
- if (!writer.writeInt(typeId))
- return false;
-
- writer.incrementState();
-
- }
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
- reader.setBuffer(buf);
-
- switch (reader.state()) {
- case 0:
- clsName = reader.readString();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 1:
- platformId = reader.readByte();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 2:
- typeId = reader.readInt();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- }
-
- return true;
- }
-
/** {@inheritDoc} */
@Override public short directType() {
return 79;
@@ -140,6 +72,11 @@ public class MissingMappingResponseMessage implements
Message {
return platformId;
}
+ /** */
+ public void platformId(byte platformId) {
+ this.platformId = platformId;
+ }
+
/**
*
*/
@@ -147,6 +84,11 @@ public class MissingMappingResponseMessage implements
Message {
return typeId;
}
+ /** */
+ public void typeId(int typeId) {
+ this.typeId = typeId;
+ }
+
/**
*
*/
@@ -154,6 +96,11 @@ public class MissingMappingResponseMessage implements
Message {
return clsName;
}
+ /** */
+ public void className(String clsName) {
+ this.clsName = clsName;
+ }
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(MissingMappingResponseMessage.class, this);
