Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 847AE18BD1 for ; Fri, 12 Jun 2015 13:40:18 +0000 (UTC) Received: (qmail 99603 invoked by uid 500); 12 Jun 2015 13:40:15 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 99570 invoked by uid 500); 12 Jun 2015 13:40:15 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 99554 invoked by uid 99); 12 Jun 2015 13:40:15 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jun 2015 13:40:15 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id C9D021A54F6 for ; Fri, 12 Jun 2015 13:40:14 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.791 X-Spam-Level: X-Spam-Status: No, score=0.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id T88KLLAytX64 for ; Fri, 12 Jun 2015 13:39:58 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id E70EA2A498 for ; Fri, 12 Jun 2015 13:39:41 +0000 (UTC) Received: (qmail 94522 invoked by uid 99); 12 Jun 2015 13:39:36 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jun 2015 13:39:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 25369E04B0; Fri, 12 Jun 2015 13:39:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 12 Jun 2015 13:40:21 -0000 Message-Id: <1c62d5bf5a3242d98f8aeb004c2d7e14@git.apache.org> In-Reply-To: <3205cdd0fed244619f0fb13cfaa4eecf@git.apache.org> References: <3205cdd0fed244619f0fb13cfaa4eecf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [47/50] [abbrv] incubator-ignite git commit: ignite-sprint-6: merge from ignite-1011 ignite-sprint-6: merge from ignite-1011 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/83a1986a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/83a1986a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/83a1986a Branch: refs/heads/ignite-950 Commit: 83a1986aec68712a8199b99bfa73babe8c26164a Parents: b087aca Author: Denis Magda Authored: Fri Jun 12 14:44:55 2015 +0300 Committer: Denis Magda Committed: Fri Jun 12 14:44:55 2015 +0300 ---------------------------------------------------------------------- .../distributed/GridCacheTxRecoveryRequest.java | 26 +++---- .../GridCacheTxRecoveryResponse.java | 14 ++-- .../distributed/GridDistributedBaseMessage.java | 77 +------------------- .../distributed/GridDistributedLockRequest.java | 54 +++++++------- .../GridDistributedLockResponse.java | 14 ++-- .../GridDistributedTxFinishRequest.java | 46 ++++++------ .../GridDistributedTxPrepareRequest.java | 62 ++++++++-------- .../GridDistributedTxPrepareResponse.java | 64 +--------------- .../GridDistributedUnlockRequest.java | 6 +- .../distributed/dht/GridDhtLockRequest.java | 72 ++++++++++++++---- .../distributed/dht/GridDhtLockResponse.java | 18 ++--- .../distributed/dht/GridDhtTxFinishRequest.java | 38 +++++----- .../dht/GridDhtTxPrepareRequest.java | 54 +++++++------- .../dht/GridDhtTxPrepareResponse.java | 22 +++--- .../distributed/dht/GridDhtUnlockRequest.java | 6 +- .../distributed/near/GridNearLockRequest.java | 58 +++++++-------- .../distributed/near/GridNearLockResponse.java | 26 +++---- .../near/GridNearTxFinishRequest.java | 26 +++---- .../near/GridNearTxPrepareRequest.java | 50 ++++++------- .../near/GridNearTxPrepareResponse.java | 46 ++++++------ .../distributed/near/GridNearUnlockRequest.java | 2 +- .../cache/transactions/IgniteTxHandler.java | 3 - .../messages/GridQueryNextPageResponse.java | 1 + 23 files changed, 348 insertions(+), 437 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java index 259c288..2f49ef4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java @@ -139,37 +139,37 @@ public class GridCacheTxRecoveryRequest extends GridDistributedBaseMessage { } switch (writer.state()) { - case 8: + case 7: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 9: + case 8: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 10: + case 9: if (!writer.writeBoolean("nearTxCheck", nearTxCheck)) return false; writer.incrementState(); - case 11: + case 10: if (!writer.writeMessage("nearXidVer", nearXidVer)) return false; writer.incrementState(); - case 12: + case 11: if (!writer.writeBoolean("sys", sys)) return false; writer.incrementState(); - case 13: + case 12: if (!writer.writeInt("txNum", txNum)) return false; @@ -191,7 +191,7 @@ public class GridCacheTxRecoveryRequest extends GridDistributedBaseMessage { return false; switch (reader.state()) { - case 8: + case 7: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -199,7 +199,7 @@ public class GridCacheTxRecoveryRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 9: + case 8: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -207,7 +207,7 @@ public class GridCacheTxRecoveryRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 10: + case 9: nearTxCheck = reader.readBoolean("nearTxCheck"); if (!reader.isLastRead()) @@ -215,7 +215,7 @@ public class GridCacheTxRecoveryRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 11: + case 10: nearXidVer = reader.readMessage("nearXidVer"); if (!reader.isLastRead()) @@ -223,7 +223,7 @@ public class GridCacheTxRecoveryRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 12: + case 11: sys = reader.readBoolean("sys"); if (!reader.isLastRead()) @@ -231,7 +231,7 @@ public class GridCacheTxRecoveryRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 13: + case 12: txNum = reader.readInt("txNum"); if (!reader.isLastRead()) @@ -251,7 +251,7 @@ public class GridCacheTxRecoveryRequest extends GridDistributedBaseMessage { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 14; + return 13; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java index e5c026a..99b676a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java @@ -102,19 +102,19 @@ public class GridCacheTxRecoveryResponse extends GridDistributedBaseMessage { } switch (writer.state()) { - case 8: + case 7: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 9: + case 8: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 10: + case 9: if (!writer.writeBoolean("success", success)) return false; @@ -136,7 +136,7 @@ public class GridCacheTxRecoveryResponse extends GridDistributedBaseMessage { return false; switch (reader.state()) { - case 8: + case 7: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -144,7 +144,7 @@ public class GridCacheTxRecoveryResponse extends GridDistributedBaseMessage { reader.incrementState(); - case 9: + case 8: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -152,7 +152,7 @@ public class GridCacheTxRecoveryResponse extends GridDistributedBaseMessage { reader.incrementState(); - case 10: + case 9: success = reader.readBoolean("success"); if (!reader.isLastRead()) @@ -172,7 +172,7 @@ public class GridCacheTxRecoveryResponse extends GridDistributedBaseMessage { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 11; + return 10; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java index 762455c..7b84f32 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java @@ -24,7 +24,6 @@ import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.plugin.extensions.communication.*; -import org.jetbrains.annotations.*; import java.io.*; import java.nio.*; @@ -55,15 +54,6 @@ public abstract class GridDistributedBaseMessage extends GridCacheMessage implem @GridToStringExclude private byte[] candsByIdxBytes; - /** Collections of local lock candidates. */ - @GridToStringInclude - @GridDirectTransient - private Map> candsByKey; - - /** Collections of local lock candidates in serialized form. */ - @GridToStringExclude - private byte[] candsByKeyBytes; - /** Committed versions with order higher than one for this message (needed for commit ordering). */ @GridToStringInclude @GridDirectCollection(GridCacheVersion.class) @@ -114,15 +104,6 @@ public abstract class GridDistributedBaseMessage extends GridCacheMessage implem if (candsByIdx != null) candsByIdxBytes = ctx.marshaller().marshal(candsByIdx); - - if (candsByKey != null) { - if (ctx.deploymentEnabled()) { - for (KeyCacheObject key : candsByKey.keySet()) - prepareObject(key, ctx); - } - - candsByKeyBytes = CU.marshal(ctx, candsByKey); - } } /** {@inheritDoc} */ @@ -131,9 +112,6 @@ public abstract class GridDistributedBaseMessage extends GridCacheMessage implem if (candsByIdxBytes != null) candsByIdx = ctx.marshaller().unmarshal(candsByIdxBytes, ldr); - - if (candsByKeyBytes != null) - candsByKey = ctx.marshaller().unmarshal(candsByKeyBytes, ldr); } /** @@ -202,39 +180,6 @@ public abstract class GridDistributedBaseMessage extends GridCacheMessage implem } /** - * @param key Candidates key. - * @param candsByKey Collection of local candidates. - */ - public void candidatesByKey(KeyCacheObject key, Collection candsByKey) { - if (this.candsByKey == null) - this.candsByKey = new HashMap<>(1, 1.0f); - - this.candsByKey.put(key, candsByKey); - } - - /** - * - * @param key Candidates key. - * @return Collection of lock candidates at given index. - */ - @Nullable public Collection candidatesByKey(KeyCacheObject key) { - assert key != null; - - if (candsByKey == null) - return null; - - return candsByKey.get(key); - } - - /** - * @return Map of candidates. - */ - public Map> candidatesByKey() { - return candsByKey == null ? - Collections.>emptyMap() : candsByKey; - } - - /** * @return Count of keys referenced in candidates array (needed only locally for optimization). */ public int keysCount() { @@ -263,24 +208,18 @@ public abstract class GridDistributedBaseMessage extends GridCacheMessage implem writer.incrementState(); case 4: - if (!writer.writeByteArray("candsByKeyBytes", candsByKeyBytes)) - return false; - - writer.incrementState(); - - case 5: if (!writer.writeCollection("committedVers", committedVers, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 6: + case 5: if (!writer.writeCollection("rolledbackVers", rolledbackVers, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 7: + case 6: if (!writer.writeMessage("ver", ver)) return false; @@ -311,14 +250,6 @@ public abstract class GridDistributedBaseMessage extends GridCacheMessage implem reader.incrementState(); case 4: - candsByKeyBytes = reader.readByteArray("candsByKeyBytes"); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - - case 5: committedVers = reader.readCollection("committedVers", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -326,7 +257,7 @@ public abstract class GridDistributedBaseMessage extends GridCacheMessage implem reader.incrementState(); - case 6: + case 5: rolledbackVers = reader.readCollection("rolledbackVers", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -334,7 +265,7 @@ public abstract class GridDistributedBaseMessage extends GridCacheMessage implem reader.incrementState(); - case 7: + case 6: ver = reader.readMessage("ver"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/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 c5ac847..ecf3259 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 @@ -321,79 +321,79 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { } switch (writer.state()) { - case 8: + case 7: if (!writer.writeByte("flags", flags)) return false; writer.incrementState(); - case 9: + case 8: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 10: + case 9: if (!writer.writeBoolean("isInTx", isInTx)) return false; writer.incrementState(); - case 11: + case 10: if (!writer.writeBoolean("isInvalidate", isInvalidate)) return false; writer.incrementState(); - case 12: + case 11: if (!writer.writeBoolean("isRead", isRead)) return false; writer.incrementState(); - case 13: + case 12: if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1)) return false; writer.incrementState(); - case 14: + case 13: if (!writer.writeCollection("keys", keys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 15: + case 14: if (!writer.writeMessage("nearXidVer", nearXidVer)) return false; writer.incrementState(); - case 16: + case 15: if (!writer.writeUuid("nodeId", nodeId)) return false; writer.incrementState(); - case 17: + case 16: if (!writer.writeBooleanArray("retVals", retVals)) return false; writer.incrementState(); - case 18: + case 17: if (!writer.writeLong("threadId", threadId)) return false; writer.incrementState(); - case 19: + case 18: if (!writer.writeLong("timeout", timeout)) return false; writer.incrementState(); - case 20: + case 19: if (!writer.writeInt("txSize", txSize)) return false; @@ -415,7 +415,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { return false; switch (reader.state()) { - case 8: + case 7: flags = reader.readByte("flags"); if (!reader.isLastRead()) @@ -423,7 +423,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 9: + case 8: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -431,7 +431,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 10: + case 9: isInTx = reader.readBoolean("isInTx"); if (!reader.isLastRead()) @@ -439,7 +439,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 11: + case 10: isInvalidate = reader.readBoolean("isInvalidate"); if (!reader.isLastRead()) @@ -447,7 +447,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 12: + case 11: isRead = reader.readBoolean("isRead"); if (!reader.isLastRead()) @@ -455,7 +455,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 13: + case 12: byte isolationOrd; isolationOrd = reader.readByte("isolation"); @@ -467,7 +467,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 14: + case 13: keys = reader.readCollection("keys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -475,7 +475,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 15: + case 14: nearXidVer = reader.readMessage("nearXidVer"); if (!reader.isLastRead()) @@ -483,7 +483,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 16: + case 15: nodeId = reader.readUuid("nodeId"); if (!reader.isLastRead()) @@ -491,7 +491,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 17: + case 16: retVals = reader.readBooleanArray("retVals"); if (!reader.isLastRead()) @@ -499,7 +499,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 18: + case 17: threadId = reader.readLong("threadId"); if (!reader.isLastRead()) @@ -507,7 +507,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 19: + case 18: timeout = reader.readLong("timeout"); if (!reader.isLastRead()) @@ -515,7 +515,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 20: + case 19: txSize = reader.readInt("txSize"); if (!reader.isLastRead()) @@ -535,7 +535,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 21; + return 20; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/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 b5e8d61..295506a 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 @@ -243,19 +243,19 @@ public class GridDistributedLockResponse extends GridDistributedBaseMessage { } switch (writer.state()) { - case 8: + case 7: if (!writer.writeByteArray("errBytes", errBytes)) return false; writer.incrementState(); - case 9: + case 8: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 10: + case 9: if (!writer.writeCollection("vals", vals, MessageCollectionItemType.MSG)) return false; @@ -277,7 +277,7 @@ public class GridDistributedLockResponse extends GridDistributedBaseMessage { return false; switch (reader.state()) { - case 8: + case 7: errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) @@ -285,7 +285,7 @@ public class GridDistributedLockResponse extends GridDistributedBaseMessage { reader.incrementState(); - case 9: + case 8: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -293,7 +293,7 @@ public class GridDistributedLockResponse extends GridDistributedBaseMessage { reader.incrementState(); - case 10: + case 9: vals = reader.readCollection("vals", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -313,7 +313,7 @@ public class GridDistributedLockResponse extends GridDistributedBaseMessage { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 11; + return 10; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/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 c524575..986e211 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 @@ -237,67 +237,67 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage { } switch (writer.state()) { - case 8: + case 7: if (!writer.writeMessage("baseVer", baseVer)) return false; writer.incrementState(); - case 9: + case 8: if (!writer.writeBoolean("commit", commit)) return false; writer.incrementState(); - case 10: + case 9: if (!writer.writeMessage("commitVer", commitVer)) return false; writer.incrementState(); - case 11: + case 10: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 12: + case 11: if (!writer.writeBoolean("invalidate", invalidate)) return false; writer.incrementState(); - case 13: + case 12: if (!writer.writeByte("plc", plc != null ? (byte)plc.ordinal() : -1)) return false; writer.incrementState(); - case 14: + case 13: if (!writer.writeBoolean("syncCommit", syncCommit)) return false; writer.incrementState(); - case 15: + case 14: if (!writer.writeBoolean("syncRollback", syncRollback)) return false; writer.incrementState(); - case 16: + case 15: if (!writer.writeBoolean("sys", sys)) return false; writer.incrementState(); - case 17: + case 16: if (!writer.writeLong("threadId", threadId)) return false; writer.incrementState(); - case 18: + case 17: if (!writer.writeInt("txSize", txSize)) return false; @@ -319,7 +319,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage { return false; switch (reader.state()) { - case 8: + case 7: baseVer = reader.readMessage("baseVer"); if (!reader.isLastRead()) @@ -327,7 +327,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 9: + case 8: commit = reader.readBoolean("commit"); if (!reader.isLastRead()) @@ -335,7 +335,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 10: + case 9: commitVer = reader.readMessage("commitVer"); if (!reader.isLastRead()) @@ -343,7 +343,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 11: + case 10: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -351,7 +351,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 12: + case 11: invalidate = reader.readBoolean("invalidate"); if (!reader.isLastRead()) @@ -359,7 +359,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 13: + case 12: byte plcOrd; plcOrd = reader.readByte("plc"); @@ -371,7 +371,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 14: + case 13: syncCommit = reader.readBoolean("syncCommit"); if (!reader.isLastRead()) @@ -379,7 +379,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 15: + case 14: syncRollback = reader.readBoolean("syncRollback"); if (!reader.isLastRead()) @@ -387,7 +387,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 16: + case 15: sys = reader.readBoolean("sys"); if (!reader.isLastRead()) @@ -395,7 +395,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 17: + case 16: threadId = reader.readLong("threadId"); if (!reader.isLastRead()) @@ -403,7 +403,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 18: + case 17: txSize = reader.readInt("txSize"); if (!reader.isLastRead()) @@ -423,7 +423,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 19; + return 18; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/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 cc2783a..3078277 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 @@ -340,91 +340,91 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage } switch (writer.state()) { - case 8: + case 7: if (!writer.writeByte("concurrency", concurrency != null ? (byte)concurrency.ordinal() : -1)) return false; writer.incrementState(); - case 9: + case 8: if (!writer.writeCollection("dhtVerKeys", dhtVerKeys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 10: + case 9: if (!writer.writeCollection("dhtVerVals", dhtVerVals, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 11: + case 10: if (!writer.writeBoolean("invalidate", invalidate)) return false; writer.incrementState(); - case 12: + case 11: if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1)) return false; writer.incrementState(); - case 13: + case 12: if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit)) return false; writer.incrementState(); - case 14: + case 13: if (!writer.writeByte("plc", plc != null ? (byte)plc.ordinal() : -1)) return false; writer.incrementState(); - case 15: + case 14: if (!writer.writeCollection("reads", reads, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 16: + case 15: if (!writer.writeBoolean("sys", sys)) return false; writer.incrementState(); - case 17: + case 16: if (!writer.writeLong("threadId", threadId)) return false; writer.incrementState(); - case 18: + case 17: if (!writer.writeLong("timeout", timeout)) return false; writer.incrementState(); - case 19: + case 18: if (!writer.writeByteArray("txNodesBytes", txNodesBytes)) return false; writer.incrementState(); - case 20: + case 19: if (!writer.writeInt("txSize", txSize)) return false; writer.incrementState(); - case 21: + case 20: if (!writer.writeMessage("writeVer", writeVer)) return false; writer.incrementState(); - case 22: + case 21: if (!writer.writeCollection("writes", writes, MessageCollectionItemType.MSG)) return false; @@ -446,7 +446,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage return false; switch (reader.state()) { - case 8: + case 7: byte concurrencyOrd; concurrencyOrd = reader.readByte("concurrency"); @@ -458,7 +458,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); - case 9: + case 8: dhtVerKeys = reader.readCollection("dhtVerKeys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -466,7 +466,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); - case 10: + case 9: dhtVerVals = reader.readCollection("dhtVerVals", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -474,7 +474,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); - case 11: + case 10: invalidate = reader.readBoolean("invalidate"); if (!reader.isLastRead()) @@ -482,7 +482,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); - case 12: + case 11: byte isolationOrd; isolationOrd = reader.readByte("isolation"); @@ -494,7 +494,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); - case 13: + case 12: onePhaseCommit = reader.readBoolean("onePhaseCommit"); if (!reader.isLastRead()) @@ -502,7 +502,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); - case 14: + case 13: byte plcOrd; plcOrd = reader.readByte("plc"); @@ -514,7 +514,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); - case 15: + case 14: reads = reader.readCollection("reads", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -522,7 +522,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); - case 16: + case 15: sys = reader.readBoolean("sys"); if (!reader.isLastRead()) @@ -530,7 +530,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); - case 17: + case 16: threadId = reader.readLong("threadId"); if (!reader.isLastRead()) @@ -538,7 +538,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); - case 18: + case 17: timeout = reader.readLong("timeout"); if (!reader.isLastRead()) @@ -546,7 +546,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); - case 19: + case 18: txNodesBytes = reader.readByteArray("txNodesBytes"); if (!reader.isLastRead()) @@ -554,7 +554,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); - case 20: + case 19: txSize = reader.readInt("txSize"); if (!reader.isLastRead()) @@ -562,7 +562,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); - case 21: + case 20: writeVer = reader.readMessage("writeVer"); if (!reader.isLastRead()) @@ -570,7 +570,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); - case 22: + case 21: writes = reader.readCollection("writes", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -590,7 +590,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 23; + return 22; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/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 adece8c..f920e48 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 @@ -22,13 +22,10 @@ import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.plugin.extensions.communication.*; -import org.jetbrains.annotations.*; import java.io.*; import java.nio.*; -import java.util.*; /** * Response to prepare request. @@ -37,14 +34,6 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage /** */ private static final long serialVersionUID = 0L; - /** Collections of local lock candidates. */ - @GridToStringInclude - @GridDirectTransient - private Map> cands; - - /** */ - private byte[] candsBytes; - /** Error. */ @GridToStringExclude @GridDirectTransient @@ -98,27 +87,11 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage return err != null; } - /** - * @param cands Candidates map to set. - */ - public void candidates(Map> cands) { - this.cands = cands; - } - /** {@inheritDoc} * @param ctx*/ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); - if (candsBytes == null && cands != null) { - if (ctx.deploymentEnabled()) { - for (KeyCacheObject k : cands.keySet()) - prepareObject(k, ctx); - } - - candsBytes = CU.marshal(ctx, cands); - } - if (err != null) errBytes = ctx.marshaller().marshal(err); } @@ -127,27 +100,10 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); - if (candsBytes != null && cands == null) - cands = ctx.marshaller().unmarshal(candsBytes, ldr); - if (errBytes != null) err = ctx.marshaller().unmarshal(errBytes, ldr); } - /** - * - * @param key Candidates key. - * @return Collection of lock candidates at given index. - */ - @Nullable public Collection candidatesForKey(KeyCacheObject key) { - assert key != null; - - if (cands == null) - return null; - - return cands.get(key); - } - /** {@inheritDoc} */ @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); @@ -163,13 +119,7 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage } switch (writer.state()) { - case 8: - if (!writer.writeByteArray("candsBytes", candsBytes)) - return false; - - writer.incrementState(); - - case 9: + case 7: if (!writer.writeByteArray("errBytes", errBytes)) return false; @@ -191,15 +141,7 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage return false; switch (reader.state()) { - case 8: - candsBytes = reader.readByteArray("candsBytes"); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - - case 9: + case 7: errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) @@ -219,7 +161,7 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 10; + return 8; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/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 c0f2472..7f31b06 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 @@ -106,7 +106,7 @@ public class GridDistributedUnlockRequest extends GridDistributedBaseMessage { } switch (writer.state()) { - case 8: + case 7: if (!writer.writeCollection("keys", keys, MessageCollectionItemType.MSG)) return false; @@ -128,7 +128,7 @@ public class GridDistributedUnlockRequest extends GridDistributedBaseMessage { return false; switch (reader.state()) { - case 8: + case 7: keys = reader.readCollection("keys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -148,7 +148,7 @@ public class GridDistributedUnlockRequest extends GridDistributedBaseMessage { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 9; + return 8; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/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 94ec718..7ce38f7 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 @@ -58,8 +58,13 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { @GridDirectTransient private Map owned; - /** Owner mapped version bytes. */ - private byte[] ownedBytes; + /** Array of keys from {@link #owned}. Used during marshalling and unmarshalling. */ + @GridToStringExclude + private KeyCacheObject[] ownedKeys; + + /** Array of values from {@link #owned}. Used during marshalling and unmarshalling. */ + @GridToStringExclude + private GridCacheVersion[] ownedValues; /** Topology version. */ private AffinityTopologyVersion topVer; @@ -295,8 +300,18 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { prepareMarshalCacheObjects(nearKeys, ctx.cacheContext(cacheId)); - if (owned != null) - ownedBytes = CU.marshal(ctx, owned); + if (owned != null) { + ownedKeys = new KeyCacheObject[owned.size()]; + ownedValues = new GridCacheVersion[ownedKeys.length]; + + int i = 0; + + for (Map.Entry entry : owned.entrySet()) { + ownedKeys[i] = entry.getKey(); + ownedValues[i] = entry.getValue(); + i++; + } + } } /** {@inheritDoc} */ @@ -305,8 +320,17 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { finishUnmarshalCacheObjects(nearKeys, ctx.cacheContext(cacheId), ldr); - if (ownedBytes != null) - owned = ctx.marshaller().unmarshal(ownedBytes, ldr); + if (ownedKeys != null) { + owned = new GridLeanMap<>(ownedKeys.length); + + for (int i = 0; i < ownedKeys.length; i++) { + ownedKeys[i].finishUnmarshal(ctx.cacheContext(cacheId).cacheObjectContext(), ldr); + owned.put(ownedKeys[i], ownedValues[i]); + } + + ownedKeys = null; + ownedValues = null; + } } /** {@inheritDoc} */ @@ -324,32 +348,38 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { } switch (writer.state()) { - case 21: + case 20: if (!writer.writeLong("accessTtl", accessTtl)) return false; writer.incrementState(); - case 22: + case 21: if (!writer.writeBitSet("invalidateEntries", invalidateEntries)) return false; writer.incrementState(); - case 23: + case 22: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 24: + case 23: if (!writer.writeCollection("nearKeys", nearKeys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); + case 24: + if (!writer.writeObjectArray("ownedKeys", ownedKeys, MessageCollectionItemType.MSG)) + return false; + + writer.incrementState(); + case 25: - if (!writer.writeByteArray("ownedBytes", ownedBytes)) + if (!writer.writeObjectArray("ownedValues", ownedValues, MessageCollectionItemType.MSG)) return false; writer.incrementState(); @@ -394,7 +424,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { return false; switch (reader.state()) { - case 21: + case 20: accessTtl = reader.readLong("accessTtl"); if (!reader.isLastRead()) @@ -402,7 +432,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 22: + case 21: invalidateEntries = reader.readBitSet("invalidateEntries"); if (!reader.isLastRead()) @@ -410,7 +440,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 23: + case 22: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -418,7 +448,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 24: + case 23: nearKeys = reader.readCollection("nearKeys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -426,8 +456,18 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); + case 24: + ownedKeys = reader.readObjectArray("ownedKeys", MessageCollectionItemType.MSG, KeyCacheObject.class); + + if (!reader.isLastRead()) + return false; + + reader.incrementState(); + case 25: - ownedBytes = reader.readByteArray("ownedBytes"); + ownedValues = reader.readObjectArray("ownedValues", + MessageCollectionItemType.MSG, + GridCacheVersion.class); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/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 bf3d974..8c9f32c 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 @@ -194,25 +194,25 @@ public class GridDhtLockResponse extends GridDistributedLockResponse { } switch (writer.state()) { - case 11: + case 10: if (!writer.writeCollection("invalidParts", invalidParts, MessageCollectionItemType.INT)) return false; writer.incrementState(); - case 12: + case 11: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 13: + case 12: if (!writer.writeCollection("nearEvicted", nearEvicted, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 14: + case 13: if (!writer.writeCollection("preloadEntries", preloadEntries, MessageCollectionItemType.MSG)) return false; @@ -234,7 +234,7 @@ public class GridDhtLockResponse extends GridDistributedLockResponse { return false; switch (reader.state()) { - case 11: + case 10: invalidParts = reader.readCollection("invalidParts", MessageCollectionItemType.INT); if (!reader.isLastRead()) @@ -242,7 +242,7 @@ public class GridDhtLockResponse extends GridDistributedLockResponse { reader.incrementState(); - case 12: + case 11: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -250,7 +250,7 @@ public class GridDhtLockResponse extends GridDistributedLockResponse { reader.incrementState(); - case 13: + case 12: nearEvicted = reader.readCollection("nearEvicted", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -258,7 +258,7 @@ public class GridDhtLockResponse extends GridDistributedLockResponse { reader.incrementState(); - case 14: + case 13: preloadEntries = reader.readCollection("preloadEntries", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -278,7 +278,7 @@ public class GridDhtLockResponse extends GridDistributedLockResponse { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 15; + return 14; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/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 7b077c3..a493ebb 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 @@ -238,55 +238,55 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { } switch (writer.state()) { - case 19: + case 18: if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1)) return false; writer.incrementState(); - case 20: + case 19: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 21: + case 20: if (!writer.writeUuid("nearNodeId", nearNodeId)) return false; writer.incrementState(); - case 22: + case 21: if (!writer.writeCollection("pendingVers", pendingVers, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 23: + case 22: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 24: + case 23: if (!writer.writeBoolean("sysInvalidate", sysInvalidate)) return false; writer.incrementState(); - case 25: + case 24: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 26: + case 25: if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); - case 27: + case 26: if (!writer.writeMessage("writeVer", writeVer)) return false; @@ -308,7 +308,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { return false; switch (reader.state()) { - case 19: + case 18: byte isolationOrd; isolationOrd = reader.readByte("isolation"); @@ -320,7 +320,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); - case 20: + case 19: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -328,7 +328,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); - case 21: + case 20: nearNodeId = reader.readUuid("nearNodeId"); if (!reader.isLastRead()) @@ -336,7 +336,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); - case 22: + case 21: pendingVers = reader.readCollection("pendingVers", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -344,7 +344,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); - case 23: + case 22: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -352,7 +352,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); - case 24: + case 23: sysInvalidate = reader.readBoolean("sysInvalidate"); if (!reader.isLastRead()) @@ -360,7 +360,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); - case 25: + case 24: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -368,7 +368,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); - case 26: + case 25: topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) @@ -376,7 +376,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); - case 27: + case 26: writeVer = reader.readMessage("writeVer"); if (!reader.isLastRead()) @@ -396,6 +396,6 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 28; + return 27; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/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 73f86fd..909080d 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 @@ -333,79 +333,79 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { } switch (writer.state()) { - case 23: + case 22: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 24: + case 23: if (!writer.writeBitSet("invalidateNearEntries", invalidateNearEntries)) return false; writer.incrementState(); - case 25: + case 24: if (!writer.writeBoolean("last", last)) return false; writer.incrementState(); - case 26: + case 25: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 27: + case 26: if (!writer.writeUuid("nearNodeId", nearNodeId)) return false; writer.incrementState(); - case 28: + case 27: if (!writer.writeCollection("nearWrites", nearWrites, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 29: + case 28: if (!writer.writeMessage("nearXidVer", nearXidVer)) return false; writer.incrementState(); - case 30: + case 29: if (!writer.writeCollection("ownedKeys", ownedKeys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 31: + case 30: if (!writer.writeCollection("ownedVals", ownedVals, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 32: + case 31: if (!writer.writeBitSet("preloadKeys", preloadKeys)) return false; writer.incrementState(); - case 33: + case 32: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 34: + case 33: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 35: + case 34: if (!writer.writeMessage("topVer", topVer)) return false; @@ -427,7 +427,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { return false; switch (reader.state()) { - case 23: + case 22: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -435,7 +435,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 24: + case 23: invalidateNearEntries = reader.readBitSet("invalidateNearEntries"); if (!reader.isLastRead()) @@ -443,7 +443,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 25: + case 24: last = reader.readBoolean("last"); if (!reader.isLastRead()) @@ -451,7 +451,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 26: + case 25: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -459,7 +459,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 27: + case 26: nearNodeId = reader.readUuid("nearNodeId"); if (!reader.isLastRead()) @@ -467,7 +467,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 28: + case 27: nearWrites = reader.readCollection("nearWrites", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -475,7 +475,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 29: + case 28: nearXidVer = reader.readMessage("nearXidVer"); if (!reader.isLastRead()) @@ -483,7 +483,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 30: + case 29: ownedKeys = reader.readCollection("ownedKeys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -491,7 +491,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 31: + case 30: ownedVals = reader.readCollection("ownedVals", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -499,7 +499,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 32: + case 31: preloadKeys = reader.readBitSet("preloadKeys"); if (!reader.isLastRead()) @@ -507,7 +507,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 33: + case 32: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -515,7 +515,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 34: + case 33: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -523,7 +523,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 35: + case 34: topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) @@ -543,6 +543,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 36; + return 35; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/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 cfec044..753c117 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 @@ -225,31 +225,31 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse { } 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, MessageCollectionItemType.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("nearEvicted", nearEvicted, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 14: + case 12: if (!writer.writeCollection("preloadEntries", preloadEntries, MessageCollectionItemType.MSG)) return false; @@ -271,7 +271,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse { return false; switch (reader.state()) { - case 10: + case 8: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -279,7 +279,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse { reader.incrementState(); - case 11: + case 9: invalidParts = reader.readCollection("invalidParts", MessageCollectionItemType.INT); if (!reader.isLastRead()) @@ -287,7 +287,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse { reader.incrementState(); - case 12: + case 10: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -295,7 +295,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse { reader.incrementState(); - case 13: + case 11: nearEvicted = reader.readCollection("nearEvicted", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -303,7 +303,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse { reader.incrementState(); - case 14: + case 12: preloadEntries = reader.readCollection("preloadEntries", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -323,6 +323,6 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 15; + return 13; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/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 1f3ba4c..f7f8167 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 @@ -110,7 +110,7 @@ public class GridDhtUnlockRequest extends GridDistributedUnlockRequest { } switch (writer.state()) { - case 9: + case 8: if (!writer.writeCollection("nearKeys", nearKeys, MessageCollectionItemType.MSG)) return false; @@ -132,7 +132,7 @@ public class GridDhtUnlockRequest extends GridDistributedUnlockRequest { return false; switch (reader.state()) { - case 9: + case 8: nearKeys = reader.readCollection("nearKeys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -152,6 +152,6 @@ public class GridDhtUnlockRequest extends GridDistributedUnlockRequest { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 10; + return 9; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/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 81184a9..4776963 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 @@ -363,85 +363,85 @@ public class GridNearLockRequest extends GridDistributedLockRequest { } switch (writer.state()) { - case 21: + case 20: if (!writer.writeLong("accessTtl", accessTtl)) return false; writer.incrementState(); - case 22: + case 21: if (!writer.writeObjectArray("dhtVers", dhtVers, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 23: + case 22: if (!writer.writeObjectArray("filter", filter, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 24: + case 23: if (!writer.writeBoolean("firstClientReq", firstClientReq)) return false; writer.incrementState(); - case 25: + case 24: if (!writer.writeBoolean("hasTransforms", hasTransforms)) return false; writer.incrementState(); - case 26: + case 25: if (!writer.writeBoolean("implicitSingleTx", implicitSingleTx)) return false; writer.incrementState(); - case 27: + case 26: if (!writer.writeBoolean("implicitTx", implicitTx)) return false; writer.incrementState(); - case 28: + case 27: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 29: + case 28: if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit)) return false; writer.incrementState(); - case 30: + case 29: if (!writer.writeBoolean("retVal", retVal)) return false; writer.incrementState(); - case 31: + case 30: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 32: + case 31: if (!writer.writeBoolean("syncCommit", syncCommit)) return false; writer.incrementState(); - case 33: + case 32: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 34: + case 33: if (!writer.writeMessage("topVer", topVer)) return false; @@ -463,7 +463,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { return false; switch (reader.state()) { - case 21: + case 20: accessTtl = reader.readLong("accessTtl"); if (!reader.isLastRead()) @@ -471,7 +471,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 22: + case 21: dhtVers = reader.readObjectArray("dhtVers", MessageCollectionItemType.MSG, GridCacheVersion.class); if (!reader.isLastRead()) @@ -479,7 +479,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 23: + case 22: filter = reader.readObjectArray("filter", MessageCollectionItemType.MSG, CacheEntryPredicate.class); if (!reader.isLastRead()) @@ -487,7 +487,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 24: + case 23: firstClientReq = reader.readBoolean("firstClientReq"); if (!reader.isLastRead()) @@ -495,7 +495,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 25: + case 24: hasTransforms = reader.readBoolean("hasTransforms"); if (!reader.isLastRead()) @@ -503,7 +503,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 26: + case 25: implicitSingleTx = reader.readBoolean("implicitSingleTx"); if (!reader.isLastRead()) @@ -511,7 +511,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 27: + case 26: implicitTx = reader.readBoolean("implicitTx"); if (!reader.isLastRead()) @@ -519,7 +519,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 28: + case 27: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -527,7 +527,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 29: + case 28: onePhaseCommit = reader.readBoolean("onePhaseCommit"); if (!reader.isLastRead()) @@ -535,7 +535,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 30: + case 29: retVal = reader.readBoolean("retVal"); if (!reader.isLastRead()) @@ -543,7 +543,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 31: + case 30: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -551,7 +551,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 32: + case 31: syncCommit = reader.readBoolean("syncCommit"); if (!reader.isLastRead()) @@ -559,7 +559,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 33: + case 32: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -567,7 +567,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 34: + case 33: topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) @@ -587,7 +587,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 35; + return 34; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a1986a/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 f324198..62002dc 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 @@ -205,37 +205,37 @@ public class GridNearLockResponse extends GridDistributedLockResponse { } switch (writer.state()) { - case 11: + case 10: if (!writer.writeMessage("clientRemapVer", clientRemapVer)) return false; writer.incrementState(); - case 12: + case 11: if (!writer.writeObjectArray("dhtVers", dhtVers, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 13: + case 12: if (!writer.writeBooleanArray("filterRes", filterRes)) return false; writer.incrementState(); - case 14: + case 13: if (!writer.writeObjectArray("mappedVers", mappedVers, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 15: + case 14: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 16: + case 15: if (!writer.writeCollection("pending", pending, MessageCollectionItemType.MSG)) return false; @@ -257,7 +257,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse { return false; switch (reader.state()) { - case 11: + case 10: clientRemapVer = reader.readMessage("clientRemapVer"); if (!reader.isLastRead()) @@ -265,7 +265,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse { reader.incrementState(); - case 12: + case 11: dhtVers = reader.readObjectArray("dhtVers", MessageCollectionItemType.MSG, GridCacheVersion.class); if (!reader.isLastRead()) @@ -273,7 +273,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse { reader.incrementState(); - case 13: + case 12: filterRes = reader.readBooleanArray("filterRes"); if (!reader.isLastRead()) @@ -281,7 +281,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse { reader.incrementState(); - case 14: + case 13: mappedVers = reader.readObjectArray("mappedVers", MessageCollectionItemType.MSG, GridCacheVersion.class); if (!reader.isLastRead()) @@ -289,7 +289,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse { reader.incrementState(); - case 15: + case 14: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -297,7 +297,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse { reader.incrementState(); - case 16: + case 15: pending = reader.readCollection("pending", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -317,7 +317,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 17; + return 16; } /** {@inheritDoc} */