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 352A4189C4 for ; Thu, 7 Jan 2016 21:19:38 +0000 (UTC) Received: (qmail 81039 invoked by uid 500); 7 Jan 2016 21:19:37 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 80972 invoked by uid 500); 7 Jan 2016 21:19:37 -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 80269 invoked by uid 99); 7 Jan 2016 21:19:37 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jan 2016 21:19:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DD294E3828; Thu, 7 Jan 2016 21:19:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Thu, 07 Jan 2016 21:19:39 -0000 Message-Id: <1ef1ded72bb94603a827fd515f78659f@git.apache.org> In-Reply-To: <86a1db6d45c64fa4a056cc45b05e3547@git.apache.org> References: <86a1db6d45c64fa4a056cc45b05e3547@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/8] cassandra git commit: Fix regression of CASSANDRA-7392 Fix regression of CASSANDRA-7392 patch by blambov; reviewed by yukim for CASSANDRA-10951 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3c6dfa4a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c6dfa4a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3c6dfa4a Branch: refs/heads/trunk Commit: 3c6dfa4aa0b9ffb0a48a02b949bff2a8406764e6 Parents: aeaa501 Author: Branimir Lambov Authored: Thu Jan 7 15:16:26 2016 -0600 Committer: Yuki Morishita Committed: Thu Jan 7 15:16:26 2016 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ReadCommand.java | 21 ++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3c6dfa4a/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 959085b..90372dd 100644 --- a/src/java/org/apache/cassandra/db/ReadCommand.java +++ b/src/java/org/apache/cassandra/db/ReadCommand.java @@ -479,23 +479,32 @@ public abstract class ReadCommand extends MonitorableImpl implements ReadQuery { protected BaseRowIterator applyToPartition(BaseRowIterator partition) { - maybeAbort(); + if (maybeAbort()) + { + partition.close(); + return null; + } + return partition; } protected Row applyToRow(Row row) { - maybeAbort(); - return row; + return maybeAbort() ? null : row; } - private void maybeAbort() + private boolean maybeAbort() { + if (TEST_ITERATION_DELAY_MILLIS > 0) + maybeDelayForTesting(); + if (isAborted()) + { stop(); + return true; + } - if (TEST_ITERATION_DELAY_MILLIS > 0) - maybeDelayForTesting(); + return false; } }