Updated Branches: refs/heads/trunk fc8b76f79 -> 2de07250d
use index interval from index summary patch by yukim; reviewed by jbellis for CASSANDRA-5731 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2de07250 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2de07250 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2de07250 Branch: refs/heads/trunk Commit: 2de07250d1235a4e9e7fac0ac1a2a45784d2a3ab Parents: fc8b76f Author: Yuki Morishita <yu...@apache.org> Authored: Mon Jul 8 13:50:21 2013 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Mon Jul 8 13:50:32 2013 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/io/sstable/SSTableReader.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2de07250/src/java/org/apache/cassandra/io/sstable/SSTableReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java index 81f83d1..c4f32cb 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java @@ -112,7 +112,7 @@ public class SSTableReader extends SSTable for (SSTableReader sstable : sstables) { int indexKeyCount = sstable.getKeySampleSize(); - count = count + (indexKeyCount + 1) * metadata.getIndexInterval(); + count = count + (indexKeyCount + 1) * sstable.indexSummary.getIndexInterval(); if (logger.isDebugEnabled()) logger.debug("index size for bloom filter calc for file : " + sstable.getFilename() + " : " + count); } @@ -556,7 +556,7 @@ public class SSTableReader extends SSTable */ public long estimatedKeys() { - return indexSummary.size() * metadata.getIndexInterval(); + return indexSummary.size() * indexSummary.getIndexInterval(); } /** @@ -569,7 +569,7 @@ public class SSTableReader extends SSTable List<Pair<Integer, Integer>> sampleIndexes = getSampleIndexesForRanges(indexSummary, ranges); for (Pair<Integer, Integer> sampleIndexRange : sampleIndexes) sampleKeyCount += (sampleIndexRange.right - sampleIndexRange.left + 1); - return Math.max(1, sampleKeyCount * metadata.getIndexInterval()); + return Math.max(1, sampleKeyCount * indexSummary.getIndexInterval()); } /** @@ -825,12 +825,12 @@ public class SSTableReader extends SSTable // of the next interval). int i = 0; Iterator<FileDataInput> segments = ifile.iterator(sampledPosition, INDEX_FILE_BUFFER_BYTES); - while (segments.hasNext() && i <= metadata.getIndexInterval()) + while (segments.hasNext() && i <= indexSummary.getIndexInterval()) { FileDataInput in = segments.next(); try { - while (!in.isEOF() && i <= metadata.getIndexInterval()) + while (!in.isEOF() && i <= indexSummary.getIndexInterval()) { i++;
