This is an automated email from the ASF dual-hosted git repository.
shishkovilja pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new cfd70ba3c18 IGNITE-26386 Remove candsByIdxBytes field from
GridDistributedBaseMessage (#12322)
cfd70ba3c18 is described below
commit cfd70ba3c1813d7b263bf6f642885c0de73ffae7
Author: Dmitry Werner <[email protected]>
AuthorDate: Mon Sep 8 12:26:43 2025 +0500
IGNITE-26386 Remove candsByIdxBytes field from GridDistributedBaseMessage
(#12322)
---
.../distributed/GridCacheTxRecoveryRequest.java | 24 +++++-----
.../distributed/GridCacheTxRecoveryResponse.java | 12 ++---
.../distributed/GridDistributedBaseMessage.java | 27 ++---------
.../distributed/GridDistributedLockRequest.java | 52 ++++++++++----------
.../distributed/GridDistributedLockResponse.java | 12 ++---
.../GridDistributedTxFinishRequest.java | 52 ++++++++++----------
.../GridDistributedTxPrepareRequest.java | 52 ++++++++++----------
.../GridDistributedTxPrepareResponse.java | 12 ++---
.../distributed/GridDistributedUnlockRequest.java | 4 +-
.../cache/distributed/dht/GridDhtLockRequest.java | 36 +++++++-------
.../cache/distributed/dht/GridDhtLockResponse.java | 12 ++---
.../distributed/dht/GridDhtTxFinishRequest.java | 12 ++---
.../distributed/dht/GridDhtTxPrepareRequest.java | 56 +++++++++++-----------
.../distributed/dht/GridDhtTxPrepareResponse.java | 20 ++++----
.../distributed/dht/GridDhtUnlockRequest.java | 4 +-
.../distributed/near/GridNearLockRequest.java | 32 ++++++-------
.../distributed/near/GridNearLockResponse.java | 28 +++++------
.../distributed/near/GridNearTxFinishRequest.java | 4 +-
.../distributed/near/GridNearTxPrepareRequest.java | 24 +++++-----
.../near/GridNearTxPrepareResponse.java | 40 ++++++++--------
20 files changed, 248 insertions(+), 267 deletions(-)
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 22f219672f5..ed1aa48f298 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
@@ -144,37 +144,37 @@ public class GridCacheTxRecoveryRequest extends
GridDistributedBaseMessage {
}
switch (writer.state()) {
- case 8:
+ case 7:
if (!writer.writeIgniteUuid(futId))
return false;
writer.incrementState();
- case 9:
+ case 8:
if (!writer.writeIgniteUuid(miniId))
return false;
writer.incrementState();
- case 10:
+ case 9:
if (!writer.writeBoolean(nearTxCheck))
return false;
writer.incrementState();
- case 11:
+ case 10:
if (!writer.writeMessage(nearXidVer))
return false;
writer.incrementState();
- case 12:
+ case 11:
if (!writer.writeBoolean(sys))
return false;
writer.incrementState();
- case 13:
+ case 12:
if (!writer.writeInt(txNum))
return false;
@@ -193,7 +193,7 @@ public class GridCacheTxRecoveryRequest extends
GridDistributedBaseMessage {
return false;
switch (reader.state()) {
- case 8:
+ case 7:
futId = reader.readIgniteUuid();
if (!reader.isLastRead())
@@ -201,7 +201,7 @@ public class GridCacheTxRecoveryRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 9:
+ case 8:
miniId = reader.readIgniteUuid();
if (!reader.isLastRead())
@@ -209,7 +209,7 @@ public class GridCacheTxRecoveryRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 10:
+ case 9:
nearTxCheck = reader.readBoolean();
if (!reader.isLastRead())
@@ -217,7 +217,7 @@ public class GridCacheTxRecoveryRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 11:
+ case 10:
nearXidVer = reader.readMessage();
if (!reader.isLastRead())
@@ -225,7 +225,7 @@ public class GridCacheTxRecoveryRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 12:
+ case 11:
sys = reader.readBoolean();
if (!reader.isLastRead())
@@ -233,7 +233,7 @@ public class GridCacheTxRecoveryRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 13:
+ case 12:
txNum = reader.readInt();
if (!reader.isLastRead())
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 875af6be441..803d40a842d 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
@@ -125,19 +125,19 @@ public class GridCacheTxRecoveryResponse extends
GridDistributedBaseMessage impl
}
switch (writer.state()) {
- case 8:
+ case 7:
if (!writer.writeIgniteUuid(futId))
return false;
writer.incrementState();
- case 9:
+ case 8:
if (!writer.writeIgniteUuid(miniId))
return false;
writer.incrementState();
- case 10:
+ case 9:
if (!writer.writeBoolean(success))
return false;
@@ -156,7 +156,7 @@ public class GridCacheTxRecoveryResponse extends
GridDistributedBaseMessage impl
return false;
switch (reader.state()) {
- case 8:
+ case 7:
futId = reader.readIgniteUuid();
if (!reader.isLastRead())
@@ -164,7 +164,7 @@ public class GridCacheTxRecoveryResponse extends
GridDistributedBaseMessage impl
reader.incrementState();
- case 9:
+ case 8:
miniId = reader.readIgniteUuid();
if (!reader.isLastRead())
@@ -172,7 +172,7 @@ public class GridCacheTxRecoveryResponse extends
GridDistributedBaseMessage impl
reader.incrementState();
- case 10:
+ case 9:
success = reader.readBoolean();
if (!reader.isLastRead())
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 47d278a0e35..3ee379d57ab 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
@@ -26,7 +26,6 @@ import
org.apache.ignite.internal.processors.cache.GridCacheDeployable;
import org.apache.ignite.internal.processors.cache.GridCacheIdMessage;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import
org.apache.ignite.internal.processors.cache.version.GridCacheVersionable;
-import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import
org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
@@ -42,10 +41,6 @@ public abstract class GridDistributedBaseMessage extends
GridCacheIdMessage impl
@GridToStringInclude
protected GridCacheVersion ver;
- /** */
- @GridToStringExclude
- private byte[] candsByIdxBytes;
-
/** Committed versions with order higher than one for this message (needed
for commit ordering). */
@GridToStringInclude
@GridDirectCollection(GridCacheVersion.class)
@@ -158,24 +153,18 @@ public abstract class GridDistributedBaseMessage extends
GridCacheIdMessage impl
switch (writer.state()) {
case 4:
- if (!writer.writeByteArray(candsByIdxBytes))
- return false;
-
- writer.incrementState();
-
- case 5:
if (!writer.writeCollection(committedVers,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 6:
+ case 5:
if (!writer.writeCollection(rolledbackVers,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 7:
+ case 6:
if (!writer.writeMessage(ver))
return false;
@@ -195,14 +184,6 @@ public abstract class GridDistributedBaseMessage extends
GridCacheIdMessage impl
switch (reader.state()) {
case 4:
- candsByIdxBytes = reader.readByteArray();
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 5:
committedVers =
reader.readCollection(MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -210,7 +191,7 @@ public abstract class GridDistributedBaseMessage extends
GridCacheIdMessage impl
reader.incrementState();
- case 6:
+ case 5:
rolledbackVers =
reader.readCollection(MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -218,7 +199,7 @@ public abstract class GridDistributedBaseMessage extends
GridCacheIdMessage impl
reader.incrementState();
- case 7:
+ case 6:
ver = reader.readMessage();
if (!reader.isLastRead())
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 aea28b76a93..5ad3abb7e16 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
@@ -357,79 +357,79 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
}
switch (writer.state()) {
- case 8:
+ case 7:
if (!writer.writeByte(flags))
return false;
writer.incrementState();
- case 9:
+ case 8:
if (!writer.writeIgniteUuid(futId))
return false;
writer.incrementState();
- case 10:
+ case 9:
if (!writer.writeBoolean(isInTx))
return false;
writer.incrementState();
- case 11:
+ case 10:
if (!writer.writeBoolean(isInvalidate))
return false;
writer.incrementState();
- case 12:
+ case 11:
if (!writer.writeBoolean(isRead))
return false;
writer.incrementState();
- case 13:
+ case 12:
if (!writer.writeByte(isolation != null ?
(byte)isolation.ordinal() : -1))
return false;
writer.incrementState();
- case 14:
+ case 13:
if (!writer.writeCollection(keys,
MessageCollectionItemType.KEY_CACHE_OBJECT))
return false;
writer.incrementState();
- case 15:
+ case 14:
if (!writer.writeMessage(nearXidVer))
return false;
writer.incrementState();
- case 16:
+ case 15:
if (!writer.writeUuid(nodeId))
return false;
writer.incrementState();
- case 17:
+ case 16:
if (!writer.writeBooleanArray(retVals))
return false;
writer.incrementState();
- case 18:
+ case 17:
if (!writer.writeLong(threadId))
return false;
writer.incrementState();
- case 19:
+ case 18:
if (!writer.writeLong(timeout))
return false;
writer.incrementState();
- case 20:
+ case 19:
if (!writer.writeInt(txSize))
return false;
@@ -448,7 +448,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
return false;
switch (reader.state()) {
- case 8:
+ case 7:
flags = reader.readByte();
if (!reader.isLastRead())
@@ -456,7 +456,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 9:
+ case 8:
futId = reader.readIgniteUuid();
if (!reader.isLastRead())
@@ -464,7 +464,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 10:
+ case 9:
isInTx = reader.readBoolean();
if (!reader.isLastRead())
@@ -472,7 +472,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 11:
+ case 10:
isInvalidate = reader.readBoolean();
if (!reader.isLastRead())
@@ -480,7 +480,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 12:
+ case 11:
isRead = reader.readBoolean();
if (!reader.isLastRead())
@@ -488,7 +488,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 13:
+ case 12:
byte isolationOrd;
isolationOrd = reader.readByte();
@@ -500,7 +500,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 14:
+ case 13:
keys =
reader.readCollection(MessageCollectionItemType.KEY_CACHE_OBJECT);
if (!reader.isLastRead())
@@ -508,7 +508,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 15:
+ case 14:
nearXidVer = reader.readMessage();
if (!reader.isLastRead())
@@ -516,7 +516,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 16:
+ case 15:
nodeId = reader.readUuid();
if (!reader.isLastRead())
@@ -524,7 +524,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 17:
+ case 16:
retVals = reader.readBooleanArray();
if (!reader.isLastRead())
@@ -532,7 +532,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 18:
+ case 17:
threadId = reader.readLong();
if (!reader.isLastRead())
@@ -540,7 +540,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 19:
+ case 18:
timeout = reader.readLong();
if (!reader.isLastRead())
@@ -548,7 +548,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 20:
+ case 19:
txSize = reader.readInt();
if (!reader.isLastRead())
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 e37db1622df..19b9a9bdea5 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
@@ -217,19 +217,19 @@ public class GridDistributedLockResponse extends
GridDistributedBaseMessage {
}
switch (writer.state()) {
- case 8:
+ case 7:
if (!writer.writeByteArray(errBytes))
return false;
writer.incrementState();
- case 9:
+ case 8:
if (!writer.writeIgniteUuid(futId))
return false;
writer.incrementState();
- case 10:
+ case 9:
if (!writer.writeCollection(vals,
MessageCollectionItemType.CACHE_OBJECT))
return false;
@@ -248,7 +248,7 @@ public class GridDistributedLockResponse extends
GridDistributedBaseMessage {
return false;
switch (reader.state()) {
- case 8:
+ case 7:
errBytes = reader.readByteArray();
if (!reader.isLastRead())
@@ -256,7 +256,7 @@ public class GridDistributedLockResponse extends
GridDistributedBaseMessage {
reader.incrementState();
- case 9:
+ case 8:
futId = reader.readIgniteUuid();
if (!reader.isLastRead())
@@ -264,7 +264,7 @@ public class GridDistributedLockResponse extends
GridDistributedBaseMessage {
reader.incrementState();
- case 10:
+ case 9:
vals =
reader.readCollection(MessageCollectionItemType.CACHE_OBJECT);
if (!reader.isLastRead())
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 b7e3376e357..69277d52f8f 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
@@ -308,79 +308,79 @@ public class GridDistributedTxFinishRequest extends
GridDistributedBaseMessage i
}
switch (writer.state()) {
- case 8:
+ case 7:
if (!writer.writeMessage(baseVer))
return false;
writer.incrementState();
- case 9:
+ case 8:
if (!writer.writeBoolean(commit))
return false;
writer.incrementState();
- case 10:
+ case 9:
if (!writer.writeMessage(commitVer))
return false;
writer.incrementState();
- case 11:
+ case 10:
if (!writer.writeByte(flags))
return false;
writer.incrementState();
- case 12:
+ case 11:
if (!writer.writeIgniteUuid(futId))
return false;
writer.incrementState();
- case 13:
+ case 12:
if (!writer.writeBoolean(invalidate))
return false;
writer.incrementState();
- case 14:
+ case 13:
if (!writer.writeByte(plc))
return false;
writer.incrementState();
- case 15:
+ case 14:
if (!writer.writeByte(syncMode != null ?
(byte)syncMode.ordinal() : -1))
return false;
writer.incrementState();
- case 16:
+ case 15:
if (!writer.writeBoolean(sys))
return false;
writer.incrementState();
- case 17:
+ case 16:
if (!writer.writeInt(taskNameHash))
return false;
writer.incrementState();
- case 18:
+ case 17:
if (!writer.writeLong(threadId))
return false;
writer.incrementState();
- case 19:
+ case 18:
if (!writer.writeAffinityTopologyVersion(topVer))
return false;
writer.incrementState();
- case 20:
+ case 19:
if (!writer.writeInt(txSize))
return false;
@@ -399,7 +399,7 @@ public class GridDistributedTxFinishRequest extends
GridDistributedBaseMessage i
return false;
switch (reader.state()) {
- case 8:
+ case 7:
baseVer = reader.readMessage();
if (!reader.isLastRead())
@@ -407,7 +407,7 @@ public class GridDistributedTxFinishRequest extends
GridDistributedBaseMessage i
reader.incrementState();
- case 9:
+ case 8:
commit = reader.readBoolean();
if (!reader.isLastRead())
@@ -415,7 +415,7 @@ public class GridDistributedTxFinishRequest extends
GridDistributedBaseMessage i
reader.incrementState();
- case 10:
+ case 9:
commitVer = reader.readMessage();
if (!reader.isLastRead())
@@ -423,7 +423,7 @@ public class GridDistributedTxFinishRequest extends
GridDistributedBaseMessage i
reader.incrementState();
- case 11:
+ case 10:
flags = reader.readByte();
if (!reader.isLastRead())
@@ -431,7 +431,7 @@ public class GridDistributedTxFinishRequest extends
GridDistributedBaseMessage i
reader.incrementState();
- case 12:
+ case 11:
futId = reader.readIgniteUuid();
if (!reader.isLastRead())
@@ -439,7 +439,7 @@ public class GridDistributedTxFinishRequest extends
GridDistributedBaseMessage i
reader.incrementState();
- case 13:
+ case 12:
invalidate = reader.readBoolean();
if (!reader.isLastRead())
@@ -447,7 +447,7 @@ public class GridDistributedTxFinishRequest extends
GridDistributedBaseMessage i
reader.incrementState();
- case 14:
+ case 13:
plc = reader.readByte();
if (!reader.isLastRead())
@@ -455,7 +455,7 @@ public class GridDistributedTxFinishRequest extends
GridDistributedBaseMessage i
reader.incrementState();
- case 15:
+ case 14:
byte syncModeOrd;
syncModeOrd = reader.readByte();
@@ -467,7 +467,7 @@ public class GridDistributedTxFinishRequest extends
GridDistributedBaseMessage i
reader.incrementState();
- case 16:
+ case 15:
sys = reader.readBoolean();
if (!reader.isLastRead())
@@ -475,7 +475,7 @@ public class GridDistributedTxFinishRequest extends
GridDistributedBaseMessage i
reader.incrementState();
- case 17:
+ case 16:
taskNameHash = reader.readInt();
if (!reader.isLastRead())
@@ -483,7 +483,7 @@ public class GridDistributedTxFinishRequest extends
GridDistributedBaseMessage i
reader.incrementState();
- case 18:
+ case 17:
threadId = reader.readLong();
if (!reader.isLastRead())
@@ -491,7 +491,7 @@ public class GridDistributedTxFinishRequest extends
GridDistributedBaseMessage i
reader.incrementState();
- case 19:
+ case 18:
topVer = reader.readAffinityTopologyVersion();
if (!reader.isLastRead())
@@ -499,7 +499,7 @@ public class GridDistributedTxFinishRequest extends
GridDistributedBaseMessage i
reader.incrementState();
- case 20:
+ case 19:
txSize = reader.readInt();
if (!reader.isLastRead())
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 4b458becbba..eae5ba8439f 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
@@ -489,79 +489,79 @@ public class GridDistributedTxPrepareRequest extends
GridDistributedBaseMessage
}
switch (writer.state()) {
- case 8:
+ case 7:
if (!writer.writeByte(concurrency != null ?
(byte)concurrency.ordinal() : -1))
return false;
writer.incrementState();
- case 9:
+ case 8:
if (!writer.writeCollection(dhtVerKeys,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 10:
+ case 9:
if (!writer.writeCollection(dhtVerVals,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 11:
+ case 10:
if (!writer.writeByte(flags))
return false;
writer.incrementState();
- case 12:
+ case 11:
if (!writer.writeByte(isolation != null ?
(byte)isolation.ordinal() : -1))
return false;
writer.incrementState();
- case 13:
+ case 12:
if (!writer.writeByte(plc))
return false;
writer.incrementState();
- case 14:
+ case 13:
if (!writer.writeCollection(reads,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 15:
+ case 14:
if (!writer.writeLong(threadId))
return false;
writer.incrementState();
- case 16:
+ case 15:
if (!writer.writeLong(timeout))
return false;
writer.incrementState();
- case 17:
+ case 16:
if (!writer.writeMap(txNodesMsg,
MessageCollectionItemType.UUID, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 18:
+ case 17:
if (!writer.writeInt(txSize))
return false;
writer.incrementState();
- case 19:
+ case 18:
if (!writer.writeMessage(writeVer))
return false;
writer.incrementState();
- case 20:
+ case 19:
if (!writer.writeCollection(writes,
MessageCollectionItemType.MSG))
return false;
@@ -580,7 +580,7 @@ public class GridDistributedTxPrepareRequest extends
GridDistributedBaseMessage
return false;
switch (reader.state()) {
- case 8:
+ case 7:
byte concurrencyOrd;
concurrencyOrd = reader.readByte();
@@ -592,7 +592,7 @@ public class GridDistributedTxPrepareRequest extends
GridDistributedBaseMessage
reader.incrementState();
- case 9:
+ case 8:
dhtVerKeys =
reader.readCollection(MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -600,7 +600,7 @@ public class GridDistributedTxPrepareRequest extends
GridDistributedBaseMessage
reader.incrementState();
- case 10:
+ case 9:
dhtVerVals =
reader.readCollection(MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -608,7 +608,7 @@ public class GridDistributedTxPrepareRequest extends
GridDistributedBaseMessage
reader.incrementState();
- case 11:
+ case 10:
flags = reader.readByte();
if (!reader.isLastRead())
@@ -616,7 +616,7 @@ public class GridDistributedTxPrepareRequest extends
GridDistributedBaseMessage
reader.incrementState();
- case 12:
+ case 11:
byte isolationOrd;
isolationOrd = reader.readByte();
@@ -628,7 +628,7 @@ public class GridDistributedTxPrepareRequest extends
GridDistributedBaseMessage
reader.incrementState();
- case 13:
+ case 12:
plc = reader.readByte();
if (!reader.isLastRead())
@@ -636,7 +636,7 @@ public class GridDistributedTxPrepareRequest extends
GridDistributedBaseMessage
reader.incrementState();
- case 14:
+ case 13:
reads = reader.readCollection(MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -644,7 +644,7 @@ public class GridDistributedTxPrepareRequest extends
GridDistributedBaseMessage
reader.incrementState();
- case 15:
+ case 14:
threadId = reader.readLong();
if (!reader.isLastRead())
@@ -652,7 +652,7 @@ public class GridDistributedTxPrepareRequest extends
GridDistributedBaseMessage
reader.incrementState();
- case 16:
+ case 15:
timeout = reader.readLong();
if (!reader.isLastRead())
@@ -660,7 +660,7 @@ public class GridDistributedTxPrepareRequest extends
GridDistributedBaseMessage
reader.incrementState();
- case 17:
+ case 16:
txNodesMsg = reader.readMap(MessageCollectionItemType.UUID,
MessageCollectionItemType.MSG, false);
if (!reader.isLastRead())
@@ -668,7 +668,7 @@ public class GridDistributedTxPrepareRequest extends
GridDistributedBaseMessage
reader.incrementState();
- case 18:
+ case 17:
txSize = reader.readInt();
if (!reader.isLastRead())
@@ -676,7 +676,7 @@ public class GridDistributedTxPrepareRequest extends
GridDistributedBaseMessage
reader.incrementState();
- case 19:
+ case 18:
writeVer = reader.readMessage();
if (!reader.isLastRead())
@@ -684,7 +684,7 @@ public class GridDistributedTxPrepareRequest extends
GridDistributedBaseMessage
reader.incrementState();
- case 20:
+ case 19:
writes = reader.readCollection(MessageCollectionItemType.MSG);
if (!reader.isLastRead())
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 3ffeb310add..8b131faee99 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
@@ -174,19 +174,19 @@ public class GridDistributedTxPrepareResponse extends
GridDistributedBaseMessage
}
switch (writer.state()) {
- case 8:
+ case 7:
if (!writer.writeByteArray(errBytes))
return false;
writer.incrementState();
- case 9:
+ case 8:
if (!writer.writeByte(flags))
return false;
writer.incrementState();
- case 10:
+ case 9:
if (!writer.writeInt(part))
return false;
@@ -205,7 +205,7 @@ public class GridDistributedTxPrepareResponse extends
GridDistributedBaseMessage
return false;
switch (reader.state()) {
- case 8:
+ case 7:
errBytes = reader.readByteArray();
if (!reader.isLastRead())
@@ -213,7 +213,7 @@ public class GridDistributedTxPrepareResponse extends
GridDistributedBaseMessage
reader.incrementState();
- case 9:
+ case 8:
flags = reader.readByte();
if (!reader.isLastRead())
@@ -221,7 +221,7 @@ public class GridDistributedTxPrepareResponse extends
GridDistributedBaseMessage
reader.incrementState();
- case 10:
+ case 9:
part = reader.readInt();
if (!reader.isLastRead())
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
index 1da28eb179e..e29d0c2f1cc 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
@@ -115,7 +115,7 @@ public class GridDistributedUnlockRequest extends
GridDistributedBaseMessage {
}
switch (writer.state()) {
- case 8:
+ case 7:
if (!writer.writeCollection(keys,
MessageCollectionItemType.KEY_CACHE_OBJECT))
return false;
@@ -134,7 +134,7 @@ public class GridDistributedUnlockRequest extends
GridDistributedBaseMessage {
return false;
switch (reader.state()) {
- case 8:
+ case 7:
keys =
reader.readCollection(MessageCollectionItemType.KEY_CACHE_OBJECT);
if (!reader.isLastRead())
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 fd46c5a0017..d35a4e67dde 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
@@ -318,55 +318,55 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
}
switch (writer.state()) {
- case 21:
+ case 20:
if (!writer.writeLong(accessTtl))
return false;
writer.incrementState();
- case 22:
+ case 21:
if (!writer.writeBitSet(invalidateEntries))
return false;
writer.incrementState();
- case 23:
+ case 22:
if (!writer.writeIgniteUuid(miniId))
return false;
writer.incrementState();
- case 24:
+ case 23:
if (!writer.writeObjectArray(ownedKeys,
MessageCollectionItemType.KEY_CACHE_OBJECT))
return false;
writer.incrementState();
- case 25:
+ case 24:
if (!writer.writeObjectArray(ownedValues,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 26:
+ case 25:
if (!writer.writeBitSet(preloadKeys))
return false;
writer.incrementState();
- case 27:
+ case 26:
if (!writer.writeInt(taskNameHash))
return false;
writer.incrementState();
- case 28:
+ case 27:
if (!writer.writeAffinityTopologyVersion(topVer))
return false;
writer.incrementState();
- case 29:
+ case 28:
if (!writer.writeString(txLbl))
return false;
@@ -385,7 +385,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
return false;
switch (reader.state()) {
- case 21:
+ case 20:
accessTtl = reader.readLong();
if (!reader.isLastRead())
@@ -393,7 +393,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 22:
+ case 21:
invalidateEntries = reader.readBitSet();
if (!reader.isLastRead())
@@ -401,7 +401,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 23:
+ case 22:
miniId = reader.readIgniteUuid();
if (!reader.isLastRead())
@@ -409,7 +409,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 24:
+ case 23:
ownedKeys =
reader.readObjectArray(MessageCollectionItemType.KEY_CACHE_OBJECT,
KeyCacheObject.class);
if (!reader.isLastRead())
@@ -417,7 +417,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 25:
+ case 24:
ownedValues =
reader.readObjectArray(MessageCollectionItemType.MSG, GridCacheVersion.class);
if (!reader.isLastRead())
@@ -425,7 +425,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 26:
+ case 25:
preloadKeys = reader.readBitSet();
if (!reader.isLastRead())
@@ -433,7 +433,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 27:
+ case 26:
taskNameHash = reader.readInt();
if (!reader.isLastRead())
@@ -441,7 +441,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 28:
+ case 27:
topVer = reader.readAffinityTopologyVersion();
if (!reader.isLastRead())
@@ -449,7 +449,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 29:
+ case 28:
txLbl = reader.readString();
if (!reader.isLastRead())
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 3a013555ee2..622e222cc27 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
@@ -170,19 +170,19 @@ public class GridDhtLockResponse extends
GridDistributedLockResponse {
}
switch (writer.state()) {
- case 11:
+ case 10:
if (!writer.writeCollection(invalidParts,
MessageCollectionItemType.INT))
return false;
writer.incrementState();
- case 12:
+ case 11:
if (!writer.writeIgniteUuid(miniId))
return false;
writer.incrementState();
- case 13:
+ case 12:
if (!writer.writeCollection(preloadEntries,
MessageCollectionItemType.MSG))
return false;
@@ -201,7 +201,7 @@ public class GridDhtLockResponse extends
GridDistributedLockResponse {
return false;
switch (reader.state()) {
- case 11:
+ case 10:
invalidParts =
reader.readCollection(MessageCollectionItemType.INT);
if (!reader.isLastRead())
@@ -209,7 +209,7 @@ public class GridDhtLockResponse extends
GridDistributedLockResponse {
reader.incrementState();
- case 12:
+ case 11:
miniId = reader.readIgniteUuid();
if (!reader.isLastRead())
@@ -217,7 +217,7 @@ public class GridDhtLockResponse extends
GridDistributedLockResponse {
reader.incrementState();
- case 13:
+ case 12:
preloadEntries =
reader.readCollection(MessageCollectionItemType.MSG);
if (!reader.isLastRead())
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 880f05fb67d..4f70aed5139 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
@@ -224,19 +224,19 @@ public class GridDhtTxFinishRequest extends
GridDistributedTxFinishRequest {
}
switch (writer.state()) {
- case 21:
+ case 20:
if (!writer.writeInt(miniId))
return false;
writer.incrementState();
- case 22:
+ case 21:
if (!writer.writeUuid(nearNodeId))
return false;
writer.incrementState();
- case 23:
+ case 22:
if (!writer.writeCollection(updCntrs,
MessageCollectionItemType.MSG))
return false;
@@ -255,7 +255,7 @@ public class GridDhtTxFinishRequest extends
GridDistributedTxFinishRequest {
return false;
switch (reader.state()) {
- case 21:
+ case 20:
miniId = reader.readInt();
if (!reader.isLastRead())
@@ -263,7 +263,7 @@ public class GridDhtTxFinishRequest extends
GridDistributedTxFinishRequest {
reader.incrementState();
- case 22:
+ case 21:
nearNodeId = reader.readUuid();
if (!reader.isLastRead())
@@ -271,7 +271,7 @@ public class GridDhtTxFinishRequest extends
GridDistributedTxFinishRequest {
reader.incrementState();
- case 23:
+ case 22:
updCntrs =
reader.readCollection(MessageCollectionItemType.MSG);
if (!reader.isLastRead())
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 60f3b1a5d21..6bc0853059c 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
@@ -406,85 +406,85 @@ public class GridDhtTxPrepareRequest extends
GridDistributedTxPrepareRequest {
}
switch (writer.state()) {
- case 21:
+ case 20:
if (!writer.writeIgniteUuid(futId))
return false;
writer.incrementState();
- case 22:
+ case 21:
if (!writer.writeBitSet(invalidateNearEntries))
return false;
writer.incrementState();
- case 23:
+ case 22:
if (!writer.writeInt(miniId))
return false;
writer.incrementState();
- case 24:
+ case 23:
if (!writer.writeUuid(nearNodeId))
return false;
writer.incrementState();
- case 25:
+ case 24:
if (!writer.writeCollection(nearWrites,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 26:
+ case 25:
if (!writer.writeMessage(nearXidVer))
return false;
writer.incrementState();
- case 27:
+ case 26:
if (!writer.writeCollection(ownedKeys,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 28:
+ case 27:
if (!writer.writeCollection(ownedVals,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 29:
+ case 28:
if (!writer.writeBitSet(preloadKeys))
return false;
writer.incrementState();
- case 30:
+ case 29:
if (!writer.writeBoolean(skipCompletedVers))
return false;
writer.incrementState();
- case 31:
+ case 30:
if (!writer.writeInt(taskNameHash))
return false;
writer.incrementState();
- case 32:
+ case 31:
if (!writer.writeAffinityTopologyVersion(topVer))
return false;
writer.incrementState();
- case 33:
+ case 32:
if (!writer.writeString(txLbl))
return false;
writer.incrementState();
- case 34:
+ case 33:
if (!writer.writeCollection(updCntrs,
MessageCollectionItemType.MSG))
return false;
@@ -503,7 +503,7 @@ public class GridDhtTxPrepareRequest extends
GridDistributedTxPrepareRequest {
return false;
switch (reader.state()) {
- case 21:
+ case 20:
futId = reader.readIgniteUuid();
if (!reader.isLastRead())
@@ -511,7 +511,7 @@ public class GridDhtTxPrepareRequest extends
GridDistributedTxPrepareRequest {
reader.incrementState();
- case 22:
+ case 21:
invalidateNearEntries = reader.readBitSet();
if (!reader.isLastRead())
@@ -519,7 +519,7 @@ public class GridDhtTxPrepareRequest extends
GridDistributedTxPrepareRequest {
reader.incrementState();
- case 23:
+ case 22:
miniId = reader.readInt();
if (!reader.isLastRead())
@@ -527,7 +527,7 @@ public class GridDhtTxPrepareRequest extends
GridDistributedTxPrepareRequest {
reader.incrementState();
- case 24:
+ case 23:
nearNodeId = reader.readUuid();
if (!reader.isLastRead())
@@ -535,7 +535,7 @@ public class GridDhtTxPrepareRequest extends
GridDistributedTxPrepareRequest {
reader.incrementState();
- case 25:
+ case 24:
nearWrites =
reader.readCollection(MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -543,7 +543,7 @@ public class GridDhtTxPrepareRequest extends
GridDistributedTxPrepareRequest {
reader.incrementState();
- case 26:
+ case 25:
nearXidVer = reader.readMessage();
if (!reader.isLastRead())
@@ -551,7 +551,7 @@ public class GridDhtTxPrepareRequest extends
GridDistributedTxPrepareRequest {
reader.incrementState();
- case 27:
+ case 26:
ownedKeys =
reader.readCollection(MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -559,7 +559,7 @@ public class GridDhtTxPrepareRequest extends
GridDistributedTxPrepareRequest {
reader.incrementState();
- case 28:
+ case 27:
ownedVals =
reader.readCollection(MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -567,7 +567,7 @@ public class GridDhtTxPrepareRequest extends
GridDistributedTxPrepareRequest {
reader.incrementState();
- case 29:
+ case 28:
preloadKeys = reader.readBitSet();
if (!reader.isLastRead())
@@ -575,7 +575,7 @@ public class GridDhtTxPrepareRequest extends
GridDistributedTxPrepareRequest {
reader.incrementState();
- case 30:
+ case 29:
skipCompletedVers = reader.readBoolean();
if (!reader.isLastRead())
@@ -583,7 +583,7 @@ public class GridDhtTxPrepareRequest extends
GridDistributedTxPrepareRequest {
reader.incrementState();
- case 31:
+ case 30:
taskNameHash = reader.readInt();
if (!reader.isLastRead())
@@ -591,7 +591,7 @@ public class GridDhtTxPrepareRequest extends
GridDistributedTxPrepareRequest {
reader.incrementState();
- case 32:
+ case 31:
topVer = reader.readAffinityTopologyVersion();
if (!reader.isLastRead())
@@ -599,7 +599,7 @@ public class GridDhtTxPrepareRequest extends
GridDistributedTxPrepareRequest {
reader.incrementState();
- case 33:
+ case 32:
txLbl = reader.readString();
if (!reader.isLastRead())
@@ -607,7 +607,7 @@ public class GridDhtTxPrepareRequest extends
GridDistributedTxPrepareRequest {
reader.incrementState();
- case 34:
+ case 33:
updCntrs =
reader.readCollection(MessageCollectionItemType.MSG);
if (!reader.isLastRead())
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 666eb64dc5c..7a42845b099 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
@@ -241,31 +241,31 @@ public class GridDhtTxPrepareResponse extends
GridDistributedTxPrepareResponse {
}
switch (writer.state()) {
- case 11:
+ case 10:
if (!writer.writeIgniteUuid(futId))
return false;
writer.incrementState();
- case 12:
+ case 11:
if (!writer.writeMap(invalidParts,
MessageCollectionItemType.INT, MessageCollectionItemType.INT_ARR))
return false;
writer.incrementState();
- case 13:
+ case 12:
if (!writer.writeInt(miniId))
return false;
writer.incrementState();
- case 14:
+ case 13:
if (!writer.writeCollection(nearEvicted,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 15:
+ case 14:
if (!writer.writeCollection(preloadEntries,
MessageCollectionItemType.MSG))
return false;
@@ -284,7 +284,7 @@ public class GridDhtTxPrepareResponse extends
GridDistributedTxPrepareResponse {
return false;
switch (reader.state()) {
- case 11:
+ case 10:
futId = reader.readIgniteUuid();
if (!reader.isLastRead())
@@ -292,7 +292,7 @@ public class GridDhtTxPrepareResponse extends
GridDistributedTxPrepareResponse {
reader.incrementState();
- case 12:
+ case 11:
invalidParts = reader.readMap(MessageCollectionItemType.INT,
MessageCollectionItemType.INT_ARR, false);
if (!reader.isLastRead())
@@ -300,7 +300,7 @@ public class GridDhtTxPrepareResponse extends
GridDistributedTxPrepareResponse {
reader.incrementState();
- case 13:
+ case 12:
miniId = reader.readInt();
if (!reader.isLastRead())
@@ -308,7 +308,7 @@ public class GridDhtTxPrepareResponse extends
GridDistributedTxPrepareResponse {
reader.incrementState();
- case 14:
+ case 13:
nearEvicted =
reader.readCollection(MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -316,7 +316,7 @@ public class GridDhtTxPrepareResponse extends
GridDistributedTxPrepareResponse {
reader.incrementState();
- case 15:
+ case 14:
preloadEntries =
reader.readCollection(MessageCollectionItemType.MSG);
if (!reader.isLastRead())
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 dcddecc5145..c509493b922 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
@@ -109,7 +109,7 @@ public class GridDhtUnlockRequest extends
GridDistributedUnlockRequest {
}
switch (writer.state()) {
- case 9:
+ case 8:
if (!writer.writeCollection(nearKeys,
MessageCollectionItemType.MSG))
return false;
@@ -128,7 +128,7 @@ public class GridDhtUnlockRequest extends
GridDistributedUnlockRequest {
return false;
switch (reader.state()) {
- case 9:
+ case 8:
nearKeys =
reader.readCollection(MessageCollectionItemType.MSG);
if (!reader.isLastRead())
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 ec61e6295e2..f108bf107c5 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
@@ -307,49 +307,49 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
}
switch (writer.state()) {
- case 21:
+ case 20:
if (!writer.writeLong(accessTtl))
return false;
writer.incrementState();
- case 22:
+ case 21:
if (!writer.writeLong(createTtl))
return false;
writer.incrementState();
- case 23:
+ case 22:
if (!writer.writeObjectArray(dhtVers,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 24:
+ case 23:
if (!writer.writeByte(flags))
return false;
writer.incrementState();
- case 25:
+ case 24:
if (!writer.writeInt(miniId))
return false;
writer.incrementState();
- case 26:
+ case 25:
if (!writer.writeInt(taskNameHash))
return false;
writer.incrementState();
- case 27:
+ case 26:
if (!writer.writeAffinityTopologyVersion(topVer))
return false;
writer.incrementState();
- case 28:
+ case 27:
if (!writer.writeString(txLbl))
return false;
@@ -367,7 +367,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
return false;
switch (reader.state()) {
- case 21:
+ case 20:
accessTtl = reader.readLong();
if (!reader.isLastRead())
@@ -375,7 +375,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 22:
+ case 21:
createTtl = reader.readLong();
if (!reader.isLastRead())
@@ -383,7 +383,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 23:
+ case 22:
dhtVers =
reader.readObjectArray(MessageCollectionItemType.MSG, GridCacheVersion.class);
if (!reader.isLastRead())
@@ -391,7 +391,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 24:
+ case 23:
flags = reader.readByte();
if (!reader.isLastRead())
@@ -399,7 +399,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 25:
+ case 24:
miniId = reader.readInt();
if (!reader.isLastRead())
@@ -407,7 +407,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 26:
+ case 25:
taskNameHash = reader.readInt();
if (!reader.isLastRead())
@@ -415,7 +415,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 27:
+ case 26:
topVer = reader.readAffinityTopologyVersion();
if (!reader.isLastRead())
@@ -423,7 +423,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 28:
+ case 27:
txLbl = reader.readString();
if (!reader.isLastRead())
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 4447500422b..d74ce684415 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
@@ -219,43 +219,43 @@ public class GridNearLockResponse extends
GridDistributedLockResponse {
}
switch (writer.state()) {
- case 11:
+ case 10:
if (!writer.writeAffinityTopologyVersion(clientRemapVer))
return false;
writer.incrementState();
- case 12:
+ case 11:
if (!writer.writeBoolean(compatibleRemapVer))
return false;
writer.incrementState();
- case 13:
+ case 12:
if (!writer.writeObjectArray(dhtVers,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 14:
+ case 13:
if (!writer.writeBooleanArray(filterRes))
return false;
writer.incrementState();
- case 15:
+ case 14:
if (!writer.writeObjectArray(mappedVers,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 16:
+ case 15:
if (!writer.writeInt(miniId))
return false;
writer.incrementState();
- case 17:
+ case 16:
if (!writer.writeCollection(pending,
MessageCollectionItemType.MSG))
return false;
@@ -274,7 +274,7 @@ public class GridNearLockResponse extends
GridDistributedLockResponse {
return false;
switch (reader.state()) {
- case 11:
+ case 10:
clientRemapVer = reader.readAffinityTopologyVersion();
if (!reader.isLastRead())
@@ -282,7 +282,7 @@ public class GridNearLockResponse extends
GridDistributedLockResponse {
reader.incrementState();
- case 12:
+ case 11:
compatibleRemapVer = reader.readBoolean();
if (!reader.isLastRead())
@@ -290,7 +290,7 @@ public class GridNearLockResponse extends
GridDistributedLockResponse {
reader.incrementState();
- case 13:
+ case 12:
dhtVers =
reader.readObjectArray(MessageCollectionItemType.MSG, GridCacheVersion.class);
if (!reader.isLastRead())
@@ -298,7 +298,7 @@ public class GridNearLockResponse extends
GridDistributedLockResponse {
reader.incrementState();
- case 14:
+ case 13:
filterRes = reader.readBooleanArray();
if (!reader.isLastRead())
@@ -306,7 +306,7 @@ public class GridNearLockResponse extends
GridDistributedLockResponse {
reader.incrementState();
- case 15:
+ case 14:
mappedVers =
reader.readObjectArray(MessageCollectionItemType.MSG, GridCacheVersion.class);
if (!reader.isLastRead())
@@ -314,7 +314,7 @@ public class GridNearLockResponse extends
GridDistributedLockResponse {
reader.incrementState();
- case 16:
+ case 15:
miniId = reader.readInt();
if (!reader.isLastRead())
@@ -322,7 +322,7 @@ public class GridNearLockResponse extends
GridDistributedLockResponse {
reader.incrementState();
- case 17:
+ case 16:
pending = reader.readCollection(MessageCollectionItemType.MSG);
if (!reader.isLastRead())
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 d9535b84ad1..cc39c3ed84c 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
@@ -163,7 +163,7 @@ public class GridNearTxFinishRequest extends
GridDistributedTxFinishRequest {
}
switch (writer.state()) {
- case 21:
+ case 20:
if (!writer.writeInt(miniId))
return false;
@@ -182,7 +182,7 @@ public class GridNearTxFinishRequest extends
GridDistributedTxFinishRequest {
return false;
switch (reader.state()) {
- case 21:
+ case 20:
miniId = reader.readInt();
if (!reader.isLastRead())
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 630b019d9cc..c09ced3b812 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
@@ -318,37 +318,37 @@ public class GridNearTxPrepareRequest extends
GridDistributedTxPrepareRequest {
}
switch (writer.state()) {
- case 21:
+ case 20:
if (!writer.writeByte(flags))
return false;
writer.incrementState();
- case 22:
+ case 21:
if (!writer.writeIgniteUuid(futId))
return false;
writer.incrementState();
- case 23:
+ case 22:
if (!writer.writeInt(miniId))
return false;
writer.incrementState();
- case 24:
+ case 23:
if (!writer.writeInt(taskNameHash))
return false;
writer.incrementState();
- case 25:
+ case 24:
if (!writer.writeAffinityTopologyVersion(topVer))
return false;
writer.incrementState();
- case 26:
+ case 25:
if (!writer.writeString(txLbl))
return false;
@@ -367,7 +367,7 @@ public class GridNearTxPrepareRequest extends
GridDistributedTxPrepareRequest {
return false;
switch (reader.state()) {
- case 21:
+ case 20:
flags = reader.readByte();
if (!reader.isLastRead())
@@ -375,7 +375,7 @@ public class GridNearTxPrepareRequest extends
GridDistributedTxPrepareRequest {
reader.incrementState();
- case 22:
+ case 21:
futId = reader.readIgniteUuid();
if (!reader.isLastRead())
@@ -383,7 +383,7 @@ public class GridNearTxPrepareRequest extends
GridDistributedTxPrepareRequest {
reader.incrementState();
- case 23:
+ case 22:
miniId = reader.readInt();
if (!reader.isLastRead())
@@ -391,7 +391,7 @@ public class GridNearTxPrepareRequest extends
GridDistributedTxPrepareRequest {
reader.incrementState();
- case 24:
+ case 23:
taskNameHash = reader.readInt();
if (!reader.isLastRead())
@@ -399,7 +399,7 @@ public class GridNearTxPrepareRequest extends
GridDistributedTxPrepareRequest {
reader.incrementState();
- case 25:
+ case 24:
topVer = reader.readAffinityTopologyVersion();
if (!reader.isLastRead())
@@ -407,7 +407,7 @@ public class GridNearTxPrepareRequest extends
GridDistributedTxPrepareRequest {
reader.incrementState();
- case 26:
+ case 25:
txLbl = reader.readString();
if (!reader.isLastRead())
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 2b0651a4f10..666b18c8dcd 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
@@ -352,61 +352,61 @@ public class GridNearTxPrepareResponse extends
GridDistributedTxPrepareResponse
}
switch (writer.state()) {
- case 11:
+ case 10:
if (!writer.writeAffinityTopologyVersion(clientRemapVer))
return false;
writer.incrementState();
- case 12:
+ case 11:
if (!writer.writeMessage(dhtVer))
return false;
writer.incrementState();
- case 13:
+ case 12:
if (!writer.writeCollection(filterFailedKeys,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 14:
+ case 13:
if (!writer.writeIgniteUuid(futId))
return false;
writer.incrementState();
- case 15:
+ case 14:
if (!writer.writeInt(miniId))
return false;
writer.incrementState();
- case 16:
+ case 15:
if (!writer.writeCollection(ownedValKeys,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 17:
+ case 16:
if (!writer.writeCollection(ownedValVals,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 18:
+ case 17:
if (!writer.writeCollection(pending,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 19:
+ case 18:
if (!writer.writeMessage(retVal))
return false;
writer.incrementState();
- case 20:
+ case 19:
if (!writer.writeMessage(writeVer))
return false;
@@ -424,7 +424,7 @@ public class GridNearTxPrepareResponse extends
GridDistributedTxPrepareResponse
return false;
switch (reader.state()) {
- case 11:
+ case 10:
clientRemapVer = reader.readAffinityTopologyVersion();
if (!reader.isLastRead())
@@ -432,7 +432,7 @@ public class GridNearTxPrepareResponse extends
GridDistributedTxPrepareResponse
reader.incrementState();
- case 12:
+ case 11:
dhtVer = reader.readMessage();
if (!reader.isLastRead())
@@ -440,7 +440,7 @@ public class GridNearTxPrepareResponse extends
GridDistributedTxPrepareResponse
reader.incrementState();
- case 13:
+ case 12:
filterFailedKeys =
reader.readCollection(MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -448,7 +448,7 @@ public class GridNearTxPrepareResponse extends
GridDistributedTxPrepareResponse
reader.incrementState();
- case 14:
+ case 13:
futId = reader.readIgniteUuid();
if (!reader.isLastRead())
@@ -456,7 +456,7 @@ public class GridNearTxPrepareResponse extends
GridDistributedTxPrepareResponse
reader.incrementState();
- case 15:
+ case 14:
miniId = reader.readInt();
if (!reader.isLastRead())
@@ -464,7 +464,7 @@ public class GridNearTxPrepareResponse extends
GridDistributedTxPrepareResponse
reader.incrementState();
- case 16:
+ case 15:
ownedValKeys =
reader.readCollection(MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -472,7 +472,7 @@ public class GridNearTxPrepareResponse extends
GridDistributedTxPrepareResponse
reader.incrementState();
- case 17:
+ case 16:
ownedValVals =
reader.readCollection(MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -480,7 +480,7 @@ public class GridNearTxPrepareResponse extends
GridDistributedTxPrepareResponse
reader.incrementState();
- case 18:
+ case 17:
pending = reader.readCollection(MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -488,7 +488,7 @@ public class GridNearTxPrepareResponse extends
GridDistributedTxPrepareResponse
reader.incrementState();
- case 19:
+ case 18:
retVal = reader.readMessage();
if (!reader.isLastRead())
@@ -496,7 +496,7 @@ public class GridNearTxPrepareResponse extends
GridDistributedTxPrepareResponse
reader.incrementState();
- case 20:
+ case 19:
writeVer = reader.readMessage();
if (!reader.isLastRead())
