Fixed messages
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/987ba6ba Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/987ba6ba Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/987ba6ba Branch: refs/heads/ignite-5797 Commit: 987ba6ba7603bff6359b4521984eeb0843b8cc36 Parents: 3dd9a3a Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Thu Oct 4 16:25:09 2018 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Thu Oct 4 16:25:09 2018 +0300 ---------------------------------------------------------------------- .../GridDistributedTxFinishRequest.java | 16 ++--- .../GridDistributedTxFinishResponse.java | 12 ++-- .../GridDistributedTxPrepareRequest.java | 20 +++--- .../GridDistributedTxPrepareResponse.java | 8 +-- .../distributed/dht/GridDhtTxFinishRequest.java | 32 ++++++--- .../dht/GridDhtTxPrepareRequest.java | 72 ++++++++++++-------- .../near/GridNearTxFinishRequest.java | 16 ++++- .../near/GridNearTxPrepareResponse.java | 36 +++++++--- 8 files changed, 134 insertions(+), 78 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/987ba6ba/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java ---------------------------------------------------------------------- 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 d552b95..cde92f3 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 @@ -365,25 +365,25 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage writer.incrementState(); case 10: - if (!writer.writeByte("flags", flags)) + if (!writer.writeMessage("eventsTrace", eventsTrace)) return false; writer.incrementState(); case 11: - if (!writer.writeIgniteUuid("futId", futId)) + if (!writer.writeByte("flags", flags)) return false; writer.incrementState(); case 12: - if (!writer.writeBoolean("invalidate", invalidate)) + if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); case 13: - if (!writer.writeMessage("eventsTrace", eventsTrace)) + if (!writer.writeBoolean("invalidate", invalidate)) return false; writer.incrementState(); @@ -477,7 +477,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage reader.incrementState(); case 10: - flags = reader.readByte("flags"); + eventsTrace = reader.readMessage("eventsTrace"); if (!reader.isLastRead()) return false; @@ -485,7 +485,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage reader.incrementState(); case 11: - futId = reader.readIgniteUuid("futId"); + flags = reader.readByte("flags"); if (!reader.isLastRead()) return false; @@ -493,7 +493,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage reader.incrementState(); case 12: - invalidate = reader.readBoolean("invalidate"); + futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) return false; @@ -501,7 +501,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage reader.incrementState(); case 13: - eventsTrace = reader.readMessage("eventsTrace"); + invalidate = reader.readBoolean("invalidate"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/ignite/blob/987ba6ba/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java index 7e09d4b..eb8bee0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java @@ -165,19 +165,19 @@ public class GridDistributedTxFinishResponse extends GridCacheMessage implements switch (writer.state()) { case 2: - if (!writer.writeByte("flags", flags)) + if (!writer.writeMessage("eventsTrace", eventsTrace)) return false; writer.incrementState(); case 3: - if (!writer.writeIgniteUuid("futId", futId)) + if (!writer.writeByte("flags", flags)) return false; writer.incrementState(); case 4: - if (!writer.writeMessage("eventsTrace", eventsTrace)) + if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); @@ -211,7 +211,7 @@ public class GridDistributedTxFinishResponse extends GridCacheMessage implements switch (reader.state()) { case 2: - flags = reader.readByte("flags"); + eventsTrace = reader.readMessage("eventsTrace"); if (!reader.isLastRead()) return false; @@ -219,7 +219,7 @@ public class GridDistributedTxFinishResponse extends GridCacheMessage implements reader.incrementState(); case 3: - futId = reader.readIgniteUuid("futId"); + flags = reader.readByte("flags"); if (!reader.isLastRead()) return false; @@ -227,7 +227,7 @@ public class GridDistributedTxFinishResponse extends GridCacheMessage implements reader.incrementState(); case 4: - eventsTrace = reader.readMessage("eventsTrace"); + futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/ignite/blob/987ba6ba/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java ---------------------------------------------------------------------- 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 db73179..8aa3111 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 @@ -545,19 +545,19 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage writer.incrementState(); case 10: - if (!writer.writeByte("flags", flags)) + if (!writer.writeMessage("eventsTrace", eventsTrace)) return false; writer.incrementState(); case 11: - if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1)) + if (!writer.writeByte("flags", flags)) return false; writer.incrementState(); case 12: - if (!writer.writeMessage("eventsTrace", eventsTrace)) + if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1)) return false; writer.incrementState(); @@ -655,7 +655,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); case 10: - flags = reader.readByte("flags"); + eventsTrace = reader.readMessage("eventsTrace"); if (!reader.isLastRead()) return false; @@ -663,23 +663,23 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); case 11: - byte isolationOrd; - - isolationOrd = reader.readByte("isolation"); + flags = reader.readByte("flags"); if (!reader.isLastRead()) return false; - isolation = TransactionIsolation.fromOrdinal(isolationOrd); - reader.incrementState(); case 12: - eventsTrace = reader.readMessage("eventsTrace"); + byte isolationOrd; + + isolationOrd = reader.readByte("isolation"); if (!reader.isLastRead()) return false; + isolation = TransactionIsolation.fromOrdinal(isolationOrd); + reader.incrementState(); case 13: http://git-wip-us.apache.org/repos/asf/ignite/blob/987ba6ba/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java ---------------------------------------------------------------------- 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 da87c03..7751ce9 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 @@ -217,13 +217,13 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage writer.incrementState(); case 8: - if (!writer.writeByte("flags", flags)) + if (!writer.writeMessage("eventsTrace", eventsTrace)) return false; writer.incrementState(); case 9: - if (!writer.writeMessage("eventsTrace", eventsTrace)) + if (!writer.writeByte("flags", flags)) return false; writer.incrementState(); @@ -259,7 +259,7 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage reader.incrementState(); case 8: - flags = reader.readByte("flags"); + eventsTrace = reader.readMessage("eventsTrace"); if (!reader.isLastRead()) return false; @@ -267,7 +267,7 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage reader.incrementState(); case 9: - eventsTrace = reader.readMessage("eventsTrace"); + flags = reader.readByte("flags"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/ignite/blob/987ba6ba/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 c305f97..93f0951 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 @@ -413,25 +413,25 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { writer.incrementState(); case 24: - if (!writer.writeUuid("nearNodeId", nearNodeId)) + if (!writer.writeMessage("mvccSnapshot", mvccSnapshot)) return false; writer.incrementState(); case 25: - if (!writer.writeMessage("partUpdateCnt", partUpdateCnt)) + if (!writer.writeUuid("nearNodeId", nearNodeId)) return false; writer.incrementState(); case 26: - if (!writer.writeCollection("pendingVers", pendingVers, MessageCollectionItemType.MSG)) + if (!writer.writeMessage("partUpdateCnt", partUpdateCnt)) return false; writer.incrementState(); case 27: - if (!writer.writeMessage("writeVer", writeVer)) + if (!writer.writeCollection("pendingVers", pendingVers, MessageCollectionItemType.MSG)) return false; writer.incrementState(); @@ -442,6 +442,12 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { writer.incrementState(); + case 29: + if (!writer.writeMessage("writeVer", writeVer)) + return false; + + writer.incrementState(); + } return true; @@ -479,7 +485,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); case 24: - nearNodeId = reader.readUuid("nearNodeId"); + mvccSnapshot = reader.readMessage("mvccSnapshot"); if (!reader.isLastRead()) return false; @@ -487,7 +493,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); case 25: - partUpdateCnt = reader.readMessage("partUpdateCnt"); + nearNodeId = reader.readUuid("nearNodeId"); if (!reader.isLastRead()) return false; @@ -495,7 +501,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); case 26: - pendingVers = reader.readCollection("pendingVers", MessageCollectionItemType.MSG); + partUpdateCnt = reader.readMessage("partUpdateCnt"); if (!reader.isLastRead()) return false; @@ -503,7 +509,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); case 27: - writeVer = reader.readMessage("writeVer"); + pendingVers = reader.readCollection("pendingVers", MessageCollectionItemType.MSG); if (!reader.isLastRead()) return false; @@ -518,6 +524,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); @@ -530,7 +544,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/987ba6ba/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 37ba055..90f0208 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 @@ -433,85 +433,91 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { switch (writer.state()) { case 21: - if (!writer.writeIgniteUuid("futId", futId)) + if (!writer.writeCollection("counters", counters, MessageCollectionItemType.MSG)) return false; writer.incrementState(); case 22: - if (!writer.writeBitSet("invalidateNearEntries", invalidateNearEntries)) + if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); case 23: - if (!writer.writeInt("miniId", miniId)) + if (!writer.writeBitSet("invalidateNearEntries", invalidateNearEntries)) return false; writer.incrementState(); case 24: - if (!writer.writeUuid("nearNodeId", nearNodeId)) + if (!writer.writeInt("miniId", miniId)) return false; writer.incrementState(); case 25: - if (!writer.writeCollection("nearWrites", nearWrites, MessageCollectionItemType.MSG)) + if (!writer.writeMessage("mvccSnapshot", mvccSnapshot)) return false; writer.incrementState(); case 26: - if (!writer.writeMessage("nearXidVer", nearXidVer)) + if (!writer.writeUuid("nearNodeId", nearNodeId)) return false; writer.incrementState(); case 27: - if (!writer.writeCollection("ownedKeys", ownedKeys, MessageCollectionItemType.MSG)) + if (!writer.writeCollection("nearWrites", nearWrites, MessageCollectionItemType.MSG)) return false; writer.incrementState(); case 28: - if (!writer.writeCollection("ownedVals", ownedVals, MessageCollectionItemType.MSG)) + if (!writer.writeMessage("nearXidVer", nearXidVer)) return false; writer.incrementState(); case 29: - if (!writer.writeBitSet("preloadKeys", preloadKeys)) + if (!writer.writeCollection("ownedKeys", ownedKeys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); case 30: - if (!writer.writeUuid("subjId", subjId)) + if (!writer.writeCollection("ownedVals", ownedVals, MessageCollectionItemType.MSG)) return false; writer.incrementState(); case 31: - if (!writer.writeInt("taskNameHash", taskNameHash)) + if (!writer.writeBitSet("preloadKeys", preloadKeys)) return false; writer.incrementState(); case 32: - if (!writer.writeMessage("topVer", topVer)) + if (!writer.writeBoolean("skipCompletedVers", skipCompletedVers)) return false; writer.incrementState(); case 33: - if (!writer.writeMessage("mvccSnapshot", mvccSnapshot)) + if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); case 34: - if (!writer.writeCollection("counters", counters, MessageCollectionItemType.MSG)) + if (!writer.writeInt("taskNameHash", taskNameHash)) + return false; + + writer.incrementState(); + + case 35: + if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); @@ -533,7 +539,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { switch (reader.state()) { case 21: - futId = reader.readIgniteUuid("futId"); + counters = reader.readCollection("counters", MessageCollectionItemType.MSG); if (!reader.isLastRead()) return false; @@ -541,7 +547,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); case 22: - invalidateNearEntries = reader.readBitSet("invalidateNearEntries"); + futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) return false; @@ -549,7 +555,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); case 23: - miniId = reader.readInt("miniId"); + invalidateNearEntries = reader.readBitSet("invalidateNearEntries"); if (!reader.isLastRead()) return false; @@ -557,7 +563,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); case 24: - nearNodeId = reader.readUuid("nearNodeId"); + miniId = reader.readInt("miniId"); if (!reader.isLastRead()) return false; @@ -565,7 +571,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); case 25: - nearWrites = reader.readCollection("nearWrites", MessageCollectionItemType.MSG); + mvccSnapshot = reader.readMessage("mvccSnapshot"); if (!reader.isLastRead()) return false; @@ -573,7 +579,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); case 26: - nearXidVer = reader.readMessage("nearXidVer"); + nearNodeId = reader.readUuid("nearNodeId"); if (!reader.isLastRead()) return false; @@ -581,7 +587,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); case 27: - ownedKeys = reader.readCollection("ownedKeys", MessageCollectionItemType.MSG); + nearWrites = reader.readCollection("nearWrites", MessageCollectionItemType.MSG); if (!reader.isLastRead()) return false; @@ -589,7 +595,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); case 28: - ownedVals = reader.readCollection("ownedVals", MessageCollectionItemType.MSG); + nearXidVer = reader.readMessage("nearXidVer"); if (!reader.isLastRead()) return false; @@ -597,7 +603,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); case 29: - preloadKeys = reader.readBitSet("preloadKeys"); + ownedKeys = reader.readCollection("ownedKeys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) return false; @@ -605,7 +611,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); case 30: - subjId = reader.readUuid("subjId"); + ownedVals = reader.readCollection("ownedVals", MessageCollectionItemType.MSG); if (!reader.isLastRead()) return false; @@ -613,7 +619,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); case 31: - taskNameHash = reader.readInt("taskNameHash"); + preloadKeys = reader.readBitSet("preloadKeys"); if (!reader.isLastRead()) return false; @@ -621,7 +627,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); case 32: - topVer = reader.readMessage("topVer"); + skipCompletedVers = reader.readBoolean("skipCompletedVers"); if (!reader.isLastRead()) return false; @@ -629,7 +635,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); case 33: - mvccSnapshot = reader.readMessage("mvccSnapshot"); + subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) return false; @@ -637,7 +643,15 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); case 34: - counters = reader.readCollection("counters", MessageCollectionItemType.MSG); + taskNameHash = reader.readInt("taskNameHash"); + + if (!reader.isLastRead()) + return false; + + reader.incrementState(); + + case 35: + topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) return false; @@ -656,7 +670,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 35; + return 36; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/987ba6ba/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java ---------------------------------------------------------------------- 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 eb9c371..cc06bbf 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 @@ -198,6 +198,12 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { writer.incrementState(); + case 23: + if (!writer.writeMessage("mvccSnapshot", mvccSnapshot)) + return false; + + writer.incrementState(); + } return true; @@ -222,6 +228,14 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); + case 23: + mvccSnapshot = reader.readMessage("mvccSnapshot"); + + if (!reader.isLastRead()) + return false; + + reader.incrementState(); + } return reader.afterMessageRead(GridNearTxFinishRequest.class); @@ -234,7 +248,7 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 23; + return 24; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/987ba6ba/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java ---------------------------------------------------------------------- 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 bc6a021..166287d 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 @@ -411,31 +411,37 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse writer.incrementState(); case 16: - if (!writer.writeCollection("ownedValKeys", ownedValKeys, MessageCollectionItemType.MSG)) + if (!writer.writeMessage("mvccSnapshot", mvccSnapshot)) return false; writer.incrementState(); case 17: - if (!writer.writeCollection("ownedValVals", ownedValVals, MessageCollectionItemType.MSG)) + if (!writer.writeCollection("ownedValKeys", ownedValKeys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); case 18: - if (!writer.writeCollection("pending", pending, MessageCollectionItemType.MSG)) + if (!writer.writeCollection("ownedValVals", ownedValVals, MessageCollectionItemType.MSG)) return false; writer.incrementState(); case 19: - if (!writer.writeMessage("retVal", retVal)) + if (!writer.writeCollection("pending", pending, MessageCollectionItemType.MSG)) return false; writer.incrementState(); case 20: - if (!writer.writeMessage("mvccSnapshot", mvccSnapshot)) + if (!writer.writeMessage("retVal", retVal)) + return false; + + writer.incrementState(); + + case 21: + if (!writer.writeMessage("writeVer", writeVer)) return false; writer.incrementState(); @@ -497,7 +503,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); case 16: - ownedValKeys = reader.readCollection("ownedValKeys", MessageCollectionItemType.MSG); + mvccSnapshot = reader.readMessage("mvccSnapshot"); if (!reader.isLastRead()) return false; @@ -505,7 +511,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); case 17: - ownedValVals = reader.readCollection("ownedValVals", MessageCollectionItemType.MSG); + ownedValKeys = reader.readCollection("ownedValKeys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) return false; @@ -513,7 +519,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); case 18: - pending = reader.readCollection("pending", MessageCollectionItemType.MSG); + ownedValVals = reader.readCollection("ownedValVals", MessageCollectionItemType.MSG); if (!reader.isLastRead()) return false; @@ -521,7 +527,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); case 19: - retVal = reader.readMessage("retVal"); + pending = reader.readCollection("pending", MessageCollectionItemType.MSG); if (!reader.isLastRead()) return false; @@ -529,7 +535,15 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); case 20: - mvccSnapshot = reader.readMessage("mvccSnapshot"); + retVal = reader.readMessage("retVal"); + + if (!reader.isLastRead()) + return false; + + reader.incrementState(); + + case 21: + writeVer = reader.readMessage("writeVer"); if (!reader.isLastRead()) return false; @@ -548,7 +562,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 21; + return 22; } /** {@inheritDoc} */