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 09D9C179C7 for ; Thu, 18 Jun 2015 19:48:21 +0000 (UTC) Received: (qmail 35366 invoked by uid 500); 18 Jun 2015 19:48:21 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 35336 invoked by uid 500); 18 Jun 2015 19:48:20 -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 35327 invoked by uid 99); 18 Jun 2015 19:48:20 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Jun 2015 19:48:20 +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 666241A5C7F for ; Thu, 18 Jun 2015 19:48:20 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-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 go44BKpczBF5 for ; Thu, 18 Jun 2015 19:48:12 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 203A428B2F for ; Thu, 18 Jun 2015 19:48:12 +0000 (UTC) Received: (qmail 34758 invoked by uid 99); 18 Jun 2015 19:48:12 -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; Thu, 18 Jun 2015 19:48:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F1931E3C9A; Thu, 18 Jun 2015 19:48:11 +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: Thu, 18 Jun 2015 19:48:39 -0000 Message-Id: In-Reply-To: <411c4853d96a433eaaf919fef45d8aae@git.apache.org> References: <411c4853d96a433eaaf919fef45d8aae@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [29/50] incubator-ignite git commit: ignite-484-1 - get rid of owning future ignite-484-1 - get rid of owning future Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/68c35e73 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/68c35e73 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/68c35e73 Branch: refs/heads/ignite-980 Commit: 68c35e734b3754460c4ad807e154ea94066600a0 Parents: 642f1c7 Author: S.Vladykin Authored: Wed Jun 17 15:24:13 2015 +0300 Committer: S.Vladykin Committed: Wed Jun 17 15:24:13 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/GridDhtLocalPartition.java | 19 ------------------- 1 file changed, 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/68c35e73/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java index 1392f5e..3a577a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java @@ -70,10 +70,6 @@ public class GridDhtLocalPartition implements Comparable, @GridToStringExclude private final GridFutureAdapter rent; - /** Rent future. */ - @GridToStringExclude - private final GridFutureAdapter own; - /** Entries map. */ private final ConcurrentMap map; @@ -118,12 +114,6 @@ public class GridDhtLocalPartition implements Comparable, } }; - own = new GridFutureAdapter() { - @Override public String toString() { - return "PartitionOwnFuture [part=" + GridDhtLocalPartition.this + ", map=" + map + ']'; - } - }; - map = new ConcurrentHashMap8<>(cctx.config().getStartSize() / cctx.affinity().partitions()); @@ -426,8 +416,6 @@ public class GridDhtLocalPartition implements Comparable, // No need to keep history any more. evictHist = null; - own.onDone(); - return true; } } @@ -462,13 +450,6 @@ public class GridDhtLocalPartition implements Comparable, } /** - * @return The future which will be completed when partition will have state {@link GridDhtPartitionState#OWNING}. - */ - public IgniteInternalFuture owningFuture() { - return own; - } - - /** * @param updateSeq Update sequence. * @return Future for evict attempt. */