Updated Branches: refs/heads/cassandra-2.0 e638acec9 -> b38bec79c
Paging filter empty rows too aggressively patch by slebresne; reviewed by iamaleksey for CASSANDRA-6040 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b38bec79 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b38bec79 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b38bec79 Branch: refs/heads/cassandra-2.0 Commit: b38bec79cf9b9221c7db0b5602ce57c382ff1852 Parents: e638ace Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Sep 17 15:36:13 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Sep 18 14:28:53 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/service/pager/AbstractQueryPager.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b38bec79/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 0142c53..5a2dc7f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -22,6 +22,7 @@ * Fix NPE in sstablesplit (CASSANDRA-6027) * Migrate pre-2.0 key/value/column aliases to system.schema_columns (CASSANDRA-6009) + * Paging filter empty rows too agressively (CASSANDRA-6040) Merged from 1.2: * Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982) * (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b38bec79/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 8d2e726..62cd454 100644 --- a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java +++ b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java @@ -116,7 +116,7 @@ abstract class AbstractQueryPager implements QueryPager List<Row> newResult = new ArrayList<Row>(result.size() - 1); for (Row row2 : result) { - if (row.cf == null || row.cf.getColumnCount() == 0) + if (row2.cf == null || row2.cf.getColumnCount() == 0) continue; newResult.add(row2);
