You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/04/10 18:25:33 UTC
git commit: Fix ABSC.SearchIterator#next() (CASSANDRA-6933 follow-up)
Repository: cassandra
Updated Branches:
refs/heads/trunk f6671a7ac -> 333986428
Fix ABSC.SearchIterator#next() (CASSANDRA-6933 follow-up)
patch by Benedict Elliott Smith; reviewed by Aleksey Yeschenko for
CASSANDRA-6933
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/33398642
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33398642
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33398642
Branch: refs/heads/trunk
Commit: 333986428e6556f68c5889046d79afad8cb8e8f9
Parents: f6671a7
Author: Benedict Elliott Smith <gi...@sub.laerad.com>
Authored: Thu Apr 10 19:21:42 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Apr 10 19:24:10 2014 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/33398642/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java b/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
index d79edd3..dcb6a37 100644
--- a/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
+++ b/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
@@ -465,8 +465,9 @@ public class ArrayBackedSortedColumns extends ColumnFamily
// optimize for runs of sequential matches, as in CollationController
// checking to see if we've found the desired cells yet (CASSANDRA-6933)
- if (metadata.comparator.compare(name, cells[i].name()) == 0)
- return cells[i++];
+ int c = metadata.comparator.compare(name, cells[i].name());
+ if (c <= 0)
+ return c < 0 ? null : cells[i++];
// use range to manually force a better bsearch "pivot" by breaking it into two calls:
// first for i..i+range, then i+range..size if necessary.