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 78257D57D for ; Fri, 29 Jun 2012 16:32:27 +0000 (UTC) Received: (qmail 90353 invoked by uid 500); 29 Jun 2012 16:32:27 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 90311 invoked by uid 500); 29 Jun 2012 16:32:27 -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 90302 invoked by uid 99); 29 Jun 2012 16:32:27 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Jun 2012 16:32:27 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E97038CD8; Fri, 29 Jun 2012 16:32:26 +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: git commit: SSTableNamesIterator misses some tombstones Message-Id: <20120629163226.E97038CD8@tyr.zones.apache.org> Date: Fri, 29 Jun 2012 16:32:26 +0000 (UTC) Updated Branches: refs/heads/trunk 6d5d91eec -> ce807c6a2 SSTableNamesIterator misses some tombstones patch by slebresne; reviewed by yukim for CASSANDRA-4395 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ce807c6a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce807c6a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce807c6a Branch: refs/heads/trunk Commit: ce807c6a22068edbed78d76367e9b35bd883fa77 Parents: 6d5d91e Author: Sylvain Lebresne Authored: Fri Jun 29 18:31:43 2012 +0200 Committer: Sylvain Lebresne Committed: Fri Jun 29 18:31:43 2012 +0200 ---------------------------------------------------------------------- .../db/columniterator/SSTableNamesIterator.java | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce807c6a/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java b/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java index 6a8cb33..1225e60 100644 --- a/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java +++ b/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java @@ -202,11 +202,18 @@ public class SSTableNamesIterator extends SimpleAbstractColumnIterator implement for (int i = 0; i < columns; i++) { OnDiskAtom column = atomSerializer.deserializeFromSSTable(file, sstable.descriptor.version); - if (columnNames.contains(column.name())) + if (column instanceof IColumn) + { + if (columnNames.contains(column.name())) + { + result.add(column); + if (n++ > filteredColumnNames.size()) + break; + } + } + else { result.add(column); - if (n++ > filteredColumnNames.size()) - break; } } }