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 2013/09/10 17:24:03 UTC
[1/2] git commit: Fix merge (s/>/>= in CompositesSearcher)
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 <al...@apache.org>
Authored: Tue Sep 10 18:23:03 2013 +0300
Committer: Aleksey Yeschenko <al...@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())
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/38226121
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/38226121
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/38226121
Branch: refs/heads/trunk
Commit: 3822612182c9c1c82ce580016ad8c6de07ff99c3
Parents: 36610aa 1ff0d8e
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Sep 10 18:23:51 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Sep 10 18:23:51 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/38226121/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
----------------------------------------------------------------------