Repository: cassandra Updated Branches: refs/heads/trunk 4f62eb953 -> f91aad465
Fix static_columns_paging_test upgrade dtest patch by slebresne; reviewed by blerer for CASSANDRA-10376 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/00b7efa6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00b7efa6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00b7efa6 Branch: refs/heads/trunk Commit: 00b7efa6ff68fc533925ebeb0e956c8a130d0b09 Parents: 73781a9 Author: Sylvain Lebresne <[email protected]> Authored: Fri Oct 2 17:02:43 2015 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Oct 26 10:28:29 2015 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ReadCommand.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/00b7efa6/src/java/org/apache/cassandra/db/ReadCommand.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java index f29a009..3b1f8a8 100644 --- a/src/java/org/apache/cassandra/db/ReadCommand.java +++ b/src/java/org/apache/cassandra/db/ReadCommand.java @@ -1583,7 +1583,11 @@ public abstract class ReadCommand implements ReadQuery { SortedSet<Clustering> requestedRows = filter.requestedRows(); Slices slices; - if (requestedRows.isEmpty() || requestedRows.size() == 1 && requestedRows.first().size() == 0) + if (requestedRows.isEmpty()) + { + slices = Slices.NONE; + } + else if (requestedRows.size() == 1 && requestedRows.first().size() == 0) { slices = Slices.ALL; }
