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 b490f04d860 IGNITE-26402 Use MessageSerializer for
GridDhtTxOnePhaseCommitAckRequest (#12328)
b490f04d860 is described below
commit b490f04d860ea246658769e13e500e7e3a1d8fb4
Author: Dmitry Werner <[email protected]>
AuthorDate: Thu Sep 11 13:30:37 2025 +0500
IGNITE-26402 Use MessageSerializer for GridDhtTxOnePhaseCommitAckRequest
(#12328)
---
.../communication/GridIoMessageFactory.java | 3 +-
.../dht/GridDhtTxOnePhaseCommitAckRequest.java | 64 ++++------------------
2 files changed, 12 insertions(+), 55 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 211c68726ea..c7dbc3a899c 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
@@ -34,6 +34,7 @@ import
org.apache.ignite.internal.codegen.GridCacheVersionExSerializer;
import org.apache.ignite.internal.codegen.GridCacheVersionSerializer;
import org.apache.ignite.internal.codegen.GridCheckpointRequestSerializer;
import org.apache.ignite.internal.codegen.GridDhtPartitionExchangeIdSerializer;
+import
org.apache.ignite.internal.codegen.GridDhtTxOnePhaseCommitAckRequestSerializer;
import org.apache.ignite.internal.codegen.GridIntListSerializer;
import org.apache.ignite.internal.codegen.GridJobCancelRequestSerializer;
import org.apache.ignite.internal.codegen.GridJobSiblingsRequestSerializer;
@@ -222,7 +223,7 @@ public class GridIoMessageFactory implements
MessageFactoryProvider {
factory.register((short)-45,
GridChangeGlobalStateMessageResponse::new);
factory.register((short)-43, IgniteIoTestMessage::new);
factory.register((short)-36, GridDhtAtomicSingleUpdateRequest::new);
- factory.register((short)-27, GridDhtTxOnePhaseCommitAckRequest::new);
+ factory.register((short)-27, GridDhtTxOnePhaseCommitAckRequest::new,
new GridDhtTxOnePhaseCommitAckRequestSerializer());
factory.register((short)-26, TxLockList::new);
factory.register((short)-25, TxLock::new, new TxLockSerializer());
factory.register((short)-24, TxLocksRequest::new, new
TxLocksRequestSerializer());
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java
index 6d8119d916f..5db3b918fd5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java
@@ -17,16 +17,12 @@
package org.apache.ignite.internal.processors.cache.distributed.dht;
-import java.nio.ByteBuffer;
import java.util.Collection;
-import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.processors.cache.GridCacheMessage;
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.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;
/**
* One Phase Commit Near transaction ack request.
@@ -34,7 +30,7 @@ import
org.apache.ignite.plugin.extensions.communication.MessageWriter;
public class GridDhtTxOnePhaseCommitAckRequest extends GridCacheMessage {
/** Lock or transaction versions. */
@GridToStringInclude
- @GridDirectCollection(GridCacheVersion.class)
+ @Order(value = 3, method = "versions")
protected Collection<GridCacheVersion> vers;
/**
@@ -63,12 +59,19 @@ public class GridDhtTxOnePhaseCommitAckRequest extends
GridCacheMessage {
}
/**
- * @return Version.
+ * @return Lock or transaction versions.
*/
public Collection<GridCacheVersion> versions() {
return vers;
}
+ /**
+ * @param vers Lock or transaction versions.
+ */
+ public void versions(Collection<GridCacheVersion> vers) {
+ this.vers = vers;
+ }
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridDhtTxOnePhaseCommitAckRequest.class, this,
super.toString());
@@ -79,53 +82,6 @@ public class GridDhtTxOnePhaseCommitAckRequest extends
GridCacheMessage {
return addDepInfo;
}
- /** {@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 3:
- 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 3:
- vers = reader.readCollection(MessageCollectionItemType.MSG);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- }
-
- return true;
- }
-
/** {@inheritDoc} */
@Override public short directType() {
return -27;
