cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [1/2] git commit: Fix merge (s/>/>= in CompositesSearcher)
Date Tue, 10 Sep 2013 15:24:03 GMT
Updated Branches:
  refs/heads/trunk 36610aaf7 -> 382261218


Fix merge (s/>/>= in CompositesSearcher)


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ff0d8e9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ff0d8e9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ff0d8e9

Branch: refs/heads/trunk
Commit: 1ff0d8e9f653b7575caa0f2c09e59ff51c79a8ad
Parents: 096f2bf
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Tue Sep 10 18:23:03 2013 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Tue Sep 10 18:23:03 2013 +0300

----------------------------------------------------------------------
 .../apache/cassandra/db/index/composites/CompositesSearcher.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ff0d8e9/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java b/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
index 011839e..0c2cfbc 100644
--- a/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
+++ b/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
@@ -138,7 +138,7 @@ public class CompositesSearcher extends SecondaryIndexSearcher
                 {
                     // Did we get more columns that needed to respect the user limit?
                     // (but we still need to return what has been fetched already)
-                    if (columnsCount > limit)
+                    if (columnsCount >= limit)
                         return makeReturn(currentKey, data);
 
                     if (indexColumns == null || indexColumns.isEmpty())


Mime
View raw message