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 CDB6710A11 for ; Thu, 8 Aug 2013 16:34:04 +0000 (UTC) Received: (qmail 36707 invoked by uid 500); 8 Aug 2013 16:34:01 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 36565 invoked by uid 500); 8 Aug 2013 16:34:01 -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 35935 invoked by uid 99); 8 Aug 2013 16:33:55 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Aug 2013 16:33:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 30ACD835FC7; Thu, 8 Aug 2013 16:33:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Thu, 08 Aug 2013 16:34:02 -0000 Message-Id: <8736755f95454828bbc979868d36fee0@git.apache.org> In-Reply-To: <5ffb917cc2ac451da41a6979bef8c26c@git.apache.org> References: <5ffb917cc2ac451da41a6979bef8c26c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/16] git commit: merge from 1.2 merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f30629b8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f30629b8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f30629b8 Branch: refs/heads/trunk Commit: f30629b83fb14b6a93e38d440f79a16200cfcef2 Parents: 88fea9f 23d7bd8 Author: Jonathan Ellis Authored: Thu Aug 8 11:15:54 2013 -0500 Committer: Jonathan Ellis Committed: Thu Aug 8 11:15:54 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f30629b8/src/java/org/apache/cassandra/io/sstable/SSTableReader.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/io/sstable/SSTableReader.java index e30e417,412e4c1..31a40cb --- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java @@@ -594,7 -597,7 +594,7 @@@ public class SSTableReader extends SSTa */ public long estimatedKeys() { - return indexSummary.size() * indexSummary.getIndexInterval(); - return ((long) indexSummary.size()) * DatabaseDescriptor.getIndexInterval(); ++ return ((long) indexSummary.size()) * indexSummary.getIndexInterval(); } /**