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/30fef4a0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/30fef4a0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/30fef4a0 Branch: refs/heads/ignite-264 Commit: 30fef4a0b38b183ed4da7d4d82d6c289abb9c272 Parents: 2182da3 Author: Alexey Goncharuk <[email protected]> Authored: Tue Feb 24 16:51:20 2015 -0800 Committer: Alexey Goncharuk <[email protected]> Committed: Tue Feb 24 16:51:20 2015 -0800 ---------------------------------------------------------------------- .../GridCacheOptimisticCheckPreparedTxRequest.java | 2 +- .../GridCacheOptimisticCheckPreparedTxResponse.java | 2 +- .../distributed/GridDistributedLockRequest.java | 6 +++--- .../distributed/GridDistributedLockResponse.java | 8 ++++---- .../distributed/GridDistributedTxFinishRequest.java | 2 +- .../GridDistributedTxPrepareRequest.java | 6 +++--- .../GridDistributedTxPrepareResponse.java | 4 ++-- .../distributed/GridDistributedUnlockRequest.java | 6 +++--- .../cache/distributed/dht/GridDhtLockRequest.java | 6 +++--- .../cache/distributed/dht/GridDhtLockResponse.java | 14 +++++++------- .../distributed/dht/GridDhtTxFinishRequest.java | 16 +++++++++++++++- .../distributed/dht/GridDhtTxFinishResponse.java | 2 +- .../distributed/dht/GridDhtTxPrepareRequest.java | 2 +- .../distributed/dht/GridDhtTxPrepareResponse.java | 16 ++++++++-------- .../cache/distributed/dht/GridDhtUnlockRequest.java | 6 +++--- .../cache/distributed/near/GridNearLockRequest.java | 4 ++-- .../distributed/near/GridNearLockResponse.java | 12 +++++++----- .../distributed/near/GridNearTxFinishRequest.java | 2 +- .../distributed/near/GridNearTxPrepareRequest.java | 2 +- .../distributed/near/GridNearTxPrepareResponse.java | 14 +++++++------- .../distributed/near/GridNearUnlockRequest.java | 2 +- 21 files changed, 75 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30fef4a0/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 a6d233b..636c5b5 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 @@ -222,7 +222,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 13; + return 11; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30fef4a0/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 2c63a93..70c512f 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 @@ -169,7 +169,7 @@ public class GridCacheOptimisticCheckPreparedTxResponse<K, V> extends GridDistri /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 11; + return 9; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30fef4a0/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 321dafd..1da0e0f 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 @@ -446,7 +446,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage reader.incrementState(); - case 14: + case 11: keyBytes = reader.readCollection("keyBytes", MessageCollectionItemType.BYTE_ARR); if (!reader.isLastRead()) @@ -470,7 +470,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage reader.incrementState(); - case 18: + case 14: retVals = reader.readBooleanArray("retVals"); if (!reader.isLastRead()) @@ -514,7 +514,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 22; + return 18; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30fef4a0/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 5a35bc4..0560234 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 @@ -298,7 +298,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag writer.incrementState(); - case 10: + case 8: if (!writer.writeCollection("valBytes", valBytes, MessageCollectionItemType.MSG)) return false; @@ -320,7 +320,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag return false; switch (reader.state()) { - case 8: + case 6: errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) @@ -336,7 +336,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag reader.incrementState(); - case 10: + case 8: valBytes = reader.readCollection("valBytes", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -356,7 +356,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 11; + return 9; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30fef4a0/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 0e7166a..fbdcde5 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 @@ -344,7 +344,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 19; + return 15; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30fef4a0/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 82b99ae..2e99ef5 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 @@ -463,7 +463,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe writer.incrementState(); - case 22: + case 18: if (!writer.writeCollection("writesBytes", writesBytes, MessageCollectionItemType.BYTE_ARR)) return false; @@ -589,7 +589,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe reader.incrementState(); - case 22: + case 18: writesBytes = reader.readCollection("writesBytes", MessageCollectionItemType.BYTE_ARR); if (!reader.isLastRead()) @@ -609,7 +609,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 23; + return 19; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30fef4a0/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 3d53f94..c89c5df 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 @@ -191,7 +191,7 @@ public class GridDistributedTxPrepareResponse<K, V> extends GridDistributedBaseM return false; switch (reader.state()) { - case 8: + case 6: candsBytes = reader.readByteArray("candsBytes"); if (!reader.isLastRead()) @@ -219,7 +219,7 @@ public class GridDistributedTxPrepareResponse<K, V> extends GridDistributedBaseM /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 10; + return 8; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30fef4a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java index 5252837..8ad7a9b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java @@ -129,7 +129,7 @@ public class GridDistributedUnlockRequest<K, V> extends GridDistributedBaseMessa } switch (writer.state()) { - case 8: + case 6: if (!writer.writeCollection("keyBytes", keyBytes, MessageCollectionItemType.BYTE_ARR)) return false; @@ -151,7 +151,7 @@ public class GridDistributedUnlockRequest<K, V> extends GridDistributedBaseMessa return false; switch (reader.state()) { - case 8: + case 6: keyBytes = reader.readCollection("keyBytes", MessageCollectionItemType.BYTE_ARR); if (!reader.isLastRead()) @@ -171,7 +171,7 @@ public class GridDistributedUnlockRequest<K, V> extends GridDistributedBaseMessa /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 9; + return 7; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30fef4a0/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 de7996b..d4c0350 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 @@ -371,7 +371,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { return false; switch (reader.state()) { - case 22: + case 18: accessTtl = reader.readLong("accessTtl"); if (!reader.isLastRead()) @@ -403,7 +403,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { reader.incrementState(); - case 27: + case 22: preloadKeys = reader.readBitSet("preloadKeys"); if (!reader.isLastRead()) @@ -447,7 +447,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 31; + return 26; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30fef4a0/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 e812b67..b6a57e5 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,7 +213,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> } switch (writer.state()) { - case 11: + case 9: if (!writer.writeCollection("invalidParts", invalidParts, MessageCollectionItemType.INT)) return false; @@ -225,13 +225,13 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> writer.incrementState(); - case 13: + case 11: if (!writer.writeCollection("nearEvictedBytes", nearEvictedBytes, MessageCollectionItemType.BYTE_ARR)) return false; writer.incrementState(); - case 14: + case 12: if (!writer.writeCollection("preloadEntriesBytes", preloadEntriesBytes, MessageCollectionItemType.BYTE_ARR)) return false; @@ -253,7 +253,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> return false; switch (reader.state()) { - case 11: + case 9: invalidParts = reader.readCollection("invalidParts", MessageCollectionItemType.INT); if (!reader.isLastRead()) @@ -269,7 +269,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> reader.incrementState(); - case 13: + case 11: nearEvictedBytes = reader.readCollection("nearEvictedBytes", MessageCollectionItemType.BYTE_ARR); if (!reader.isLastRead()) @@ -277,7 +277,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> reader.incrementState(); - case 14: + case 12: preloadEntriesBytes = reader.readCollection("preloadEntriesBytes", MessageCollectionItemType.BYTE_ARR); if (!reader.isLastRead()) @@ -297,7 +297,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 15; + return 13; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30fef4a0/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 2cd9ead..d9e8b18 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 @@ -236,6 +236,12 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest writer.incrementState(); + case 18: + if (!writer.writeUuid("nearNodeId", nearNodeId)) + return false; + + writer.incrementState(); + case 19: if (!writer.writeUuid("subjId", subjId)) return false; @@ -282,6 +288,14 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest return false; switch (reader.state()) { + case 15: + checkCommitted = reader.readBoolean("checkCommitted"); + + if (!reader.isLastRead()) + return false; + + reader.incrementState(); + case 16: byte isolationOrd; @@ -362,6 +376,6 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 28; + return 24; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30fef4a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java index a2959e3..03b8227 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java @@ -173,6 +173,6 @@ public class GridDhtTxFinishResponse<K, V> extends GridDistributedTxFinishRespon /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 6; + return 7; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30fef4a0/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 5783929..795764f 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 @@ -520,6 +520,6 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 35; + return 31; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30fef4a0/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 2864d63..c00c141 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 @@ -227,7 +227,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp writer.incrementState(); - case 11: + case 9: if (!writer.writeCollection("invalidParts", invalidParts, MessageCollectionItemType.INT)) return false; @@ -239,13 +239,13 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp writer.incrementState(); - case 13: + case 11: if (!writer.writeCollection("nearEvictedBytes", nearEvictedBytes, MessageCollectionItemType.BYTE_ARR)) return false; writer.incrementState(); - case 14: + case 12: if (!writer.writeCollection("preloadEntriesBytes", preloadEntriesBytes, MessageCollectionItemType.BYTE_ARR)) return false; @@ -267,7 +267,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp return false; switch (reader.state()) { - case 9: + case 8: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -275,7 +275,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp reader.incrementState(); - case 11: + case 9: invalidParts = reader.readCollection("invalidParts", MessageCollectionItemType.INT); if (!reader.isLastRead()) @@ -291,7 +291,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp reader.incrementState(); - case 13: + case 11: nearEvictedBytes = reader.readCollection("nearEvictedBytes", MessageCollectionItemType.BYTE_ARR); if (!reader.isLastRead()) @@ -299,7 +299,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp reader.incrementState(); - case 14: + case 12: preloadEntriesBytes = reader.readCollection("preloadEntriesBytes", MessageCollectionItemType.BYTE_ARR); if (!reader.isLastRead()) @@ -319,6 +319,6 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 15; + return 13; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30fef4a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java index 6fec0ef..911609b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java @@ -118,7 +118,7 @@ public class GridDhtUnlockRequest<K, V> extends GridDistributedUnlockRequest<K, } switch (writer.state()) { - case 9: + case 7: if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, MessageCollectionItemType.BYTE_ARR)) return false; @@ -140,7 +140,7 @@ public class GridDhtUnlockRequest<K, V> extends GridDistributedUnlockRequest<K, return false; switch (reader.state()) { - case 9: + case 7: nearKeyBytes = reader.readCollection("nearKeyBytes", MessageCollectionItemType.BYTE_ARR); if (!reader.isLastRead()) @@ -160,6 +160,6 @@ public class GridDhtUnlockRequest<K, V> extends GridDistributedUnlockRequest<K, /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 10; + return 8; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30fef4a0/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 41061b7..6bc286e 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 @@ -450,7 +450,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> reader.incrementState(); - case 30: + case 25: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -494,7 +494,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 34; + return 29; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30fef4a0/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 f620163..f7478b9 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,7 +170,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V } switch (writer.state()) { - case 11: + case 9: if (!writer.writeObjectArray("dhtVers", dhtVers, MessageCollectionItemType.MSG)) return false; @@ -182,7 +182,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V writer.incrementState(); - case 13: + case 11: if (!writer.writeObjectArray("mappedVers", mappedVers, MessageCollectionItemType.MSG)) return false; @@ -193,6 +193,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V return false; writer.incrementState(); + } return true; @@ -209,7 +210,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V return false; switch (reader.state()) { - case 11: + case 9: dhtVers = reader.readObjectArray("dhtVers", MessageCollectionItemType.MSG, GridCacheVersion.class); if (!reader.isLastRead()) @@ -225,7 +226,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V reader.incrementState(); - case 13: + case 11: mappedVers = reader.readObjectArray("mappedVers", MessageCollectionItemType.MSG, GridCacheVersion.class); if (!reader.isLastRead()) @@ -240,6 +241,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V return false; reader.incrementState(); + } return true; @@ -252,7 +254,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 16; + return 13; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30fef4a0/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 029e464..6ebcb59 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 @@ -272,7 +272,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 25; + return 21; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30fef4a0/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 ac52e90..66653ad 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 @@ -421,7 +421,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 33; + return 29; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30fef4a0/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 72f5fe6..a119288 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 @@ -292,7 +292,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes writer.incrementState(); - case 13: + case 11: if (!writer.writeCollection("invalidParts", invalidParts, MessageCollectionItemType.INT)) return false; @@ -304,13 +304,13 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes writer.incrementState(); - case 15: + case 13: if (!writer.writeCollection("ownedValsBytes", ownedValsBytes, MessageCollectionItemType.BYTE_ARR)) return false; writer.incrementState(); - case 17: + case 14: if (!writer.writeByteArray("retValBytes", retValBytes)) return false; @@ -356,7 +356,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes reader.incrementState(); - case 13: + case 11: invalidParts = reader.readCollection("invalidParts", MessageCollectionItemType.INT); if (!reader.isLastRead()) @@ -372,7 +372,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes reader.incrementState(); - case 15: + case 13: ownedValsBytes = reader.readCollection("ownedValsBytes", MessageCollectionItemType.BYTE_ARR); if (!reader.isLastRead()) @@ -380,7 +380,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes reader.incrementState(); - case 17: + case 14: retValBytes = reader.readByteArray("retValBytes"); if (!reader.isLastRead()) @@ -400,7 +400,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 18; + return 15; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30fef4a0/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 0b9df12..7116272 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 @@ -83,7 +83,7 @@ public class GridNearUnlockRequest<K, V> extends GridDistributedUnlockRequest<K, /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 9; + return 7; } /** {@inheritDoc} */
