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 fe6e94388f8 IGNITE-26607 Use MessageSerializer for
GridDhtAtomicUpdateResponse (#12411)
fe6e94388f8 is described below
commit fe6e94388f897874d5dd7dab2e668a21ce1f64b5
Author: Didar Shayarov <[email protected]>
AuthorDate: Fri Oct 24 14:31:29 2025 +0300
IGNITE-26607 Use MessageSerializer for GridDhtAtomicUpdateResponse (#12411)
---
.../communication/GridIoMessageFactory.java | 3 +-
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 130 ++++++---------------
2 files changed, 36 insertions(+), 97 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 294670f1c83..136e8493b37 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
@@ -51,6 +51,7 @@ 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.GridDhtAtomicUpdateResponseSerializer;
import org.apache.ignite.internal.codegen.GridDhtForceKeysRequestSerializer;
import org.apache.ignite.internal.codegen.GridDhtForceKeysResponseSerializer;
import org.apache.ignite.internal.codegen.GridDhtLockRequestSerializer;
@@ -328,7 +329,7 @@ public class GridIoMessageFactory implements
MessageFactoryProvider {
factory.register((short)36, GridDhtUnlockRequest::new, new
GridDhtUnlockRequestSerializer());
factory.register((short)37, GridDhtAtomicDeferredUpdateResponse::new);
factory.register((short)38, GridDhtAtomicUpdateRequest::new);
- factory.register((short)39, GridDhtAtomicUpdateResponse::new);
+ factory.register((short)39, GridDhtAtomicUpdateResponse::new, new
GridDhtAtomicUpdateResponseSerializer());
factory.register((short)40, GridNearAtomicFullUpdateRequest::new);
factory.register((short)41, GridNearAtomicUpdateResponse::new, new
GridNearAtomicUpdateResponseSerializer());
factory.register((short)42, GridDhtForceKeysRequest::new, new
GridDhtForceKeysRequestSerializer());
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
index daea4d72b0d..59d3a41a75b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
@@ -17,12 +17,11 @@
package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
-import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.List;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.managers.communication.ErrorMessage;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheDeployable;
@@ -31,9 +30,6 @@ import
org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.KeyCacheObject;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.internal.S;
-import
org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
-import org.apache.ignite.plugin.extensions.communication.MessageReader;
-import org.apache.ignite.plugin.extensions.communication.MessageWriter;
/**
* DHT atomic cache backup update response.
@@ -43,17 +39,20 @@ public class GridDhtAtomicUpdateResponse extends
GridCacheIdMessage implements G
public static final int CACHE_MSG_IDX = nextIndexId();
/** Future version. */
+ @Order(value = 4, method = "futureId")
private long futId;
/** */
+ @Order(value = 5, method = "errors")
private UpdateErrors errs;
/** Evicted readers. */
@GridToStringInclude
- @GridDirectCollection(KeyCacheObject.class)
+ @Order(6)
private List<KeyCacheObject> nearEvicted;
/** */
+ @Order(value = 7, method = "partition")
private int partId;
/**
@@ -88,6 +87,27 @@ public class GridDhtAtomicUpdateResponse extends
GridCacheIdMessage implements G
return futId;
}
+ /**
+ * @param futId New future version.
+ */
+ public void futureId(long futId) {
+ this.futId = futId;
+ }
+
+ /**
+ * @return Errors.
+ */
+ public UpdateErrors errors() {
+ return errs;
+ }
+
+ /**
+ * @param errs Errors.
+ */
+ public void errors(UpdateErrors errs) {
+ this.errs = errs;
+ }
+
/**
* Sets update error.
*
@@ -108,7 +128,7 @@ public class GridDhtAtomicUpdateResponse extends
GridCacheIdMessage implements G
/**
* @return Evicted readers.
*/
- Collection<KeyCacheObject> nearEvicted() {
+ public Collection<KeyCacheObject> nearEvicted() {
return nearEvicted;
}
@@ -124,6 +144,13 @@ public class GridDhtAtomicUpdateResponse extends
GridCacheIdMessage implements G
return partId;
}
+ /**
+ * @param partId Partition.
+ */
+ public void partition(int partId) {
+ this.partId = partId;
+ }
+
/** {@inheritDoc} */
@Override public void prepareMarshal(GridCacheSharedContext ctx) throws
IgniteCheckedException {
super.prepareMarshal(ctx);
@@ -161,95 +188,6 @@ public class GridDhtAtomicUpdateResponse extends
GridCacheIdMessage implements G
return ctx.atomicMessageLogger();
}
- /** {@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.writeLong(futId))
- return false;
-
- writer.incrementState();
-
- case 6:
- if (!writer.writeCollection(nearEvicted,
MessageCollectionItemType.KEY_CACHE_OBJECT))
- return false;
-
- writer.incrementState();
-
- case 7:
- if (!writer.writeInt(partId))
- 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:
- futId = reader.readLong();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 6:
- nearEvicted =
reader.readCollection(MessageCollectionItemType.KEY_CACHE_OBJECT);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 7:
- partId = reader.readInt();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- }
-
- return true;
- }
-
/** {@inheritDoc} */
@Override public short directType() {
return 39;
