Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A2A50200C30 for ; Tue, 7 Mar 2017 13:36:53 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id A1428160B74; Tue, 7 Mar 2017 12:36:53 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id EE1DF160B68 for ; Tue, 7 Mar 2017 13:36:52 +0100 (CET) Received: (qmail 18164 invoked by uid 500); 7 Mar 2017 12:36:52 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 18150 invoked by uid 99); 7 Mar 2017 12:36:52 -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; Tue, 07 Mar 2017 12:36:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C353CDFC4A; Tue, 7 Mar 2017 12:36:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Message-Id: <75069fecf6874747a94bf94f1d543dcb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: ignite-4768 Date: Tue, 7 Mar 2017 12:36:51 +0000 (UTC) archived-at: Tue, 07 Mar 2017 12:36:53 -0000 Repository: ignite Updated Branches: refs/heads/ignite-4768 ca67537f3 -> 0f069f8d6 ignite-4768 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0f069f8d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0f069f8d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0f069f8d Branch: refs/heads/ignite-4768 Commit: 0f069f8d6d24b0bea4197f3249f42c1ded8d1923 Parents: ca67537 Author: sboikov Authored: Tue Mar 7 15:36:45 2017 +0300 Committer: sboikov Committed: Tue Mar 7 15:36:45 2017 +0300 ---------------------------------------------------------------------- .../near/GridNearTxPrepareRequest.java | 33 +++++--------------- 1 file changed, 7 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0f069f8d/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 c9ab48f..86f7060 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 @@ -66,11 +66,6 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { /** Topology version. */ private AffinityTopologyVersion topVer; - /** IDs of backup nodes receiving last prepare request during this prepare. */ - @GridDirectCollection(UUID.class) - @GridToStringInclude - private Collection lastBackups; - /** Subject ID. */ private UUID subjId; @@ -306,30 +301,24 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { writer.incrementState(); case 22: - if (!writer.writeCollection("lastBackups", lastBackups, MessageCollectionItemType.UUID)) - return false; - - writer.incrementState(); - - case 23: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 24: + case 23: if (!writer.writeUuid("subjId", subjId)) 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; @@ -368,14 +357,6 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); case 22: - lastBackups = reader.readCollection("lastBackups", MessageCollectionItemType.UUID); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - - case 23: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -383,7 +364,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 24: + case 23: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -391,7 +372,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 25: + case 24: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -399,7 +380,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 26: + case 25: topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) @@ -419,7 +400,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 27; + return 26; } /** {@inheritDoc} */