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/cassandra-2.0.0 Commit: f30629b83fb14b6a93e38d440f79a16200cfcef2 Parents: 88fea9f 23d7bd8 Author: Jonathan Ellis <[email protected]> Authored: Thu Aug 8 11:15:54 2013 -0500 Committer: Jonathan Ellis <[email protected]> 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(); } /**
