Lock tracing
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1767dce2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1767dce2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1767dce2 Branch: refs/heads/ignite-5797 Commit: 1767dce24c92695a4c76c2de0a3e48395df81296 Parents: aa86880 Author: Alexey Goncharuk <[email protected]> Authored: Thu Oct 4 17:11:28 2018 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Thu Oct 4 17:11:28 2018 +0300 ---------------------------------------------------------------------- .../ignite/codegen/MessageCodeGenerator.java | 6 ++ .../processors/cache/GridCacheIoManager.java | 6 +- .../distributed/GridDistributedLockRequest.java | 64 ++++++++++++-------- .../GridDistributedLockResponse.java | 20 +++++- .../distributed/dht/GridDhtLockRequest.java | 42 ++++++------- .../distributed/dht/GridDhtLockResponse.java | 18 +++--- .../distributed/near/GridNearLockRequest.java | 38 ++++++------ .../distributed/near/GridNearLockResponse.java | 26 ++++---- 8 files changed, 128 insertions(+), 92 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1767dce2/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java ---------------------------------------------------------------------- diff --git a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java index afecd17..3fe9f83 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java @@ -43,14 +43,20 @@ import org.apache.ignite.internal.GridDirectCollection; import org.apache.ignite.internal.GridDirectMap; import org.apache.ignite.internal.GridDirectTransient; import org.apache.ignite.internal.IgniteCodeGeneratingFail; +import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockRequest; +import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockResponse; import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishRequest; import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishResponse; import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareRequest; import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareResponse; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockRequest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockResponse; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishRequest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishResponse; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareRequest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareResponse; +import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockRequest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockResponse; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishRequest; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishResponse; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareRequest; http://git-wip-us.apache.org/repos/asf/ignite/blob/1767dce2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java index f6feb53..734628c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java @@ -729,7 +729,8 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { req.futureId(), req.miniId(), 0, - false); + false, + req.nodeTrace()); sendResponseOnFailedMessage(nodeId, res, cctx, plc); } @@ -865,7 +866,8 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { 0, req.classError(), null, - false); + false, + req.nodeTrace()); sendResponseOnFailedMessage(nodeId, res, cctx, plc); } http://git-wip-us.apache.org/repos/asf/ignite/blob/1767dce2/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 8858e97..6af535b 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 @@ -388,78 +388,84 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage imple switch (writer.state()) { case 7: - if (!writer.writeByte("flags", flags)) + if (!writer.writeMessage("evtsTrace", evtsTrace)) return false; writer.incrementState(); case 8: - if (!writer.writeIgniteUuid("futId", futId)) + if (!writer.writeByte("flags", flags)) return false; writer.incrementState(); case 9: - if (!writer.writeBoolean("isInTx", isInTx)) + if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); case 10: - if (!writer.writeBoolean("isInvalidate", isInvalidate)) + if (!writer.writeBoolean("isInTx", isInTx)) return false; writer.incrementState(); case 11: - if (!writer.writeBoolean("isRead", isRead)) + if (!writer.writeBoolean("isInvalidate", isInvalidate)) return false; writer.incrementState(); case 12: - if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1)) + if (!writer.writeBoolean("isRead", isRead)) return false; writer.incrementState(); case 13: - if (!writer.writeCollection("keys", keys, MessageCollectionItemType.MSG)) + if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1)) return false; writer.incrementState(); case 14: - if (!writer.writeMessage("nearXidVer", nearXidVer)) + if (!writer.writeCollection("keys", keys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); case 15: - if (!writer.writeUuid("nodeId", nodeId)) + if (!writer.writeMessage("nearXidVer", nearXidVer)) return false; writer.incrementState(); case 16: - if (!writer.writeBooleanArray("retVals", retVals)) + if (!writer.writeUuid("nodeId", nodeId)) return false; writer.incrementState(); case 17: - if (!writer.writeLong("threadId", threadId)) + if (!writer.writeBooleanArray("retVals", retVals)) return false; writer.incrementState(); case 18: - if (!writer.writeLong("timeout", timeout)) + if (!writer.writeLong("threadId", threadId)) return false; writer.incrementState(); case 19: + if (!writer.writeLong("timeout", timeout)) + return false; + + writer.incrementState(); + + case 20: if (!writer.writeInt("txSize", txSize)) return false; @@ -482,7 +488,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage imple switch (reader.state()) { case 7: - flags = reader.readByte("flags"); + evtsTrace = reader.readMessage("evtsTrace"); if (!reader.isLastRead()) return false; @@ -490,7 +496,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage imple reader.incrementState(); case 8: - futId = reader.readIgniteUuid("futId"); + flags = reader.readByte("flags"); if (!reader.isLastRead()) return false; @@ -498,7 +504,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage imple reader.incrementState(); case 9: - isInTx = reader.readBoolean("isInTx"); + futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) return false; @@ -506,7 +512,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage imple reader.incrementState(); case 10: - isInvalidate = reader.readBoolean("isInvalidate"); + isInTx = reader.readBoolean("isInTx"); if (!reader.isLastRead()) return false; @@ -514,7 +520,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage imple reader.incrementState(); case 11: - isRead = reader.readBoolean("isRead"); + isInvalidate = reader.readBoolean("isInvalidate"); if (!reader.isLastRead()) return false; @@ -522,6 +528,14 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage imple reader.incrementState(); case 12: + isRead = reader.readBoolean("isRead"); + + if (!reader.isLastRead()) + return false; + + reader.incrementState(); + + case 13: byte isolationOrd; isolationOrd = reader.readByte("isolation"); @@ -533,7 +547,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage imple reader.incrementState(); - case 13: + case 14: keys = reader.readCollection("keys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -541,7 +555,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage imple reader.incrementState(); - case 14: + case 15: nearXidVer = reader.readMessage("nearXidVer"); if (!reader.isLastRead()) @@ -549,7 +563,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage imple reader.incrementState(); - case 15: + case 16: nodeId = reader.readUuid("nodeId"); if (!reader.isLastRead()) @@ -557,7 +571,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage imple reader.incrementState(); - case 16: + case 17: retVals = reader.readBooleanArray("retVals"); if (!reader.isLastRead()) @@ -565,7 +579,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage imple reader.incrementState(); - case 17: + case 18: threadId = reader.readLong("threadId"); if (!reader.isLastRead()) @@ -573,7 +587,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage imple reader.incrementState(); - case 18: + case 19: timeout = reader.readLong("timeout"); if (!reader.isLastRead()) @@ -581,7 +595,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage imple reader.incrementState(); - case 19: + case 20: txSize = reader.readInt("txSize"); if (!reader.isLastRead()) @@ -601,7 +615,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage imple /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 20; + return 21; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/1767dce2/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 55470fd..a8e20a6 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 @@ -251,12 +251,18 @@ public class GridDistributedLockResponse extends GridDistributedBaseMessage impl writer.incrementState(); case 8: - if (!writer.writeIgniteUuid("futId", futId)) + if (!writer.writeMessage("evtsTrace", evtsTrace)) return false; writer.incrementState(); case 9: + if (!writer.writeIgniteUuid("futId", futId)) + return false; + + writer.incrementState(); + + case 10: if (!writer.writeCollection("vals", vals, MessageCollectionItemType.MSG)) return false; @@ -287,7 +293,7 @@ public class GridDistributedLockResponse extends GridDistributedBaseMessage impl reader.incrementState(); case 8: - futId = reader.readIgniteUuid("futId"); + evtsTrace = reader.readMessage("evtsTrace"); if (!reader.isLastRead()) return false; @@ -295,6 +301,14 @@ public class GridDistributedLockResponse extends GridDistributedBaseMessage impl reader.incrementState(); case 9: + futId = reader.readIgniteUuid("futId"); + + if (!reader.isLastRead()) + return false; + + reader.incrementState(); + + case 10: vals = reader.readCollection("vals", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -314,7 +328,7 @@ public class GridDistributedLockResponse extends GridDistributedBaseMessage impl /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 10; + return 11; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/1767dce2/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 0ec7096..8697419 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 @@ -368,61 +368,61 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { } switch (writer.state()) { - case 20: + case 21: if (!writer.writeLong("accessTtl", accessTtl)) return false; writer.incrementState(); - case 21: + case 22: if (!writer.writeBitSet("invalidateEntries", invalidateEntries)) return false; writer.incrementState(); - case 22: + case 23: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 23: + case 24: if (!writer.writeCollection("nearKeys", nearKeys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 24: + case 25: if (!writer.writeObjectArray("ownedKeys", ownedKeys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 25: + case 26: if (!writer.writeObjectArray("ownedValues", ownedValues, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 26: + case 27: if (!writer.writeBitSet("preloadKeys", preloadKeys)) return false; writer.incrementState(); - case 27: + case 28: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 28: + case 29: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 29: + case 30: if (!writer.writeMessage("topVer", topVer)) return false; @@ -444,7 +444,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { return false; switch (reader.state()) { - case 20: + case 21: accessTtl = reader.readLong("accessTtl"); if (!reader.isLastRead()) @@ -452,7 +452,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 21: + case 22: invalidateEntries = reader.readBitSet("invalidateEntries"); if (!reader.isLastRead()) @@ -460,7 +460,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 22: + case 23: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -468,7 +468,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 23: + case 24: nearKeys = reader.readCollection("nearKeys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -476,7 +476,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 24: + case 25: ownedKeys = reader.readObjectArray("ownedKeys", MessageCollectionItemType.MSG, KeyCacheObject.class); if (!reader.isLastRead()) @@ -484,7 +484,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 25: + case 26: ownedValues = reader.readObjectArray("ownedValues", MessageCollectionItemType.MSG, GridCacheVersion.class); if (!reader.isLastRead()) @@ -492,7 +492,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 26: + case 27: preloadKeys = reader.readBitSet("preloadKeys"); if (!reader.isLastRead()) @@ -500,7 +500,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 27: + case 28: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -508,7 +508,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 28: + case 29: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -516,7 +516,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 29: + case 30: topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) @@ -536,7 +536,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 30; + return 31; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/1767dce2/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 9f9ff6d..42f323e 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 @@ -222,25 +222,25 @@ public class GridDhtLockResponse extends GridDistributedLockResponse { } switch (writer.state()) { - case 10: + case 11: if (!writer.writeCollection("invalidParts", invalidParts, MessageCollectionItemType.INT)) return false; writer.incrementState(); - case 11: + case 12: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 12: + case 13: if (!writer.writeCollection("nearEvicted", nearEvicted, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 13: + case 14: if (!writer.writeCollection("preloadEntries", preloadEntries, MessageCollectionItemType.MSG)) return false; @@ -262,7 +262,7 @@ public class GridDhtLockResponse extends GridDistributedLockResponse { return false; switch (reader.state()) { - case 10: + case 11: invalidParts = reader.readCollection("invalidParts", MessageCollectionItemType.INT); if (!reader.isLastRead()) @@ -270,7 +270,7 @@ public class GridDhtLockResponse extends GridDistributedLockResponse { reader.incrementState(); - case 11: + case 12: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -278,7 +278,7 @@ public class GridDhtLockResponse extends GridDistributedLockResponse { reader.incrementState(); - case 12: + case 13: nearEvicted = reader.readCollection("nearEvicted", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -286,7 +286,7 @@ public class GridDhtLockResponse extends GridDistributedLockResponse { reader.incrementState(); - case 13: + case 14: preloadEntries = reader.readCollection("preloadEntries", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -306,7 +306,7 @@ public class GridDhtLockResponse extends GridDistributedLockResponse { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 14; + return 15; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/1767dce2/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 009d928..2f29e1f 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 @@ -369,55 +369,55 @@ public class GridNearLockRequest extends GridDistributedLockRequest { } switch (writer.state()) { - case 20: + case 21: if (!writer.writeLong("accessTtl", accessTtl)) return false; writer.incrementState(); - case 21: + case 22: if (!writer.writeLong("createTtl", createTtl)) return false; writer.incrementState(); - case 22: + case 23: if (!writer.writeObjectArray("dhtVers", dhtVers, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 23: + case 24: if (!writer.writeObjectArray("filter", filter, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 24: + case 25: if (!writer.writeByte("flags", flags)) return false; writer.incrementState(); - case 25: + case 26: if (!writer.writeInt("miniId", miniId)) return false; writer.incrementState(); - case 26: + case 27: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 27: + case 28: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 28: + case 29: if (!writer.writeMessage("topVer", topVer)) return false; @@ -439,7 +439,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { return false; switch (reader.state()) { - case 20: + case 21: accessTtl = reader.readLong("accessTtl"); if (!reader.isLastRead()) @@ -447,7 +447,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 21: + case 22: createTtl = reader.readLong("createTtl"); if (!reader.isLastRead()) @@ -455,7 +455,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 22: + case 23: dhtVers = reader.readObjectArray("dhtVers", MessageCollectionItemType.MSG, GridCacheVersion.class); if (!reader.isLastRead()) @@ -463,7 +463,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 23: + case 24: filter = reader.readObjectArray("filter", MessageCollectionItemType.MSG, CacheEntryPredicate.class); if (!reader.isLastRead()) @@ -471,7 +471,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 24: + case 25: flags = reader.readByte("flags"); if (!reader.isLastRead()) @@ -479,7 +479,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 25: + case 26: miniId = reader.readInt("miniId"); if (!reader.isLastRead()) @@ -487,7 +487,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 26: + case 27: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -495,7 +495,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 27: + case 28: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -503,7 +503,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 28: + case 29: topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) @@ -523,7 +523,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 29; + return 30; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/1767dce2/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 2bbe861..7f43a52 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 @@ -212,37 +212,37 @@ public class GridNearLockResponse extends GridDistributedLockResponse { } switch (writer.state()) { - case 10: + case 11: if (!writer.writeMessage("clientRemapVer", clientRemapVer)) return false; writer.incrementState(); - case 11: + case 12: if (!writer.writeObjectArray("dhtVers", dhtVers, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 12: + case 13: if (!writer.writeBooleanArray("filterRes", filterRes)) return false; writer.incrementState(); - case 13: + case 14: if (!writer.writeObjectArray("mappedVers", mappedVers, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 14: + case 15: if (!writer.writeInt("miniId", miniId)) return false; writer.incrementState(); - case 15: + case 16: if (!writer.writeCollection("pending", pending, MessageCollectionItemType.MSG)) return false; @@ -264,7 +264,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse { return false; switch (reader.state()) { - case 10: + case 11: clientRemapVer = reader.readMessage("clientRemapVer"); if (!reader.isLastRead()) @@ -272,7 +272,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse { reader.incrementState(); - case 11: + case 12: dhtVers = reader.readObjectArray("dhtVers", MessageCollectionItemType.MSG, GridCacheVersion.class); if (!reader.isLastRead()) @@ -280,7 +280,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse { reader.incrementState(); - case 12: + case 13: filterRes = reader.readBooleanArray("filterRes"); if (!reader.isLastRead()) @@ -288,7 +288,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse { reader.incrementState(); - case 13: + case 14: mappedVers = reader.readObjectArray("mappedVers", MessageCollectionItemType.MSG, GridCacheVersion.class); if (!reader.isLastRead()) @@ -296,7 +296,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse { reader.incrementState(); - case 14: + case 15: miniId = reader.readInt("miniId"); if (!reader.isLastRead()) @@ -304,7 +304,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse { reader.incrementState(); - case 15: + case 16: pending = reader.readCollection("pending", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -324,7 +324,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 16; + return 17; } /** {@inheritDoc} */
