http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java ---------------------------------------------------------------------- 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 61896b5..04f411d 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 @@ -393,44 +393,38 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { } switch (writer.state()) { - case 21: - if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1)) - return false; - - writer.incrementState(); - case 22: - if (!writer.writeInt("miniId", miniId)) + if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1)) return false; writer.incrementState(); case 23: - if (!writer.writeUuid("nearNodeId", nearNodeId)) + if (!writer.writeInt("miniId", miniId)) return false; writer.incrementState(); case 24: - if (!writer.writeMessage("partUpdateCnt", partUpdateCnt)) + if (!writer.writeMessage("mvccSnapshot", mvccSnapshot)) return false; writer.incrementState(); case 25: - if (!writer.writeCollection("pendingVers", pendingVers, MessageCollectionItemType.MSG)) + if (!writer.writeUuid("nearNodeId", nearNodeId)) return false; writer.incrementState(); case 26: - if (!writer.writeMessage("writeVer", writeVer)) + if (!writer.writeMessage("partUpdateCnt", partUpdateCnt)) return false; writer.incrementState(); case 27: - if (!writer.writeMessage("mvccSnapshot", mvccSnapshot)) + if (!writer.writeCollection("pendingVers", pendingVers, MessageCollectionItemType.MSG)) return false; writer.incrementState(); @@ -441,6 +435,12 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { writer.incrementState(); + case 29: + if (!writer.writeMessage("writeVer", writeVer)) + return false; + + writer.incrementState(); + } return true; @@ -457,7 +457,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { return false; switch (reader.state()) { - case 21: + case 22: byte isolationOrd; isolationOrd = reader.readByte("isolation"); @@ -469,16 +469,8 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); - case 22: - miniId = reader.readInt("miniId"); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - case 23: - nearNodeId = reader.readUuid("nearNodeId"); + miniId = reader.readInt("miniId"); if (!reader.isLastRead()) return false; @@ -486,7 +478,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); case 24: - partUpdateCnt = reader.readMessage("partUpdateCnt"); + mvccSnapshot = reader.readMessage("mvccSnapshot"); if (!reader.isLastRead()) return false; @@ -494,7 +486,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); case 25: - pendingVers = reader.readCollection("pendingVers", MessageCollectionItemType.MSG); + nearNodeId = reader.readUuid("nearNodeId"); if (!reader.isLastRead()) return false; @@ -502,7 +494,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); case 26: - writeVer = reader.readMessage("writeVer"); + partUpdateCnt = reader.readMessage("partUpdateCnt"); if (!reader.isLastRead()) return false; @@ -510,7 +502,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); case 27: - mvccSnapshot = reader.readMessage("mvccSnapshot"); + pendingVers = reader.readCollection("pendingVers", MessageCollectionItemType.MSG); if (!reader.isLastRead()) return false; @@ -525,6 +517,14 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); + case 29: + writeVer = reader.readMessage("writeVer"); + + if (!reader.isLastRead()) + return false; + + reader.incrementState(); + } return reader.afterMessageRead(GridDhtTxFinishRequest.class); @@ -537,7 +537,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 29; + return 30; } /** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java ---------------------------------------------------------------------- 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 6d717eb..d777a22 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 @@ -173,19 +173,19 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse { } switch (writer.state()) { - case 6: + case 7: if (!writer.writeByteArray("checkCommittedErrBytes", checkCommittedErrBytes)) return false; writer.incrementState(); - case 7: + case 8: if (!writer.writeInt("miniId", miniId)) return false; writer.incrementState(); - case 8: + case 9: if (!writer.writeMessage("retVal", retVal)) return false; @@ -207,7 +207,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse { return false; switch (reader.state()) { - case 6: + case 7: checkCommittedErrBytes = reader.readByteArray("checkCommittedErrBytes"); if (!reader.isLastRead()) @@ -215,7 +215,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse { reader.incrementState(); - case 7: + case 8: miniId = reader.readInt("miniId"); if (!reader.isLastRead()) @@ -223,7 +223,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse { reader.incrementState(); - case 8: + case 9: retVal = reader.readMessage("retVal"); if (!reader.isLastRead()) @@ -243,7 +243,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 9; + return 10; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java ---------------------------------------------------------------------- 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 67eacd3..50f2e79 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 @@ -97,7 +97,7 @@ public class GridDhtTxOnePhaseCommitAckRequest extends GridCacheMessage { } switch (writer.state()) { - case 2: + case 3: if (!writer.writeCollection("vers", vers, MessageCollectionItemType.MSG)) return false; @@ -119,7 +119,7 @@ public class GridDhtTxOnePhaseCommitAckRequest extends GridCacheMessage { return false; switch (reader.state()) { - case 2: + case 3: vers = reader.readCollection("vers", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -139,6 +139,6 @@ public class GridDhtTxOnePhaseCommitAckRequest extends GridCacheMessage { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 3; + return 4; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java ---------------------------------------------------------------------- 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 c86265a..5b8292f 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 @@ -90,7 +90,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { /** */ @GridDirectCollection(PartitionUpdateCountersMessage.class) - private Collection<PartitionUpdateCountersMessage> counters; + private Collection<PartitionUpdateCountersMessage> updCntrs; /** Near transaction ID. */ private GridCacheVersion nearXidVer; @@ -140,7 +140,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { * @param storeWriteThrough Cache store write through flag. * @param retVal Need return value flag * @param mvccSnapshot Mvcc snapshot. - * @param counters Update counters for mvcc Tx. + * @param updCntrs Update counters for mvcc Tx. */ public GridDhtTxPrepareRequest( IgniteUuid futId, @@ -160,7 +160,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { boolean storeWriteThrough, boolean retVal, MvccSnapshot mvccSnapshot, - Collection<PartitionUpdateCountersMessage> counters) { + Collection<PartitionUpdateCountersMessage> updCntrs) { super(tx, timeout, null, @@ -182,7 +182,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { this.subjId = subjId; this.taskNameHash = taskNameHash; this.mvccSnapshot = mvccSnapshot; - this.counters = counters; + this.updCntrs = updCntrs; storeWriteThrough(storeWriteThrough); needReturnValue(retVal); @@ -207,7 +207,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { * @return Update counters list. */ public Collection<PartitionUpdateCountersMessage> updateCounters() { - return counters; + return updCntrs; } /** @@ -436,12 +436,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { } switch (writer.state()) { - case 20: - if (!writer.writeCollection("counters", counters, MessageCollectionItemType.MSG)) - return false; - - writer.incrementState(); - case 21: if (!writer.writeIgniteUuid("futId", futId)) return false; @@ -521,7 +515,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { writer.incrementState(); case 34: - if (!writer.writeMessage("topVer", topVer)) + if (!writer.writeAffinityTopologyVersion("topVer", topVer)) return false; writer.incrementState(); @@ -532,6 +526,12 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { writer.incrementState(); + case 36: + if (!writer.writeCollection("updCntrs", updCntrs, MessageCollectionItemType.MSG)) + return false; + + writer.incrementState(); + } return true; @@ -548,14 +548,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { return false; switch (reader.state()) { - case 20: - counters = reader.readCollection("counters", MessageCollectionItemType.MSG); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - case 21: futId = reader.readIgniteUuid("futId"); @@ -661,7 +653,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); case 34: - topVer = reader.readMessage("topVer"); + topVer = reader.readAffinityTopologyVersion("topVer"); if (!reader.isLastRead()) return false; @@ -676,6 +668,14 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); + case 36: + updCntrs = reader.readCollection("updCntrs", MessageCollectionItemType.MSG); + + if (!reader.isLastRead()) + return false; + + reader.incrementState(); + } return reader.afterMessageRead(GridDhtTxPrepareRequest.class); @@ -688,7 +688,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 36; + return 37; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java ---------------------------------------------------------------------- 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 0c2bf81..fcb14a3 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 @@ -245,31 +245,31 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse { } switch (writer.state()) { - case 10: + case 11: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 11: + case 12: if (!writer.writeMap("invalidParts", invalidParts, MessageCollectionItemType.INT, MessageCollectionItemType.INT_ARR)) return false; writer.incrementState(); - case 12: + case 13: if (!writer.writeInt("miniId", miniId)) return false; writer.incrementState(); - case 13: + case 14: if (!writer.writeCollection("nearEvicted", nearEvicted, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 14: + case 15: if (!writer.writeCollection("preloadEntries", preloadEntries, MessageCollectionItemType.MSG)) return false; @@ -291,7 +291,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse { return false; switch (reader.state()) { - case 10: + case 11: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -299,7 +299,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse { reader.incrementState(); - case 11: + case 12: invalidParts = reader.readMap("invalidParts", MessageCollectionItemType.INT, MessageCollectionItemType.INT_ARR, false); if (!reader.isLastRead()) @@ -307,7 +307,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse { reader.incrementState(); - case 12: + case 13: miniId = reader.readInt("miniId"); if (!reader.isLastRead()) @@ -315,7 +315,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse { reader.incrementState(); - case 13: + case 14: nearEvicted = reader.readCollection("nearEvicted", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -323,7 +323,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse { reader.incrementState(); - case 14: + case 15: preloadEntries = reader.readCollection("preloadEntries", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -343,7 +343,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 15; + return 16; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryEnlistRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryEnlistRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryEnlistRequest.java index b3aa56d..27b7c81 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryEnlistRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryEnlistRequest.java @@ -247,43 +247,43 @@ public class GridDhtTxQueryEnlistRequest extends GridCacheIdMessage { } switch (writer.state()) { - case 3: + case 4: if (!writer.writeInt("batchId", batchId)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeIgniteUuid("dhtFutId", dhtFutId)) return false; writer.incrementState(); - case 5: + case 6: if (!writer.writeCollection("keys", keys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 6: + case 7: if (!writer.writeMessage("lockVer", lockVer)) return false; writer.incrementState(); - case 7: + case 8: if (!writer.writeInt("mvccOpCnt", mvccOpCnt)) return false; writer.incrementState(); - case 8: + case 9: if (!writer.writeByte("op", op != null ? (byte)op.ordinal() : -1)) return false; writer.incrementState(); - case 9: + case 10: if (!writer.writeCollection("vals", vals, MessageCollectionItemType.MSG)) return false; @@ -305,7 +305,7 @@ public class GridDhtTxQueryEnlistRequest extends GridCacheIdMessage { return false; switch (reader.state()) { - case 3: + case 4: batchId = reader.readInt("batchId"); if (!reader.isLastRead()) @@ -313,7 +313,7 @@ public class GridDhtTxQueryEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 4: + case 5: dhtFutId = reader.readIgniteUuid("dhtFutId"); if (!reader.isLastRead()) @@ -321,7 +321,7 @@ public class GridDhtTxQueryEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 5: + case 6: keys = reader.readCollection("keys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -329,7 +329,7 @@ public class GridDhtTxQueryEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 6: + case 7: lockVer = reader.readMessage("lockVer"); if (!reader.isLastRead()) @@ -337,7 +337,7 @@ public class GridDhtTxQueryEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 7: + case 8: mvccOpCnt = reader.readInt("mvccOpCnt"); if (!reader.isLastRead()) @@ -345,7 +345,7 @@ public class GridDhtTxQueryEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 8: + case 9: byte opOrd; opOrd = reader.readByte("op"); @@ -357,7 +357,7 @@ public class GridDhtTxQueryEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 9: + case 10: vals = reader.readCollection("vals", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -372,7 +372,7 @@ public class GridDhtTxQueryEnlistRequest extends GridCacheIdMessage { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 10; + return 11; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryEnlistResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryEnlistResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryEnlistResponse.java index f3b4aa7..18f4baa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryEnlistResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryEnlistResponse.java @@ -117,7 +117,7 @@ public class GridDhtTxQueryEnlistResponse extends GridCacheIdMessage { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 6; + return 7; } /** {@inheritDoc} */ @@ -135,19 +135,19 @@ public class GridDhtTxQueryEnlistResponse extends GridCacheIdMessage { } switch (writer.state()) { - case 3: + case 4: if (!writer.writeInt("batchId", batchId)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeByteArray("errBytes", errBytes)) return false; writer.incrementState(); - case 5: + case 6: if (!writer.writeIgniteUuid("futId", futId)) return false; @@ -169,7 +169,7 @@ public class GridDhtTxQueryEnlistResponse extends GridCacheIdMessage { return false; switch (reader.state()) { - case 3: + case 4: batchId = reader.readInt("batchId"); if (!reader.isLastRead()) @@ -177,7 +177,7 @@ public class GridDhtTxQueryEnlistResponse extends GridCacheIdMessage { reader.incrementState(); - case 4: + case 5: errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) @@ -185,7 +185,7 @@ public class GridDhtTxQueryEnlistResponse extends GridCacheIdMessage { reader.incrementState(); - case 5: + case 6: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryFirstEnlistRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryFirstEnlistRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryFirstEnlistRequest.java index 5c1bf6c..2220b29 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryFirstEnlistRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryFirstEnlistRequest.java @@ -208,56 +208,56 @@ public class GridDhtTxQueryFirstEnlistRequest extends GridDhtTxQueryEnlistReques } switch (writer.state()) { - case 10: + case 11: if (!writer.writeLong("cleanupVer", cleanupVer)) return false; writer.incrementState(); - case 11: + case 12: if (!writer.writeLong("cntr", cntr)) return false; writer.incrementState(); - case 12: + case 13: if (!writer.writeLong("crdVer", crdVer)) return false; writer.incrementState(); - case 13: + case 14: if (!writer.writeUuid("nearNodeId", nearNodeId)) return false; writer.incrementState(); - case 14: + case 15: if (!writer.writeMessage("nearXidVer", nearXidVer)) return false; writer.incrementState(); - case 15: + case 16: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 16: + case 17: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 17: + case 18: if (!writer.writeLong("timeout", timeout)) return false; writer.incrementState(); - case 18: - if (!writer.writeMessage("topVer", topVer)) + case 19: + if (!writer.writeAffinityTopologyVersion("topVer", topVer)) return false; writer.incrementState(); @@ -278,7 +278,7 @@ public class GridDhtTxQueryFirstEnlistRequest extends GridDhtTxQueryEnlistReques return false; switch (reader.state()) { - case 10: + case 11: cleanupVer = reader.readLong("cleanupVer"); if (!reader.isLastRead()) @@ -286,7 +286,7 @@ public class GridDhtTxQueryFirstEnlistRequest extends GridDhtTxQueryEnlistReques reader.incrementState(); - case 11: + case 12: cntr = reader.readLong("cntr"); if (!reader.isLastRead()) @@ -294,7 +294,7 @@ public class GridDhtTxQueryFirstEnlistRequest extends GridDhtTxQueryEnlistReques reader.incrementState(); - case 12: + case 13: crdVer = reader.readLong("crdVer"); if (!reader.isLastRead()) @@ -302,7 +302,7 @@ public class GridDhtTxQueryFirstEnlistRequest extends GridDhtTxQueryEnlistReques reader.incrementState(); - case 13: + case 14: nearNodeId = reader.readUuid("nearNodeId"); if (!reader.isLastRead()) @@ -310,7 +310,7 @@ public class GridDhtTxQueryFirstEnlistRequest extends GridDhtTxQueryEnlistReques reader.incrementState(); - case 14: + case 15: nearXidVer = reader.readMessage("nearXidVer"); if (!reader.isLastRead()) @@ -318,7 +318,7 @@ public class GridDhtTxQueryFirstEnlistRequest extends GridDhtTxQueryEnlistReques reader.incrementState(); - case 15: + case 16: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -326,7 +326,7 @@ public class GridDhtTxQueryFirstEnlistRequest extends GridDhtTxQueryEnlistReques reader.incrementState(); - case 16: + case 17: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -334,7 +334,7 @@ public class GridDhtTxQueryFirstEnlistRequest extends GridDhtTxQueryEnlistReques reader.incrementState(); - case 17: + case 18: timeout = reader.readLong("timeout"); if (!reader.isLastRead()) @@ -342,8 +342,8 @@ public class GridDhtTxQueryFirstEnlistRequest extends GridDhtTxQueryEnlistReques reader.incrementState(); - case 18: - topVer = reader.readMessage("topVer"); + case 19: + topVer = reader.readAffinityTopologyVersion("topVer"); if (!reader.isLastRead()) return false; @@ -357,7 +357,7 @@ public class GridDhtTxQueryFirstEnlistRequest extends GridDhtTxQueryEnlistReques /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 19; + return 20; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java ---------------------------------------------------------------------- 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 5671d7f..3bc4de0 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 @@ -113,7 +113,7 @@ public class GridDhtUnlockRequest extends GridDistributedUnlockRequest { } switch (writer.state()) { - case 8: + case 9: if (!writer.writeCollection("nearKeys", nearKeys, MessageCollectionItemType.MSG)) return false; @@ -135,7 +135,7 @@ public class GridDhtUnlockRequest extends GridDistributedUnlockRequest { return false; switch (reader.state()) { - case 8: + case 9: nearKeys = reader.readCollection("nearKeys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -155,6 +155,6 @@ public class GridDhtUnlockRequest extends GridDistributedUnlockRequest { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 9; + return 10; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java index 3e5953f..f30d51d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import java.nio.ByteBuffer; import java.util.Arrays; import org.apache.ignite.internal.GridDirectTransient; +import org.apache.ignite.internal.IgniteCodeGeneratingFail; import org.apache.ignite.internal.util.GridUnsafe; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.plugin.extensions.communication.MessageReader; @@ -28,6 +29,7 @@ import org.apache.ignite.plugin.extensions.communication.MessageWriter; /** * Partition update counters message. */ +@IgniteCodeGeneratingFail public class PartitionUpdateCountersMessage implements Message { /** */ private static final int ITEM_SIZE = 4 /* partition */ + 8 /* initial counter */ + 8 /* updates count */; http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java ---------------------------------------------------------------------- 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 a5e9feb..0096f01 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 @@ -484,7 +484,7 @@ public abstract class GridDhtAtomicAbstractUpdateRequest extends GridCacheIdMess /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 12; + return 13; } /** {@inheritDoc} */ @@ -502,55 +502,55 @@ public abstract class GridDhtAtomicAbstractUpdateRequest extends GridCacheIdMess } switch (writer.state()) { - case 3: + case 4: if (!writer.writeByte("flags", flags)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeLong("futId", futId)) return false; writer.incrementState(); - case 5: + case 6: if (!writer.writeLong("nearFutId", nearFutId)) return false; writer.incrementState(); - case 6: + case 7: if (!writer.writeUuid("nearNodeId", nearNodeId)) return false; writer.incrementState(); - case 7: + case 8: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 8: + case 9: if (!writer.writeByte("syncMode", syncMode != null ? (byte)syncMode.ordinal() : -1)) return false; writer.incrementState(); - case 9: + case 10: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 10: - if (!writer.writeMessage("topVer", topVer)) + case 11: + if (!writer.writeAffinityTopologyVersion("topVer", topVer)) return false; writer.incrementState(); - case 11: + case 12: if (!writer.writeMessage("writeVer", writeVer)) return false; @@ -572,7 +572,7 @@ public abstract class GridDhtAtomicAbstractUpdateRequest extends GridCacheIdMess return false; switch (reader.state()) { - case 3: + case 4: flags = reader.readByte("flags"); if (!reader.isLastRead()) @@ -580,7 +580,7 @@ public abstract class GridDhtAtomicAbstractUpdateRequest extends GridCacheIdMess reader.incrementState(); - case 4: + case 5: futId = reader.readLong("futId"); if (!reader.isLastRead()) @@ -588,7 +588,7 @@ public abstract class GridDhtAtomicAbstractUpdateRequest extends GridCacheIdMess reader.incrementState(); - case 5: + case 6: nearFutId = reader.readLong("nearFutId"); if (!reader.isLastRead()) @@ -596,7 +596,7 @@ public abstract class GridDhtAtomicAbstractUpdateRequest extends GridCacheIdMess reader.incrementState(); - case 6: + case 7: nearNodeId = reader.readUuid("nearNodeId"); if (!reader.isLastRead()) @@ -604,7 +604,7 @@ public abstract class GridDhtAtomicAbstractUpdateRequest extends GridCacheIdMess reader.incrementState(); - case 7: + case 8: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -612,7 +612,7 @@ public abstract class GridDhtAtomicAbstractUpdateRequest extends GridCacheIdMess reader.incrementState(); - case 8: + case 9: byte syncModeOrd; syncModeOrd = reader.readByte("syncMode"); @@ -624,7 +624,7 @@ public abstract class GridDhtAtomicAbstractUpdateRequest extends GridCacheIdMess reader.incrementState(); - case 9: + case 10: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -632,15 +632,15 @@ public abstract class GridDhtAtomicAbstractUpdateRequest extends GridCacheIdMess reader.incrementState(); - case 10: - topVer = reader.readMessage("topVer"); + case 11: + topVer = reader.readAffinityTopologyVersion("topVer"); if (!reader.isLastRead()) return false; reader.incrementState(); - case 11: + case 12: writeVer = reader.readMessage("writeVer"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index cbb217c..86d7b3c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -1773,7 +1773,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { // Can not wait for topology future since it will break // GridNearAtomicCheckUpdateRequest processing. remap = !top.topologyVersionFuture().exchangeDone() || - needRemap(req.topologyVersion(), top.readyTopologyVersion()); + needRemap(req.topologyVersion(), top.readyTopologyVersion(), req.keys()); } if (!remap) { http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java ---------------------------------------------------------------------- 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 0c069da..ee5eac1 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 @@ -119,7 +119,7 @@ public class GridDhtAtomicDeferredUpdateResponse extends GridCacheIdMessage impl } switch (writer.state()) { - case 3: + case 4: if (!writer.writeMessage("futIds", futIds)) return false; @@ -141,7 +141,7 @@ public class GridDhtAtomicDeferredUpdateResponse extends GridCacheIdMessage impl return false; switch (reader.state()) { - case 3: + case 4: futIds = reader.readMessage("futIds"); if (!reader.isLastRead()) @@ -161,7 +161,7 @@ public class GridDhtAtomicDeferredUpdateResponse extends GridCacheIdMessage impl /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 4; + return 5; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java ---------------------------------------------------------------------- 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 71d2321..8f11ead 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 @@ -171,7 +171,7 @@ public class GridDhtAtomicNearResponse extends GridCacheIdMessage { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 8; + return 9; } /** {@inheritDoc} */ @@ -210,31 +210,31 @@ public class GridDhtAtomicNearResponse extends GridCacheIdMessage { } switch (writer.state()) { - case 3: + case 4: if (!writer.writeMessage("errs", errs)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeByte("flags", flags)) return false; writer.incrementState(); - case 5: + case 6: if (!writer.writeLong("futId", futId)) return false; writer.incrementState(); - case 6: + case 7: if (!writer.writeInt("partId", partId)) return false; writer.incrementState(); - case 7: + case 8: if (!writer.writeUuid("primaryId", primaryId)) return false; @@ -256,7 +256,7 @@ public class GridDhtAtomicNearResponse extends GridCacheIdMessage { return false; switch (reader.state()) { - case 3: + case 4: errs = reader.readMessage("errs"); if (!reader.isLastRead()) @@ -264,7 +264,7 @@ public class GridDhtAtomicNearResponse extends GridCacheIdMessage { reader.incrementState(); - case 4: + case 5: flags = reader.readByte("flags"); if (!reader.isLastRead()) @@ -272,7 +272,7 @@ public class GridDhtAtomicNearResponse extends GridCacheIdMessage { reader.incrementState(); - case 5: + case 6: futId = reader.readLong("futId"); if (!reader.isLastRead()) @@ -280,7 +280,7 @@ public class GridDhtAtomicNearResponse extends GridCacheIdMessage { reader.incrementState(); - case 6: + case 7: partId = reader.readInt("partId"); if (!reader.isLastRead()) @@ -288,7 +288,7 @@ public class GridDhtAtomicNearResponse extends GridCacheIdMessage { reader.incrementState(); - case 7: + case 8: primaryId = reader.readUuid("primaryId"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java ---------------------------------------------------------------------- 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 19b24b0..16be80e 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 @@ -373,25 +373,25 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat } switch (writer.state()) { - case 12: + case 13: if (!writer.writeMessage("key", key)) return false; writer.incrementState(); - case 13: + case 14: if (!writer.writeMessage("prevVal", prevVal)) return false; writer.incrementState(); - case 14: + case 15: if (!writer.writeLong("updateCntr", updateCntr)) return false; writer.incrementState(); - case 15: + case 16: if (!writer.writeMessage("val", val)) return false; @@ -413,7 +413,7 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat return false; switch (reader.state()) { - case 12: + case 13: key = reader.readMessage("key"); if (!reader.isLastRead()) @@ -421,7 +421,7 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat reader.incrementState(); - case 13: + case 14: prevVal = reader.readMessage("prevVal"); if (!reader.isLastRead()) @@ -429,7 +429,7 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat reader.incrementState(); - case 14: + case 15: updateCntr = reader.readLong("updateCntr"); if (!reader.isLastRead()) @@ -437,7 +437,7 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat reader.incrementState(); - case 15: + case 16: val = reader.readMessage("val"); if (!reader.isLastRead()) @@ -487,7 +487,7 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 16; + return 17; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java ---------------------------------------------------------------------- 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 30be9dc..67281f7 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 @@ -558,97 +558,97 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque } switch (writer.state()) { - case 12: + case 13: if (!writer.writeMessage("conflictExpireTimes", conflictExpireTimes)) return false; writer.incrementState(); - case 13: + case 14: if (!writer.writeCollection("conflictVers", conflictVers, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 14: + case 15: if (!writer.writeCollection("entryProcessorsBytes", entryProcessorsBytes, MessageCollectionItemType.BYTE_ARR)) return false; writer.incrementState(); - case 15: + case 16: if (!writer.writeBoolean("forceTransformBackups", forceTransformBackups)) return false; writer.incrementState(); - case 16: + case 17: if (!writer.writeObjectArray("invokeArgsBytes", invokeArgsBytes, MessageCollectionItemType.BYTE_ARR)) return false; writer.incrementState(); - case 17: + case 18: if (!writer.writeCollection("keys", keys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 18: + case 19: if (!writer.writeCollection("nearEntryProcessorsBytes", nearEntryProcessorsBytes, MessageCollectionItemType.BYTE_ARR)) return false; writer.incrementState(); - case 19: + case 20: if (!writer.writeMessage("nearExpireTimes", nearExpireTimes)) return false; writer.incrementState(); - case 20: + case 21: if (!writer.writeCollection("nearKeys", nearKeys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 21: + case 22: if (!writer.writeMessage("nearTtls", nearTtls)) return false; writer.incrementState(); - case 22: + case 23: if (!writer.writeCollection("nearVals", nearVals, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 23: + case 24: if (!writer.writeMessage("obsoleteIndexes", obsoleteIndexes)) return false; writer.incrementState(); - case 24: + case 25: if (!writer.writeCollection("prevVals", prevVals, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 25: + case 26: if (!writer.writeMessage("ttls", ttls)) return false; writer.incrementState(); - case 26: + case 27: if (!writer.writeMessage("updateCntrs", updateCntrs)) return false; writer.incrementState(); - case 27: + case 28: if (!writer.writeCollection("vals", vals, MessageCollectionItemType.MSG)) return false; @@ -670,7 +670,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque return false; switch (reader.state()) { - case 12: + case 13: conflictExpireTimes = reader.readMessage("conflictExpireTimes"); if (!reader.isLastRead()) @@ -678,7 +678,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 13: + case 14: conflictVers = reader.readCollection("conflictVers", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -686,7 +686,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 14: + case 15: entryProcessorsBytes = reader.readCollection("entryProcessorsBytes", MessageCollectionItemType.BYTE_ARR); if (!reader.isLastRead()) @@ -694,7 +694,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 15: + case 16: forceTransformBackups = reader.readBoolean("forceTransformBackups"); if (!reader.isLastRead()) @@ -702,7 +702,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 16: + case 17: invokeArgsBytes = reader.readObjectArray("invokeArgsBytes", MessageCollectionItemType.BYTE_ARR, byte[].class); if (!reader.isLastRead()) @@ -710,7 +710,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 17: + case 18: keys = reader.readCollection("keys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -718,7 +718,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 18: + case 19: nearEntryProcessorsBytes = reader.readCollection("nearEntryProcessorsBytes", MessageCollectionItemType.BYTE_ARR); if (!reader.isLastRead()) @@ -726,7 +726,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 19: + case 20: nearExpireTimes = reader.readMessage("nearExpireTimes"); if (!reader.isLastRead()) @@ -734,7 +734,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 20: + case 21: nearKeys = reader.readCollection("nearKeys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -742,7 +742,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 21: + case 22: nearTtls = reader.readMessage("nearTtls"); if (!reader.isLastRead()) @@ -750,7 +750,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 22: + case 23: nearVals = reader.readCollection("nearVals", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -758,7 +758,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 23: + case 24: obsoleteIndexes = reader.readMessage("obsoleteIndexes"); if (!reader.isLastRead()) @@ -766,7 +766,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 24: + case 25: prevVals = reader.readCollection("prevVals", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -774,7 +774,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 25: + case 26: ttls = reader.readMessage("ttls"); if (!reader.isLastRead()) @@ -782,7 +782,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 26: + case 27: updateCntrs = reader.readMessage("updateCntrs"); if (!reader.isLastRead()) @@ -790,7 +790,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque reader.incrementState(); - case 27: + case 28: vals = reader.readCollection("vals", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -816,7 +816,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 28; + return 29; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java ---------------------------------------------------------------------- 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 70bf6f5..21efbb1 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 @@ -179,25 +179,25 @@ public class GridDhtAtomicUpdateResponse extends GridCacheIdMessage implements G } switch (writer.state()) { - case 3: + case 4: if (!writer.writeMessage("errs", errs)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeLong("futId", futId)) return false; writer.incrementState(); - case 5: + case 6: if (!writer.writeCollection("nearEvicted", nearEvicted, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 6: + case 7: if (!writer.writeInt("partId", partId)) return false; @@ -219,7 +219,7 @@ public class GridDhtAtomicUpdateResponse extends GridCacheIdMessage implements G return false; switch (reader.state()) { - case 3: + case 4: errs = reader.readMessage("errs"); if (!reader.isLastRead()) @@ -227,7 +227,7 @@ public class GridDhtAtomicUpdateResponse extends GridCacheIdMessage implements G reader.incrementState(); - case 4: + case 5: futId = reader.readLong("futId"); if (!reader.isLastRead()) @@ -235,7 +235,7 @@ public class GridDhtAtomicUpdateResponse extends GridCacheIdMessage implements G reader.incrementState(); - case 5: + case 6: nearEvicted = reader.readCollection("nearEvicted", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -243,7 +243,7 @@ public class GridDhtAtomicUpdateResponse extends GridCacheIdMessage implements G reader.incrementState(); - case 6: + case 7: partId = reader.readInt("partId"); if (!reader.isLastRead()) @@ -263,7 +263,7 @@ public class GridDhtAtomicUpdateResponse extends GridCacheIdMessage implements G /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 7; + return 8; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java ---------------------------------------------------------------------- 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 62618f8..64fe1ee 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 @@ -528,7 +528,7 @@ public abstract class GridNearAtomicAbstractUpdateRequest extends GridCacheIdMes /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 10; + return 11; } /** {@inheritDoc} */ @@ -546,44 +546,44 @@ public abstract class GridNearAtomicAbstractUpdateRequest extends GridCacheIdMes } switch (writer.state()) { - case 3: + case 4: if (!writer.writeByte("flags", flags)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeLong("futId", futId)) return false; writer.incrementState(); - case 5: + case 6: if (!writer.writeByte("op", op != null ? (byte)op.ordinal() : -1)) return false; writer.incrementState(); - case 6: + case 7: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 7: + case 8: if (!writer.writeByte("syncMode", syncMode != null ? (byte)syncMode.ordinal() : -1)) return false; writer.incrementState(); - case 8: + case 9: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 9: - if (!writer.writeMessage("topVer", topVer)) + case 10: + if (!writer.writeAffinityTopologyVersion("topVer", topVer)) return false; writer.incrementState(); @@ -604,7 +604,7 @@ public abstract class GridNearAtomicAbstractUpdateRequest extends GridCacheIdMes return false; switch (reader.state()) { - case 3: + case 4: flags = reader.readByte("flags"); if (!reader.isLastRead()) @@ -612,7 +612,7 @@ public abstract class GridNearAtomicAbstractUpdateRequest extends GridCacheIdMes reader.incrementState(); - case 4: + case 5: futId = reader.readLong("futId"); if (!reader.isLastRead()) @@ -620,7 +620,7 @@ public abstract class GridNearAtomicAbstractUpdateRequest extends GridCacheIdMes reader.incrementState(); - case 5: + case 6: byte opOrd; opOrd = reader.readByte("op"); @@ -632,7 +632,7 @@ public abstract class GridNearAtomicAbstractUpdateRequest extends GridCacheIdMes reader.incrementState(); - case 6: + case 7: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -640,7 +640,7 @@ public abstract class GridNearAtomicAbstractUpdateRequest extends GridCacheIdMes reader.incrementState(); - case 7: + case 8: byte syncModeOrd; syncModeOrd = reader.readByte("syncMode"); @@ -652,7 +652,7 @@ public abstract class GridNearAtomicAbstractUpdateRequest extends GridCacheIdMes reader.incrementState(); - case 8: + case 9: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -660,8 +660,8 @@ public abstract class GridNearAtomicAbstractUpdateRequest extends GridCacheIdMes reader.incrementState(); - case 9: - topVer = reader.readMessage("topVer"); + case 10: + topVer = reader.readAffinityTopologyVersion("topVer"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java ---------------------------------------------------------------------- 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 96be023..a19e280 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 @@ -101,7 +101,7 @@ public class GridNearAtomicCheckUpdateRequest extends GridCacheIdMessage { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 5; + return 6; } /** {@inheritDoc} */ @@ -119,13 +119,13 @@ public class GridNearAtomicCheckUpdateRequest extends GridCacheIdMessage { } switch (writer.state()) { - case 3: + case 4: if (!writer.writeLong("futId", futId)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeInt("partId", partId)) return false; @@ -147,7 +147,7 @@ public class GridNearAtomicCheckUpdateRequest extends GridCacheIdMessage { return false; switch (reader.state()) { - case 3: + case 4: futId = reader.readLong("futId"); if (!reader.isLastRead()) @@ -155,7 +155,7 @@ public class GridNearAtomicCheckUpdateRequest extends GridCacheIdMessage { reader.incrementState(); - case 4: + case 5: partId = reader.readInt("partId"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java ---------------------------------------------------------------------- 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 d6956a6..170586b 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 @@ -435,55 +435,55 @@ public class GridNearAtomicFullUpdateRequest extends GridNearAtomicAbstractUpdat } switch (writer.state()) { - case 10: + case 11: if (!writer.writeMessage("conflictExpireTimes", conflictExpireTimes)) return false; writer.incrementState(); - case 11: + case 12: if (!writer.writeMessage("conflictTtls", conflictTtls)) return false; writer.incrementState(); - case 12: + case 13: if (!writer.writeCollection("conflictVers", conflictVers, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 13: + case 14: if (!writer.writeCollection("entryProcessorsBytes", entryProcessorsBytes, MessageCollectionItemType.BYTE_ARR)) return false; writer.incrementState(); - case 14: + case 15: if (!writer.writeByteArray("expiryPlcBytes", expiryPlcBytes)) return false; writer.incrementState(); - case 15: + case 16: if (!writer.writeObjectArray("filter", filter, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 16: + case 17: if (!writer.writeObjectArray("invokeArgsBytes", invokeArgsBytes, MessageCollectionItemType.BYTE_ARR)) return false; writer.incrementState(); - case 17: + case 18: if (!writer.writeCollection("keys", keys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 18: + case 19: if (!writer.writeCollection("vals", vals, MessageCollectionItemType.MSG)) return false; @@ -505,7 +505,7 @@ public class GridNearAtomicFullUpdateRequest extends GridNearAtomicAbstractUpdat return false; switch (reader.state()) { - case 10: + case 11: conflictExpireTimes = reader.readMessage("conflictExpireTimes"); if (!reader.isLastRead()) @@ -513,7 +513,7 @@ public class GridNearAtomicFullUpdateRequest extends GridNearAtomicAbstractUpdat reader.incrementState(); - case 11: + case 12: conflictTtls = reader.readMessage("conflictTtls"); if (!reader.isLastRead()) @@ -521,7 +521,7 @@ public class GridNearAtomicFullUpdateRequest extends GridNearAtomicAbstractUpdat reader.incrementState(); - case 12: + case 13: conflictVers = reader.readCollection("conflictVers", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -529,7 +529,7 @@ public class GridNearAtomicFullUpdateRequest extends GridNearAtomicAbstractUpdat reader.incrementState(); - case 13: + case 14: entryProcessorsBytes = reader.readCollection("entryProcessorsBytes", MessageCollectionItemType.BYTE_ARR); if (!reader.isLastRead()) @@ -537,7 +537,7 @@ public class GridNearAtomicFullUpdateRequest extends GridNearAtomicAbstractUpdat reader.incrementState(); - case 14: + case 15: expiryPlcBytes = reader.readByteArray("expiryPlcBytes"); if (!reader.isLastRead()) @@ -545,7 +545,7 @@ public class GridNearAtomicFullUpdateRequest extends GridNearAtomicAbstractUpdat reader.incrementState(); - case 15: + case 16: filter = reader.readObjectArray("filter", MessageCollectionItemType.MSG, CacheEntryPredicate.class); if (!reader.isLastRead()) @@ -553,7 +553,7 @@ public class GridNearAtomicFullUpdateRequest extends GridNearAtomicAbstractUpdat reader.incrementState(); - case 16: + case 17: invokeArgsBytes = reader.readObjectArray("invokeArgsBytes", MessageCollectionItemType.BYTE_ARR, byte[].class); if (!reader.isLastRead()) @@ -561,7 +561,7 @@ public class GridNearAtomicFullUpdateRequest extends GridNearAtomicAbstractUpdat reader.incrementState(); - case 17: + case 18: keys = reader.readCollection("keys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -569,7 +569,7 @@ public class GridNearAtomicFullUpdateRequest extends GridNearAtomicAbstractUpdat reader.incrementState(); - case 18: + case 19: vals = reader.readCollection("vals", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -601,7 +601,7 @@ public class GridNearAtomicFullUpdateRequest extends GridNearAtomicAbstractUpdat /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 19; + return 20; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java ---------------------------------------------------------------------- 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 1ebfe80..4c20344 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 @@ -154,7 +154,7 @@ public class GridNearAtomicSingleUpdateFilterRequest extends GridNearAtomicSingl } switch (writer.state()) { - case 12: + case 13: if (!writer.writeObjectArray("filter", filter, MessageCollectionItemType.MSG)) return false; @@ -176,7 +176,7 @@ public class GridNearAtomicSingleUpdateFilterRequest extends GridNearAtomicSingl return false; switch (reader.state()) { - case 12: + case 13: filter = reader.readObjectArray("filter", MessageCollectionItemType.MSG, CacheEntryPredicate.class); if (!reader.isLastRead()) @@ -196,7 +196,7 @@ public class GridNearAtomicSingleUpdateFilterRequest extends GridNearAtomicSingl /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 13; + return 14; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java ---------------------------------------------------------------------- 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 865d6f8..ee3d2a4 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 @@ -225,13 +225,13 @@ public class GridNearAtomicSingleUpdateInvokeRequest extends GridNearAtomicSingl } switch (writer.state()) { - case 12: + case 13: if (!writer.writeByteArray("entryProcessorBytes", entryProcessorBytes)) return false; writer.incrementState(); - case 13: + case 14: if (!writer.writeObjectArray("invokeArgsBytes", invokeArgsBytes, MessageCollectionItemType.BYTE_ARR)) return false; @@ -253,7 +253,7 @@ public class GridNearAtomicSingleUpdateInvokeRequest extends GridNearAtomicSingl return false; switch (reader.state()) { - case 12: + case 13: entryProcessorBytes = reader.readByteArray("entryProcessorBytes"); if (!reader.isLastRead()) @@ -261,7 +261,7 @@ public class GridNearAtomicSingleUpdateInvokeRequest extends GridNearAtomicSingl reader.incrementState(); - case 13: + case 14: invokeArgsBytes = reader.readObjectArray("invokeArgsBytes", MessageCollectionItemType.BYTE_ARR, byte[].class); if (!reader.isLastRead()) @@ -276,7 +276,7 @@ public class GridNearAtomicSingleUpdateInvokeRequest extends GridNearAtomicSingl /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 14; + return 15; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java ---------------------------------------------------------------------- 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 dd3a7be..83ec456 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 @@ -247,13 +247,13 @@ public class GridNearAtomicSingleUpdateRequest extends GridNearAtomicAbstractSin } switch (writer.state()) { - case 10: + case 11: if (!writer.writeMessage("key", key)) return false; writer.incrementState(); - case 11: + case 12: if (!writer.writeMessage("val", val)) return false; @@ -275,7 +275,7 @@ public class GridNearAtomicSingleUpdateRequest extends GridNearAtomicAbstractSin return false; switch (reader.state()) { - case 10: + case 11: key = reader.readMessage("key"); if (!reader.isLastRead()) @@ -283,7 +283,7 @@ public class GridNearAtomicSingleUpdateRequest extends GridNearAtomicAbstractSin reader.incrementState(); - case 11: + case 12: val = reader.readMessage("val"); if (!reader.isLastRead()) @@ -311,7 +311,7 @@ public class GridNearAtomicSingleUpdateRequest extends GridNearAtomicAbstractSin /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 12; + return 13; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java ---------------------------------------------------------------------- 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 0e40788..e3f4258 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 @@ -403,43 +403,43 @@ public class GridNearAtomicUpdateResponse extends GridCacheIdMessage implements } switch (writer.state()) { - case 3: + case 4: if (!writer.writeMessage("errs", errs)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeLong("futId", futId)) return false; writer.incrementState(); - case 5: + case 6: if (!writer.writeCollection("mapping", mapping, MessageCollectionItemType.UUID)) return false; writer.incrementState(); - case 6: + case 7: if (!writer.writeMessage("nearUpdates", nearUpdates)) return false; writer.incrementState(); - case 7: + case 8: if (!writer.writeInt("partId", partId)) return false; writer.incrementState(); - case 8: - if (!writer.writeMessage("remapTopVer", remapTopVer)) + case 9: + if (!writer.writeAffinityTopologyVersion("remapTopVer", remapTopVer)) return false; writer.incrementState(); - case 9: + case 10: if (!writer.writeMessage("ret", ret)) return false; @@ -461,7 +461,7 @@ public class GridNearAtomicUpdateResponse extends GridCacheIdMessage implements return false; switch (reader.state()) { - case 3: + case 4: errs = reader.readMessage("errs"); if (!reader.isLastRead()) @@ -469,7 +469,7 @@ public class GridNearAtomicUpdateResponse extends GridCacheIdMessage implements reader.incrementState(); - case 4: + case 5: futId = reader.readLong("futId"); if (!reader.isLastRead()) @@ -477,7 +477,7 @@ public class GridNearAtomicUpdateResponse extends GridCacheIdMessage implements reader.incrementState(); - case 5: + case 6: mapping = reader.readCollection("mapping", MessageCollectionItemType.UUID); if (!reader.isLastRead()) @@ -485,7 +485,7 @@ public class GridNearAtomicUpdateResponse extends GridCacheIdMessage implements reader.incrementState(); - case 6: + case 7: nearUpdates = reader.readMessage("nearUpdates"); if (!reader.isLastRead()) @@ -493,7 +493,7 @@ public class GridNearAtomicUpdateResponse extends GridCacheIdMessage implements reader.incrementState(); - case 7: + case 8: partId = reader.readInt("partId"); if (!reader.isLastRead()) @@ -501,15 +501,15 @@ public class GridNearAtomicUpdateResponse extends GridCacheIdMessage implements reader.incrementState(); - case 8: - remapTopVer = reader.readMessage("remapTopVer"); + case 9: + remapTopVer = reader.readAffinityTopologyVersion("remapTopVer"); if (!reader.isLastRead()) return false; reader.incrementState(); - case 9: + case 10: ret = reader.readMessage("ret"); if (!reader.isLastRead()) @@ -529,7 +529,7 @@ public class GridNearAtomicUpdateResponse extends GridCacheIdMessage implements /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 10; + return 11; } /** {@inheritDoc} */