Add MappingProposedMessage

Author: abashev

modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java

@@ -51,6 +51,10 @@
 import org.apache.ignite.internal.processors.continuous.StopRoutineAckDiscoveryMessageSerializer;
 import org.apache.ignite.internal.processors.continuous.StopRoutineDiscoveryMessage;
 import org.apache.ignite.internal.processors.continuous.StopRoutineDiscoveryMessageSerializer;
+import org.apache.ignite.internal.processors.marshaller.MappingAcceptedMessage;
+import org.apache.ignite.internal.processors.marshaller.MappingAcceptedMessageSerializer;
+import org.apache.ignite.internal.processors.marshaller.MappingProposedMessage;
+import org.apache.ignite.internal.processors.marshaller.MappingProposedMessageSerializer;
 import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageCasAckMessage;
 import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageCasAckMessageSerializer;
 import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageCasMessage;
@@ -59,8 +63,6 @@
 import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageUpdateAckMessageSerializer;
 import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageUpdateMessage;
 import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageUpdateMessageSerializer;
-import org.apache.ignite.internal.processors.marshaller.MappingAcceptedMessage;
-import org.apache.ignite.internal.processors.marshaller.MappingAcceptedMessageSerializer;
 import org.apache.ignite.internal.processors.query.schema.message.SchemaFinishDiscoveryMessage;
 import org.apache.ignite.internal.processors.query.schema.message.SchemaFinishDiscoveryMessageSerializer;
 import org.apache.ignite.internal.processors.query.schema.message.SchemaProposeDiscoveryMessage;
@@ -226,6 +228,7 @@ public DiscoveryMessageFactory(@Nullable Marshaller cstDataMarshall, @Nullable C
         factory.register((short)515, CacheAffinityChangeMessage::new, new CacheAffinityChangeMessageSerializer());
         factory.register((short)516, ClientCacheChangeDiscoveryMessage::new, new ClientCacheChangeDiscoveryMessageSerializer());
         factory.register((short)517, MappingAcceptedMessage::new, new MappingAcceptedMessageSerializer());
+        factory.register((short)518, MappingProposedMessage::new, new MappingProposedMessageSerializer());
 
     }
 }

modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MappingAcceptedMessage.java

@@ -18,7 +18,6 @@
 package org.apache.ignite.internal.processors.marshaller;
 
 import org.apache.ignite.internal.Order;
-import org.apache.ignite.internal.managers.discovery.DiscoCache;
 import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;

modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MappingProposedMessage.java

@@ -18,10 +18,11 @@
 package org.apache.ignite.internal.processors.marshaller;
 
 import java.util.UUID;
+import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
-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.jetbrains.annotations.Nullable;
 
 /**
@@ -33,9 +34,9 @@
  * When it completes a pass around the cluster ring with no conflicts observed,
  * {@link MappingAcceptedMessage} is sent as an acknowledgement that everything is fine.
  */
-public class MappingProposedMessage implements DiscoveryCustomMessage {
+public class MappingProposedMessage implements DiscoveryCustomMessage, Message {
     /** */
-    private enum ProposalStatus {
+    enum ProposalStatus {
         /** */
         SUCCESSFUL,
         /** */
@@ -48,20 +49,37 @@ private enum ProposalStatus {
     private static final long serialVersionUID = 0L;
 
     /** */
-    private final IgniteUuid id = IgniteUuid.randomUuid();
+    @Order(0)
+    IgniteUuid id;
 
     /** */
-    private final UUID origNodeId;
+    @Order(1)
+    UUID origNodeId;
 
     /** */
-    @GridToStringInclude
-    private final MarshallerMappingItem mappingItem;
+    @Order(2)
+    byte platformId;
 
     /** */
-    private ProposalStatus status = ProposalStatus.SUCCESSFUL;
+    @Order(3)
+    int typeId;
 
     /** */
-    private String conflictingClsName;
+    @Order(4)
+    String clsName;
+
+    /** */
+    @Order(5)
+    ProposalStatus status;
+
+    /** */
+    @Order(6)
+    String conflictingClsName;
+
+    /** */
+    public MappingProposedMessage() {
+        // No-op.
+    }
 
     /**
      * @param mappingItem Mapping item.
@@ -70,8 +88,12 @@ private enum ProposalStatus {
     MappingProposedMessage(MarshallerMappingItem mappingItem, UUID origNodeId) {
         assert origNodeId != null;
 
-        this.mappingItem = mappingItem;
+        id = IgniteUuid.randomUuid();
+        platformId = mappingItem.platformId();
+        typeId = mappingItem.typeId();
+        clsName = mappingItem.className();
         this.origNodeId = origNodeId;
+        status = ProposalStatus.SUCCESSFUL;
     }
 
     /** {@inheritDoc} */
@@ -84,7 +106,7 @@ private enum ProposalStatus {
      */
     @Nullable @Override public DiscoveryCustomMessage ackMessage() {
         if (status == ProposalStatus.SUCCESSFUL)
-            return new MappingAcceptedMessage(mappingItem);
+            return new MappingAcceptedMessage(mappingItem());
         else
             return null;
     }
@@ -96,7 +118,7 @@ private enum ProposalStatus {
 
     /** */
     MarshallerMappingItem mappingItem() {
-        return mappingItem;
+        return new MarshallerMappingItem(platformId, typeId, clsName);
     }
 
     /** */
@@ -130,6 +152,11 @@ String conflictingClassName() {
         return conflictingClsName;
     }
 
+    /** {@inheritDoc} */
+    @Override public short directType() {
+        return 518;
+    }
+
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(MappingProposedMessage.class, this);