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 9E410200C61 for ; Mon, 10 Apr 2017 17:55:10 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9CF97160BCA; Mon, 10 Apr 2017 15:55:10 +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 EB4E1160BB0 for ; Mon, 10 Apr 2017 17:55:09 +0200 (CEST) Received: (qmail 46844 invoked by uid 500); 10 Apr 2017 15:55:09 -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 46352 invoked by uid 99); 10 Apr 2017 15:55:08 -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; Mon, 10 Apr 2017 15:55:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 83B71F21A5; Mon, 10 Apr 2017 15:55:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.apache.org Date: Mon, 10 Apr 2017 15:55:19 -0000 Message-Id: In-Reply-To: <6249ec11a1c540ac927d10c6995c825f@git.apache.org> References: <6249ec11a1c540ac927d10c6995c825f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/53] [abbrv] ignite git commit: ignite-4535 : Fixed DHT cache size calculation. archived-at: Mon, 10 Apr 2017 15:55:10 -0000 ignite-4535 : Fixed DHT cache size calculation. (cherry picked from commit 06c845c) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/952c0efd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/952c0efd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/952c0efd Branch: refs/heads/ignite-3477-master Commit: 952c0efd12d2b90b3b519a999ae0fd6935b84274 Parents: 0756bb8 Author: Ilya Lantukh Authored: Fri Mar 24 14:30:00 2017 +0300 Committer: Ilya Lantukh Committed: Thu Mar 30 16:20:52 2017 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtCacheAdapter.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/952c0efd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java index e85dcf7..7e6ae81 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java @@ -569,6 +569,21 @@ public abstract class GridDhtCacheAdapter extends GridDistributedCacheAdap } /** {@inheritDoc} */ + @Override public int size() { + return (int)sizeLong(); + } + + /** {@inheritDoc} */ + @Override public long sizeLong() { + long sum = 0; + + for (GridDhtLocalPartition p : topology().currentLocalPartitions()) + sum += p.dataStore().size(); + + return sum; + } + + /** {@inheritDoc} */ @Override public int primarySize() { return (int)primarySizeLong(); } @@ -581,7 +596,7 @@ public abstract class GridDhtCacheAdapter extends GridDistributedCacheAdap for (GridDhtLocalPartition p : topology().currentLocalPartitions()) { if (p.primary(topVer)) - sum += p.publicSize(); + sum += p.dataStore().size(); } return sum;