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 bb78d1baed0 IGNITE-26056 Use MessageSerializer for
ServiceSingleNodeDeploymentResultBatch (#12340)
bb78d1baed0 is described below
commit bb78d1baed03e395feb22e08464348d55c7da549
Author: Dmitry Werner <[email protected]>
AuthorDate: Mon Sep 15 11:55:37 2025 +0500
IGNITE-26056 Use MessageSerializer for
ServiceSingleNodeDeploymentResultBatch (#12340)
---
.../communication/GridIoMessageFactory.java | 3 +-
.../ServiceSingleNodeDeploymentResultBatch.java | 72 +++++-----------------
2 files changed, 17 insertions(+), 58 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 48b0db2e546..9c19488a702 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
@@ -56,6 +56,7 @@ import
org.apache.ignite.internal.codegen.MissingMappingRequestMessageSerializer
import
org.apache.ignite.internal.codegen.MissingMappingResponseMessageSerializer;
import org.apache.ignite.internal.codegen.NearCacheUpdatesSerializer;
import
org.apache.ignite.internal.codegen.SchemaOperationStatusMessageSerializer;
+import
org.apache.ignite.internal.codegen.ServiceSingleNodeDeploymentResultBatchSerializer;
import org.apache.ignite.internal.codegen.SessionChannelMessageSerializer;
import
org.apache.ignite.internal.codegen.SnapshotFilesFailureMessageSerializer;
import
org.apache.ignite.internal.codegen.SnapshotFilesRequestMessageSerializer;
@@ -347,7 +348,7 @@ public class GridIoMessageFactory implements
MessageFactoryProvider {
factory.register((short)162, GenerateEncryptionKeyRequest::new, new
GenerateEncryptionKeyRequestSerializer());
factory.register((short)163, GenerateEncryptionKeyResponse::new);
factory.register((short)167, ServiceDeploymentProcessId::new);
- factory.register((short)168,
ServiceSingleNodeDeploymentResultBatch::new);
+ factory.register((short)168,
ServiceSingleNodeDeploymentResultBatch::new, new
ServiceSingleNodeDeploymentResultBatchSerializer());
factory.register((short)169, ServiceSingleNodeDeploymentResult::new);
factory.register(GridQueryKillRequest.TYPE_CODE,
GridQueryKillRequest::new, new GridQueryKillRequestSerializer());
factory.register(GridQueryKillResponse.TYPE_CODE,
GridQueryKillResponse::new, new GridQueryKillResponseSerializer());
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResultBatch.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResultBatch.java
index c1622db92e3..e0d689d330e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResultBatch.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResultBatch.java
@@ -17,19 +17,14 @@
package org.apache.ignite.internal.processors.service;
-import java.nio.ByteBuffer;
import java.util.Map;
+import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.plugin.extensions.communication.Message;
-import org.apache.ignite.plugin.extensions.communication.MessageReader;
-import org.apache.ignite.plugin.extensions.communication.MessageWriter;
import org.jetbrains.annotations.NotNull;
-import static
org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType.IGNITE_UUID;
-import static
org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType.MSG;
-
/**
* Batch of service single node deployment result.
* <p/>
@@ -37,10 +32,12 @@ import static
org.apache.ignite.plugin.extensions.communication.MessageCollectio
*/
public class ServiceSingleNodeDeploymentResultBatch implements Message {
/** Deployment process id. */
+ @Order(value = 0, method = "deploymentId")
@GridToStringInclude
private ServiceDeploymentProcessId depId;
/** Services deployments results. */
+ @Order(1)
@GridToStringInclude
private Map<IgniteUuid, ServiceSingleNodeDeploymentResult> results;
@@ -67,6 +64,13 @@ public class ServiceSingleNodeDeploymentResultBatch
implements Message {
return results;
}
+ /**
+ * @param results Services deployments results.
+ */
+ public void results(Map<IgniteUuid, ServiceSingleNodeDeploymentResult>
results) {
+ this.results = results;
+ }
+
/**
* @return Deployment process id.
*/
@@ -74,57 +78,11 @@ public class ServiceSingleNodeDeploymentResultBatch
implements Message {
return depId;
}
- /** {@inheritDoc} */
- @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
- writer.setBuffer(buf);
-
- if (!writer.isHeaderWritten()) {
- if (!writer.writeHeader(directType()))
- return false;
-
- writer.onHeaderWritten();
- }
-
- switch (writer.state()) {
- case 0:
- if (!writer.writeMessage(depId))
- return false;
-
- writer.incrementState();
-
- case 1:
- if (!writer.writeMap(results, IGNITE_UUID, MSG))
- return false;
-
- writer.incrementState();
- }
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
- reader.setBuffer(buf);
-
- switch (reader.state()) {
- case 0:
- depId = reader.readMessage();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 1:
- results = reader.readMap(IGNITE_UUID, MSG, false);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
- }
-
- return true;
+ /**
+ * @param depId Deployment process id.
+ */
+ public void deploymentId(ServiceDeploymentProcessId depId) {
+ this.depId = depId;
}
/** {@inheritDoc} */
