http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java index 2cb75c2..584cec2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java @@ -206,32 +206,32 @@ public class GridNearSingleGetResponse extends GridCacheIdMessage implements Gri } switch (writer.state()) { - case 3: + case 4: if (!writer.writeByteArray("errBytes", errBytes)) 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.writeMessage("res", res)) return false; writer.incrementState(); - case 7: - if (!writer.writeMessage("topVer", topVer)) + case 8: + if (!writer.writeAffinityTopologyVersion("topVer", topVer)) return false; writer.incrementState(); @@ -252,7 +252,7 @@ public class GridNearSingleGetResponse extends GridCacheIdMessage implements Gri return false; switch (reader.state()) { - case 3: + case 4: errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) @@ -260,7 +260,7 @@ public class GridNearSingleGetResponse extends GridCacheIdMessage implements Gri reader.incrementState(); - case 4: + case 5: flags = reader.readByte("flags"); if (!reader.isLastRead()) @@ -268,7 +268,7 @@ public class GridNearSingleGetResponse extends GridCacheIdMessage implements Gri reader.incrementState(); - case 5: + case 6: futId = reader.readLong("futId"); if (!reader.isLastRead()) @@ -276,7 +276,7 @@ public class GridNearSingleGetResponse extends GridCacheIdMessage implements Gri reader.incrementState(); - case 6: + case 7: res = reader.readMessage("res"); if (!reader.isLastRead()) @@ -284,8 +284,8 @@ public class GridNearSingleGetResponse extends GridCacheIdMessage implements Gri reader.incrementState(); - case 7: - topVer = reader.readMessage("topVer"); + case 8: + topVer = reader.readAffinityTopologyVersion("topVer"); if (!reader.isLastRead()) return false; @@ -309,7 +309,7 @@ public class GridNearSingleGetResponse extends GridCacheIdMessage implements Gri /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 8; + return 9; } /** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxEnlistRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxEnlistRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxEnlistRequest.java index e71de89..dd86861 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxEnlistRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxEnlistRequest.java @@ -388,97 +388,97 @@ public class GridNearTxEnlistRequest extends GridCacheIdMessage { } switch (writer.state()) { - case 3: + case 4: if (!writer.writeBoolean("clientFirst", clientFirst)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeMessage("filter", filter)) return false; writer.incrementState(); - case 5: + case 6: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 6: + case 7: if (!writer.writeObjectArray("keys", keys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 7: + case 8: if (!writer.writeMessage("lockVer", lockVer)) return false; writer.incrementState(); - case 8: + case 9: if (!writer.writeInt("miniId", miniId)) return false; writer.incrementState(); - case 9: + case 10: if (!writer.writeMessage("mvccSnapshot", mvccSnapshot)) return false; writer.incrementState(); - case 10: + case 11: if (!writer.writeBoolean("needRes", needRes)) return false; writer.incrementState(); - case 11: + case 12: if (!writer.writeByte("op", op != null ? (byte)op.ordinal() : -1)) return false; writer.incrementState(); - case 12: + case 13: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 13: + case 14: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 14: + case 15: if (!writer.writeLong("threadId", threadId)) return false; writer.incrementState(); - case 15: + case 16: if (!writer.writeLong("timeout", timeout)) return false; writer.incrementState(); - case 16: - if (!writer.writeMessage("topVer", topVer)) + case 17: + if (!writer.writeAffinityTopologyVersion("topVer", topVer)) return false; writer.incrementState(); - case 17: + case 18: if (!writer.writeLong("txTimeout", txTimeout)) return false; writer.incrementState(); - case 18: + case 19: if (!writer.writeObjectArray("values", values, MessageCollectionItemType.MSG)) return false; @@ -500,7 +500,7 @@ public class GridNearTxEnlistRequest extends GridCacheIdMessage { return false; switch (reader.state()) { - case 3: + case 4: clientFirst = reader.readBoolean("clientFirst"); if (!reader.isLastRead()) @@ -508,7 +508,7 @@ public class GridNearTxEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 4: + case 5: filter = reader.readMessage("filter"); if (!reader.isLastRead()) @@ -516,7 +516,7 @@ public class GridNearTxEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 5: + case 6: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -524,7 +524,7 @@ public class GridNearTxEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 6: + case 7: keys = reader.readObjectArray("keys", MessageCollectionItemType.MSG, KeyCacheObject.class); if (!reader.isLastRead()) @@ -532,7 +532,7 @@ public class GridNearTxEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 7: + case 8: lockVer = reader.readMessage("lockVer"); if (!reader.isLastRead()) @@ -540,7 +540,7 @@ public class GridNearTxEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 8: + case 9: miniId = reader.readInt("miniId"); if (!reader.isLastRead()) @@ -548,7 +548,7 @@ public class GridNearTxEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 9: + case 10: mvccSnapshot = reader.readMessage("mvccSnapshot"); if (!reader.isLastRead()) @@ -556,7 +556,7 @@ public class GridNearTxEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 10: + case 11: needRes = reader.readBoolean("needRes"); if (!reader.isLastRead()) @@ -564,7 +564,7 @@ public class GridNearTxEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 11: + case 12: byte opOrd; opOrd = reader.readByte("op"); @@ -576,7 +576,7 @@ public class GridNearTxEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 12: + case 13: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -584,7 +584,7 @@ public class GridNearTxEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 13: + case 14: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -592,7 +592,7 @@ public class GridNearTxEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 14: + case 15: threadId = reader.readLong("threadId"); if (!reader.isLastRead()) @@ -600,7 +600,7 @@ public class GridNearTxEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 15: + case 16: timeout = reader.readLong("timeout"); if (!reader.isLastRead()) @@ -608,15 +608,15 @@ public class GridNearTxEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 16: - topVer = reader.readMessage("topVer"); + case 17: + topVer = reader.readAffinityTopologyVersion("topVer"); if (!reader.isLastRead()) return false; reader.incrementState(); - case 17: + case 18: txTimeout = reader.readLong("txTimeout"); if (!reader.isLastRead()) @@ -624,7 +624,7 @@ public class GridNearTxEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 18: + case 19: values = reader.readObjectArray("values", MessageCollectionItemType.MSG, Message.class); if (!reader.isLastRead()) @@ -639,7 +639,7 @@ public class GridNearTxEnlistRequest extends GridCacheIdMessage { /** {@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/near/GridNearTxEnlistResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxEnlistResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxEnlistResponse.java index 78333a4..cf00186 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxEnlistResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxEnlistResponse.java @@ -190,7 +190,7 @@ public class GridNearTxEnlistResponse extends GridCacheIdMessage implements Exce /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 11; + return 12; } /** {@inheritDoc} */ @@ -208,49 +208,49 @@ public class GridNearTxEnlistResponse extends GridCacheIdMessage implements Exce } switch (writer.state()) { - case 3: + case 4: if (!writer.writeIgniteUuid("dhtFutId", dhtFutId)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeMessage("dhtVer", dhtVer)) return false; writer.incrementState(); - case 5: + case 6: if (!writer.writeByteArray("errBytes", errBytes)) return false; writer.incrementState(); - case 6: + case 7: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 7: + case 8: if (!writer.writeMessage("lockVer", lockVer)) return false; writer.incrementState(); - case 8: + case 9: if (!writer.writeInt("miniId", miniId)) return false; writer.incrementState(); - case 9: + case 10: if (!writer.writeCollection("newDhtNodes", newDhtNodes, MessageCollectionItemType.UUID)) return false; writer.incrementState(); - case 10: + case 11: if (!writer.writeMessage("res", res)) return false; @@ -272,7 +272,7 @@ public class GridNearTxEnlistResponse extends GridCacheIdMessage implements Exce return false; switch (reader.state()) { - case 3: + case 4: dhtFutId = reader.readIgniteUuid("dhtFutId"); if (!reader.isLastRead()) @@ -280,7 +280,7 @@ public class GridNearTxEnlistResponse extends GridCacheIdMessage implements Exce reader.incrementState(); - case 4: + case 5: dhtVer = reader.readMessage("dhtVer"); if (!reader.isLastRead()) @@ -288,7 +288,7 @@ public class GridNearTxEnlistResponse extends GridCacheIdMessage implements Exce reader.incrementState(); - case 5: + case 6: errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) @@ -296,7 +296,7 @@ public class GridNearTxEnlistResponse extends GridCacheIdMessage implements Exce reader.incrementState(); - case 6: + case 7: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -304,7 +304,7 @@ public class GridNearTxEnlistResponse extends GridCacheIdMessage implements Exce reader.incrementState(); - case 7: + case 8: lockVer = reader.readMessage("lockVer"); if (!reader.isLastRead()) @@ -312,7 +312,7 @@ public class GridNearTxEnlistResponse extends GridCacheIdMessage implements Exce reader.incrementState(); - case 8: + case 9: miniId = reader.readInt("miniId"); if (!reader.isLastRead()) @@ -320,7 +320,7 @@ public class GridNearTxEnlistResponse extends GridCacheIdMessage implements Exce reader.incrementState(); - case 9: + case 10: newDhtNodes = reader.readCollection("newDhtNodes", MessageCollectionItemType.UUID); if (!reader.isLastRead()) @@ -328,7 +328,7 @@ public class GridNearTxEnlistResponse extends GridCacheIdMessage implements Exce reader.incrementState(); - case 10: + case 11: res = reader.readMessage("res"); 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/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 6b5aa90..91079df 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 @@ -186,13 +186,13 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { } switch (writer.state()) { - case 21: + case 22: if (!writer.writeInt("miniId", miniId)) return false; writer.incrementState(); - case 22: + case 23: if (!writer.writeMessage("mvccSnapshot", mvccSnapshot)) return false; @@ -214,7 +214,7 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { return false; switch (reader.state()) { - case 21: + case 22: miniId = reader.readInt("miniId"); if (!reader.isLastRead()) @@ -222,7 +222,7 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); - case 22: + case 23: mvccSnapshot = reader.readMessage("mvccSnapshot"); if (!reader.isLastRead()) @@ -242,7 +242,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/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java index a1a2b57..e3dcbf8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java @@ -133,19 +133,19 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse { } switch (writer.state()) { - case 6: + case 7: if (!writer.writeByteArray("errBytes", errBytes)) return false; writer.incrementState(); - case 7: + case 8: if (!writer.writeInt("miniId", miniId)) return false; writer.incrementState(); - case 8: + case 9: if (!writer.writeLong("nearThreadId", nearThreadId)) return false; @@ -167,7 +167,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse { return false; switch (reader.state()) { - case 6: + case 7: errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) @@ -175,7 +175,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse { reader.incrementState(); - case 7: + case 8: miniId = reader.readInt("miniId"); if (!reader.isLastRead()) @@ -183,7 +183,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse { reader.incrementState(); - case 8: + case 9: nearThreadId = reader.readLong("nearThreadId"); if (!reader.isLastRead()) @@ -203,7 +203,7 @@ public class GridNearTxFinishResponse 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/near/GridNearTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java index d740737..c3eae2c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java @@ -332,43 +332,43 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { } switch (writer.state()) { - case 20: + case 21: if (!writer.writeByte("flags", flags)) return false; writer.incrementState(); - case 21: + case 22: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 22: + case 23: if (!writer.writeInt("miniId", miniId)) return false; writer.incrementState(); - case 23: + case 24: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 24: + case 25: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 25: - if (!writer.writeMessage("topVer", topVer)) + case 26: + if (!writer.writeAffinityTopologyVersion("topVer", topVer)) return false; writer.incrementState(); - case 26: + case 27: if (!writer.writeString("txLbl", txLbl)) return false; @@ -390,7 +390,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { return false; switch (reader.state()) { - case 20: + case 21: flags = reader.readByte("flags"); if (!reader.isLastRead()) @@ -398,7 +398,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 21: + case 22: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -406,7 +406,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 22: + case 23: miniId = reader.readInt("miniId"); if (!reader.isLastRead()) @@ -414,7 +414,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 23: + case 24: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -422,7 +422,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 24: + case 25: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -430,15 +430,15 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 25: - topVer = reader.readMessage("topVer"); + case 26: + topVer = reader.readAffinityTopologyVersion("topVer"); if (!reader.isLastRead()) return false; reader.incrementState(); - case 26: + case 27: txLbl = reader.readString("txLbl"); if (!reader.isLastRead()) @@ -458,7 +458,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 27; + return 28; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/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 e9865df..67f7116 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 @@ -376,68 +376,68 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse } switch (writer.state()) { - case 10: - if (!writer.writeMessage("clientRemapVer", clientRemapVer)) - return false; - - writer.incrementState(); - case 11: - if (!writer.writeMessage("dhtVer", dhtVer)) + if (!writer.writeAffinityTopologyVersion("clientRemapVer", clientRemapVer)) return false; writer.incrementState(); case 12: - if (!writer.writeCollection("filterFailedKeys", filterFailedKeys, MessageCollectionItemType.MSG)) + if (!writer.writeMessage("dhtVer", dhtVer)) return false; writer.incrementState(); case 13: - if (!writer.writeIgniteUuid("futId", futId)) + if (!writer.writeCollection("filterFailedKeys", filterFailedKeys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); case 14: - if (!writer.writeInt("miniId", miniId)) + if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); case 15: - if (!writer.writeCollection("ownedValKeys", ownedValKeys, MessageCollectionItemType.MSG)) + if (!writer.writeInt("miniId", miniId)) return false; writer.incrementState(); case 16: - if (!writer.writeCollection("ownedValVals", ownedValVals, MessageCollectionItemType.MSG)) + if (!writer.writeMessage("mvccSnapshot", mvccSnapshot)) return false; writer.incrementState(); case 17: - if (!writer.writeCollection("pending", pending, MessageCollectionItemType.MSG)) + if (!writer.writeCollection("ownedValKeys", ownedValKeys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); case 18: - if (!writer.writeMessage("retVal", retVal)) + if (!writer.writeCollection("ownedValVals", ownedValVals, MessageCollectionItemType.MSG)) return false; writer.incrementState(); case 19: - if (!writer.writeMessage("writeVer", writeVer)) + 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(); @@ -458,16 +458,8 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse return false; switch (reader.state()) { - case 10: - clientRemapVer = reader.readMessage("clientRemapVer"); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - case 11: - dhtVer = reader.readMessage("dhtVer"); + clientRemapVer = reader.readAffinityTopologyVersion("clientRemapVer"); if (!reader.isLastRead()) return false; @@ -475,7 +467,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); case 12: - filterFailedKeys = reader.readCollection("filterFailedKeys", MessageCollectionItemType.MSG); + dhtVer = reader.readMessage("dhtVer"); if (!reader.isLastRead()) return false; @@ -483,7 +475,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); case 13: - futId = reader.readIgniteUuid("futId"); + filterFailedKeys = reader.readCollection("filterFailedKeys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) return false; @@ -491,7 +483,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); case 14: - miniId = reader.readInt("miniId"); + futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) return false; @@ -499,7 +491,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); case 15: - ownedValKeys = reader.readCollection("ownedValKeys", MessageCollectionItemType.MSG); + miniId = reader.readInt("miniId"); if (!reader.isLastRead()) return false; @@ -507,7 +499,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); case 16: - ownedValVals = reader.readCollection("ownedValVals", MessageCollectionItemType.MSG); + mvccSnapshot = reader.readMessage("mvccSnapshot"); if (!reader.isLastRead()) return false; @@ -515,7 +507,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); case 17: - pending = reader.readCollection("pending", MessageCollectionItemType.MSG); + ownedValKeys = reader.readCollection("ownedValKeys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) return false; @@ -523,7 +515,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); case 18: - retVal = reader.readMessage("retVal"); + ownedValVals = reader.readCollection("ownedValVals", MessageCollectionItemType.MSG); if (!reader.isLastRead()) return false; @@ -531,7 +523,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse reader.incrementState(); case 19: - writeVer = reader.readMessage("writeVer"); + pending = reader.readCollection("pending", MessageCollectionItemType.MSG); if (!reader.isLastRead()) return false; @@ -539,7 +531,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; @@ -558,7 +558,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 21; + return 22; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryEnlistRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryEnlistRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryEnlistRequest.java index 472937b..3b22afb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryEnlistRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryEnlistRequest.java @@ -297,7 +297,7 @@ public class GridNearTxQueryEnlistRequest extends GridCacheIdMessage { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 21; + return 22; } /** {@inheritDoc} */ @@ -331,109 +331,109 @@ public class GridNearTxQueryEnlistRequest extends GridCacheIdMessage { } switch (writer.state()) { - case 3: + case 4: if (!writer.writeIntArray("cacheIds", cacheIds)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeBoolean("clientFirst", clientFirst)) return false; writer.incrementState(); - case 5: + case 6: if (!writer.writeInt("flags", flags)) return false; writer.incrementState(); - case 6: + case 7: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 7: + case 8: if (!writer.writeMessage("lockVer", lockVer)) return false; writer.incrementState(); - case 8: + case 9: if (!writer.writeInt("miniId", miniId)) return false; writer.incrementState(); - case 9: + case 10: if (!writer.writeMessage("mvccSnapshot", mvccSnapshot)) return false; writer.incrementState(); - case 10: + case 11: if (!writer.writeInt("pageSize", pageSize)) return false; writer.incrementState(); - case 11: + case 12: if (!writer.writeByteArray("paramsBytes", paramsBytes)) return false; writer.incrementState(); - case 12: + case 13: if (!writer.writeIntArray("parts", parts)) return false; writer.incrementState(); - case 13: + case 14: if (!writer.writeString("qry", qry)) return false; writer.incrementState(); - case 14: + case 15: if (!writer.writeString("schema", schema)) 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("threadId", threadId)) return false; writer.incrementState(); - case 18: + case 19: if (!writer.writeLong("timeout", timeout)) return false; writer.incrementState(); - case 19: - if (!writer.writeMessage("topVer", topVer)) + case 20: + if (!writer.writeAffinityTopologyVersion("topVer", topVer)) return false; writer.incrementState(); - case 20: + case 21: if (!writer.writeLong("txTimeout", txTimeout)) return false; @@ -455,7 +455,7 @@ public class GridNearTxQueryEnlistRequest extends GridCacheIdMessage { return false; switch (reader.state()) { - case 3: + case 4: cacheIds = reader.readIntArray("cacheIds"); if (!reader.isLastRead()) @@ -463,7 +463,7 @@ public class GridNearTxQueryEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 4: + case 5: clientFirst = reader.readBoolean("clientFirst"); if (!reader.isLastRead()) @@ -471,7 +471,7 @@ public class GridNearTxQueryEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 5: + case 6: flags = reader.readInt("flags"); if (!reader.isLastRead()) @@ -479,7 +479,7 @@ public class GridNearTxQueryEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 6: + case 7: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -487,7 +487,7 @@ public class GridNearTxQueryEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 7: + case 8: lockVer = reader.readMessage("lockVer"); if (!reader.isLastRead()) @@ -495,7 +495,7 @@ public class GridNearTxQueryEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 8: + case 9: miniId = reader.readInt("miniId"); if (!reader.isLastRead()) @@ -503,7 +503,7 @@ public class GridNearTxQueryEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 9: + case 10: mvccSnapshot = reader.readMessage("mvccSnapshot"); if (!reader.isLastRead()) @@ -511,7 +511,7 @@ public class GridNearTxQueryEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 10: + case 11: pageSize = reader.readInt("pageSize"); if (!reader.isLastRead()) @@ -519,7 +519,7 @@ public class GridNearTxQueryEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 11: + case 12: paramsBytes = reader.readByteArray("paramsBytes"); if (!reader.isLastRead()) @@ -527,7 +527,7 @@ public class GridNearTxQueryEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 12: + case 13: parts = reader.readIntArray("parts"); if (!reader.isLastRead()) @@ -535,7 +535,7 @@ public class GridNearTxQueryEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 13: + case 14: qry = reader.readString("qry"); if (!reader.isLastRead()) @@ -543,7 +543,7 @@ public class GridNearTxQueryEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 14: + case 15: schema = reader.readString("schema"); if (!reader.isLastRead()) @@ -551,7 +551,7 @@ public class GridNearTxQueryEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 15: + case 16: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -559,7 +559,7 @@ public class GridNearTxQueryEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 16: + case 17: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -567,7 +567,7 @@ public class GridNearTxQueryEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 17: + case 18: threadId = reader.readLong("threadId"); if (!reader.isLastRead()) @@ -575,7 +575,7 @@ public class GridNearTxQueryEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 18: + case 19: timeout = reader.readLong("timeout"); if (!reader.isLastRead()) @@ -583,15 +583,15 @@ public class GridNearTxQueryEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 19: - topVer = reader.readMessage("topVer"); + case 20: + topVer = reader.readAffinityTopologyVersion("topVer"); if (!reader.isLastRead()) return false; reader.incrementState(); - case 20: + case 21: txTimeout = reader.readLong("txTimeout"); 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/near/GridNearTxQueryEnlistResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryEnlistResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryEnlistResponse.java index d628de1..2715f89 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryEnlistResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryEnlistResponse.java @@ -166,7 +166,7 @@ public class GridNearTxQueryEnlistResponse extends GridCacheIdMessage implements /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 10; + return 11; } /** {@inheritDoc} */ @@ -184,47 +184,48 @@ public class GridNearTxQueryEnlistResponse extends GridCacheIdMessage implements } switch (writer.state()) { - case 3: + case 4: if (!writer.writeByteArray("errBytes", errBytes)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 5: + case 6: if (!writer.writeMessage("lockVer", lockVer)) return false; writer.incrementState(); - case 6: + case 7: if (!writer.writeInt("miniId", miniId)) return false; writer.incrementState(); - case 7: - if (!writer.writeBoolean("removeMapping", removeMapping)) + case 8: + if (!writer.writeCollection("newDhtNodes", newDhtNodes, MessageCollectionItemType.UUID)) return false; writer.incrementState(); - case 8: - if (!writer.writeLong("res", res)) + case 9: + if (!writer.writeBoolean("removeMapping", removeMapping)) return false; writer.incrementState(); - case 9: - if (!writer.writeCollection("newDhtNodes", newDhtNodes, MessageCollectionItemType.UUID)) + case 10: + if (!writer.writeLong("res", res)) return false; writer.incrementState(); + } return true; @@ -241,7 +242,7 @@ public class GridNearTxQueryEnlistResponse extends GridCacheIdMessage implements return false; switch (reader.state()) { - case 3: + case 4: errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) @@ -249,7 +250,7 @@ public class GridNearTxQueryEnlistResponse extends GridCacheIdMessage implements reader.incrementState(); - case 4: + case 5: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -257,7 +258,7 @@ public class GridNearTxQueryEnlistResponse extends GridCacheIdMessage implements reader.incrementState(); - case 5: + case 6: lockVer = reader.readMessage("lockVer"); if (!reader.isLastRead()) @@ -265,7 +266,7 @@ public class GridNearTxQueryEnlistResponse extends GridCacheIdMessage implements reader.incrementState(); - case 6: + case 7: miniId = reader.readInt("miniId"); if (!reader.isLastRead()) @@ -273,29 +274,30 @@ public class GridNearTxQueryEnlistResponse extends GridCacheIdMessage implements reader.incrementState(); - case 7: - removeMapping = reader.readBoolean("removeMapping"); + case 8: + newDhtNodes = reader.readCollection("newDhtNodes", MessageCollectionItemType.UUID); if (!reader.isLastRead()) return false; reader.incrementState(); - case 8: - res = reader.readLong("res"); + case 9: + removeMapping = reader.readBoolean("removeMapping"); if (!reader.isLastRead()) return false; reader.incrementState(); - case 9: - newDhtNodes = reader.readCollection("newDhtNodes", MessageCollectionItemType.UUID); + case 10: + res = reader.readLong("res"); if (!reader.isLastRead()) return false; reader.incrementState(); + } return reader.afterMessageRead(GridNearTxQueryEnlistResponse.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryResultsEnlistRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryResultsEnlistRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryResultsEnlistRequest.java index f350d50..8e10a7e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryResultsEnlistRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryResultsEnlistRequest.java @@ -335,85 +335,85 @@ public class GridNearTxQueryResultsEnlistRequest extends GridCacheIdMessage { } switch (writer.state()) { - case 3: + case 4: if (!writer.writeBoolean("clientFirst", clientFirst)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 5: + case 6: if (!writer.writeObjectArray("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("miniId", miniId)) return false; writer.incrementState(); - case 8: + case 9: if (!writer.writeMessage("mvccSnapshot", mvccSnapshot)) return false; writer.incrementState(); - case 9: + case 10: if (!writer.writeByte("op", op != null ? (byte)op.ordinal() : -1)) return false; writer.incrementState(); - case 10: + case 11: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 11: + case 12: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 12: + case 13: if (!writer.writeLong("threadId", threadId)) return false; writer.incrementState(); - case 13: + case 14: if (!writer.writeLong("timeout", timeout)) return false; writer.incrementState(); - case 14: - if (!writer.writeMessage("topVer", topVer)) + case 15: + if (!writer.writeAffinityTopologyVersion("topVer", topVer)) return false; writer.incrementState(); - case 15: + case 16: if (!writer.writeLong("txTimeout", txTimeout)) return false; writer.incrementState(); - case 16: + case 17: if (!writer.writeObjectArray("values", values, MessageCollectionItemType.MSG)) return false; @@ -435,7 +435,7 @@ public class GridNearTxQueryResultsEnlistRequest extends GridCacheIdMessage { return false; switch (reader.state()) { - case 3: + case 4: clientFirst = reader.readBoolean("clientFirst"); if (!reader.isLastRead()) @@ -443,7 +443,7 @@ public class GridNearTxQueryResultsEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 4: + case 5: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -451,7 +451,7 @@ public class GridNearTxQueryResultsEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 5: + case 6: keys = reader.readObjectArray("keys", MessageCollectionItemType.MSG, KeyCacheObject.class); if (!reader.isLastRead()) @@ -459,7 +459,7 @@ public class GridNearTxQueryResultsEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 6: + case 7: lockVer = reader.readMessage("lockVer"); if (!reader.isLastRead()) @@ -467,7 +467,7 @@ public class GridNearTxQueryResultsEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 7: + case 8: miniId = reader.readInt("miniId"); if (!reader.isLastRead()) @@ -475,7 +475,7 @@ public class GridNearTxQueryResultsEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 8: + case 9: mvccSnapshot = reader.readMessage("mvccSnapshot"); if (!reader.isLastRead()) @@ -483,7 +483,7 @@ public class GridNearTxQueryResultsEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 9: + case 10: byte opOrd; opOrd = reader.readByte("op"); @@ -495,7 +495,7 @@ public class GridNearTxQueryResultsEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 10: + case 11: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -503,7 +503,7 @@ public class GridNearTxQueryResultsEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 11: + case 12: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -511,7 +511,7 @@ public class GridNearTxQueryResultsEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 12: + case 13: threadId = reader.readLong("threadId"); if (!reader.isLastRead()) @@ -519,7 +519,7 @@ public class GridNearTxQueryResultsEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 13: + case 14: timeout = reader.readLong("timeout"); if (!reader.isLastRead()) @@ -527,15 +527,15 @@ public class GridNearTxQueryResultsEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 14: - topVer = reader.readMessage("topVer"); + case 15: + topVer = reader.readAffinityTopologyVersion("topVer"); if (!reader.isLastRead()) return false; reader.incrementState(); - case 15: + case 16: txTimeout = reader.readLong("txTimeout"); if (!reader.isLastRead()) @@ -543,7 +543,7 @@ public class GridNearTxQueryResultsEnlistRequest extends GridCacheIdMessage { reader.incrementState(); - case 16: + case 17: values = reader.readObjectArray("values", MessageCollectionItemType.MSG, CacheObject.class); if (!reader.isLastRead()) @@ -558,7 +558,7 @@ public class GridNearTxQueryResultsEnlistRequest extends GridCacheIdMessage { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 17; + return 18; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryResultsEnlistResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryResultsEnlistResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryResultsEnlistResponse.java index 48c63bc..2a0c632 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryResultsEnlistResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryResultsEnlistResponse.java @@ -102,7 +102,7 @@ public class GridNearTxQueryResultsEnlistResponse extends GridNearTxQueryEnlistR /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 12; + return 13; } /** {@inheritDoc} */ @@ -120,17 +120,18 @@ public class GridNearTxQueryResultsEnlistResponse extends GridNearTxQueryEnlistR } switch (writer.state()) { - case 10: + case 11: if (!writer.writeIgniteUuid("dhtFutId", dhtFutId)) return false; writer.incrementState(); - case 11: + case 12: if (!writer.writeMessage("dhtVer", dhtVer)) return false; writer.incrementState(); + } return true; @@ -147,7 +148,7 @@ public class GridNearTxQueryResultsEnlistResponse extends GridNearTxQueryEnlistR return false; switch (reader.state()) { - case 10: + case 11: dhtFutId = reader.readIgniteUuid("dhtFutId"); if (!reader.isLastRead()) @@ -155,13 +156,14 @@ public class GridNearTxQueryResultsEnlistResponse extends GridNearTxQueryEnlistR reader.incrementState(); - case 11: + case 12: dhtVer = reader.readMessage("dhtVer"); if (!reader.isLastRead()) return false; reader.incrementState(); + } return reader.afterMessageRead(GridNearTxQueryResultsEnlistResponse.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java index 14b5438..3b2ccb4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java @@ -84,7 +84,7 @@ public class GridNearUnlockRequest extends GridDistributedUnlockRequest { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 8; + return 9; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccAckRequestTxAndQueryId.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccAckRequestTxAndQueryId.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccAckRequestTxAndQueryId.java index 89f09db..f3b3150 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccAckRequestTxAndQueryId.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccAckRequestTxAndQueryId.java @@ -76,6 +76,7 @@ public class MvccAckRequestTxAndQueryId extends MvccAckRequestTx { return false; writer.incrementState(); + } return true; http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccSnapshotResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccSnapshotResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccSnapshotResponse.java index c5a8494..73d3f94 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccSnapshotResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccSnapshotResponse.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.mvcc.msg; 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.managers.communication.GridIoMessageFactory; import org.apache.ignite.internal.processors.cache.mvcc.MvccLongList; import org.apache.ignite.internal.processors.cache.mvcc.MvccSnapshot; @@ -33,6 +34,7 @@ import org.apache.ignite.plugin.extensions.communication.MessageWriter; /** * */ +@IgniteCodeGeneratingFail public class MvccSnapshotResponse implements MvccMessage, MvccSnapshot, MvccLongList { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccTxSnapshotRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccTxSnapshotRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccTxSnapshotRequest.java index cd30eb8..4cf6f65 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccTxSnapshotRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccTxSnapshotRequest.java @@ -81,6 +81,7 @@ public class MvccTxSnapshotRequest implements MvccMessage { return false; writer.incrementState(); + } return true; @@ -101,6 +102,7 @@ public class MvccTxSnapshotRequest implements MvccMessage { return false; reader.incrementState(); + } return reader.afterMessageRead(MvccTxSnapshotRequest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/PartitionCountersNeighborcastRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/PartitionCountersNeighborcastRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/PartitionCountersNeighborcastRequest.java index ffd9a67..5c46ca6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/PartitionCountersNeighborcastRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/PartitionCountersNeighborcastRequest.java @@ -79,13 +79,13 @@ public class PartitionCountersNeighborcastRequest extends GridCacheIdMessage { } switch (writer.state()) { - case 3: + case 4: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeCollection("updCntrs", updCntrs, MessageCollectionItemType.MSG)) return false; @@ -107,7 +107,7 @@ public class PartitionCountersNeighborcastRequest extends GridCacheIdMessage { return false; switch (reader.state()) { - case 3: + case 4: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -115,7 +115,7 @@ public class PartitionCountersNeighborcastRequest extends GridCacheIdMessage { reader.incrementState(); - case 4: + case 5: updCntrs = reader.readCollection("updCntrs", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -135,7 +135,7 @@ public class PartitionCountersNeighborcastRequest extends GridCacheIdMessage { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 5; + return 6; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/PartitionCountersNeighborcastResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/PartitionCountersNeighborcastResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/PartitionCountersNeighborcastResponse.java index 547539d..2f88cde 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/PartitionCountersNeighborcastResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/PartitionCountersNeighborcastResponse.java @@ -62,7 +62,7 @@ public class PartitionCountersNeighborcastResponse extends GridCacheIdMessage { } switch (writer.state()) { - case 3: + case 4: if (!writer.writeIgniteUuid("futId", futId)) return false; @@ -84,7 +84,7 @@ public class PartitionCountersNeighborcastResponse extends GridCacheIdMessage { return false; switch (reader.state()) { - case 3: + case 4: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -104,7 +104,7 @@ public class PartitionCountersNeighborcastResponse extends GridCacheIdMessage { /** {@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/query/GridCacheQueryRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java index b7205b6..21c6363 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java @@ -513,128 +513,128 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac } switch (writer.state()) { - case 3: - if (!writer.writeBoolean("all", all)) - return false; - - writer.incrementState(); - case 4: - if (!writer.writeByteArray("argsBytes", argsBytes)) + if (!writer.writeBoolean("all", all)) return false; writer.incrementState(); case 5: - if (!writer.writeString("cacheName", cacheName)) + if (!writer.writeByteArray("argsBytes", argsBytes)) return false; writer.incrementState(); case 6: - if (!writer.writeBoolean("cancel", cancel)) + if (!writer.writeString("cacheName", cacheName)) return false; writer.incrementState(); case 7: - if (!writer.writeString("clause", clause)) + if (!writer.writeBoolean("cancel", cancel)) return false; writer.incrementState(); case 8: - if (!writer.writeString("clsName", clsName)) + if (!writer.writeString("clause", clause)) return false; writer.incrementState(); case 9: - if (!writer.writeBoolean("fields", fields)) + if (!writer.writeString("clsName", clsName)) return false; writer.incrementState(); case 10: - if (!writer.writeLong("id", id)) + if (!writer.writeBoolean("fields", fields)) return false; writer.incrementState(); case 11: - if (!writer.writeBoolean("incBackups", incBackups)) + if (!writer.writeLong("id", id)) return false; writer.incrementState(); case 12: - if (!writer.writeBoolean("incMeta", incMeta)) + if (!writer.writeBoolean("incBackups", incBackups)) return false; writer.incrementState(); case 13: - if (!writer.writeBoolean("keepBinary", keepBinary)) + if (!writer.writeBoolean("incMeta", incMeta)) return false; writer.incrementState(); case 14: - if (!writer.writeByteArray("keyValFilterBytes", keyValFilterBytes)) + if (!writer.writeBoolean("keepBinary", keepBinary)) return false; writer.incrementState(); case 15: - if (!writer.writeInt("pageSize", pageSize)) + if (!writer.writeByteArray("keyValFilterBytes", keyValFilterBytes)) return false; writer.incrementState(); case 16: - if (!writer.writeInt("part", part)) + if (!writer.writeMessage("mvccSnapshot", mvccSnapshot)) return false; writer.incrementState(); case 17: - if (!writer.writeByteArray("rdcBytes", rdcBytes)) + if (!writer.writeInt("pageSize", pageSize)) return false; writer.incrementState(); case 18: - if (!writer.writeUuid("subjId", subjId)) + if (!writer.writeInt("part", part)) return false; writer.incrementState(); case 19: - if (!writer.writeInt("taskHash", taskHash)) + if (!writer.writeByteArray("rdcBytes", rdcBytes)) return false; writer.incrementState(); case 20: - if (!writer.writeMessage("topVer", topVer)) + if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); case 21: - if (!writer.writeByteArray("transBytes", transBytes)) + if (!writer.writeInt("taskHash", taskHash)) return false; writer.incrementState(); case 22: - if (!writer.writeByte("type", type != null ? (byte)type.ordinal() : -1)) + if (!writer.writeAffinityTopologyVersion("topVer", topVer)) return false; writer.incrementState(); case 23: - if (!writer.writeMessage("mvccSnapshot", mvccSnapshot)) + if (!writer.writeByteArray("transBytes", transBytes)) + return false; + + writer.incrementState(); + + case 24: + if (!writer.writeByte("type", type != null ? (byte)type.ordinal() : -1)) return false; writer.incrementState(); @@ -655,7 +655,7 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac return false; switch (reader.state()) { - case 3: + case 4: all = reader.readBoolean("all"); if (!reader.isLastRead()) @@ -663,7 +663,7 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac reader.incrementState(); - case 4: + case 5: argsBytes = reader.readByteArray("argsBytes"); if (!reader.isLastRead()) @@ -671,7 +671,7 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac reader.incrementState(); - case 5: + case 6: cacheName = reader.readString("cacheName"); if (!reader.isLastRead()) @@ -679,7 +679,7 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac reader.incrementState(); - case 6: + case 7: cancel = reader.readBoolean("cancel"); if (!reader.isLastRead()) @@ -687,7 +687,7 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac reader.incrementState(); - case 7: + case 8: clause = reader.readString("clause"); if (!reader.isLastRead()) @@ -695,7 +695,7 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac reader.incrementState(); - case 8: + case 9: clsName = reader.readString("clsName"); if (!reader.isLastRead()) @@ -703,7 +703,7 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac reader.incrementState(); - case 9: + case 10: fields = reader.readBoolean("fields"); if (!reader.isLastRead()) @@ -711,7 +711,7 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac reader.incrementState(); - case 10: + case 11: id = reader.readLong("id"); if (!reader.isLastRead()) @@ -719,7 +719,7 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac reader.incrementState(); - case 11: + case 12: incBackups = reader.readBoolean("incBackups"); if (!reader.isLastRead()) @@ -727,7 +727,7 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac reader.incrementState(); - case 12: + case 13: incMeta = reader.readBoolean("incMeta"); if (!reader.isLastRead()) @@ -735,7 +735,7 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac reader.incrementState(); - case 13: + case 14: keepBinary = reader.readBoolean("keepBinary"); if (!reader.isLastRead()) @@ -743,7 +743,7 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac reader.incrementState(); - case 14: + case 15: keyValFilterBytes = reader.readByteArray("keyValFilterBytes"); if (!reader.isLastRead()) @@ -751,7 +751,15 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac reader.incrementState(); - case 15: + case 16: + mvccSnapshot = reader.readMessage("mvccSnapshot"); + + if (!reader.isLastRead()) + return false; + + reader.incrementState(); + + case 17: pageSize = reader.readInt("pageSize"); if (!reader.isLastRead()) @@ -759,7 +767,7 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac reader.incrementState(); - case 16: + case 18: part = reader.readInt("part"); if (!reader.isLastRead()) @@ -767,7 +775,7 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac reader.incrementState(); - case 17: + case 19: rdcBytes = reader.readByteArray("rdcBytes"); if (!reader.isLastRead()) @@ -775,7 +783,7 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac reader.incrementState(); - case 18: + case 20: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -783,7 +791,7 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac reader.incrementState(); - case 19: + case 21: taskHash = reader.readInt("taskHash"); if (!reader.isLastRead()) @@ -791,15 +799,15 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac reader.incrementState(); - case 20: - topVer = reader.readMessage("topVer"); + case 22: + topVer = reader.readAffinityTopologyVersion("topVer"); if (!reader.isLastRead()) return false; reader.incrementState(); - case 21: + case 23: transBytes = reader.readByteArray("transBytes"); if (!reader.isLastRead()) @@ -807,7 +815,7 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac reader.incrementState(); - case 22: + case 24: byte typeOrd; typeOrd = reader.readByte("type"); @@ -819,14 +827,6 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac reader.incrementState(); - case 23: - mvccSnapshot = reader.readMessage("mvccSnapshot"); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - } return reader.afterMessageRead(GridCacheQueryRequest.class); @@ -839,7 +839,7 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 24; + return 25; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java index 13e0915..a1650be 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java @@ -287,37 +287,37 @@ public class GridCacheQueryResponse extends GridCacheIdMessage implements GridCa } switch (writer.state()) { - case 3: + case 4: if (!writer.writeCollection("dataBytes", dataBytes, MessageCollectionItemType.BYTE_ARR)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeByteArray("errBytes", errBytes)) return false; writer.incrementState(); - case 5: + case 6: if (!writer.writeBoolean("fields", fields)) return false; writer.incrementState(); - case 6: + case 7: if (!writer.writeBoolean("finished", finished)) return false; writer.incrementState(); - case 7: + case 8: if (!writer.writeCollection("metaDataBytes", metaDataBytes, MessageCollectionItemType.BYTE_ARR)) return false; writer.incrementState(); - case 8: + case 9: if (!writer.writeLong("reqId", reqId)) return false; @@ -339,7 +339,7 @@ public class GridCacheQueryResponse extends GridCacheIdMessage implements GridCa return false; switch (reader.state()) { - case 3: + case 4: dataBytes = reader.readCollection("dataBytes", MessageCollectionItemType.BYTE_ARR); if (!reader.isLastRead()) @@ -347,7 +347,7 @@ public class GridCacheQueryResponse extends GridCacheIdMessage implements GridCa reader.incrementState(); - case 4: + case 5: errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) @@ -355,7 +355,7 @@ public class GridCacheQueryResponse extends GridCacheIdMessage implements GridCa reader.incrementState(); - case 5: + case 6: fields = reader.readBoolean("fields"); if (!reader.isLastRead()) @@ -363,7 +363,7 @@ public class GridCacheQueryResponse extends GridCacheIdMessage implements GridCa reader.incrementState(); - case 6: + case 7: finished = reader.readBoolean("finished"); if (!reader.isLastRead()) @@ -371,7 +371,7 @@ public class GridCacheQueryResponse extends GridCacheIdMessage implements GridCa reader.incrementState(); - case 7: + case 8: metaDataBytes = reader.readCollection("metaDataBytes", MessageCollectionItemType.BYTE_ARR); if (!reader.isLastRead()) @@ -379,7 +379,7 @@ public class GridCacheQueryResponse extends GridCacheIdMessage implements GridCa reader.incrementState(); - case 8: + case 9: reqId = reader.readLong("reqId"); if (!reader.isLastRead()) @@ -399,7 +399,7 @@ public class GridCacheQueryResponse extends GridCacheIdMessage implements GridCa /** {@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/query/continuous/CacheContinuousQueryBatchAck.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java index ef0157e..9ba9ad2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java @@ -90,15 +90,14 @@ public class CacheContinuousQueryBatchAck extends GridCacheIdMessage { } switch (writer.state()) { - case 3: + case 4: if (!writer.writeUuid("routineId", routineId)) return false; writer.incrementState(); - case 4: - if (!writer.writeMap("updateCntrs", updateCntrs, MessageCollectionItemType.INT, - MessageCollectionItemType.LONG)) + case 5: + if (!writer.writeMap("updateCntrs", updateCntrs, MessageCollectionItemType.INT, MessageCollectionItemType.LONG)) return false; writer.incrementState(); @@ -119,7 +118,7 @@ public class CacheContinuousQueryBatchAck extends GridCacheIdMessage { return false; switch (reader.state()) { - case 3: + case 4: routineId = reader.readUuid("routineId"); if (!reader.isLastRead()) @@ -127,9 +126,8 @@ public class CacheContinuousQueryBatchAck extends GridCacheIdMessage { reader.incrementState(); - case 4: - updateCntrs = reader.readMap("updateCntrs", MessageCollectionItemType.INT, - MessageCollectionItemType.LONG, false); + case 5: + updateCntrs = reader.readMap("updateCntrs", MessageCollectionItemType.INT, MessageCollectionItemType.LONG, false); if (!reader.isLastRead()) return false; @@ -153,7 +151,7 @@ public class CacheContinuousQueryBatchAck extends GridCacheIdMessage { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 5; + return 6; } /** {@inheritDoc} */