IGNITE-264 - Regenerated messages.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e929822b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e929822b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e929822b Branch: refs/heads/ignite-264 Commit: e929822bab4e00d54b8233385533673d59e51ffb Parents: 3a88c01 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Fri Feb 20 18:55:10 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Fri Feb 20 18:55:10 2015 -0800 ---------------------------------------------------------------------- ...idCacheOptimisticCheckPreparedTxRequest.java | 20 ++++---- ...dCacheOptimisticCheckPreparedTxResponse.java | 12 ++--- .../distributed/GridDistributedLockRequest.java | 48 +++++++++--------- .../GridDistributedLockResponse.java | 12 ++--- .../GridDistributedTxFinishRequest.java | 36 +++++++------- .../GridDistributedTxPrepareRequest.java | 52 ++++++++++---------- .../GridDistributedTxPrepareResponse.java | 8 +-- .../distributed/dht/GridDhtLockRequest.java | 36 +++++++------- .../distributed/dht/GridDhtLockResponse.java | 16 +++--- .../distributed/dht/GridDhtTxFinishRequest.java | 36 +++++++------- .../dht/GridDhtTxPrepareRequest.java | 48 +++++++++--------- .../dht/GridDhtTxPrepareResponse.java | 20 ++++---- .../distributed/near/GridNearLockRequest.java | 48 +++++++++--------- .../distributed/near/GridNearLockResponse.java | 18 ++++--- .../near/GridNearTxFinishRequest.java | 24 ++++----- .../near/GridNearTxPrepareRequest.java | 40 +++++++-------- .../near/GridNearTxPrepareResponse.java | 28 +++++------ 17 files changed, 252 insertions(+), 250 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e929822b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java index d6f175e..7584c3b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java @@ -124,31 +124,31 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib } switch (writer.state()) { - case 8: + case 6: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 9: + case 7: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 10: + case 8: if (!writer.writeMessage("nearXidVer", nearXidVer)) return false; writer.incrementState(); - case 11: + case 9: if (!writer.writeBoolean("sys", sys)) return false; writer.incrementState(); - case 12: + case 10: if (!writer.writeInt("txNum", txNum)) return false; @@ -167,7 +167,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib return false; switch (readState) { - case 8: + case 6: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -175,7 +175,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib readState++; - case 9: + case 7: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -183,7 +183,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib readState++; - case 10: + case 8: nearXidVer = reader.readMessage("nearXidVer"); if (!reader.isLastRead()) @@ -191,7 +191,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib readState++; - case 11: + case 9: sys = reader.readBoolean("sys"); if (!reader.isLastRead()) @@ -199,7 +199,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib readState++; - case 12: + case 10: txNum = reader.readInt("txNum"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e929822b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java index 0168398..bc22a5d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java @@ -99,19 +99,19 @@ public class GridCacheOptimisticCheckPreparedTxResponse<K, V> extends GridDistri } switch (writer.state()) { - case 8: + case 6: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 9: + case 7: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 10: + case 8: if (!writer.writeBoolean("success", success)) return false; @@ -130,7 +130,7 @@ public class GridCacheOptimisticCheckPreparedTxResponse<K, V> extends GridDistri return false; switch (readState) { - case 8: + case 6: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -138,7 +138,7 @@ public class GridCacheOptimisticCheckPreparedTxResponse<K, V> extends GridDistri readState++; - case 9: + case 7: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -146,7 +146,7 @@ public class GridCacheOptimisticCheckPreparedTxResponse<K, V> extends GridDistri readState++; - case 10: + case 8: success = reader.readBoolean("success"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e929822b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java index a5370da..97269fe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java @@ -314,73 +314,73 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage } switch (writer.state()) { - case 8: + case 6: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 9: + case 7: if (!writer.writeBoolean("isInTx", isInTx)) return false; writer.incrementState(); - case 10: + case 8: if (!writer.writeBoolean("isInvalidate", isInvalidate)) return false; writer.incrementState(); - case 11: + case 9: if (!writer.writeBoolean("isRead", isRead)) return false; writer.incrementState(); - case 12: + case 10: if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1)) return false; writer.incrementState(); - case 13: + case 11: if (!writer.writeCollection("keyBytes", keyBytes, Type.BYTE_ARR)) return false; writer.incrementState(); - case 14: + case 12: if (!writer.writeMessage("nearXidVer", nearXidVer)) return false; writer.incrementState(); - case 15: + case 13: if (!writer.writeUuid("nodeId", nodeId)) return false; writer.incrementState(); - case 16: + case 14: if (!writer.writeBooleanArray("retVals", retVals)) return false; writer.incrementState(); - case 17: + case 15: if (!writer.writeLong("threadId", threadId)) return false; writer.incrementState(); - case 18: + case 16: if (!writer.writeLong("timeout", timeout)) return false; writer.incrementState(); - case 19: + case 17: if (!writer.writeInt("txSize", txSize)) return false; @@ -399,7 +399,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage return false; switch (readState) { - case 8: + case 6: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -407,7 +407,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; - case 9: + case 7: isInTx = reader.readBoolean("isInTx"); if (!reader.isLastRead()) @@ -415,7 +415,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; - case 10: + case 8: isInvalidate = reader.readBoolean("isInvalidate"); if (!reader.isLastRead()) @@ -423,7 +423,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; - case 11: + case 9: isRead = reader.readBoolean("isRead"); if (!reader.isLastRead()) @@ -431,7 +431,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; - case 12: + case 10: byte isolationOrd; isolationOrd = reader.readByte("isolation"); @@ -443,7 +443,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; - case 13: + case 11: keyBytes = reader.readCollection("keyBytes", Type.BYTE_ARR); if (!reader.isLastRead()) @@ -451,7 +451,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; - case 14: + case 12: nearXidVer = reader.readMessage("nearXidVer"); if (!reader.isLastRead()) @@ -459,7 +459,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; - case 15: + case 13: nodeId = reader.readUuid("nodeId"); if (!reader.isLastRead()) @@ -467,7 +467,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; - case 16: + case 14: retVals = reader.readBooleanArray("retVals"); if (!reader.isLastRead()) @@ -475,7 +475,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; - case 17: + case 15: threadId = reader.readLong("threadId"); if (!reader.isLastRead()) @@ -483,7 +483,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; - case 18: + case 16: timeout = reader.readLong("timeout"); if (!reader.isLastRead()) @@ -491,7 +491,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; - case 19: + case 17: txSize = reader.readInt("txSize"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e929822b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java index d01d212..6029c8f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java @@ -286,19 +286,19 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag } switch (writer.state()) { - case 8: + case 6: if (!writer.writeByteArray("errBytes", errBytes)) return false; writer.incrementState(); - case 9: + case 7: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 10: + case 8: if (!writer.writeCollection("valBytes", valBytes, Type.MSG)) return false; @@ -317,7 +317,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag return false; switch (readState) { - case 8: + case 6: errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) @@ -325,7 +325,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag readState++; - case 9: + case 7: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -333,7 +333,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag readState++; - case 10: + case 8: valBytes = reader.readCollection("valBytes", Type.MSG); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e929822b/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 81a5cf7..9662251 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 @@ -190,55 +190,55 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes } switch (writer.state()) { - case 9: + case 6: if (!writer.writeBoolean("commit", commit)) return false; writer.incrementState(); - case 10: + case 7: if (!writer.writeMessage("commitVer", commitVer)) return false; writer.incrementState(); - case 11: + case 8: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 12: + case 9: if (!writer.writeBoolean("invalidate", invalidate)) return false; writer.incrementState(); - case 13: + case 10: if (!writer.writeBoolean("syncCommit", syncCommit)) return false; writer.incrementState(); - case 14: + case 11: if (!writer.writeBoolean("syncRollback", syncRollback)) return false; writer.incrementState(); - case 15: + case 12: if (!writer.writeBoolean("sys", sys)) return false; writer.incrementState(); - case 16: + case 13: if (!writer.writeLong("threadId", threadId)) return false; writer.incrementState(); - case 17: + case 14: if (!writer.writeInt("txSize", txSize)) return false; @@ -257,7 +257,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes return false; switch (readState) { - case 9: + case 6: commit = reader.readBoolean("commit"); if (!reader.isLastRead()) @@ -265,7 +265,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; - case 10: + case 7: commitVer = reader.readMessage("commitVer"); if (!reader.isLastRead()) @@ -273,7 +273,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; - case 11: + case 8: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -281,7 +281,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; - case 12: + case 9: invalidate = reader.readBoolean("invalidate"); if (!reader.isLastRead()) @@ -289,7 +289,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; - case 13: + case 10: syncCommit = reader.readBoolean("syncCommit"); if (!reader.isLastRead()) @@ -297,7 +297,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; - case 14: + case 11: syncRollback = reader.readBoolean("syncRollback"); if (!reader.isLastRead()) @@ -305,7 +305,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; - case 15: + case 12: sys = reader.readBoolean("sys"); if (!reader.isLastRead()) @@ -313,7 +313,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; - case 16: + case 13: threadId = reader.readLong("threadId"); if (!reader.isLastRead()) @@ -321,7 +321,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; - case 17: + case 14: txSize = reader.readInt("txSize"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e929822b/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 cd07512..bdfd3e7 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 @@ -391,79 +391,79 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe } switch (writer.state()) { - case 8: + case 6: if (!writer.writeByte("concurrency", concurrency != null ? (byte)concurrency.ordinal() : -1)) return false; writer.incrementState(); - case 9: + case 7: if (!writer.writeByteArray("dhtVersBytes", dhtVersBytes)) return false; writer.incrementState(); - case 10: + case 8: if (!writer.writeBoolean("invalidate", invalidate)) return false; writer.incrementState(); - case 11: + case 9: if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1)) return false; writer.incrementState(); - case 12: + case 10: if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit)) return false; writer.incrementState(); - case 13: + case 11: if (!writer.writeCollection("readsBytes", readsBytes, Type.BYTE_ARR)) return false; writer.incrementState(); - case 14: + case 12: if (!writer.writeBoolean("sys", sys)) return false; writer.incrementState(); - case 15: + case 13: if (!writer.writeLong("threadId", threadId)) return false; writer.incrementState(); - case 16: + case 14: if (!writer.writeLong("timeout", timeout)) return false; writer.incrementState(); - case 17: + case 15: if (!writer.writeByteArray("txNodesBytes", txNodesBytes)) return false; writer.incrementState(); - case 18: + case 16: if (!writer.writeInt("txSize", txSize)) return false; writer.incrementState(); - case 19: + case 17: if (!writer.writeMessage("writeVer", writeVer)) return false; writer.incrementState(); - case 20: + case 18: if (!writer.writeCollection("writesBytes", writesBytes, Type.BYTE_ARR)) return false; @@ -482,7 +482,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe return false; switch (readState) { - case 8: + case 6: byte concurrencyOrd; concurrencyOrd = reader.readByte("concurrency"); @@ -494,7 +494,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; - case 9: + case 7: dhtVersBytes = reader.readByteArray("dhtVersBytes"); if (!reader.isLastRead()) @@ -502,7 +502,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; - case 10: + case 8: invalidate = reader.readBoolean("invalidate"); if (!reader.isLastRead()) @@ -510,7 +510,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; - case 11: + case 9: byte isolationOrd; isolationOrd = reader.readByte("isolation"); @@ -522,7 +522,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; - case 12: + case 10: onePhaseCommit = reader.readBoolean("onePhaseCommit"); if (!reader.isLastRead()) @@ -530,7 +530,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; - case 13: + case 11: readsBytes = reader.readCollection("readsBytes", Type.BYTE_ARR); if (!reader.isLastRead()) @@ -538,7 +538,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; - case 14: + case 12: sys = reader.readBoolean("sys"); if (!reader.isLastRead()) @@ -546,7 +546,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; - case 15: + case 13: threadId = reader.readLong("threadId"); if (!reader.isLastRead()) @@ -554,7 +554,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; - case 16: + case 14: timeout = reader.readLong("timeout"); if (!reader.isLastRead()) @@ -562,7 +562,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; - case 17: + case 15: txNodesBytes = reader.readByteArray("txNodesBytes"); if (!reader.isLastRead()) @@ -570,7 +570,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; - case 18: + case 16: txSize = reader.readInt("txSize"); if (!reader.isLastRead()) @@ -578,7 +578,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; - case 19: + case 17: writeVer = reader.readMessage("writeVer"); if (!reader.isLastRead()) @@ -586,7 +586,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; - case 20: + case 18: writesBytes = reader.readCollection("writesBytes", Type.BYTE_ARR); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e929822b/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 c8576a1..c8be6f7 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 @@ -163,13 +163,13 @@ public class GridDistributedTxPrepareResponse<K, V> extends GridDistributedBaseM } switch (writer.state()) { - case 8: + case 6: if (!writer.writeByteArray("candsBytes", candsBytes)) return false; writer.incrementState(); - case 9: + case 7: if (!writer.writeByteArray("errBytes", errBytes)) return false; @@ -188,7 +188,7 @@ public class GridDistributedTxPrepareResponse<K, V> extends GridDistributedBaseM return false; switch (readState) { - case 8: + case 6: candsBytes = reader.readByteArray("candsBytes"); if (!reader.isLastRead()) @@ -196,7 +196,7 @@ public class GridDistributedTxPrepareResponse<K, V> extends GridDistributedBaseM readState++; - case 9: + case 7: errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e929822b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java index 37d3ad8..b5952cb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java @@ -344,55 +344,55 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { } switch (writer.state()) { - case 20: + case 18: if (!writer.writeLong("accessTtl", accessTtl)) return false; writer.incrementState(); - case 21: + case 19: if (!writer.writeBitSet("invalidateEntries", invalidateEntries)) return false; writer.incrementState(); - case 22: + case 20: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 23: + case 21: if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, Type.BYTE_ARR)) return false; writer.incrementState(); - case 24: + case 22: if (!writer.writeByteArray("ownedBytes", ownedBytes)) return false; writer.incrementState(); - case 25: + case 23: if (!writer.writeBitSet("preloadKeys", preloadKeys)) return false; writer.incrementState(); - case 26: + case 24: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 27: + case 25: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 28: + case 26: if (!writer.writeLong("topVer", topVer)) return false; @@ -411,7 +411,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { return false; switch (readState) { - case 20: + case 18: accessTtl = reader.readLong("accessTtl"); if (!reader.isLastRead()) @@ -419,7 +419,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { readState++; - case 21: + case 19: invalidateEntries = reader.readBitSet("invalidateEntries"); if (!reader.isLastRead()) @@ -427,7 +427,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { readState++; - case 22: + case 20: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -435,7 +435,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { readState++; - case 23: + case 21: nearKeyBytes = reader.readCollection("nearKeyBytes", Type.BYTE_ARR); if (!reader.isLastRead()) @@ -443,7 +443,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { readState++; - case 24: + case 22: ownedBytes = reader.readByteArray("ownedBytes"); if (!reader.isLastRead()) @@ -451,7 +451,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { readState++; - case 25: + case 23: preloadKeys = reader.readBitSet("preloadKeys"); if (!reader.isLastRead()) @@ -459,7 +459,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { readState++; - case 26: + case 24: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -467,7 +467,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { readState++; - case 27: + case 25: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -475,7 +475,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { readState++; - case 28: + case 26: topVer = reader.readLong("topVer"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e929822b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java index 409dbb6..75cbf04 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java @@ -213,25 +213,25 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> } switch (writer.state()) { - case 11: + case 9: if (!writer.writeCollection("invalidParts", invalidParts, Type.INT)) return false; writer.incrementState(); - case 12: + case 10: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 13: + case 11: if (!writer.writeCollection("nearEvictedBytes", nearEvictedBytes, Type.BYTE_ARR)) return false; writer.incrementState(); - case 14: + case 12: if (!writer.writeCollection("preloadEntriesBytes", preloadEntriesBytes, Type.BYTE_ARR)) return false; @@ -250,7 +250,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> return false; switch (readState) { - case 11: + case 9: invalidParts = reader.readCollection("invalidParts", Type.INT); if (!reader.isLastRead()) @@ -258,7 +258,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> readState++; - case 12: + case 10: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -266,7 +266,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> readState++; - case 13: + case 11: nearEvictedBytes = reader.readCollection("nearEvictedBytes", Type.BYTE_ARR); if (!reader.isLastRead()) @@ -274,7 +274,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> readState++; - case 14: + case 12: preloadEntriesBytes = reader.readCollection("preloadEntriesBytes", Type.BYTE_ARR); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e929822b/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 97a8b46..6845d27 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 @@ -218,55 +218,55 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest } switch (writer.state()) { - case 18: + case 15: if (!writer.writeBoolean("checkCommitted", checkCommitted)) return false; writer.incrementState(); - case 19: + case 16: if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1)) return false; writer.incrementState(); - case 20: + case 17: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 21: + case 18: if (!writer.writeUuid("nearNodeId", nearNodeId)) return false; writer.incrementState(); - case 23: + case 19: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 24: + case 20: if (!writer.writeBoolean("sysInvalidate", sysInvalidate)) return false; writer.incrementState(); - case 25: + case 21: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 26: + case 22: if (!writer.writeLong("topVer", topVer)) return false; writer.incrementState(); - case 27: + case 23: if (!writer.writeMessage("writeVer", writeVer)) return false; @@ -285,7 +285,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest return false; switch (readState) { - case 18: + case 15: checkCommitted = reader.readBoolean("checkCommitted"); if (!reader.isLastRead()) @@ -293,7 +293,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest readState++; - case 19: + case 16: byte isolationOrd; isolationOrd = reader.readByte("isolation"); @@ -305,7 +305,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest readState++; - case 20: + case 17: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -313,7 +313,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest readState++; - case 21: + case 18: nearNodeId = reader.readUuid("nearNodeId"); if (!reader.isLastRead()) @@ -321,7 +321,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest readState++; - case 23: + case 19: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -329,7 +329,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest readState++; - case 24: + case 20: sysInvalidate = reader.readBoolean("sysInvalidate"); if (!reader.isLastRead()) @@ -337,7 +337,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest readState++; - case 25: + case 21: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -345,7 +345,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest readState++; - case 26: + case 22: topVer = reader.readLong("topVer"); if (!reader.isLastRead()) @@ -353,7 +353,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest readState++; - case 27: + case 23: writeVer = reader.readMessage("writeVer"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e929822b/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 bb29b57..3905523 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 @@ -324,73 +324,73 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque } switch (writer.state()) { - case 21: + case 19: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 22: + case 20: if (!writer.writeBitSet("invalidateNearEntries", invalidateNearEntries)) return false; writer.incrementState(); - case 23: + case 21: if (!writer.writeBoolean("last", last)) return false; writer.incrementState(); - case 24: + case 22: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 25: + case 23: if (!writer.writeUuid("nearNodeId", nearNodeId)) return false; writer.incrementState(); - case 26: + case 24: if (!writer.writeCollection("nearWritesBytes", nearWritesBytes, Type.BYTE_ARR)) return false; writer.incrementState(); - case 27: + case 25: if (!writer.writeMessage("nearXidVer", nearXidVer)) return false; writer.incrementState(); - case 28: + case 26: if (!writer.writeByteArray("ownedBytes", ownedBytes)) return false; writer.incrementState(); - case 29: + case 27: if (!writer.writeBitSet("preloadKeys", preloadKeys)) return false; writer.incrementState(); - case 30: + case 28: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 31: + case 29: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 32: + case 30: if (!writer.writeLong("topVer", topVer)) return false; @@ -409,7 +409,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque return false; switch (readState) { - case 21: + case 19: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -417,7 +417,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; - case 22: + case 20: invalidateNearEntries = reader.readBitSet("invalidateNearEntries"); if (!reader.isLastRead()) @@ -425,7 +425,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; - case 23: + case 21: last = reader.readBoolean("last"); if (!reader.isLastRead()) @@ -433,7 +433,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; - case 24: + case 22: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -441,7 +441,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; - case 25: + case 23: nearNodeId = reader.readUuid("nearNodeId"); if (!reader.isLastRead()) @@ -449,7 +449,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; - case 26: + case 24: nearWritesBytes = reader.readCollection("nearWritesBytes", Type.BYTE_ARR); if (!reader.isLastRead()) @@ -457,7 +457,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; - case 27: + case 25: nearXidVer = reader.readMessage("nearXidVer"); if (!reader.isLastRead()) @@ -465,7 +465,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; - case 28: + case 26: ownedBytes = reader.readByteArray("ownedBytes"); if (!reader.isLastRead()) @@ -473,7 +473,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; - case 29: + case 27: preloadKeys = reader.readBitSet("preloadKeys"); if (!reader.isLastRead()) @@ -481,7 +481,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; - case 30: + case 28: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -489,7 +489,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; - case 31: + case 29: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -497,7 +497,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; - case 32: + case 30: topVer = reader.readLong("topVer"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e929822b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java index f85d5f8..ccca063 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java @@ -221,31 +221,31 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp } switch (writer.state()) { - case 10: + case 8: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 11: + case 9: if (!writer.writeCollection("invalidParts", invalidParts, Type.INT)) return false; writer.incrementState(); - case 12: + case 10: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 13: + case 11: if (!writer.writeCollection("nearEvictedBytes", nearEvictedBytes, Type.BYTE_ARR)) return false; writer.incrementState(); - case 14: + case 12: if (!writer.writeCollection("preloadEntriesBytes", preloadEntriesBytes, Type.BYTE_ARR)) return false; @@ -264,7 +264,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp return false; switch (readState) { - case 10: + case 8: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -272,7 +272,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp readState++; - case 11: + case 9: invalidParts = reader.readCollection("invalidParts", Type.INT); if (!reader.isLastRead()) @@ -280,7 +280,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp readState++; - case 12: + case 10: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -288,7 +288,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp readState++; - case 13: + case 11: nearEvictedBytes = reader.readCollection("nearEvictedBytes", Type.BYTE_ARR); if (!reader.isLastRead()) @@ -296,7 +296,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp readState++; - case 14: + case 12: preloadEntriesBytes = reader.readCollection("preloadEntriesBytes", Type.BYTE_ARR); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e929822b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java index dbbd12e..df59ac4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java @@ -329,73 +329,73 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> } switch (writer.state()) { - case 20: + case 18: if (!writer.writeLong("accessTtl", accessTtl)) return false; writer.incrementState(); - case 21: + case 19: if (!writer.writeObjectArray("dhtVers", dhtVers, Type.MSG)) return false; writer.incrementState(); - case 22: + case 20: if (!writer.writeObjectArray("filterBytes", filterBytes, Type.BYTE_ARR)) return false; writer.incrementState(); - case 23: + case 21: if (!writer.writeBoolean("hasTransforms", hasTransforms)) return false; writer.incrementState(); - case 24: + case 22: if (!writer.writeBoolean("implicitSingleTx", implicitSingleTx)) return false; writer.incrementState(); - case 25: + case 23: if (!writer.writeBoolean("implicitTx", implicitTx)) return false; writer.incrementState(); - case 26: + case 24: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 27: + case 25: if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit)) return false; writer.incrementState(); - case 28: + case 26: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 29: + case 27: if (!writer.writeBoolean("syncCommit", syncCommit)) return false; writer.incrementState(); - case 30: + case 28: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 31: + case 29: if (!writer.writeLong("topVer", topVer)) return false; @@ -414,7 +414,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> return false; switch (readState) { - case 20: + case 18: accessTtl = reader.readLong("accessTtl"); if (!reader.isLastRead()) @@ -422,7 +422,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> readState++; - case 21: + case 19: dhtVers = reader.readObjectArray("dhtVers", Type.MSG, GridCacheVersion.class); if (!reader.isLastRead()) @@ -430,7 +430,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> readState++; - case 22: + case 20: filterBytes = reader.readObjectArray("filterBytes", Type.BYTE_ARR, byte[].class); if (!reader.isLastRead()) @@ -438,7 +438,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> readState++; - case 23: + case 21: hasTransforms = reader.readBoolean("hasTransforms"); if (!reader.isLastRead()) @@ -446,7 +446,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> readState++; - case 24: + case 22: implicitSingleTx = reader.readBoolean("implicitSingleTx"); if (!reader.isLastRead()) @@ -454,7 +454,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> readState++; - case 25: + case 23: implicitTx = reader.readBoolean("implicitTx"); if (!reader.isLastRead()) @@ -462,7 +462,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> readState++; - case 26: + case 24: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -470,7 +470,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> readState++; - case 27: + case 25: onePhaseCommit = reader.readBoolean("onePhaseCommit"); if (!reader.isLastRead()) @@ -478,7 +478,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> readState++; - case 28: + case 26: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -486,7 +486,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> readState++; - case 29: + case 27: syncCommit = reader.readBoolean("syncCommit"); if (!reader.isLastRead()) @@ -494,7 +494,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> readState++; - case 30: + case 28: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -502,7 +502,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> readState++; - case 31: + case 29: topVer = reader.readLong("topVer"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e929822b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java index 6ba3dab..3b67a00 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java @@ -170,29 +170,30 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V } switch (writer.state()) { - case 11: + case 9: if (!writer.writeObjectArray("dhtVers", dhtVers, Type.MSG)) return false; writer.incrementState(); - case 12: + case 10: if (!writer.writeBooleanArray("filterRes", filterRes)) return false; writer.incrementState(); - case 13: + case 11: if (!writer.writeObjectArray("mappedVers", mappedVers, Type.MSG)) return false; writer.incrementState(); - case 14: + case 12: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); + } return true; @@ -206,7 +207,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V return false; switch (readState) { - case 11: + case 9: dhtVers = reader.readObjectArray("dhtVers", Type.MSG, GridCacheVersion.class); if (!reader.isLastRead()) @@ -214,7 +215,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V readState++; - case 12: + case 10: filterRes = reader.readBooleanArray("filterRes"); if (!reader.isLastRead()) @@ -222,7 +223,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V readState++; - case 13: + case 11: mappedVers = reader.readObjectArray("mappedVers", Type.MSG, GridCacheVersion.class); if (!reader.isLastRead()) @@ -230,13 +231,14 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V readState++; - case 14: + case 12: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) return false; readState++; + } return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e929822b/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 5cd0957..3bc87d2 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 @@ -160,37 +160,37 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques } switch (writer.state()) { - case 18: + case 15: if (!writer.writeBoolean("explicitLock", explicitLock)) return false; writer.incrementState(); - case 19: + case 16: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 20: + case 17: if (!writer.writeBoolean("storeEnabled", storeEnabled)) return false; writer.incrementState(); - case 21: + case 18: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 22: + case 19: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 23: + case 20: if (!writer.writeLong("topVer", topVer)) return false; @@ -209,7 +209,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques return false; switch (readState) { - case 18: + case 15: explicitLock = reader.readBoolean("explicitLock"); if (!reader.isLastRead()) @@ -217,7 +217,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques readState++; - case 19: + case 16: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -225,7 +225,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques readState++; - case 20: + case 17: storeEnabled = reader.readBoolean("storeEnabled"); if (!reader.isLastRead()) @@ -233,7 +233,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques readState++; - case 21: + case 18: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -241,7 +241,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques readState++; - case 22: + case 19: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -249,7 +249,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques readState++; - case 23: + case 20: topVer = reader.readLong("topVer"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e929822b/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 140a0cc..797bb15 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 @@ -253,61 +253,61 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ } switch (writer.state()) { - case 21: + case 19: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 22: + case 20: if (!writer.writeBoolean("implicitSingle", implicitSingle)) return false; writer.incrementState(); - case 23: + case 21: if (!writer.writeBoolean("last", last)) return false; writer.incrementState(); - case 24: + case 22: if (!writer.writeCollection("lastBackups", lastBackups, Type.UUID)) return false; writer.incrementState(); - case 25: + case 23: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 26: + case 24: if (!writer.writeBoolean("near", near)) return false; writer.incrementState(); - case 27: + case 25: if (!writer.writeBoolean("retVal", retVal)) return false; writer.incrementState(); - case 28: + case 26: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 29: + case 27: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 30: + case 28: if (!writer.writeLong("topVer", topVer)) return false; @@ -326,7 +326,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ return false; switch (readState) { - case 21: + case 19: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -334,7 +334,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ readState++; - case 22: + case 20: implicitSingle = reader.readBoolean("implicitSingle"); if (!reader.isLastRead()) @@ -342,7 +342,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ readState++; - case 23: + case 21: last = reader.readBoolean("last"); if (!reader.isLastRead()) @@ -350,7 +350,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ readState++; - case 24: + case 22: lastBackups = reader.readCollection("lastBackups", Type.UUID); if (!reader.isLastRead()) @@ -358,7 +358,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ readState++; - case 25: + case 23: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -366,7 +366,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ readState++; - case 26: + case 24: near = reader.readBoolean("near"); if (!reader.isLastRead()) @@ -374,7 +374,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ readState++; - case 27: + case 25: retVal = reader.readBoolean("retVal"); if (!reader.isLastRead()) @@ -382,7 +382,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ readState++; - case 28: + case 26: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -390,7 +390,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ readState++; - case 29: + case 27: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -398,7 +398,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ readState++; - case 30: + case 28: topVer = reader.readLong("topVer"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e929822b/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 5c101af..ea2f689 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 @@ -274,43 +274,43 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes } switch (writer.state()) { - case 10: + case 8: if (!writer.writeMessage("dhtVer", dhtVer)) return false; writer.incrementState(); - case 11: + case 9: if (!writer.writeByteArray("filterFailedKeyBytes", filterFailedKeyBytes)) return false; writer.incrementState(); - case 12: + case 10: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 13: + case 11: if (!writer.writeCollection("invalidParts", invalidParts, Type.INT)) return false; writer.incrementState(); - case 14: + case 12: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 15: + case 13: if (!writer.writeCollection("ownedValsBytes", ownedValsBytes, Type.BYTE_ARR)) return false; writer.incrementState(); - case 17: + case 14: if (!writer.writeByteArray("retValBytes", retValBytes)) return false; @@ -329,7 +329,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes return false; switch (readState) { - case 10: + case 8: dhtVer = reader.readMessage("dhtVer"); if (!reader.isLastRead()) @@ -337,7 +337,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes readState++; - case 11: + case 9: filterFailedKeyBytes = reader.readByteArray("filterFailedKeyBytes"); if (!reader.isLastRead()) @@ -345,7 +345,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes readState++; - case 12: + case 10: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -353,7 +353,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes readState++; - case 13: + case 11: invalidParts = reader.readCollection("invalidParts", Type.INT); if (!reader.isLastRead()) @@ -361,7 +361,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes readState++; - case 14: + case 12: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -369,7 +369,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes readState++; - case 15: + case 13: ownedValsBytes = reader.readCollection("ownedValsBytes", Type.BYTE_ARR); if (!reader.isLastRead()) @@ -377,7 +377,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes readState++; - case 17: + case 14: retValBytes = reader.readByteArray("retValBytes"); if (!reader.isLastRead())
