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 80a31c120e3 IGNITE-25962 Use MessageSerializer for
GridDhtAtomicNearResponse (#12324)
80a31c120e3 is described below
commit 80a31c120e3a0805f2627573cc479e510b6852c0
Author: Denis <[email protected]>
AuthorDate: Mon Sep 29 16:44:52 2025 +1000
IGNITE-25962 Use MessageSerializer for GridDhtAtomicNearResponse (#12324)
---
.../communication/GridIoMessageFactory.java | 3 +-
.../dht/atomic/GridDhtAtomicNearResponse.java | 155 ++++++---------------
2 files changed, 47 insertions(+), 111 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 50fa69f9692..163d9d211f1 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
@@ -39,6 +39,7 @@ import
org.apache.ignite.internal.codegen.GridCacheVersionSerializer;
import org.apache.ignite.internal.codegen.GridCheckpointRequestSerializer;
import org.apache.ignite.internal.codegen.GridDeploymentResponseSerializer;
import
org.apache.ignite.internal.codegen.GridDhtAffinityAssignmentRequestSerializer;
+import org.apache.ignite.internal.codegen.GridDhtAtomicNearResponseSerializer;
import org.apache.ignite.internal.codegen.GridDhtForceKeysRequestSerializer;
import org.apache.ignite.internal.codegen.GridDhtPartitionExchangeIdSerializer;
import
org.apache.ignite.internal.codegen.GridDhtPartitionsSingleRequestSerializer;
@@ -234,7 +235,7 @@ public class GridIoMessageFactory implements
MessageFactoryProvider {
factory.register((short)-51, NearCacheUpdates::new, new
NearCacheUpdatesSerializer());
factory.register((short)-50, GridNearAtomicCheckUpdateRequest::new,
new GridNearAtomicCheckUpdateRequestSerializer());
factory.register((short)-49, UpdateErrors::new);
- factory.register((short)-48, GridDhtAtomicNearResponse::new);
+ factory.register((short)-48, GridDhtAtomicNearResponse::new, new
GridDhtAtomicNearResponseSerializer());
factory.register((short)-45,
GridChangeGlobalStateMessageResponse::new);
factory.register((short)-43, IgniteIoTestMessage::new);
factory.register((short)-36, GridDhtAtomicSingleUpdateRequest::new);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java
index 2341fcbd542..2c58e3c02f6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java
@@ -17,9 +17,9 @@
package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
-import java.nio.ByteBuffer;
import java.util.UUID;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.processors.cache.GridCacheIdMessage;
import org.apache.ignite.internal.processors.cache.GridCacheReturn;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
@@ -27,8 +27,6 @@ import
org.apache.ignite.internal.processors.cache.KeyCacheObject;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.internal.S;
-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.cache.distributed.dht.atomic.GridDhtAtomicAbstractUpdateRequest.DHT_ATOMIC_HAS_RESULT_MASK;
@@ -41,19 +39,24 @@ public class GridDhtAtomicNearResponse extends
GridCacheIdMessage {
public static final int CACHE_MSG_IDX = nextIndexId();
/** */
+ @Order(value = 4, method = "partition")
private int partId;
/** */
+ @Order(value = 5, method = "futureId")
private long futId;
/** */
+ @Order(6)
private UUID primaryId;
/** */
+ @Order(7)
@GridToStringExclude
private byte flags;
/** */
+ @Order(value = 8, method = "errors")
@GridToStringInclude
private UpdateErrors errs;
@@ -89,7 +92,7 @@ public class GridDhtAtomicNearResponse extends
GridCacheIdMessage {
/**
* @return Errors.
*/
- @Nullable UpdateErrors errors() {
+ @Nullable public UpdateErrors errors() {
return errs;
}
@@ -103,15 +106,43 @@ public class GridDhtAtomicNearResponse extends
GridCacheIdMessage {
/**
* @return Primary node ID.
*/
- UUID primaryId() {
+ public UUID primaryId() {
return primaryId;
}
+ /**
+ * @param primaryId Primary node ID.
+ */
+ public void primaryId(UUID primaryId) {
+ this.primaryId = primaryId;
+ }
+
+ /**
+ * @return Flags.
+ */
+ public byte flags() {
+ return flags;
+ }
+
+ /**
+ * @param flags Flags.
+ */
+ public void flags(byte flags) {
+ this.flags = flags;
+ }
+
/** {@inheritDoc} */
@Override public int partition() {
return partId;
}
+ /**
+ * @param partId Partition ID.
+ */
+ public void partition(int partId) {
+ this.partId = partId;
+ }
+
/**
* @param key Key.
* @param e Error.
@@ -156,6 +187,13 @@ public class GridDhtAtomicNearResponse extends
GridCacheIdMessage {
return futId;
}
+ /**
+ * @param futId Future ID.
+ */
+ public void futureId(long futId) {
+ this.futId = futId;
+ }
+
/** {@inheritDoc} */
@Override public int lookupIndex() {
return CACHE_MSG_IDX;
@@ -172,7 +210,7 @@ public class GridDhtAtomicNearResponse extends
GridCacheIdMessage {
}
/** {@inheritDoc} */
- @Override public void prepareMarshal(GridCacheSharedContext ctx) throws
IgniteCheckedException {
+ @Override public void prepareMarshal(GridCacheSharedContext<?, ?> ctx)
throws IgniteCheckedException {
super.prepareMarshal(ctx);
if (errs != null)
@@ -180,116 +218,13 @@ public class GridDhtAtomicNearResponse extends
GridCacheIdMessage {
}
/** {@inheritDoc} */
- @Override public void finishUnmarshal(GridCacheSharedContext ctx,
ClassLoader ldr) throws IgniteCheckedException {
+ @Override public void finishUnmarshal(GridCacheSharedContext<?, ?> ctx,
ClassLoader ldr) throws IgniteCheckedException {
super.finishUnmarshal(ctx, ldr);
if (errs != null)
errs.finishUnmarshal(this, ctx.cacheContext(cacheId), ldr);
}
- /** {@inheritDoc} */
- @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
- writer.setBuffer(buf);
-
- if (!super.writeTo(buf, writer))
- return false;
-
- if (!writer.isHeaderWritten()) {
- if (!writer.writeHeader(directType()))
- return false;
-
- writer.onHeaderWritten();
- }
-
- switch (writer.state()) {
- case 4:
- if (!writer.writeMessage(errs))
- return false;
-
- writer.incrementState();
-
- case 5:
- if (!writer.writeByte(flags))
- return false;
-
- writer.incrementState();
-
- case 6:
- if (!writer.writeLong(futId))
- return false;
-
- writer.incrementState();
-
- case 7:
- if (!writer.writeInt(partId))
- return false;
-
- writer.incrementState();
-
- case 8:
- if (!writer.writeUuid(primaryId))
- return false;
-
- writer.incrementState();
-
- }
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
- reader.setBuffer(buf);
-
- if (!super.readFrom(buf, reader))
- return false;
-
- switch (reader.state()) {
- case 4:
- errs = reader.readMessage();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 5:
- flags = reader.readByte();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 6:
- futId = reader.readLong();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 7:
- partId = reader.readInt();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 8:
- primaryId = reader.readUuid();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- }
-
- return true;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
StringBuilder flags = new StringBuilder();
