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 82074D405 for ; Tue, 31 Jul 2012 16:20:43 +0000 (UTC) Received: (qmail 13300 invoked by uid 500); 31 Jul 2012 16:20:43 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 13278 invoked by uid 500); 31 Jul 2012 16:20:43 -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 13257 invoked by uid 99); 31 Jul 2012 16:20:43 -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, 31 Jul 2012 16:20:43 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id ED3301A72C; Tue, 31 Jul 2012 16:20:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: fix CFRR iterating through resultset consisting entirely of tombstones patch by jbellis; tested by Niel Drummand and reviewed by Brandon Williams for CASSANDRA-4466 Message-Id: <20120731162042.ED3301A72C@tyr.zones.apache.org> Date: Tue, 31 Jul 2012 16:20:42 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.0 4f0237acd -> 8b6ce324b fix CFRR iterating through resultset consisting entirely of tombstones patch by jbellis; tested by Niel Drummand and reviewed by Brandon Williams for CASSANDRA-4466 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b6ce324 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b6ce324 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b6ce324 Branch: refs/heads/cassandra-1.0 Commit: 8b6ce324bf35210196e0f0ec0665ba87b0f3991f Parents: 813553b Author: Jonathan Ellis Authored: Tue Jul 31 10:41:26 2012 -0500 Committer: Jonathan Ellis Committed: Tue Jul 31 10:47:14 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 5 +++++ .../cassandra/hadoop/ColumnFamilyRecordReader.java | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b6ce324/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index c708aea..222081b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,8 @@ +1.0.12 + * (Hadoop) fix iterating through a resultset consisting entirely + of tombstoned rows (CASSANDRA-4466) + + 1.0.11 * allow dropping columns shadowed by not-yet-expired supercolumn or row tombstones in PrecompactedRow (CASSANDRA-4396) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b6ce324/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java index 5d0ac72..20d6068 100644 --- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java +++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java @@ -307,18 +307,21 @@ public class ColumnFamilyRecordReader extends RecordReader it = rows.iterator(); - while (it.hasNext()) + KeySlice ks; + do { - KeySlice ks = it.next(); + ks = it.next(); if (ks.getColumnsSize() == 0) { it.remove(); } - } + } while (it.hasNext()); // all ghosts, spooky if (rows.isEmpty()) { + // maybeInit assumes it can get the start-with key from the rows collection, so add back the last + rows.add(ks); maybeInit(); return; }