This is an automated email from the ASF dual-hosted git repository.
av 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 673e4d96ce8 IGNITE-28021 Order should start from 0 at each class and
subclass (#12831)
673e4d96ce8 is described below
commit 673e4d96ce8a1d436eb41253d806e07ed234e0fa
Author: Anton Vinogradov <[email protected]>
AuthorDate: Mon Mar 2 17:44:30 2026 +0300
IGNITE-28021 Order should start from 0 at each class and subclass (#12831)
---
.../query/calcite/message/CalciteErrorMessage.java | 4 +-
.../apache/ignite/internal/MessageProcessor.java | 57 +++++++++++++---------
.../communication/GridIoSecurityAwareMessage.java | 2 +-
.../processors/cache/GridCacheGroupIdMessage.java | 2 +-
.../processors/cache/GridCacheIdMessage.java | 2 +-
.../GridChangeGlobalStateMessageResponse.java | 4 +-
.../distributed/GridCacheTtlUpdateRequest.java | 12 ++---
.../distributed/GridCacheTxRecoveryRequest.java | 12 ++---
.../distributed/GridCacheTxRecoveryResponse.java | 6 +--
.../distributed/GridDistributedBaseMessage.java | 6 +--
.../distributed/GridDistributedLockRequest.java | 26 +++++-----
.../distributed/GridDistributedLockResponse.java | 6 +--
.../GridDistributedTxFinishRequest.java | 22 ++++-----
.../GridDistributedTxFinishResponse.java | 6 +--
.../GridDistributedTxPrepareRequest.java | 26 +++++-----
.../GridDistributedTxPrepareResponse.java | 4 +-
.../cache/distributed/GridNearUnlockRequest.java | 2 +-
.../dht/GridDhtAffinityAssignmentRequest.java | 6 +--
.../dht/GridDhtAffinityAssignmentResponse.java | 12 ++---
.../cache/distributed/dht/GridDhtLockRequest.java | 18 +++----
.../cache/distributed/dht/GridDhtLockResponse.java | 6 +--
.../distributed/dht/GridDhtTxFinishRequest.java | 6 +--
.../distributed/dht/GridDhtTxFinishResponse.java | 8 +--
.../dht/GridDhtTxOnePhaseCommitAckRequest.java | 2 +-
.../distributed/dht/GridDhtTxPrepareRequest.java | 28 +++++------
.../distributed/dht/GridDhtTxPrepareResponse.java | 10 ++--
.../distributed/dht/GridDhtUnlockRequest.java | 2 +-
.../dht/TransactionAttributesAwareRequest.java | 4 +-
.../AtomicApplicationAttributesAwareRequest.java | 4 +-
.../atomic/GridDhtAtomicAbstractUpdateRequest.java | 14 +++---
.../GridDhtAtomicDeferredUpdateResponse.java | 2 +-
.../dht/atomic/GridDhtAtomicNearResponse.java | 10 ++--
.../atomic/GridDhtAtomicSingleUpdateRequest.java | 8 +--
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 32 ++++++------
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 8 +--
.../GridNearAtomicAbstractUpdateRequest.java | 12 ++---
.../atomic/GridNearAtomicCheckUpdateRequest.java | 4 +-
.../atomic/GridNearAtomicFullUpdateRequest.java | 18 +++----
.../GridNearAtomicSingleUpdateFilterRequest.java | 2 +-
.../GridNearAtomicSingleUpdateInvokeRequest.java | 4 +-
.../atomic/GridNearAtomicSingleUpdateRequest.java | 4 +-
.../dht/atomic/GridNearAtomicUpdateResponse.java | 14 +++---
.../dht/preloader/GridDhtForceKeysRequest.java | 8 +--
.../dht/preloader/GridDhtForceKeysResponse.java | 10 ++--
.../preloader/GridDhtPartitionDemandMessage.java | 10 ++--
.../preloader/GridDhtPartitionSupplyMessage.java | 14 +++---
.../GridDhtPartitionsAbstractMessage.java | 6 +--
.../preloader/GridDhtPartitionsFullMessage.java | 26 +++++-----
.../preloader/GridDhtPartitionsSingleMessage.java | 20 ++++----
.../preloader/GridDhtPartitionsSingleRequest.java | 2 +-
.../cache/distributed/near/GridNearGetRequest.java | 22 ++++-----
.../distributed/near/GridNearGetResponse.java | 14 +++---
.../distributed/near/GridNearLockRequest.java | 16 +++---
.../distributed/near/GridNearLockResponse.java | 14 +++---
.../distributed/near/GridNearSingleGetRequest.java | 16 +++---
.../near/GridNearSingleGetResponse.java | 10 ++--
.../distributed/near/GridNearTxFinishRequest.java | 2 +-
.../distributed/near/GridNearTxFinishResponse.java | 6 +--
.../distributed/near/GridNearTxPrepareRequest.java | 12 ++---
.../near/GridNearTxPrepareResponse.java | 22 ++++-----
.../snapshot/IncrementalSnapshotAwareMessage.java | 8 +--
.../snapshot/SnapshotFilesFailureMessage.java | 2 +-
.../snapshot/SnapshotFilesRequestMessage.java | 8 +--
.../cache/query/GridCacheQueryRequest.java | 44 ++++++++---------
.../cache/query/GridCacheQueryResponse.java | 12 ++---
.../continuous/CacheContinuousQueryBatchAck.java | 4 +-
.../cache/transactions/TxLocksRequest.java | 4 +-
.../cache/transactions/TxLocksResponse.java | 8 +--
.../cache/version/GridCacheVersionEx.java | 2 +-
.../tcp/messages/InetSocketAddressMessage.java | 2 +-
.../TcpDiscoveryAbstractTraceableMessage.java | 2 +-
.../messages/TcpDiscoveryAuthFailedMessage.java | 4 +-
.../messages/TcpDiscoveryCheckFailedMessage.java | 2 +-
.../messages/TcpDiscoveryClientAckResponse.java | 2 +-
.../TcpDiscoveryClientMetricsUpdateMessage.java | 2 +-
.../messages/TcpDiscoveryClientPingRequest.java | 2 +-
.../messages/TcpDiscoveryClientPingResponse.java | 4 +-
.../messages/TcpDiscoveryCustomEventMessage.java | 4 +-
.../tcp/messages/TcpDiscoveryDiscardMessage.java | 4 +-
.../messages/TcpDiscoveryDuplicateIdMessage.java | 2 +-
.../tcp/messages/TcpDiscoveryHandshakeRequest.java | 4 +-
.../messages/TcpDiscoveryHandshakeResponse.java | 6 +--
.../messages/TcpDiscoveryJoinRequestMessage.java | 4 +-
.../TcpDiscoveryLoopbackProblemMessage.java | 4 +-
.../messages/TcpDiscoveryMetricsUpdateMessage.java | 6 +--
.../TcpDiscoveryNodeAddFinishedMessage.java | 6 +--
.../messages/TcpDiscoveryNodeFailedMessage.java | 6 +--
.../tcp/messages/TcpDiscoveryPingRequest.java | 2 +-
.../tcp/messages/TcpDiscoveryPingResponse.java | 2 +-
.../TcpDiscoveryRingLatencyCheckMessage.java | 4 +-
.../messages/TcpDiscoveryStatusCheckMessage.java | 6 +--
.../src/test/resources/codegen/ChildMessage.java | 2 +-
92 files changed, 427 insertions(+), 414 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteErrorMessage.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteErrorMessage.java
index a766adae920..99695f9cf1a 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteErrorMessage.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteErrorMessage.java
@@ -26,11 +26,11 @@ import
org.apache.ignite.internal.managers.communication.ErrorMessage;
*/
public class CalciteErrorMessage extends ErrorMessage implements
CalciteMessage {
/** */
- @Order(1)
+ @Order(0)
UUID qryId;
/** */
- @Order(2)
+ @Order(1)
long fragmentId;
/** */
diff --git
a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageProcessor.java
b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageProcessor.java
index 30cd08f930f..c4c6ab72073 100644
---
a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageProcessor.java
+++
b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageProcessor.java
@@ -125,41 +125,54 @@ public class MessageProcessor extends AbstractProcessor {
* @return a list of {@code VariableElement} objects representing all
ordered fields, including those declared in superclasses.
*/
private List<VariableElement> orderedFields(TypeElement type) {
+ List<List<VariableElement>> hierList = hierarchicalOrderedFields(type);
+
List<VariableElement> result = new ArrayList<>();
- while (type != null) {
- for (Element el: type.getEnclosedElements()) {
- if (el.getAnnotation(Order.class) != null) {
- result.add((VariableElement)el);
+ for (List<VariableElement> elList : hierList) {
+ elList.sort(Comparator.comparingInt(f ->
f.getAnnotation(Order.class).value()));
- if (el.getModifiers().contains(Modifier.STATIC)) {
- processingEnv.getMessager().printMessage(
- Diagnostic.Kind.ERROR,
- "Annotation @Order must only be used for
non-static fields.",
- el);
- }
+ result.addAll(elList);
- validateEnumFieldMapping(type, el);
+ for (int i = 0; i < elList.size(); i++) {
+ if (elList.get(i).getAnnotation(Order.class).value() != i) {
+ processingEnv.getMessager().printMessage(
+ Diagnostic.Kind.ERROR,
+ "Annotation @Order must be a sequence from 0 to " +
(elList.size() - 1),
+ elList.get(i));
}
}
+ }
- Element superType =
processingEnv.getTypeUtils().asElement(type.getSuperclass());
+ return result;
+ }
- type = (TypeElement)superType;
- }
+ /** */
+ private List<List<VariableElement>> hierarchicalOrderedFields(TypeElement
type) {
+ Element superType =
processingEnv.getTypeUtils().asElement(type.getSuperclass());
- result.sort(Comparator.comparingInt(f ->
f.getAnnotation(Order.class).value()));
+ List<List<VariableElement>> hierList = superType == null ? new
ArrayList<>() : hierarchicalOrderedFields((TypeElement)superType);
- for (int i = 0; i < result.size(); i++) {
- if (result.get(i).getAnnotation(Order.class).value() != i) {
- processingEnv.getMessager().printMessage(
- Diagnostic.Kind.ERROR,
- "Annotation @Order must be a sequence from 0 to " +
(result.size() - 1),
- result.get(i));
+ List<VariableElement> elList = new ArrayList<>();
+
+ for (Element el : type.getEnclosedElements()) {
+ if (el.getAnnotation(Order.class) != null) {
+ elList.add((VariableElement)el);
+
+ if (el.getModifiers().contains(Modifier.STATIC)) {
+ processingEnv.getMessager().printMessage(
+ Diagnostic.Kind.ERROR,
+ "Annotation @Order must only be used for non-static
fields.",
+ el);
+ }
+
+ validateEnumFieldMapping(type, el);
}
}
- return result;
+ hierList.add(elList);
+
+ return hierList;
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java
index ae4c7abebab..3e35894a136 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java
@@ -29,7 +29,7 @@ public class GridIoSecurityAwareMessage extends GridIoMessage
{
public static final short TYPE_CODE = 174;
/** Security subject ID that will be used during message processing on a
remote node. */
- @Order(8)
+ @Order(0)
UUID secSubjId;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java
index 49f9980c4c9..4e41c0f6d1d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java
@@ -30,7 +30,7 @@ import
org.apache.ignite.plugin.extensions.communication.MessageWriter;
public abstract class GridCacheGroupIdMessage extends GridCacheMessage {
/** Cache group ID. */
@GridToStringInclude
- @Order(3)
+ @Order(0)
public int grpId;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java
index 8365c22a250..ec677b647d5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java
@@ -30,7 +30,7 @@ import
org.apache.ignite.plugin.extensions.communication.MessageWriter;
public abstract class GridCacheIdMessage extends GridCacheMessage {
/** Cache ID. */
@GridToStringInclude
- @Order(3)
+ @Order(0)
public int cacheId;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java
index 2358d71f844..e790ff7ff70 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java
@@ -28,11 +28,11 @@ import org.jetbrains.annotations.Nullable;
*/
public class GridChangeGlobalStateMessageResponse extends GridCacheMessage {
/** Request id. */
- @Order(3)
+ @Order(0)
UUID reqId;
/** Activation error message. */
- @Order(4)
+ @Order(1)
ErrorMessage errMsg;
/**
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 b7d7e6322fc..62f93959ae9 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
@@ -37,28 +37,28 @@ import org.apache.ignite.internal.util.typedef.internal.S;
public class GridCacheTtlUpdateRequest extends GridCacheIdMessage {
/** Entries keys. */
@GridToStringInclude
- @Order(4)
+ @Order(0)
List<KeyCacheObject> keys;
/** Entries versions. */
- @Order(5)
+ @Order(1)
List<GridCacheVersion> vers;
/** Near entries keys. */
@GridToStringInclude
- @Order(6)
+ @Order(2)
List<KeyCacheObject> nearKeys;
/** Near entries versions. */
- @Order(7)
+ @Order(3)
List<GridCacheVersion> nearVers;
/** New TTL. */
- @Order(8)
+ @Order(4)
long ttl;
/** Topology version. */
- @Order(9)
+ @Order(5)
AffinityTopologyVersion topVer;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java
index 8b48490c6bd..8d19a32c894 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java
@@ -30,27 +30,27 @@ import org.apache.ignite.lang.IgniteUuid;
*/
public class GridCacheTxRecoveryRequest extends GridDistributedBaseMessage {
/** Future ID. */
- @Order(7)
+ @Order(0)
IgniteUuid futId;
/** Mini future ID. */
- @Order(8)
+ @Order(1)
IgniteUuid miniId;
/** Near transaction ID. */
- @Order(9)
+ @Order(2)
GridCacheVersion nearXidVer;
/** Expected number of transactions on node. */
- @Order(10)
+ @Order(3)
int txNum;
/** System transaction flag. */
- @Order(11)
+ @Order(4)
boolean sys;
/** {@code True} if should check only tx on near node. */
- @Order(12)
+ @Order(5)
boolean nearTxCheck;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java
index 01696ac60bf..2c7fe02b70c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java
@@ -31,15 +31,15 @@ import org.apache.ignite.lang.IgniteUuid;
*/
public class GridCacheTxRecoveryResponse extends GridDistributedBaseMessage
implements IgniteTxStateAware {
/** Future ID. */
- @Order(7)
+ @Order(0)
IgniteUuid futId;
/** Mini future ID. */
- @Order(8)
+ @Order(1)
IgniteUuid miniId;
/** Flag indicating if all remote transactions were prepared. */
- @Order(9)
+ @Order(2)
boolean success;
/** Transient TX state. */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java
index 8d8d045ffda..21516e1ca5f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java
@@ -33,17 +33,17 @@ import org.jetbrains.annotations.Nullable;
public abstract class GridDistributedBaseMessage extends GridCacheIdMessage
implements GridCacheDeployable,
GridCacheVersionable {
/** Lock or transaction version. */
- @Order(4)
+ @Order(0)
@GridToStringInclude
public GridCacheVersion ver;
/** Committed versions with order higher than one for this message (needed
for commit ordering). */
- @Order(5)
+ @Order(1)
@GridToStringInclude
@Nullable public Collection<GridCacheVersion> committedVers;
/** Rolled back versions with order higher than one for this message
(needed for commit ordering). */
- @Order(6)
+ @Order(2)
@GridToStringInclude
@Nullable public Collection<GridCacheVersion> rolledbackVers;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
index aa7eb1c8ec7..22fd4d654f2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
@@ -50,47 +50,47 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
private static final int SKIP_READ_THROUGH_FLAG_MASK = 0x08;
/** Sender node ID. */
- @Order(7)
+ @Order(0)
public UUID nodeId;
/** Near transaction version. */
- @Order(8)
+ @Order(1)
public GridCacheVersion nearXidVer;
/** Thread ID. */
- @Order(9)
+ @Order(2)
public long threadId;
/** Future ID. */
- @Order(10)
+ @Order(3)
public IgniteUuid futId;
/** Max wait timeout. */
- @Order(11)
+ @Order(4)
public long timeout;
/** Indicates whether lock is obtained within a scope of transaction. */
- @Order(12)
+ @Order(5)
public boolean isInTx;
/** Invalidate flag for transactions. */
- @Order(13)
+ @Order(6)
public boolean isInvalidate;
/** Indicates whether implicit lock so for read or write operation. */
- @Order(14)
+ @Order(7)
public boolean isRead;
/** Transaction isolation level. */
- @Order(15)
+ @Order(8)
public TransactionIsolation isolation;
/** Key bytes for keys to lock. */
- @Order(16)
+ @Order(9)
public List<KeyCacheObject> keys;
/** Array indicating whether value should be returned for a key. */
- @Order(17)
+ @Order(10)
@GridToStringInclude
public boolean[] retVals;
@@ -98,11 +98,11 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
protected int idx;
/** Key count. */
- @Order(18)
+ @Order(11)
public int txSize;
/** Additional flags. */
- @Order(19)
+ @Order(12)
public byte flags;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
index 10fa4714dbc..a8b0bfa7b31 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
@@ -38,16 +38,16 @@ import org.jetbrains.annotations.Nullable;
@SuppressWarnings("AssignmentOrReturnOfFieldWithMutableType")
public class GridDistributedLockResponse extends GridDistributedBaseMessage {
/** Future ID. */
- @Order(7)
+ @Order(0)
public IgniteUuid futId;
/** Error. */
- @Order(8)
+ @Order(1)
public ErrorMessage errMsg;
/** Values. */
@GridToStringInclude
- @Order(9)
+ @Order(2)
public List<CacheObject> vals;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
index 3528473dd3f..ca3e276dd39 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
@@ -56,47 +56,47 @@ public class GridDistributedTxFinishRequest extends
GridDistributedBaseMessage i
protected static final int STORE_ENABLED_FLAG_MASK = 0x20;
/** Topology version. */
- @Order(7)
+ @Order(0)
public AffinityTopologyVersion topVer;
/** Future ID. */
- @Order(8)
+ @Order(1)
public IgniteUuid futId;
/** Thread ID. */
- @Order(9)
+ @Order(2)
public long threadId;
/** Commit version. */
- @Order(10)
+ @Order(3)
public GridCacheVersion commitVer;
/** Invalidate flag. */
- @Order(11)
+ @Order(4)
public boolean invalidate;
/** Commit flag. */
- @Order(12)
+ @Order(5)
public boolean commit;
/** Min version used as base for completed versions. */
- @Order(13)
+ @Order(6)
public GridCacheVersion baseVer;
/** IO policy. */
- @Order(14)
+ @Order(7)
public byte plc;
/** Task name hash. */
- @Order(15)
+ @Order(8)
public int taskNameHash;
/** */
- @Order(16)
+ @Order(9)
public byte flags;
/** Write synchronization mode. */
- @Order(17)
+ @Order(10)
public CacheWriteSynchronizationMode syncMode;
/** Transient TX state. */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
index 05f85e3275a..180d71d38e6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
@@ -31,15 +31,15 @@ import org.apache.ignite.lang.IgniteUuid;
*/
public class GridDistributedTxFinishResponse extends GridCacheMessage {
/** */
- @Order(3)
+ @Order(0)
public GridCacheVersion txId;
/** Future ID. */
- @Order(4)
+ @Order(1)
public IgniteUuid futId;
/** Partition ID this message is targeted to. */
- @Order(5)
+ @Order(2)
public int part;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
index 379fc9bcd17..bfe5bdda3aa 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
@@ -75,37 +75,37 @@ public class GridDistributedTxPrepareRequest extends
GridDistributedBaseMessage
private static final C1<UUIDCollectionMessage, Collection<UUID>>
MSG_TO_COL = UUIDCollectionMessage::uuids;
/** Thread ID. */
- @Order(7)
+ @Order(0)
@GridToStringInclude
public long threadId;
/** Transaction concurrency. */
- @Order(8)
+ @Order(1)
@GridToStringInclude
public TransactionConcurrency concurrency;
/** Transaction isolation. */
- @Order(9)
+ @Order(2)
@GridToStringInclude
public TransactionIsolation isolation;
/** Commit version for EC transactions. */
- @Order(10)
+ @Order(3)
@GridToStringInclude
public GridCacheVersion writeVer;
/** Transaction timeout. */
- @Order(11)
+ @Order(4)
@GridToStringInclude
public long timeout;
/** Transaction read set. */
- @Order(12)
+ @Order(5)
@GridToStringInclude
public Collection<IgniteTxEntry> reads;
/** Transaction write entries. */
- @Order(13)
+ @Order(6)
@GridToStringInclude
public Collection<IgniteTxEntry> writes;
@@ -114,33 +114,33 @@ public class GridDistributedTxPrepareRequest extends
GridDistributedBaseMessage
private Map<IgniteTxKey, GridCacheVersion> dhtVers;
/** */
- @Order(14)
+ @Order(7)
public Collection<IgniteTxKey> dhtVerKeys;
/** */
- @Order(15)
+ @Order(8)
public Collection<GridCacheVersion> dhtVerVals;
/** Expected transaction size. */
- @Order(16)
+ @Order(9)
public int txSize;
/** Transaction nodes mapping (primary node -> related backup nodes). */
private Map<UUID, Collection<UUID>> txNodes;
/** Tx nodes direct marshallable message. */
- @Order(17)
+ @Order(10)
public Map<UUID, UUIDCollectionMessage> txNodesMsg;
/** IO policy. */
- @Order(18)
+ @Order(11)
public byte plc;
/** Transient TX state. */
private IgniteTxState txState;
/** */
- @Order(19)
+ @Order(12)
@GridToStringExclude
public byte flags;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
index 0584e7521f7..9bfbeb33c3f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
@@ -34,14 +34,14 @@ import org.jetbrains.annotations.Nullable;
public class GridDistributedTxPrepareResponse extends
GridDistributedBaseMessage implements IgniteTxStateAware {
/** Error message. */
@GridToStringExclude
- @Order(7)
+ @Order(0)
@Nullable public ErrorMessage errMsg;
/** TX state. */
private IgniteTxState txState;
/** Partition ID this message is targeted to. */
- @Order(8)
+ @Order(1)
public int part;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java
index 152f6f75893..1dfb0dc0ae4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java
@@ -33,7 +33,7 @@ import org.apache.ignite.internal.util.typedef.internal.S;
public class GridNearUnlockRequest extends GridDistributedBaseMessage {
/** Keys. */
@GridToStringInclude
- @Order(7)
+ @Order(0)
public List<KeyCacheObject> keys;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
index d2ebcb9835b..230a056d525 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
@@ -30,15 +30,15 @@ public class GridDhtAffinityAssignmentRequest extends
GridCacheGroupIdMessage {
private static final int SND_PART_STATE_MASK = 0x01;
/** */
- @Order(4)
+ @Order(0)
byte flags;
/** */
- @Order(5)
+ @Order(1)
long futId;
/** Topology version being queried. */
- @Order(6)
+ @Order(2)
AffinityTopologyVersion topVer;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
index 5703b597953..0395eb77a83 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
@@ -38,39 +38,39 @@ import org.jetbrains.annotations.Nullable;
*/
public class GridDhtAffinityAssignmentResponse extends GridCacheGroupIdMessage
{
/** */
- @Order(4)
+ @Order(0)
long futId;
/** Topology version. */
- @Order(5)
+ @Order(1)
AffinityTopologyVersion topVer;
/** */
private List<List<UUID>> affAssignmentIds;
/** */
- @Order(6)
+ @Order(2)
byte[] affAssignmentIdsBytes;
/** */
private List<List<UUID>> idealAffAssignment;
/** Affinity assignment bytes. */
- @Order(7)
+ @Order(3)
byte[] idealAffAssignmentBytes;
/** */
private GridDhtPartitionFullMap partMap;
/** */
- @Order(8)
+ @Order(4)
byte[] partBytes;
/** Indicates that getting required affinity assignments has been failed.
*/
private IgniteCheckedException affAssignmentErr;
/** Serialized error. */
- @Order(9)
+ @Order(5)
byte[] affAssignmentErrBytes;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
index 6deb563f671..56fe1d807e8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
@@ -41,11 +41,11 @@ import org.jetbrains.annotations.Nullable;
*/
public class GridDhtLockRequest extends GridDistributedLockRequest {
/** Invalidate reader flags. */
- @Order(20)
+ @Order(0)
BitSet invalidateEntries;
/** Mini future ID. */
- @Order(21)
+ @Order(1)
IgniteUuid miniId;
/** Owner mapped version, if any. */
@@ -53,33 +53,33 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
private Map<KeyCacheObject, GridCacheVersion> owned;
/** Array of keys from {@link #owned}. Used during marshalling and
unmarshalling. */
- @Order(22)
+ @Order(2)
@GridToStringExclude
KeyCacheObject[] ownedKeys;
/** Array of values from {@link #owned}. Used during marshalling and
unmarshalling. */
- @Order(23)
+ @Order(3)
@GridToStringExclude
GridCacheVersion[] ownedValues;
/** Topology version. */
- @Order(24)
+ @Order(4)
AffinityTopologyVersion topVer;
/** Task name hash. */
- @Order(25)
+ @Order(5)
int taskNameHash;
/** Indexes of keys needed to be preloaded. */
- @Order(26)
+ @Order(6)
BitSet preloadKeys;
/** TTL for read operation. */
- @Order(27)
+ @Order(7)
long accessTtl;
/** Transaction label. */
- @Order(28)
+ @Order(8)
String txLbl;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
index c1d48bcc030..04412f4e577 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
@@ -38,16 +38,16 @@ import org.apache.ignite.lang.IgniteUuid;
@SuppressWarnings("AssignmentOrReturnOfFieldWithMutableType")
public class GridDhtLockResponse extends GridDistributedLockResponse {
/** Mini future ID. */
- @Order(10)
+ @Order(0)
IgniteUuid miniId;
/** Invalid partitions. */
@GridToStringInclude
- @Order(11)
+ @Order(1)
Collection<Integer> invalidParts;
/** Preload entries returned from backup. */
- @Order(12)
+ @Order(2)
List<GridCacheEntryInfo> preloadEntries;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
index d6e5b22b60a..dc4007c21cc 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
@@ -34,15 +34,15 @@ import org.jetbrains.annotations.NotNull;
*/
public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
/** Near node ID. */
- @Order(18)
+ @Order(0)
UUID nearNodeId;
/** Mini future ID. */
- @Order(19)
+ @Order(1)
int miniId;
/** */
- @Order(20)
+ @Order(2)
Collection<PartitionUpdateCountersMessage> updCntrs;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
index ae2e0f60452..8e218befadf 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
@@ -34,19 +34,19 @@ import org.jetbrains.annotations.Nullable;
*/
public final class GridDhtTxFinishResponse extends
GridDistributedTxFinishResponse {
/** Mini future ID. */
- @Order(6)
+ @Order(0)
int miniId;
/** Error message. */
- @Order(7)
+ @Order(1)
@Nullable ErrorMessage checkCommittedErrMsg;
/** Cache return value. */
- @Order(8)
+ @Order(2)
GridCacheReturn retVal;
/** Flag indicating if this is a check-committed response. */
- @Order(9)
+ @Order(3)
boolean checkCommitted;
/**
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 3fbd909658b..3e067f64f9b 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
@@ -30,7 +30,7 @@ import org.apache.ignite.internal.util.typedef.internal.S;
public class GridDhtTxOnePhaseCommitAckRequest extends GridCacheMessage {
/** Lock or transaction versions. */
@GridToStringInclude
- @Order(3)
+ @Order(0)
protected Collection<GridCacheVersion> vers;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
index 06300deeaec..e3b1ef448ce 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
@@ -46,27 +46,27 @@ import org.jetbrains.annotations.Nullable;
*/
public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
/** Max order. */
- @Order(20)
+ @Order(0)
UUID nearNodeId;
/** Future ID. */
- @Order(21)
+ @Order(1)
IgniteUuid futId;
/** Mini future ID. */
- @Order(22)
+ @Order(2)
int miniId;
/** Topology version. */
- @Order(23)
+ @Order(3)
AffinityTopologyVersion topVer;
/** Invalidate near entries flags. */
- @Order(24)
+ @Order(4)
BitSet invalidateNearEntries;
/** Near writes. */
- @Order(25)
+ @Order(5)
@GridToStringInclude
Collection<IgniteTxEntry> nearWrites;
@@ -75,38 +75,38 @@ public class GridDhtTxPrepareRequest extends
GridDistributedTxPrepareRequest {
private Map<IgniteTxKey, GridCacheVersion> owned;
/** Owned keys. */
- @Order(26)
+ @Order(6)
Collection<IgniteTxKey> ownedKeys;
/** Owned values. */
- @Order(27)
+ @Order(7)
Collection<GridCacheVersion> ownedVals;
/** */
- @Order(28)
+ @Order(8)
Collection<PartitionUpdateCountersMessage> updCntrs;
/** Near transaction ID. */
- @Order(29)
+ @Order(9)
GridCacheVersion nearXidVer;
/** Task name hash. */
- @Order(30)
+ @Order(10)
int taskNameHash;
/** Preload keys. */
- @Order(31)
+ @Order(11)
BitSet preloadKeys;
/** */
private List<IgniteTxKey> nearWritesCacheMissed;
/** {@code True} if remote tx should skip adding itself to completed
versions map on finish. */
- @Order(32)
+ @Order(12)
boolean skipCompletedVers;
/** Transaction label. */
- @Order(33)
+ @Order(13)
@GridToStringInclude
@Nullable String txLbl;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
index d8867bfd816..fa947fc4e54 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
@@ -40,23 +40,23 @@ import org.jetbrains.annotations.Nullable;
public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse
{
/** Evicted readers. */
@GridToStringInclude
- @Order(9)
+ @Order(0)
@Nullable Collection<IgniteTxKey> nearEvicted;
/** Future ID. */
- @Order(10)
+ @Order(1)
IgniteUuid futId;
/** Mini future ID. */
- @Order(11)
+ @Order(2)
int miniId;
/** Invalid partitions by cache ID. */
- @Order(12)
+ @Order(3)
@Nullable Map<Integer, int[]> invalidParts;
/** Preload entries found on backup node. */
- @Order(13)
+ @Order(4)
@Nullable List<GridCacheEntryInfo> preloadEntries;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
index eebee53b53e..2aaa04b4328 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
@@ -31,7 +31,7 @@ import org.apache.ignite.internal.util.typedef.internal.S;
*/
public class GridDhtUnlockRequest extends GridNearUnlockRequest {
/** Near keys. */
- @Order(8)
+ @Order(0)
List<KeyCacheObject> nearKeys;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java
index b5c01c89508..30c023ff918 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java
@@ -30,11 +30,11 @@ public class TransactionAttributesAwareRequest extends
GridCacheMessage {
public static final short TYPE_CODE = 181;
/** Original transaction prepare message. */
- @Order(3)
+ @Order(0)
GridDistributedTxPrepareRequest payload;
/** Application attributes. */
- @Order(4)
+ @Order(1)
Map<String, String> appAttrs;
/** */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java
index 6b44d9dec5e..2b5eec5284d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java
@@ -29,11 +29,11 @@ public class AtomicApplicationAttributesAwareRequest
extends GridCacheIdMessage
public static final short TYPE_CODE = 180;
/** Original update message. */
- @Order(4)
+ @Order(0)
GridNearAtomicAbstractUpdateRequest payload;
/** Application attributes. */
- @Order(5)
+ @Order(1)
Map<String, String> appAttrs;
/** */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java
index b13bac3c793..c9b55fcbc0a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java
@@ -62,19 +62,19 @@ public abstract class GridDhtAtomicAbstractUpdateRequest
extends GridCacheIdMess
public static final int CACHE_MSG_IDX = nextIndexId();
/** Future ID on primary. */
- @Order(4)
+ @Order(0)
protected long futId;
/** Write version. */
- @Order(5)
+ @Order(1)
protected GridCacheVersion writeVer;
/** Topology version. */
- @Order(6)
+ @Order(2)
protected AffinityTopologyVersion topVer;
/** Task name hash. */
- @Order(7)
+ @Order(3)
protected int taskNameHash;
/** Node ID. */
@@ -84,15 +84,15 @@ public abstract class GridDhtAtomicAbstractUpdateRequest
extends GridCacheIdMess
private boolean onRes;
/** */
- @Order(8)
+ @Order(4)
UUID nearNodeId;
/** */
- @Order(9)
+ @Order(5)
long nearFutId;
/** Additional flags. */
- @Order(10)
+ @Order(6)
protected byte flags;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java
index 1a949a32bbb..fa9947d3560 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java
@@ -36,7 +36,7 @@ public class GridDhtAtomicDeferredUpdateResponse extends
GridCacheIdMessage impl
public static final int CACHE_MSG_IDX = nextIndexId();
/** ACK future versions. */
- @Order(4)
+ @Order(0)
GridLongList futIds;
/** */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java
index 579ce307dcc..5abd304a918 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java
@@ -39,24 +39,24 @@ public class GridDhtAtomicNearResponse extends
GridCacheIdMessage {
public static final int CACHE_MSG_IDX = nextIndexId();
/** */
- @Order(4)
+ @Order(0)
int partId;
/** */
- @Order(5)
+ @Order(1)
long futId;
/** */
- @Order(6)
+ @Order(2)
UUID primaryId;
/** */
- @Order(7)
+ @Order(3)
@GridToStringExclude
byte flags;
/** */
- @Order(8)
+ @Order(4)
@GridToStringInclude
UpdateErrors errs;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java
index c1c5045bea8..98fb9ca58a9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java
@@ -42,21 +42,21 @@ import static
org.apache.ignite.internal.processors.cache.GridCacheOperation.TRA
public class GridDhtAtomicSingleUpdateRequest extends
GridDhtAtomicAbstractUpdateRequest {
/** Key to update. */
@GridToStringInclude
- @Order(11)
+ @Order(0)
protected KeyCacheObject key;
/** Value to update. */
@GridToStringInclude
- @Order(12)
+ @Order(1)
protected CacheObject val;
/** Previous value. */
@GridToStringInclude
- @Order(13)
+ @Order(2)
protected CacheObject prevVal;
/** Partition. */
- @Order(14)
+ @Order(3)
protected long updateCntr;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
index 6a5f90debd0..f26873a89a8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
@@ -45,81 +45,81 @@ import org.jetbrains.annotations.Nullable;
public class GridDhtAtomicUpdateRequest extends
GridDhtAtomicAbstractUpdateRequest {
/** Keys to update. */
@GridToStringInclude
- @Order(11)
+ @Order(0)
List<KeyCacheObject> keys;
/** Values to update. */
@GridToStringInclude
- @Order(12)
+ @Order(1)
List<CacheObject> vals;
/** Previous values. */
@GridToStringInclude
- @Order(13)
+ @Order(2)
List<CacheObject> prevVals;
/** Conflict versions. */
- @Order(14)
+ @Order(3)
List<GridCacheVersion> conflictVers;
/** TTLs. */
- @Order(15)
+ @Order(4)
GridLongList ttls;
/** Conflict expire time. */
- @Order(16)
+ @Order(5)
GridLongList conflictExpireTimes;
/** Near TTLs. */
- @Order(17)
+ @Order(6)
GridLongList nearTtls;
/** Near expire times. */
- @Order(18)
+ @Order(7)
GridLongList nearExpireTimes;
/** Near cache keys to update. */
@GridToStringInclude
- @Order(19)
+ @Order(8)
List<KeyCacheObject> nearKeys;
/** Values to update. */
@GridToStringInclude
- @Order(20)
+ @Order(9)
List<CacheObject> nearVals;
/** Obsolete near values. */
@GridToStringInclude
- @Order(21)
+ @Order(10)
List<Integer> obsoleteIndexes;
/** Force transform backups flag. */
- @Order(22)
+ @Order(11)
boolean forceTransformBackups;
/** Entry processors. */
private List<EntryProcessor<Object, Object, Object>> entryProcessors;
/** Entry processors bytes. */
- @Order(23)
+ @Order(12)
List<byte[]> entryProcessorsBytes;
/** Near entry processors. */
private List<EntryProcessor<Object, Object, Object>> nearEntryProcessors;
/** Near entry processors bytes. */
- @Order(24)
+ @Order(13)
List<byte[]> nearEntryProcessorsBytes;
/** Optional arguments for entry processor. */
private Object[] invokeArgs;
/** Entry processor arguments bytes. */
- @Order(25)
+ @Order(14)
List<byte[]> invokeArgsBytes;
/** Partition. */
- @Order(26)
+ @Order(15)
GridLongList updateCntrs;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
index 687e5e0db17..0e937db5e58 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
@@ -38,20 +38,20 @@ public class GridDhtAtomicUpdateResponse extends
GridCacheIdMessage implements G
public static final int CACHE_MSG_IDX = nextIndexId();
/** Future version. */
- @Order(4)
+ @Order(0)
long futId;
/** */
- @Order(5)
+ @Order(1)
UpdateErrors errs;
/** Evicted readers. */
@GridToStringInclude
- @Order(6)
+ @Order(2)
List<KeyCacheObject> nearEvicted;
/** */
- @Order(7)
+ @Order(3)
int partId;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java
index cc39e3a54e9..368ffe41676 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java
@@ -76,28 +76,28 @@ public abstract class GridNearAtomicAbstractUpdateRequest
extends GridCacheIdMes
protected UUID nodeId;
/** Future version. */
- @Order(4)
+ @Order(0)
protected long futId;
/** Topology version. */
- @Order(5)
+ @Order(1)
protected AffinityTopologyVersion topVer;
/** Cache update operation. */
- @Order(6)
+ @Order(2)
protected GridCacheOperation op;
/** Write synchronization mode. */
- @Order(7)
+ @Order(3)
protected CacheWriteSynchronizationMode syncMode;
/** Task name hash. */
- @Order(8)
+ @Order(4)
protected int taskNameHash;
/** Compressed boolean flags. Make sure 'toString' is updated when add new
flag. */
@GridToStringExclude
- @Order(9)
+ @Order(5)
protected short flags;
/** */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java
index ff6fead509a..8ad123b4d3d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java
@@ -32,11 +32,11 @@ public class GridNearAtomicCheckUpdateRequest extends
GridCacheIdMessage {
private GridNearAtomicAbstractUpdateRequest updateReq;
/** */
- @Order(4)
+ @Order(0)
int partId;
/** */
- @Order(5)
+ @Order(1)
long futId;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
index 06dbcab7c6f..6a3bab524e7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
@@ -53,49 +53,49 @@ import static
org.apache.ignite.internal.processors.cache.GridCacheOperation.UPD
*/
public class GridNearAtomicFullUpdateRequest extends
GridNearAtomicAbstractUpdateRequest {
/** Keys to update. */
- @Order(10)
+ @Order(0)
@GridToStringInclude
List<KeyCacheObject> keys;
/** Values to update. */
- @Order(11)
+ @Order(1)
List<CacheObject> vals;
/** Entry processors. */
private List<EntryProcessor<Object, Object, Object>> entryProcessors;
/** Entry processors bytes. */
- @Order(12)
+ @Order(2)
@Nullable List<byte[]> entryProcessorsBytes;
/** Conflict versions. */
- @Order(13)
+ @Order(3)
@Nullable List<GridCacheVersion> conflictVers;
/** Conflict TTLs. */
- @Order(14)
+ @Order(4)
GridLongList conflictTtls;
/** Conflict expire times. */
- @Order(15)
+ @Order(5)
GridLongList conflictExpireTimes;
/** Optional arguments for entry processor. */
private @Nullable Object[] invokeArgs;
/** Entry processor arguments bytes. */
- @Order(16)
+ @Order(6)
@Nullable List<byte[]> invokeArgsBytes;
/** Expiry policy. */
private @Nullable ExpiryPolicy expiryPlc;
/** Expiry policy bytes. */
- @Order(17)
+ @Order(7)
@Nullable byte[] expiryPlcBytes;
/** Filter. */
- @Order(18)
+ @Order(8)
@Nullable CacheEntryPredicate[] filter;
/** Maximum possible size of inner collections. */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
index bc9ee233434..6ed17f45b45 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
@@ -36,7 +36,7 @@ import org.jetbrains.annotations.Nullable;
*/
public class GridNearAtomicSingleUpdateFilterRequest extends
GridNearAtomicSingleUpdateRequest {
/** Filter. */
- @Order(12)
+ @Order(0)
CacheEntryPredicate[] filter;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
index 3110cf9e3f5..90a70b2daed 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
@@ -49,14 +49,14 @@ public class GridNearAtomicSingleUpdateInvokeRequest
extends GridNearAtomicSingl
private @Nullable Object[] invokeArgs;
/** Entry processor arguments bytes. */
- @Order(12)
+ @Order(0)
@Nullable List<byte[]> invokeArgsBytes;
/** Entry processors. */
private @Nullable EntryProcessor<Object, Object, Object> entryProc;
/** Entry processors bytes. */
- @Order(13)
+ @Order(1)
@Nullable byte[] entryProcBytes;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
index 8c7a6fbc5e5..80e6102e630 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
@@ -49,11 +49,11 @@ import static
org.apache.ignite.internal.processors.cache.GridCacheOperation.TRA
public class GridNearAtomicSingleUpdateRequest extends
GridNearAtomicAbstractUpdateRequest {
/** Key to update. */
@GridToStringInclude
- @Order(10)
+ @Order(0)
protected KeyCacheObject key;
/** Value to update. */
- @Order(11)
+ @Order(1)
protected CacheObject val;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
index 6767c19f76e..41faec1130e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
@@ -47,33 +47,33 @@ public class GridNearAtomicUpdateResponse extends
GridCacheIdMessage implements
private UUID nodeId;
/** Future ID. */
- @Order(4)
+ @Order(0)
long futId;
/** */
- @Order(5)
+ @Order(1)
UpdateErrors errs;
/** Return value. */
@GridToStringInclude
- @Order(6)
+ @Order(2)
GridCacheReturn ret;
/** */
- @Order(7)
+ @Order(3)
AffinityTopologyVersion remapTopVer;
/** Data for near cache update. */
- @Order(8)
+ @Order(4)
NearCacheUpdates nearUpdates;
/** Partition ID. */
- @Order(9)
+ @Order(5)
int partId;
/** */
@GridToStringInclude
- @Order(10)
+ @Order(6)
List<UUID> mapping;
/** */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
index e780c631a2d..dba2560c6f3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
@@ -37,20 +37,20 @@ import org.apache.ignite.lang.IgniteUuid;
*/
public class GridDhtForceKeysRequest extends GridCacheIdMessage implements
GridCacheDeployable {
/** Future ID. */
- @Order(4)
+ @Order(0)
IgniteUuid futId;
/** Mini-future ID. */
- @Order(5)
+ @Order(1)
IgniteUuid miniId;
/** Keys to request. */
- @Order(6)
+ @Order(2)
@GridToStringInclude
Collection<KeyCacheObject> keys;
/** Topology version for which keys are requested. */
- @Order(7)
+ @Order(3)
AffinityTopologyVersion topVer;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
index deb45e83621..ec8de445dbc 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
@@ -40,25 +40,25 @@ import org.jetbrains.annotations.Nullable;
*/
public class GridDhtForceKeysResponse extends GridCacheIdMessage implements
GridCacheDeployable {
/** Future ID. */
- @Order(4)
+ @Order(0)
IgniteUuid futId;
/** Mini-future ID. */
- @Order(5)
+ @Order(1)
IgniteUuid miniId;
/** Error message. */
- @Order(6)
+ @Order(2)
@Nullable volatile ErrorMessage errMsg;
/** Missed (not found) keys. */
@GridToStringInclude
- @Order(7)
+ @Order(3)
List<KeyCacheObject> missedKeys;
/** Cache entries. */
@GridToStringInclude
- @Order(8)
+ @Order(4)
List<GridCacheEntryInfo> infos;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
index b299f431afd..b65bd6e2ab9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
@@ -28,23 +28,23 @@ import org.jetbrains.annotations.NotNull;
*/
public class GridDhtPartitionDemandMessage extends GridCacheGroupIdMessage {
/** Rebalance id. */
- @Order(4)
+ @Order(0)
long rebalanceId;
/** Partitions map. */
- @Order(5)
+ @Order(1)
IgniteDhtDemandedPartitionsMap parts;
/** Timeout. */
- @Order(6)
+ @Order(2)
long timeout;
/** Worker ID. */
- @Order(7)
+ @Order(3)
int workerId = -1;
/** Topology version. */
- @Order(8)
+ @Order(4)
AffinityTopologyVersion topVer;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
index d697eb90b6c..cee4b4ba773 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
@@ -43,32 +43,32 @@ import org.jetbrains.annotations.Nullable;
@SuppressWarnings("AssignmentOrReturnOfFieldWithMutableType")
public class GridDhtPartitionSupplyMessage extends GridCacheGroupIdMessage
implements GridCacheDeployable {
/** An unique (per demander) rebalance id. */
- @Order(4)
+ @Order(0)
long rebalanceId;
/** Topology version for which demand message is sent. */
- @Order(5)
+ @Order(1)
AffinityTopologyVersion topVer;
/** Partitions that have been fully sent. */
- @Order(6)
+ @Order(2)
Map<Integer, Long> last;
/** Partitions which were not found. */
@GridToStringInclude
- @Order(7)
+ @Order(3)
Collection<Integer> missed;
/** Entries. */
- @Order(8)
+ @Order(4)
Map<Integer, CacheEntryInfoCollection> infos;
/** Message size. */
- @Order(9)
+ @Order(5)
int msgSize;
/** Supplying process error message. */
- @Order(10)
+ @Order(6)
@Nullable ErrorMessage errMsg;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
index 6170e30e20a..0af0f2ec1c0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
@@ -32,15 +32,15 @@ public abstract class GridDhtPartitionsAbstractMessage
extends GridCacheMessage
private static final byte RESTORE_STATE_FLAG_MASK = 0x02;
/** Exchange ID. */
- @Order(3)
+ @Order(0)
GridDhtPartitionExchangeId exchId;
/** Last used cache version. */
- @Order(4)
+ @Order(1)
GridCacheVersion lastVer;
/** */
- @Order(5)
+ @Order(2)
protected byte flags;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
index 872629ddf19..37079381e9f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
@@ -57,38 +57,38 @@ public class GridDhtPartitionsFullMessage extends
GridDhtPartitionsAbstractMessa
private Map<Integer, GridDhtPartitionFullMap> parts;
/** Partitions without duplicated data. */
- @Order(6)
+ @Order(0)
@Compress
Map<Integer, GridDhtPartitionFullMap> locParts;
/** */
- @Order(7)
+ @Order(1)
Map<Integer, Integer> dupPartsData;
/** Partitions update counters. */
- @Order(8)
+ @Order(2)
@Compress
@GridToStringInclude
IgniteDhtPartitionCountersMap partCntrs;
/** Partitions history suppliers. */
- @Order(9)
+ @Order(3)
@Compress
@GridToStringInclude
IgniteDhtPartitionHistorySuppliersMap partHistSuppliers;
/** Partitions that must be cleared and re-loaded. */
- @Order(10)
+ @Order(4)
@Compress
@GridToStringInclude
IgniteDhtPartitionsToReloadMap partsToReload;
/** Partition sizes. */
- @Order(11)
+ @Order(5)
Map<Integer, IntLongMap> partsSizes;
/** Topology version. */
- @Order(12)
+ @Order(6)
AffinityTopologyVersion topVer;
/** Exceptions. */
@@ -99,29 +99,29 @@ public class GridDhtPartitionsFullMessage extends
GridDhtPartitionsAbstractMessa
* Used as a stub for serialization of {@link #errs}.
* All logic resides within getter and setter.
*/
- @Order(value = 13, method = "errorMessages")
+ @Order(value = 7, method = "errorMessages")
@Compress
@SuppressWarnings("unused")
private Map<UUID, ErrorMessage> errMsgs;
/** */
- @Order(14)
+ @Order(8)
AffinityTopologyVersion resTopVer;
/** */
- @Order(15)
+ @Order(9)
Map<Integer, CacheGroupAffinityMessage> joinedNodeAff;
/** */
- @Order(16)
+ @Order(10)
Map<Integer, CacheGroupAffinityMessage> idealAffDiff;
/** */
- @Order(17)
+ @Order(11)
byte flags;
/** */
- @Order(18)
+ @Order(12)
@GridToStringExclude
Map<Integer, int[]> lostParts;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
index 840a0f2da54..3129920338e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
@@ -40,55 +40,55 @@ import org.jetbrains.annotations.Nullable;
*/
public class GridDhtPartitionsSingleMessage extends
GridDhtPartitionsAbstractMessage {
/** Local partitions. */
- @Order(6)
+ @Order(0)
@Compress
@GridToStringInclude
Map<Integer, GridDhtPartitionMap> parts;
/** */
- @Order(7)
+ @Order(1)
Map<Integer, Integer> dupPartsData;
/** Partitions update counters. */
- @Order(8)
+ @Order(2)
@Compress
@GridToStringInclude
Map<Integer, CachePartitionPartialCountersMap> partCntrs;
/** Partitions sizes. */
- @Order(9)
+ @Order(3)
@Compress
@GridToStringInclude
Map<Integer, IntLongMap> partsSizes;
/** Partitions history reservation counters. */
- @Order(10)
+ @Order(4)
@Compress
@GridToStringInclude
Map<Integer, IntLongMap> partHistCntrs;
/** Error message. */
- @Order(11)
+ @Order(5)
@GridToStringInclude
ErrorMessage errMsg;
/** */
- @Order(12)
+ @Order(6)
boolean client;
/** */
- @Order(13)
+ @Order(7)
Collection<Integer> grpsAffReq;
/** Start time of exchange on node which sent this message in nanoseconds.
*/
- @Order(14)
+ @Order(8)
long exchangeStartTime;
/**
* Exchange finish message, sent to new coordinator when it tries to
restore state after previous coordinator failed
* during exchange.
*/
- @Order(15)
+ @Order(9)
GridDhtPartitionsFullMessage finishMsg;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
index ada0395b131..0dc27e1d2b2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
@@ -25,7 +25,7 @@ import org.apache.ignite.internal.util.typedef.internal.S;
*/
public class GridDhtPartitionsSingleRequest extends
GridDhtPartitionsAbstractMessage {
/** */
- @Order(6)
+ @Order(0)
GridDhtPartitionExchangeId restoreExchId;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
index d5a62826e92..51a31a3ee07 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
@@ -58,15 +58,15 @@ public class GridNearGetRequest extends GridCacheIdMessage
implements GridCacheD
public static final int RECOVERY_FLAG_MASK = 0x08;
/** Future ID. */
- @Order(4)
+ @Order(0)
IgniteUuid futId;
/** Sub ID. */
- @Order(5)
+ @Order(1)
IgniteUuid miniId;
/** Version. */
- @Order(6)
+ @Order(2)
GridCacheVersion ver;
/** */
@@ -74,35 +74,35 @@ public class GridNearGetRequest extends GridCacheIdMessage
implements GridCacheD
private LinkedHashMap<KeyCacheObject, Boolean> keyMap;
/** */
- @Order(7)
+ @Order(3)
List<KeyCacheObject> keys;
/** */
- @Order(8)
+ @Order(4)
List<Boolean> readersFlags;
/** */
- @Order(9)
+ @Order(5)
byte flags;
/** Topology version. */
- @Order(10)
+ @Order(6)
AffinityTopologyVersion topVer;
/** Task name hash. */
- @Order(11)
+ @Order(7)
int taskNameHash;
/** TTL for read operation. */
- @Order(12)
+ @Order(8)
long createTtl;
/** TTL for read operation. */
- @Order(13)
+ @Order(9)
long accessTtl;
/** Transaction label. */
- @Order(14)
+ @Order(10)
@Nullable String txLbl;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java
index f8c92112730..937abedccd2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java
@@ -42,33 +42,33 @@ import org.jetbrains.annotations.Nullable;
*/
public class GridNearGetResponse extends GridCacheIdMessage implements
GridCacheDeployable, GridCacheVersionable {
/** Future ID. */
- @Order(4)
+ @Order(0)
IgniteUuid futId;
/** Sub ID. */
- @Order(5)
+ @Order(1)
IgniteUuid miniId;
/** Version. */
- @Order(6)
+ @Order(2)
GridCacheVersion ver;
/** Result. */
@GridToStringInclude
- @Order(value = 7, method = "entries")
+ @Order(value = 3, method = "entries")
Collection<GridCacheEntryInfo> entries;
/** Keys to retry due to ownership shift. */
@GridToStringInclude
- @Order(8)
+ @Order(4)
Collection<Integer> invalidParts = new GridLeanSet<>();
/** Topology version if invalid partitions is not empty. */
- @Order(9)
+ @Order(5)
AffinityTopologyVersion topVer;
/** Error message. */
- @Order(10)
+ @Order(6)
@Nullable ErrorMessage errMsg;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
index 71e5187653b..949c4d4fea8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
@@ -47,36 +47,36 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
private static final int NEAR_CACHE_FLAG_MASK = 0x08;
/** Topology version. */
- @Order(20)
+ @Order(0)
AffinityTopologyVersion topVer;
/** Mini future ID. */
- @Order(21)
+ @Order(1)
int miniId;
/** Array of mapped DHT versions for this entry. */
- @Order(22)
+ @Order(2)
@GridToStringInclude
GridCacheVersion[] dhtVers;
/** Task name hash. */
- @Order(23)
+ @Order(3)
int taskNameHash;
/** TTL for create operation. */
- @Order(24)
+ @Order(4)
long createTtl;
/** TTL for read operation. */
- @Order(25)
+ @Order(5)
long accessTtl;
/** */
- @Order(26)
+ @Order(6)
byte flags;
/** Transaction label. */
- @Order(27)
+ @Order(7)
String txLbl;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
index f36b7006214..3c5b90d8d78 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
@@ -36,36 +36,36 @@ import org.jetbrains.annotations.Nullable;
public class GridNearLockResponse extends GridDistributedLockResponse {
/** Pending versions that are less than {@link #version()}. */
@GridToStringInclude
- @Order(10)
+ @Order(0)
Collection<GridCacheVersion> pending;
/** Mini future ID. */
- @Order(11)
+ @Order(1)
int miniId;
/** DHT versions. */
@GridToStringInclude
- @Order(12)
+ @Order(2)
GridCacheVersion[] dhtVers;
/** DHT candidate versions. */
@GridToStringInclude
- @Order(13)
+ @Order(3)
GridCacheVersion[] mappedVers;
/** Filter evaluation results for fast-commit transactions. */
- @Order(14)
+ @Order(4)
boolean[] filterRes;
/** Topology version, which is set when client node should remap lock
request. */
- @Order(15)
+ @Order(5)
AffinityTopologyVersion clientRemapVer;
/**
* Flag, indicating whether remap version is compatible with current
version.
* Used together with clientRemapVer.
*/
- @Order(16)
+ @Order(6)
boolean compatibleRemapVer;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
index 485bdc36046..771e77df9cd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
@@ -52,35 +52,35 @@ public class GridNearSingleGetRequest extends
GridCacheIdMessage implements Grid
public static final int RECOVERY_FLAG_MASK = 0x20;
/** Future ID. */
- @Order(4)
+ @Order(0)
long futId;
/** */
- @Order(5)
+ @Order(1)
KeyCacheObject key;
/** Flags. */
- @Order(6)
+ @Order(2)
byte flags;
/** Topology version. */
- @Order(7)
+ @Order(3)
AffinityTopologyVersion topVer;
/** Task name hash. */
- @Order(8)
+ @Order(4)
int taskNameHash;
/** TTL for read operation. */
- @Order(9)
+ @Order(5)
long createTtl;
/** TTL for read operation. */
- @Order(10)
+ @Order(6)
long accessTtl;
/** Transaction label. */
- @Order(11)
+ @Order(7)
@Nullable String txLbl;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java
index 961ef40e7a3..d8d3bbc59cf 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java
@@ -42,23 +42,23 @@ public class GridNearSingleGetResponse extends
GridCacheIdMessage implements Gri
public static final int CONTAINS_VAL_FLAG_MASK = 0x2;
/** Future ID. */
- @Order(4)
+ @Order(0)
long futId;
/** Result. */
- @Order(5)
+ @Order(1)
Message res;
/** Topology version. */
- @Order(value = 6, method = "topologyVersion")
+ @Order(value = 2, method = "topologyVersion")
AffinityTopologyVersion topVer;
/** Error message. */
- @Order(7)
+ @Order(3)
ErrorMessage errMsg;
/** Flags. */
- @Order(8)
+ @Order(4)
byte flags;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
index ebc08f48fe9..059222f3e17 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
@@ -33,7 +33,7 @@ import org.jetbrains.annotations.NotNull;
*/
public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest {
/** Mini future ID. */
- @Order(18)
+ @Order(0)
int miniId;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
index cfac5b264a5..5cb53e7d946 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
@@ -30,15 +30,15 @@ import org.jetbrains.annotations.Nullable;
*/
public final class GridNearTxFinishResponse extends
GridDistributedTxFinishResponse {
/** Error message. */
- @Order(6)
+ @Order(0)
@Nullable ErrorMessage errMsg;
/** Mini future ID. */
- @Order(7)
+ @Order(1)
int miniId;
/** Near tx thread ID. */
- @Order(8)
+ @Order(2)
long nearThreadId;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
index 700c797dc97..46a02f401ed 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
@@ -58,28 +58,28 @@ public class GridNearTxPrepareRequest extends
GridDistributedTxPrepareRequest {
private static final int RECOVERY_FLAG_MASK = 0x40;
/** Future ID. */
- @Order(20)
+ @Order(0)
IgniteUuid futId;
/** Mini future ID. */
- @Order(21)
+ @Order(1)
int miniId;
/** Topology version. */
- @Order(22)
+ @Order(2)
AffinityTopologyVersion topVer;
/** Task name hash. */
- @Order(23)
+ @Order(3)
int taskNameHash;
/** */
- @Order(24)
+ @Order(4)
@GridToStringExclude
byte flags;
/** Transaction label. */
- @Order(25)
+ @Order(5)
@GridToStringInclude
@Nullable String txLbl;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
index 45382d139a3..15be184ccca 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
@@ -45,23 +45,23 @@ import org.jetbrains.annotations.Nullable;
public class GridNearTxPrepareResponse extends
GridDistributedTxPrepareResponse {
/** Versions that are less than lock version ({@link #version()}). */
@GridToStringInclude
- @Order(9)
+ @Order(0)
@Nullable Collection<GridCacheVersion> pending;
/** Future ID. */
- @Order(10)
+ @Order(1)
IgniteUuid futId;
/** Mini future ID. */
- @Order(11)
+ @Order(2)
int miniId;
/** DHT version. */
- @Order(12)
+ @Order(3)
GridCacheVersion dhtVer;
/** Write version. */
- @Order(13)
+ @Order(4)
GridCacheVersion writeVer;
/** Map of owned values to set on near node. */
@@ -69,27 +69,27 @@ public class GridNearTxPrepareResponse extends
GridDistributedTxPrepareResponse
private Map<IgniteTxKey, CacheVersionedValue> ownedVals;
/** OwnedVals' keys for marshalling. */
- @Order(14)
+ @Order(5)
@Nullable Collection<IgniteTxKey> ownedValKeys;
/** OwnedVals' values for marshalling. */
- @Order(15)
+ @Order(6)
@Nullable Collection<CacheVersionedValue> ownedValVals;
/** Cache return value. */
- @Order(16)
+ @Order(7)
GridCacheReturn retVal;
/** Keys that did not pass the filter. */
- @Order(17)
+ @Order(8)
@Nullable Collection<IgniteTxKey> filterFailedKeys;
/** Topology version, which is set when client node should remap lock
request. */
- @Order(18)
+ @Order(9)
@Nullable AffinityTopologyVersion clientRemapVer;
/** One-phase commit on primary flag. */
- @Order(19)
+ @Order(10)
boolean onePhaseCommit;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java
index 0c257a6dc6c..30526aa14b1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java
@@ -32,19 +32,19 @@ public class IncrementalSnapshotAwareMessage extends
GridCacheMessage {
public static final short TYPE_CODE = 400;
/** Original transaction message. */
- @Order(3)
+ @Order(0)
GridCacheMessage payload;
/** Incremental snapshot ID. */
- @Order(4)
+ @Order(1)
UUID id;
/** ID of the latest incremental snapshot after which this transaction
committed. */
- @Order(5)
+ @Order(2)
@Nullable UUID txSnpId;
/** Incremental snapshot topology version. */
- @Order(6)
+ @Order(3)
long topVer;
/** */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java
index 4e0416e959f..71ac90131ef 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java
@@ -29,7 +29,7 @@ public class SnapshotFilesFailureMessage extends
AbstractSnapshotMessage {
public static final short TYPE_CODE = 179;
/** Exception message which is occurred during snapshot request
processing. */
- @Order(1)
+ @Order(0)
String errMsg;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java
index b084b6cb9a5..cbf7770bbae 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java
@@ -38,19 +38,19 @@ public class SnapshotFilesRequestMessage extends
AbstractSnapshotMessage {
public static final short TYPE_CODE = 178;
/** Snapshot operation request ID. */
- @Order(1)
+ @Order(0)
UUID reqId;
/** Snapshot name to request. */
- @Order(2)
+ @Order(1)
String snpName;
/** Snapshot directory path. */
- @Order(3)
+ @Order(2)
String snpPath;
/** Map of cache group ids and corresponding set of its partition ids. */
- @Order(4)
+ @Order(3)
Map<Integer, int[]> parts;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
index 3e0c9500973..b5bb798ca40 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
@@ -59,19 +59,19 @@ public class GridCacheQueryRequest extends
GridCacheIdMessage implements GridCac
private static final int FLAG_DATA_PAGE_SCAN_MASK = 0b11;
/** */
- @Order(4)
+ @Order(0)
long id;
/** */
- @Order(5)
+ @Order(1)
String cacheName;
/** */
- @Order(6)
+ @Order(2)
GridCacheQueryType type;
/** */
- @Order(7)
+ @Order(3)
@GridToStringInclude(sensitive = true)
String clause;
@@ -79,87 +79,87 @@ public class GridCacheQueryRequest extends
GridCacheIdMessage implements GridCac
private IndexQueryDesc idxQryDesc;
/** */
- @Order(8)
+ @Order(4)
byte[] idxQryDescBytes;
/** */
- @Order(9)
+ @Order(5)
int limit;
/** */
- @Order(10)
+ @Order(6)
String clsName;
/** */
private IgniteBiPredicate<Object, Object> keyValFilter;
/** */
- @Order(11)
+ @Order(7)
byte[] keyValFilterBytes;
/** */
private IgniteReducer<Object, Object> rdc;
/** */
- @Order(12)
+ @Order(8)
byte[] rdcBytes;
/** */
private IgniteClosure<?, ?> trans;
/** */
- @Order(13)
+ @Order(9)
byte[] transBytes;
/** */
private Object[] args;
/** */
- @Order(14)
+ @Order(10)
byte[] argsBytes;
/** */
- @Order(15)
+ @Order(11)
int pageSize;
/** */
- @Order(16)
+ @Order(12)
boolean incBackups;
/** */
- @Order(17)
+ @Order(13)
boolean cancel;
/** */
- @Order(18)
+ @Order(14)
boolean incMeta;
/** */
- @Order(19)
+ @Order(15)
boolean all;
/** */
- @Order(20)
+ @Order(16)
boolean keepBinary;
/** */
- @Order(21)
+ @Order(17)
int taskHash;
/** Partition. */
- @Order(22)
+ @Order(18)
int part = -1;
/** */
- @Order(value = 23, method = "topologyVersion")
+ @Order(value = 19, method = "topologyVersion")
AffinityTopologyVersion topVer;
/** Set of keys that must be skiped during iteration. */
- @Order(24)
+ @Order(20)
Collection<KeyCacheObject> skipKeys;
/** */
- @Order(25)
+ @Order(21)
byte flags;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
index fb1b7ea2203..0b788c42c69 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
@@ -42,27 +42,27 @@ import org.jetbrains.annotations.Nullable;
*/
public class GridCacheQueryResponse extends GridCacheIdMessage implements
GridCacheDeployable {
/** */
- @Order(4)
+ @Order(0)
boolean finished;
/** */
- @Order(5)
+ @Order(1)
long reqId;
/** */
- @Order(6)
+ @Order(2)
@Nullable ErrorMessage errMsg;
/** */
- @Order(7)
+ @Order(3)
boolean fields;
/** */
- @Order(8)
+ @Order(4)
IndexQueryResultMeta idxQryMetadata;
/** */
- @Order(9)
+ @Order(5)
Collection<byte[]> dataBytes;
/** */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java
index 204e16ce71e..8f0b348e833 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java
@@ -29,11 +29,11 @@ import org.apache.ignite.internal.util.typedef.internal.S;
*/
public class CacheContinuousQueryBatchAck extends GridCacheIdMessage {
/** Routine ID. */
- @Order(4)
+ @Order(0)
UUID routineId;
/** Update counters. */
- @Order(5)
+ @Order(1)
@GridToStringInclude
Map<Integer, Long> updateCntrs;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java
index ccd324a2ec4..6d516e30303 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java
@@ -34,7 +34,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
*/
public class TxLocksRequest extends GridCacheMessage {
/** Future ID. */
- @Order(3)
+ @Order(0)
long futId;
/** Tx keys. */
@@ -43,7 +43,7 @@ public class TxLocksRequest extends GridCacheMessage {
/** Array of txKeys from {@link #txKeys}. Used during marshalling and
unmarshalling. */
@GridToStringExclude
- @Order(4)
+ @Order(1)
IgniteTxKey[] txKeysArr;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksResponse.java
index 02aee47d21e..961a2265f9e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksResponse.java
@@ -35,7 +35,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
*/
public class TxLocksResponse extends GridCacheMessage {
/** Future ID. */
- @Order(3)
+ @Order(0)
long futId;
/** Locks for near txKeys of near transactions. */
@@ -48,17 +48,17 @@ public class TxLocksResponse extends GridCacheMessage {
/** Array of txKeys from {@link #nearTxKeyLocks}. Used during marshalling
and unmarshalling. */
@GridToStringExclude
- @Order(4)
+ @Order(1)
IgniteTxKey[] nearTxKeysArr;
/** Array of txKeys from {@link #txKeys}. Used during marshalling and
unmarshalling. */
@GridToStringExclude
- @Order(5)
+ @Order(2)
IgniteTxKey[] txKeysArr;
/** Array of locksArr from {@link #nearTxKeyLocks}. Used during
marshalling and unmarshalling. */
@GridToStringExclude
- @Order(6)
+ @Order(3)
TxLockList[] locksArr;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
index bea8fa7c681..a29af56d410 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
@@ -32,7 +32,7 @@ public class GridCacheVersionEx extends GridCacheVersion {
private static final long serialVersionUID = 0L;
/** DR version. */
- @Order(3)
+ @Order(0)
GridCacheVersion drVer;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetSocketAddressMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetSocketAddressMessage.java
index f23d7d7cf80..5026fa3f257 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetSocketAddressMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetSocketAddressMessage.java
@@ -25,7 +25,7 @@ import org.apache.ignite.internal.util.typedef.internal.S;
/** Socket address utility container message. Is not a pure {@link
TcpDiscoveryAbstractMessage}. */
public class InetSocketAddressMessage extends InetAddressMessage {
/** */
- @Order(2)
+ @Order(0)
int port;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractTraceableMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractTraceableMessage.java
index 66b74c532ab..440766b99ab 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractTraceableMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractTraceableMessage.java
@@ -33,7 +33,7 @@ public abstract class TcpDiscoveryAbstractTraceableMessage
extends TcpDiscoveryA
/** Serialization holder of {@link #spanContainer}'s bytes. */
@SuppressWarnings("unused")
- @Order(value = 5, method = "spanBytes")
+ @Order(value = 0, method = "spanBytes")
@Nullable byte[] spanBytesHolder;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
index 992bb1c7c37..75b87dad1bb 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java
@@ -32,11 +32,11 @@ public class TcpDiscoveryAuthFailedMessage extends
TcpDiscoveryAbstractMessage i
private static final long serialVersionUID = 0L;
/** Creator address. */
- @Order(5)
+ @Order(0)
InetAddressMessage creatorAddrMsg;
/** Node id for which authentication was failed. */
- @Order(6)
+ @Order(1)
UUID targetNodeId;
/** Default constructor for {@link DiscoveryMessageFactory}. */
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java
index 46d5531d178..a149b9b49cf 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java
@@ -30,7 +30,7 @@ public class TcpDiscoveryCheckFailedMessage extends
TcpDiscoveryAbstractMessage
private static final long serialVersionUID = 0L;
/** Coordinator version. */
- @Order(5)
+ @Order(0)
String err;
/** */
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
index a780f5e633d..e7e7aaa0df4 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java
@@ -31,7 +31,7 @@ public class TcpDiscoveryClientAckResponse extends
TcpDiscoveryAbstractMessage i
private static final long serialVersionUID = 0L;
/** */
- @Order(5)
+ @Order(0)
IgniteUuid msgId;
/** */
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java
index 61cb68449e7..40d22b4d05b 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java
@@ -34,7 +34,7 @@ public class TcpDiscoveryClientMetricsUpdateMessage extends
TcpDiscoveryAbstract
private static final long serialVersionUID = 0L;
/** */
- @Order(5)
+ @Order(0)
TcpDiscoveryNodeMetricsMessage metricsMsg;
/** Constructor for {@link DiscoveryMessageFactory}. */
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java
index 729c57c4049..dcaa01ddf20 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java
@@ -31,7 +31,7 @@ public class TcpDiscoveryClientPingRequest extends
TcpDiscoveryAbstractMessage i
private static final long serialVersionUID = 0L;
/** Pinged client node ID. */
- @Order(5)
+ @Order(0)
@Nullable UUID nodeToPing;
/** */
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java
index 66f4ef6cf90..a0fb8de7f9c 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java
@@ -31,11 +31,11 @@ public class TcpDiscoveryClientPingResponse extends
TcpDiscoveryAbstractMessage
private static final long serialVersionUID = 0L;
/** Pinged client node ID. */
- @Order(5)
+ @Order(0)
@Nullable UUID nodeToPing;
/** */
- @Order(6)
+ @Order(1)
boolean res;
/** */
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
index 242931e2bae..4b860f5e962 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
@@ -44,12 +44,12 @@ public class TcpDiscoveryCustomEventMessage extends
TcpDiscoveryAbstractTraceabl
/** Serialized message bytes. */
// TODO: Should be removed in
https://issues.apache.org/jira/browse/IGNITE-27627
- @Order(6)
+ @Order(0)
volatile @Nullable byte[] msgBytes;
/** {@link Message} representation of original message. */
// TODO: Should be removed in
https://issues.apache.org/jira/browse/IGNITE-27627
- @Order(7)
+ @Order(1)
volatile @Nullable Message serMsg;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
index a82beeaa4d4..b70be6e19b6 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
@@ -32,11 +32,11 @@ public class TcpDiscoveryDiscardMessage extends
TcpDiscoveryAbstractMessage impl
private static final long serialVersionUID = 0L;
/** ID of the message to discard (this and all preceding). */
- @Order(5)
+ @Order(0)
IgniteUuid msgId;
/** True if this is discard ID for custom event message. */
- @Order(6)
+ @Order(1)
boolean customMsgDiscard;
/** */
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java
index 9e0e249ea5f..924d95f8bcc 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java
@@ -31,7 +31,7 @@ public class TcpDiscoveryDuplicateIdMessage extends
TcpDiscoveryAbstractMessage
private static final long serialVersionUID = 0L;
/** ID of the node with duplicate ID. */
- @Order(5)
+ @Order(0)
UUID nodeId;
/** */
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java
index 6e23b5a39cd..f9c33466d83 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java
@@ -32,11 +32,11 @@ public class TcpDiscoveryHandshakeRequest extends
TcpDiscoveryAbstractMessage im
private static final long serialVersionUID = 0L;
/** */
- @Order(5)
+ @Order(0)
@Nullable UUID prevNodeId;
/** */
- @Order(6)
+ @Order(1)
@Nullable String dcId;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java
index 99eb35d2f3d..aa6490660cd 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java
@@ -35,15 +35,15 @@ public class TcpDiscoveryHandshakeResponse extends
TcpDiscoveryAbstractMessage i
private static final long serialVersionUID = 0L;
/** */
- @Order(5)
+ @Order(0)
long order;
/** */
- @Order(6)
+ @Order(1)
boolean prevNodeAliveFlag;
/** Redirect addresses messages serialization holder. */
- @Order(7)
+ @Order(2)
@Nullable Collection<InetSocketAddressMessage> redirectAddrsMsgs;
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java
index 33b46585b43..6ddbb8f7af2 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryJoinRequestMessage.java
@@ -42,11 +42,11 @@ public class TcpDiscoveryJoinRequestMessage extends
TcpDiscoveryAbstractTraceabl
/** Serialized {@link #node}. */
// TODO Remove the field after completing
https://issues.apache.org/jira/browse/IGNITE-27899.
- @Order(6)
+ @Order(0)
byte[] nodeBytes;
/** Discovery data container. */
- @Order(7)
+ @Order(1)
DiscoveryDataPacket dataPacket;
/** Constructor. */
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java
index 6193b772691..f2936a45ad9 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java
@@ -32,11 +32,11 @@ public class TcpDiscoveryLoopbackProblemMessage extends
TcpDiscoveryAbstractMess
private static final long serialVersionUID = 0L;
/** Remote node addresses. */
- @Order(5)
+ @Order(0)
Collection<String> addrs;
/** Remote node host names. */
- @Order(6)
+ @Order(1)
Collection<String> hostNames;
/** */
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java
index 33e7a0e4fa8..767a03ccaa7 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java
@@ -54,16 +54,16 @@ public class TcpDiscoveryMetricsUpdateMessage extends
TcpDiscoveryAbstractMessag
/** Connected clients metrics: server id -> client id -> clients metrics.
*/
@GridToStringExclude
- @Order(5)
+ @Order(0)
Map<UUID, TcpDiscoveryClientNodesMetricsMessage>
connectedClientsMetricsMsgs;
/** Servers full metrics: server id -> server metrics + metrics of
server's caches. */
@GridToStringExclude
- @Order(6)
+ @Order(1)
@Nullable Map<UUID, TcpDiscoveryNodeFullMetricsMessage>
serversFullMetricsMsgs;
/** Client node IDs. */
- @Order(7)
+ @Order(2)
@Nullable Set<UUID> clientNodeIds;
/** Constructor for {@link DiscoveryMessageFactory}. */
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java
index e8bd7c7ad2a..86fecaed00f 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java
@@ -41,14 +41,14 @@ public class TcpDiscoveryNodeAddFinishedMessage extends
TcpDiscoveryAbstractTrac
private static final long serialVersionUID = 0L;
/** Added node ID. */
- @Order(6)
+ @Order(0)
UUID nodeId;
/**
* Client node can not get discovery data from
TcpDiscoveryNodeAddedMessage, we have to pass discovery data in
* TcpDiscoveryNodeAddFinishedMessage.
*/
- @Order(7)
+ @Order(1)
@GridToStringExclude DiscoveryDataPacket clientDiscoData;
/** */
@@ -56,7 +56,7 @@ public class TcpDiscoveryNodeAddFinishedMessage extends
TcpDiscoveryAbstractTrac
private Map<String, Object> clientNodeAttrs;
/** Serialized client node attributes. */
- @Order(8)
+ @Order(2)
@Nullable byte[] clientNodeAttrsBytes;
/** Constructor. */
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java
index 14cd0fcafc2..7de93d625c7 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java
@@ -34,15 +34,15 @@ public class TcpDiscoveryNodeFailedMessage extends
TcpDiscoveryAbstractTraceable
private static final long serialVersionUID = 0L;
/** ID of the failed node. */
- @Order(6)
+ @Order(0)
UUID failedNodeId;
/** Internal order of the failed node. */
- @Order(7)
+ @Order(1)
long order;
/** */
- @Order(8)
+ @Order(2)
String warning;
/** Constructor. */
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java
index 503b3e091fe..90027782be0 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java
@@ -31,7 +31,7 @@ public class TcpDiscoveryPingRequest extends
TcpDiscoveryAbstractMessage impleme
private static final long serialVersionUID = 0L;
/** Pinged client node ID. */
- @Order(5)
+ @Order(0)
@Nullable UUID clientNodeId;
/** */
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
index ec93f1f2e9b..200ba86515f 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
@@ -30,7 +30,7 @@ public class TcpDiscoveryPingResponse extends
TcpDiscoveryAbstractMessage implem
private static final long serialVersionUID = 0L;
/** Whether pinged client exists. */
- @Order(5)
+ @Order(0)
boolean clientExists;
/** */
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java
index 4dc212ff0c6..dc56a76634b 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java
@@ -31,11 +31,11 @@ public class TcpDiscoveryRingLatencyCheckMessage extends
TcpDiscoveryAbstractMes
private static final long serialVersionUID = 0L;
/** Maximal hops number. */
- @Order(5)
+ @Order(0)
int maxHops;
/** Current hops reached. */
- @Order(6)
+ @Order(1)
int curHops;
/** Empty constructor for {@link DiscoveryMessageFactory}. */
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java
index 2cd673ebaf5..becd8dab015 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java
@@ -47,15 +47,15 @@ public class TcpDiscoveryStatusCheckMessage extends
TcpDiscoveryAbstractMessage
public static final int STATUS_RECON = 2;
/** Creator node addresses. */
- @Order(5)
+ @Order(0)
@Nullable Collection<InetSocketAddressMessage> creatorNodeAddrsMsgs;
/** Failed node id. */
- @Order(6)
+ @Order(1)
@Nullable UUID failedNodeId;
/** Creator node status (initialized by coordinator). */
- @Order(7)
+ @Order(2)
int status;
/** Empty constructor for {@link DiscoveryMessageFactory}. */
diff --git a/modules/core/src/test/resources/codegen/ChildMessage.java
b/modules/core/src/test/resources/codegen/ChildMessage.java
index 151fcc09269..fa97a6cbc44 100644
--- a/modules/core/src/test/resources/codegen/ChildMessage.java
+++ b/modules/core/src/test/resources/codegen/ChildMessage.java
@@ -21,6 +21,6 @@ import java.lang.String;
import java.nio.ByteBuffer;
public class ChildMessage extends AbstractMessage {
- @Order(1)
+ @Order(0)
String str;
}
