cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject git commit: SSTableNamesIterator misses some tombstones
Date Fri, 29 Jun 2012 16:32:26 GMT
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 <sylvain@datastax.com>
Authored: Fri Jun 29 18:31:43 2012 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
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;
             }
         }
     }


Mime
View raw message