You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/05/20 00:34:54 UTC
[3/6] git commit: fix split generation regression patch by Bartomiej
Romaski; reviewed by jbellis for CASSANDRA-4259
fix split generation regression
patch by Bartomiej Romaski; reviewed by jbellis for CASSANDRA-4259
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39dd8550
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39dd8550
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39dd8550
Branch: refs/heads/trunk
Commit: 39dd8550194676766a260e4bc92edebf17cf8162
Parents: 89e7a57
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat May 19 17:25:07 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat May 19 17:25:07 2012 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/io/sstable/SSTableReader.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/39dd8550/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fe448f2..6a00d41 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.1.1-dev
+ * (Hadoop) fix split generation regression (CASSANDRA-4259)
* ignore min/max compactions settings in LCS, while preserving
behavior that min=max=0 disables autocompaction (CASSANDRA-4233)
* log number of rows read from saved cache (CASSANDRA-4249)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/39dd8550/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 2482188..98058e8 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@ -505,10 +505,10 @@ public class SSTableReader extends SSTable
if (samples.isEmpty())
return positions;
- for (Range<Token> range : Range.<Token>normalize(ranges))
+ for (Range<Token> range : Range.normalize(ranges))
{
RowPosition leftPosition = range.left.maxKeyBound();
- RowPosition rightPosition = range.left.maxKeyBound();
+ RowPosition rightPosition = range.right.maxKeyBound();
int left = Collections.binarySearch(samples, leftPosition);
if (left < 0)