Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 2ed855592 -> 1ff9df75c refs/heads/cassandra-3.0 8b32d48de -> 736a0cefb refs/heads/trunk 5e933c542 -> 0fe80fb42
Fix paging for COMPACT tables without clustering columns patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-11467 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea9b42e7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea9b42e7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea9b42e7 Branch: refs/heads/trunk Commit: ea9b42e7d7bf9003dd6ed911035d3a85a2d99bac Parents: f3b3c41 Author: Benjamin Lerer <b.le...@gmail.com> Authored: Sat Apr 2 17:55:04 2016 +0200 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Sat Apr 2 17:55:04 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- .../org/apache/cassandra/service/pager/AbstractQueryPager.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea9b42e7/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 50bc894..113da17 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,6 @@ 2.1.14 - * Fix out-of-space error treatment in memtable flushing (CASSANDRA-11448). + * Fix paging for COMPACT tables without clustering columns (CASSANDRA-11467) + * Fix out-of-space error treatment in memtable flushing (CASSANDRA-11448) * Backport CASSANDRA-10859 (CASSANDRA-11415) * COPY FROM fails when importing blob (CASSANDRA-11375) * Backport CASSANDRA-10679 (CASSANDRA-9598) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea9b42e7/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 6056b9a..8bbf6d6 100644 --- a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java +++ b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java @@ -359,6 +359,9 @@ abstract class AbstractQueryPager implements QueryPager // paging and a deletion (pretty unlikely), so this is probably acceptable. int liveCount = columnCounter().countAll(cf).live(); + if (liveCount == toDiscard) + return toDiscard; + ColumnCounter counter = columnCounter(); // Discard the last 'toDiscard' live (so stop adding as sound as we're past 'liveCount - toDiscard') while (iter.hasNext())
