Fix bad merge (commit: 88b9d95165b5f83896be740bcfff260ff8e2009d)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/444a5515 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/444a5515 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/444a5515 Branch: refs/heads/trunk Commit: 444a5515bad8b6ab57a3489f0ea0563115eeacb4 Parents: 2513480 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Mar 6 18:22:03 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Mar 12 18:56:22 2013 +0100 ---------------------------------------------------------------------- .../apache/cassandra/db/SliceFromReadCommand.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/444a5515/src/java/org/apache/cassandra/db/SliceFromReadCommand.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/SliceFromReadCommand.java b/src/java/org/apache/cassandra/db/SliceFromReadCommand.java index a9bbaf0..889038d 100644 --- a/src/java/org/apache/cassandra/db/SliceFromReadCommand.java +++ b/src/java/org/apache/cassandra/db/SliceFromReadCommand.java @@ -77,8 +77,9 @@ public class SliceFromReadCommand extends ReadCommand int count = filter.count; // We generate a retry if at least one node reply with count live columns but after merge we have less - // than the total number of column we are interested in (which may be < count on a retry) - if (maxLiveColumns >= count) + // than the total number of column we are interested in (which may be < count on a retry). + // So in particular, if no host returned count live columns, we know it's not a short read. + if (maxLiveColumns < count) return null; int liveCountInRow = row == null || row.cf == null ? 0 : filter.getLiveCount(row.cf);
