Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E21071790D for ; Tue, 31 Mar 2015 08:51:50 +0000 (UTC) Received: (qmail 86092 invoked by uid 500); 31 Mar 2015 08:51:50 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 85954 invoked by uid 500); 31 Mar 2015 08:51:50 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 85642 invoked by uid 99); 31 Mar 2015 08:51:50 -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, 31 Mar 2015 08:51:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 620B9E2F19; Tue, 31 Mar 2015 08:51:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: snazy@apache.org To: commits@cassandra.apache.org Date: Tue, 31 Mar 2015 08:51:55 -0000 Message-Id: <5232e9754bac4d15889ce19dde2a26d1@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] cassandra git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f91cfc7e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f91cfc7e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f91cfc7e Branch: refs/heads/trunk Commit: f91cfc7e400fc446f248d2eddae72b5e589a4372 Parents: f6217ae 3575cd3 Author: Robert Stupp Authored: Tue Mar 31 10:50:46 2015 +0200 Committer: Robert Stupp Committed: Tue Mar 31 10:51:07 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 5 +++++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f91cfc7e/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f91cfc7e/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 7f1bf98,430259e..dbd55a0 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@@ -1356,6 -1368,11 +1356,11 @@@ public class ColumnFamilyStore implemen for (Pair position : positions) expectedFileSize += position.right - position.left; } + - double compressionRatio = getCompressionRatio(); ++ double compressionRatio = metric.compressionRatio.getValue(); + if (compressionRatio > 0d) + expectedFileSize *= compressionRatio; + return expectedFileSize; }