You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/12/20 09:45:18 UTC
[1/2] git commit: Fix tests
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 <sy...@datastax.com>
Authored: Fri Dec 20 09:44:38 2013 +0100
Committer: Sylvain Lebresne <sy...@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();
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by sl...@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/fb603774
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb603774
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb603774
Branch: refs/heads/trunk
Commit: fb60377442b893590a663d1decd079d7dcb1f055
Parents: 1f7a5d1 4d36bbf
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Dec 20 09:44:58 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Dec 20 09:44:58 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/fb603774/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
----------------------------------------------------------------------