This is an automated email from the ASF dual-hosted git repository.
timoninmaxim 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 8bd059bcad4 IGNITE-26540 Use MessageSerializer for
GridCacheTtlUpdateRequest (#12379)
8bd059bcad4 is described below
commit 8bd059bcad4c3646f186234c8c5d11ef1816212e
Author: Didar Shayarov <[email protected]>
AuthorDate: Fri Oct 3 16:25:18 2025 +0300
IGNITE-26540 Use MessageSerializer for GridCacheTtlUpdateRequest (#12379)
---
.../communication/GridIoMessageFactory.java | 3 +-
.../distributed/GridCacheTtlUpdateRequest.java | 175 ++++++---------------
2 files changed, 51 insertions(+), 127 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 695741d1b72..f4b42133c17 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
@@ -33,6 +33,7 @@ import
org.apache.ignite.internal.codegen.CacheVersionedValueSerializer;
import
org.apache.ignite.internal.codegen.GenerateEncryptionKeyRequestSerializer;
import org.apache.ignite.internal.codegen.GridCacheEntryInfoSerializer;
import org.apache.ignite.internal.codegen.GridCacheSqlQuerySerializer;
+import org.apache.ignite.internal.codegen.GridCacheTtlUpdateRequestSerializer;
import org.apache.ignite.internal.codegen.GridCacheTxRecoveryRequestSerializer;
import
org.apache.ignite.internal.codegen.GridCacheTxRecoveryResponseSerializer;
import org.apache.ignite.internal.codegen.GridCacheVersionExSerializer;
@@ -265,7 +266,7 @@ public class GridIoMessageFactory implements
MessageFactoryProvider {
factory.register((short)13, GridEventStorageMessage::new);
factory.register((short)16, GridCacheTxRecoveryRequest::new, new
GridCacheTxRecoveryRequestSerializer());
factory.register((short)17, GridCacheTxRecoveryResponse::new, new
GridCacheTxRecoveryResponseSerializer());
- factory.register((short)20, GridCacheTtlUpdateRequest::new);
+ factory.register((short)20, GridCacheTtlUpdateRequest::new, new
GridCacheTtlUpdateRequestSerializer());
factory.register((short)21, GridDistributedLockRequest::new);
factory.register((short)22, GridDistributedLockResponse::new);
factory.register((short)23, GridDistributedTxFinishRequest::new);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
index c822a5fab2f..d81d51ea8a7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
@@ -17,11 +17,10 @@
package org.apache.ignite.internal.processors.cache.distributed;
-import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
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.GridCacheIdMessage;
@@ -31,9 +30,6 @@ import
org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.internal.CU;
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;
/**
*
@@ -41,26 +37,28 @@ import
org.apache.ignite.plugin.extensions.communication.MessageWriter;
public class GridCacheTtlUpdateRequest extends GridCacheIdMessage {
/** Entries keys. */
@GridToStringInclude
- @GridDirectCollection(KeyCacheObject.class)
+ @Order(4)
private List<KeyCacheObject> keys;
/** Entries versions. */
- @GridDirectCollection(GridCacheVersion.class)
+ @Order(value = 5, method = "versions")
private List<GridCacheVersion> vers;
/** Near entries keys. */
@GridToStringInclude
- @GridDirectCollection(KeyCacheObject.class)
+ @Order(6)
private List<KeyCacheObject> nearKeys;
/** Near entries versions. */
- @GridDirectCollection(GridCacheVersion.class)
+ @Order(value = 7, method = "nearVersions")
private List<GridCacheVersion> nearVers;
/** New TTL. */
+ @Order(8)
private long ttl;
/** Topology version. */
+ @Order(value = 9, method = "topologyVersion")
private AffinityTopologyVersion topVer;
/**
@@ -90,6 +88,13 @@ public class GridCacheTtlUpdateRequest extends
GridCacheIdMessage {
return topVer;
}
+ /**
+ * @param topVer New topology version.
+ */
+ public void topologyVersion(AffinityTopologyVersion topVer) {
+ this.topVer = topVer;
+ }
+
/**
* @return TTL.
*/
@@ -97,6 +102,13 @@ public class GridCacheTtlUpdateRequest extends
GridCacheIdMessage {
return ttl;
}
+ /**
+ * @param ttl New TTL.
+ */
+ public void ttl(long ttl) {
+ this.ttl = ttl;
+ }
+
/**
* @param key Key.
* @param ver Version.
@@ -136,6 +148,13 @@ public class GridCacheTtlUpdateRequest extends
GridCacheIdMessage {
return keys;
}
+ /**
+ * @param keys New entries keys.
+ */
+ public void keys(List<KeyCacheObject> keys) {
+ this.keys = keys;
+ }
+
/**
* @return Versions.
*/
@@ -143,6 +162,13 @@ public class GridCacheTtlUpdateRequest extends
GridCacheIdMessage {
return vers;
}
+ /**
+ * @param vers New entries versions.
+ */
+ public void versions(List<GridCacheVersion> vers) {
+ this.vers = vers;
+ }
+
/**
* @param idx Entry index.
* @return Version.
@@ -160,6 +186,13 @@ public class GridCacheTtlUpdateRequest extends
GridCacheIdMessage {
return nearKeys;
}
+ /**
+ * @param nearKeys New near entries keys.
+ */
+ public void nearKeys(List<KeyCacheObject> nearKeys) {
+ this.nearKeys = nearKeys;
+ }
+
/**
* @return Versions for near cache entries.
*/
@@ -167,6 +200,13 @@ public class GridCacheTtlUpdateRequest extends
GridCacheIdMessage {
return nearVers;
}
+ /**
+ * @param nearVers New near entries versions.
+ */
+ public void nearVersions(List<GridCacheVersion> nearVers) {
+ this.nearVers = nearVers;
+ }
+
/** {@inheritDoc} */
@Override public void prepareMarshal(GridCacheSharedContext ctx) throws
IgniteCheckedException {
super.prepareMarshal(ctx);
@@ -195,123 +235,6 @@ public class GridCacheTtlUpdateRequest extends
GridCacheIdMessage {
return false;
}
- /** {@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.writeCollection(keys,
MessageCollectionItemType.KEY_CACHE_OBJECT))
- return false;
-
- writer.incrementState();
-
- case 5:
- if (!writer.writeCollection(nearKeys,
MessageCollectionItemType.KEY_CACHE_OBJECT))
- return false;
-
- writer.incrementState();
-
- case 6:
- if (!writer.writeCollection(nearVers,
MessageCollectionItemType.MSG))
- return false;
-
- writer.incrementState();
-
- case 7:
- if (!writer.writeAffinityTopologyVersion(topVer))
- return false;
-
- writer.incrementState();
-
- case 8:
- if (!writer.writeLong(ttl))
- return false;
-
- writer.incrementState();
-
- case 9:
- if (!writer.writeCollection(vers,
MessageCollectionItemType.MSG))
- 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:
- keys =
reader.readCollection(MessageCollectionItemType.KEY_CACHE_OBJECT);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 5:
- nearKeys =
reader.readCollection(MessageCollectionItemType.KEY_CACHE_OBJECT);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 6:
- nearVers =
reader.readCollection(MessageCollectionItemType.MSG);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 7:
- topVer = reader.readAffinityTopologyVersion();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 8:
- ttl = reader.readLong();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 9:
- vers = reader.readCollection(MessageCollectionItemType.MSG);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- }
-
- return true;
- }
-
/** {@inheritDoc} */
@Override public short directType() {
return 20;
