Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 04a2c2420 -> ce3ce44a5
Fix regression in DISTINCT queries w/ deletions Patch by Sam Tunnicliffe; reviewed by Tyler Hobbs as a follow-up for CASSANDRA-8717 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ce3ce44a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce3ce44a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce3ce44a Branch: refs/heads/cassandra-2.1 Commit: ce3ce44a5379f7de162b059fb99641fc4e6a344a Parents: 04a2c24 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Wed May 6 17:22:20 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Wed May 6 17:22:20 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/AbstractRangeCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce3ce44a/src/java/org/apache/cassandra/db/AbstractRangeCommand.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/AbstractRangeCommand.java b/src/java/org/apache/cassandra/db/AbstractRangeCommand.java index 959b524..8bcb5b3 100644 --- a/src/java/org/apache/cassandra/db/AbstractRangeCommand.java +++ b/src/java/org/apache/cassandra/db/AbstractRangeCommand.java @@ -62,7 +62,7 @@ public abstract class AbstractRangeCommand implements IReadCommand private List<Row> trim(List<Row> rows) { - if (countCQL3Rows()) + if (countCQL3Rows() || ignoredTombstonedPartitions()) return rows; else return rows.size() > limit() ? rows.subList(0, limit()) : rows;