You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2010/05/07 21:52:20 UTC

svn commit: r942192 - in /cassandra/branches/cassandra-0.6: ./ src/java/org/apache/cassandra/db/ src/java/org/apache/cassandra/db/filter/ src/java/org/apache/cassandra/thrift/ test/unit/org/apache/cassandra/db/

Author: jbellis
Date: Fri May  7 19:52:20 2010
New Revision: 942192

URL: http://svn.apache.org/viewvc?rev=942192&view=rev
Log:
fix bugs that result in tombstone-only rows from sstables being ignored (and not merged into the resultset correctly).  patch by jbellis; reviewed by Stu Hood and tested by Brandon Williams for CASSANDRA-1063

Modified:
    cassandra/branches/cassandra-0.6/CHANGES.txt
    cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
    cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java
    cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java
    cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraServer.java
    cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java

Modified: cassandra/branches/cassandra-0.6/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=942192&r1=942191&r2=942192&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.6/CHANGES.txt Fri May  7 19:52:20 2010
@@ -10,6 +10,7 @@
  * make concurrent_reads, concurrent_writes configurable at runtime via JMX
    (CASSANDRA-1060)
  * disable GCInspector on non-Sun JVMs (CASSANDRA-1061)
+ * fix tombstone handling in sstable rows with no other data (CASSANDRA-1063)
 
 
 0.6.1

Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=942192&r1=942191&r2=942192&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Fri May  7 19:52:20 2010
@@ -857,20 +857,17 @@ public class ColumnFamilyStore implement
             for (SSTableReader sstable : ssTables_)
             {
                 iter = filter.getSSTableColumnIterator(sstable);
-                if (iter.hasNext()) // initializes iter.CF
+                if (iter.getColumnFamily() != null)
                 {
                     returnCF.delete(iter.getColumnFamily());
+                    iterators.add(iter);
                 }
-                iterators.add(iter);
             }
 
             Comparator<IColumn> comparator = filter.getColumnComparator(getComparator());
             Iterator collated = IteratorUtils.collatedIterator(comparator, iterators);
-            if (!collated.hasNext())
-                return null;
-
             filter.collectCollatedColumns(returnCF, collated, gcBefore);
-            return returnCF;
+            return removeDeleted(returnCF, gcBefore);
         }
         finally
         {

Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java?rev=942192&r1=942191&r2=942192&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java Fri May  7 19:52:20 2010
@@ -57,8 +57,14 @@ public class SSTableNamesIterator extend
                    : String.format("%s != %s in %s", keyInDisk, decoratedKey, file.getPath());
             file.readInt(); // data size
 
-            /* Read the bloom filter summarizing the columns */
+            /* Read the bloom filter and index summarizing the columns */
             BloomFilter bf = IndexHelper.defreezeBloomFilter(file);
+            List<IndexHelper.IndexInfo> indexList = IndexHelper.deserializeIndex(file);
+
+            cf = ColumnFamily.serializer().deserializeFromSSTableNoColumns(ssTable.makeColumnFamily(), file);
+
+            // we can stop early if bloom filter says none of the columns actually exist -- but,
+            // we can't stop before initializing the cf above, in case there's a relevant tombstone
             List<byte[]> filteredColumnNames = new ArrayList<byte[]>(columnNames.size());
             for (byte[] name : columnNames)
             {
@@ -68,13 +74,8 @@ public class SSTableNamesIterator extend
                 }
             }
             if (filteredColumnNames.isEmpty())
-            {
                 return;
-            }
-
-            List<IndexHelper.IndexInfo> indexList = IndexHelper.deserializeIndex(file);
 
-            cf = ColumnFamily.serializer().deserializeFromSSTableNoColumns(ssTable.makeColumnFamily(), file);
             file.readInt(); // column count
 
             /* get the various column ranges we have to read */

Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java?rev=942192&r1=942191&r2=942192&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java Fri May  7 19:52:20 2010
@@ -79,7 +79,7 @@ class SSTableSliceIterator extends Abstr
 
     public ColumnFamily getColumnFamily()
     {
-        return reader.getEmptyColumnFamily();
+        return reader == null ? null : reader.getEmptyColumnFamily();
     }
 
     protected IColumn computeNext()

Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraServer.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraServer.java?rev=942192&r1=942191&r2=942192&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraServer.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraServer.java Fri May  7 19:52:20 2010
@@ -360,7 +360,7 @@ public class CassandraServer implements 
         }
         doInsert(consistency_level, rm);
     }
-    
+
     public void batch_insert(String keyspace, String key, Map<String, List<ColumnOrSuperColumn>> cfmap, ConsistencyLevel consistency_level)
     throws InvalidRequestException, UnavailableException, TimedOutException
     {

Modified: cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java?rev=942192&r1=942191&r2=942192&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java (original)
+++ cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java Fri May  7 19:52:20 2010
@@ -90,9 +90,14 @@ public class ColumnFamilyStoreTest exten
             public void runMayThrow() throws IOException
             {
                 SliceQueryFilter sliceFilter = new SliceQueryFilter("key1", new QueryPath("Standard2", null, null), ArrayUtils.EMPTY_BYTE_ARRAY, ArrayUtils.EMPTY_BYTE_ARRAY, false, 1);
-                assertNull(store.getColumnFamily(sliceFilter));
+                ColumnFamily cf = store.getColumnFamily(sliceFilter);
+                assert cf.isMarkedForDelete();
+                assert cf.getColumnsMap().isEmpty();
+
                 NamesQueryFilter namesFilter = new NamesQueryFilter("key1", new QueryPath("Standard2", null, null), "a".getBytes());
-                assertNull(store.getColumnFamily(namesFilter));
+                cf = store.getColumnFamily(namesFilter);
+                assert cf.isMarkedForDelete();
+                assert cf.getColumnsMap().isEmpty();
             }
         };