Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
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.ServiceDeploymentProcessIdSerializer;
import org.apache.ignite.internal.codegen.ServiceSingleNodeDeploymentResultBatchSerializer;
import org.apache.ignite.internal.codegen.SessionChannelMessageSerializer;
import org.apache.ignite.internal.codegen.SnapshotFilesFailureMessageSerializer;
Expand Down Expand Up @@ -358,7 +359,7 @@ public class GridIoMessageFactory implements MessageFactoryProvider {
factory.register((short)157, PartitionUpdateCountersMessage::new);
factory.register((short)162, GenerateEncryptionKeyRequest::new, new GenerateEncryptionKeyRequestSerializer());
factory.register((short)163, GenerateEncryptionKeyResponse::new);
factory.register((short)167, ServiceDeploymentProcessId::new);
factory.register((short)167, ServiceDeploymentProcessId::new, new ServiceDeploymentProcessIdSerializer());
factory.register((short)168, ServiceSingleNodeDeploymentResultBatch::new, new ServiceSingleNodeDeploymentResultBatchSerializer());
factory.register((short)169, ServiceSingleNodeDeploymentResult::new);
factory.register(GridQueryKillRequest.TYPE_CODE, GridQueryKillRequest::new, new GridQueryKillRequestSerializer());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@
package org.apache.ignite.internal.processors.service;

import java.io.Serializable;
import java.nio.ByteBuffer;
import java.util.Objects;
import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
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 org.jetbrains.annotations.Nullable;

Expand All @@ -37,9 +35,11 @@ public class ServiceDeploymentProcessId implements Message, Serializable {
private static final long serialVersionUID = 0L;

/** Topology version. */
@Order(value = 0, method = "topologyVersion")
@Nullable private AffinityTopologyVersion topVer;

/** Request's id. */
@Order(value = 1, method = "requestId")
@Nullable private IgniteUuid reqId;

/**
Expand Down Expand Up @@ -69,64 +69,25 @@ public AffinityTopologyVersion topologyVersion() {
return topVer;
}

/**
* @param topVer New topology version.
*/
public void topologyVersion(AffinityTopologyVersion topVer) {
this.topVer = topVer;
}

/**
* @return Requests id.
*/
public IgniteUuid requestId() {
return reqId;
}

/** {@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.writeAffinityTopologyVersion(topVer))
return false;

writer.incrementState();

case 1:
if (!writer.writeIgniteUuid(reqId))
return false;

writer.incrementState();
}

return true;
}

/** {@inheritDoc} */
@Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
reader.setBuffer(buf);

switch (reader.state()) {
case 0:
topVer = reader.readAffinityTopologyVersion();

if (!reader.isLastRead())
return false;

reader.incrementState();

case 1:
reqId = reader.readIgniteUuid();

if (!reader.isLastRead())
return false;

reader.incrementState();
}

return true;
/**
* @param reqId Request's id.
*/
public void requestId(IgniteUuid reqId) {
this.reqId = reqId;
}

/** {@inheritDoc} */
Expand Down