Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/db900a37
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db900a37
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db900a37
Branch: refs/heads/trunk
Commit: db900a37465d4e3a0c915d16725c890f3ee375e9
Parents: 04f351d f7856c2
Author: Tyler Hobbs <[email protected]>
Authored: Fri Mar 27 10:04:06 2015 -0500
Committer: Tyler Hobbs <[email protected]>
Committed: Fri Mar 27 10:04:06 2015 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/io/sstable/IndexSummaryBuilder.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/db900a37/src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java
index 2e96d03,ff06c10..696bbf8
--- a/src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java
+++ b/src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java
@@@ -107,9 -107,12 +107,12 @@@ public class IndexSummaryBuilder implem
// for initializing data structures, adjust our estimates based on
the sampling level
maxExpectedEntries = Math.max(1, (maxExpectedEntries * samplingLevel)
/ BASE_SAMPLING_LEVEL);
- offsets = new SafeMemoryWriter(4 *
maxExpectedEntries).withByteOrder(ByteOrder.nativeOrder());
- entries = new SafeMemoryWriter(40 *
maxExpectedEntries).withByteOrder(ByteOrder.nativeOrder());
+ offsets = new SafeMemoryWriter(4 *
maxExpectedEntries).order(ByteOrder.nativeOrder());
+ entries = new SafeMemoryWriter(40 *
maxExpectedEntries).order(ByteOrder.nativeOrder());
- setNextSamplePosition(-minIndexInterval);
+
+ // the summary will always contain the first index entry
(downsampling will never remove it)
+ nextSamplePosition = 0;
+ indexIntervalMatches++;
}
// the index file has been flushed to the provided position; stash it and
use that to recalculate our max readable boundary
