cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/2] git commit: Fix tests
Date Fri, 20 Dec 2013 08:45:18 GMT
Updated Branches:
  refs/heads/trunk 1f7a5d194 -> fb6037744


Fix tests


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

Branch: refs/heads/trunk
Commit: 4d36bbfbbb1692ef6038189fdd4981f23431cef0
Parents: a462083
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Dec 20 09:44:38 2013 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Dec 20 09:44:38 2013 +0100

----------------------------------------------------------------------
 .../org/apache/cassandra/service/pager/AbstractQueryPager.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d36bbfb/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
index 6047b5b..ba4d8f2 100644
--- a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
@@ -197,7 +197,7 @@ abstract class AbstractQueryPager implements QueryPager
         }
 
         // If there is less live data than to discard, all is discarded
-        if (i >= rows.size())
+        if (toDiscard > 0 && i >= rows.size())
             return Collections.<Row>emptyList();
 
         int count = firstCf.getColumnCount();
@@ -234,7 +234,7 @@ abstract class AbstractQueryPager implements QueryPager
         }
 
         // If there is less live data than to discard, all is discarded
-        if (i < 0)
+        if (toDiscard > 0 && i < 0)
             return Collections.<Row>emptyList();
 
         int count = lastCf.getColumnCount();


Mime
View raw message