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 7916fbed073 IGNITE-26606 Use MessageSerializer for
GridDhtAtomicDeferredUpdateResponse (#12413)
7916fbed073 is described below
commit 7916fbed073e96caf902a6ae02b2cbeb9b5aae2b
Author: Didar Shayarov <[email protected]>
AuthorDate: Fri Oct 24 14:44:48 2025 +0300
IGNITE-26606 Use MessageSerializer for GridDhtAtomicDeferredUpdateResponse
(#12413)
---
.../communication/GridIoMessageFactory.java | 3 +-
.../GridDhtAtomicDeferredUpdateResponse.java | 63 ++++------------------
2 files changed, 12 insertions(+), 54 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 136e8493b37..11e834db240 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
@@ -50,6 +50,7 @@ import
org.apache.ignite.internal.codegen.GridChangeGlobalStateMessageResponseSe
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.GridDhtAtomicDeferredUpdateResponseSerializer;
import org.apache.ignite.internal.codegen.GridDhtAtomicNearResponseSerializer;
import
org.apache.ignite.internal.codegen.GridDhtAtomicUpdateResponseSerializer;
import org.apache.ignite.internal.codegen.GridDhtForceKeysRequestSerializer;
@@ -327,7 +328,7 @@ public class GridIoMessageFactory implements
MessageFactoryProvider {
factory.register((short)34, GridDhtTxPrepareRequest::new, new
GridDhtTxPrepareRequestSerializer());
factory.register((short)35, GridDhtTxPrepareResponse::new, new
GridDhtTxPrepareResponseSerializer());
factory.register((short)36, GridDhtUnlockRequest::new, new
GridDhtUnlockRequestSerializer());
- factory.register((short)37, GridDhtAtomicDeferredUpdateResponse::new);
+ factory.register((short)37, GridDhtAtomicDeferredUpdateResponse::new,
new GridDhtAtomicDeferredUpdateResponseSerializer());
factory.register((short)38, GridDhtAtomicUpdateRequest::new);
factory.register((short)39, GridDhtAtomicUpdateResponse::new, new
GridDhtAtomicUpdateResponseSerializer());
factory.register((short)40, GridNearAtomicFullUpdateRequest::new);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java
index cd4fcc2ae5a..a2322cb4e4a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java
@@ -17,9 +17,8 @@
package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
-import java.nio.ByteBuffer;
import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.processors.cache.GridCacheDeployable;
import org.apache.ignite.internal.processors.cache.GridCacheIdMessage;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
@@ -27,8 +26,6 @@ import
org.apache.ignite.internal.processors.timeout.GridTimeoutObject;
import org.apache.ignite.internal.util.GridLongList;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
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;
/**
@@ -39,10 +36,10 @@ public class GridDhtAtomicDeferredUpdateResponse extends
GridCacheIdMessage impl
public static final int CACHE_MSG_IDX = nextIndexId();
/** ACK future versions. */
+ @Order(value = 4, method = "futureIds")
private GridLongList futIds;
/** */
- @GridDirectTransient
@GridToStringExclude
private GridTimeoutObject timeoutSnd;
@@ -91,60 +88,20 @@ public class GridDhtAtomicDeferredUpdateResponse extends
GridCacheIdMessage impl
/**
* @return List of ACKed future ids.
*/
- GridLongList futureIds() {
+ public GridLongList futureIds() {
return futIds;
}
- /** {@inheritDoc} */
- @Override public IgniteLogger messageLogger(GridCacheSharedContext ctx) {
- 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.writeGridLongList(futIds))
- return false;
-
- writer.incrementState();
-
- }
-
- return true;
+ /**
+ * @param futIds New list of ACKed future ids.
+ */
+ public void futureIds(GridLongList futIds) {
+ this.futIds = futIds;
}
/** {@inheritDoc} */
- @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
- reader.setBuffer(buf);
-
- if (!super.readFrom(buf, reader))
- return false;
-
- switch (reader.state()) {
- case 4:
- futIds = reader.readGridLongList();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- }
-
- return true;
+ @Override public IgniteLogger messageLogger(GridCacheSharedContext ctx) {
+ return ctx.atomicMessageLogger();
}
/** {@inheritDoc} */
