Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 197D999EF for ; Tue, 12 Mar 2013 18:03:10 +0000 (UTC) Received: (qmail 12219 invoked by uid 500); 12 Mar 2013 18:03:09 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 12058 invoked by uid 500); 12 Mar 2013 18:03:09 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 12040 invoked by uid 99); 12 Mar 2013 18:03:09 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Mar 2013 18:03:09 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7CCA9CFB4; Tue, 12 Mar 2013 18:03:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: Fix bad merge (commit: 88b9d95165b5f83896be740bcfff260ff8e2009d) Message-Id: <20130312180309.7CCA9CFB4@tyr.zones.apache.org> Date: Tue, 12 Mar 2013 18:03:09 +0000 (UTC) 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/cassandra-1.2 Commit: 444a5515bad8b6ab57a3489f0ea0563115eeacb4 Parents: 2513480 Author: Sylvain Lebresne Authored: Wed Mar 6 18:22:03 2013 +0100 Committer: Sylvain Lebresne 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);