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 20d68028f17 IGNITE-26513 Use MessageSerializer for
GridDhtForceKeysRequest (#12373)
20d68028f17 is described below
commit 20d68028f170c1acaf08b5885c9c72cedca04296
Author: Dmitry Werner <[email protected]>
AuthorDate: Fri Sep 26 17:02:45 2025 +0500
IGNITE-26513 Use MessageSerializer for GridDhtForceKeysRequest (#12373)
---
.../communication/GridIoMessageFactory.java | 3 +-
.../dht/preloader/GridDhtForceKeysRequest.java | 128 ++++++---------------
2 files changed, 35 insertions(+), 96 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 341c696726b..50fa69f9692 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.GridDhtForceKeysRequestSerializer;
import org.apache.ignite.internal.codegen.GridDhtPartitionExchangeIdSerializer;
import
org.apache.ignite.internal.codegen.GridDhtPartitionsSingleRequestSerializer;
import
org.apache.ignite.internal.codegen.GridDhtTxOnePhaseCommitAckRequestSerializer;
@@ -284,7 +285,7 @@ public class GridIoMessageFactory implements
MessageFactoryProvider {
factory.register((short)39, GridDhtAtomicUpdateResponse::new);
factory.register((short)40, GridNearAtomicFullUpdateRequest::new);
factory.register((short)41, GridNearAtomicUpdateResponse::new, new
GridNearAtomicUpdateResponseSerializer());
- factory.register((short)42, GridDhtForceKeysRequest::new);
+ factory.register((short)42, GridDhtForceKeysRequest::new, new
GridDhtForceKeysRequestSerializer());
factory.register((short)43, GridDhtForceKeysResponse::new);
factory.register((short)45, GridDhtPartitionDemandMessage::new);
factory.register((short)46, GridDhtPartitionsFullMessage::new);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
index 75fafb77df8..98848323106 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
@@ -17,10 +17,9 @@
package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
-import java.nio.ByteBuffer;
import java.util.Collection;
import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
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.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.lang.IgniteUuid;
-import
org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
-import org.apache.ignite.plugin.extensions.communication.MessageReader;
-import org.apache.ignite.plugin.extensions.communication.MessageWriter;
/**
* Force keys request. This message is sent by node while preloading to force
another node to put given keys into the
@@ -41,17 +37,20 @@ import
org.apache.ignite.plugin.extensions.communication.MessageWriter;
*/
public class GridDhtForceKeysRequest extends GridCacheIdMessage implements
GridCacheDeployable {
/** Future ID. */
+ @Order(value = 4, method = "futureId")
private IgniteUuid futId;
/** Mini-future ID. */
+ @Order(5)
private IgniteUuid miniId;
/** Keys to request. */
+ @Order(6)
@GridToStringInclude
- @GridDirectCollection(KeyCacheObject.class)
private Collection<KeyCacheObject> keys;
/** Topology version for which keys are requested. */
+ @Order(value = 7, method = "topologyVersion")
private AffinityTopologyVersion topVer;
/**
@@ -96,6 +95,13 @@ public class GridDhtForceKeysRequest extends
GridCacheIdMessage implements GridC
return futId;
}
+ /**
+ * @param futId Future ID.
+ */
+ public void futureId(IgniteUuid futId) {
+ this.futId = futId;
+ }
+
/**
* @return Mini-future ID.
*/
@@ -103,6 +109,13 @@ public class GridDhtForceKeysRequest extends
GridCacheIdMessage implements GridC
return miniId;
}
+ /**
+ * @param miniId Mini-future ID.
+ */
+ public void miniId(IgniteUuid miniId) {
+ this.miniId = miniId;
+ }
+
/**
* @return Keys.
*/
@@ -110,6 +123,13 @@ public class GridDhtForceKeysRequest extends
GridCacheIdMessage implements GridC
return keys;
}
+ /**
+ * @param keys Keys.
+ */
+ public void keys(Collection<KeyCacheObject> keys) {
+ this.keys = keys;
+ }
+
/**
* @return Topology version for which keys are requested.
*/
@@ -117,6 +137,13 @@ public class GridDhtForceKeysRequest extends
GridCacheIdMessage implements GridC
return topVer;
}
+ /**
+ * @param topVer Topology version for which keys are requested.
+ */
+ public void topologyVersion(AffinityTopologyVersion topVer) {
+ this.topVer = topVer;
+ }
+
/** {@inheritDoc} */
@Override public void prepareMarshal(GridCacheSharedContext ctx) throws
IgniteCheckedException {
super.prepareMarshal(ctx);
@@ -147,95 +174,6 @@ public class GridDhtForceKeysRequest extends
GridCacheIdMessage implements GridC
return keys.size();
}
- /** {@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.writeIgniteUuid(futId))
- return false;
-
- writer.incrementState();
-
- case 5:
- if (!writer.writeCollection(keys,
MessageCollectionItemType.KEY_CACHE_OBJECT))
- return false;
-
- writer.incrementState();
-
- case 6:
- if (!writer.writeIgniteUuid(miniId))
- return false;
-
- writer.incrementState();
-
- case 7:
- if (!writer.writeAffinityTopologyVersion(topVer))
- 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:
- futId = reader.readIgniteUuid();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 5:
- keys =
reader.readCollection(MessageCollectionItemType.KEY_CACHE_OBJECT);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 6:
- miniId = reader.readIgniteUuid();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 7:
- topVer = reader.readAffinityTopologyVersion();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- }
-
- return true;
- }
-
/** {@inheritDoc} */
@Override public short directType() {
return 42;
