svn commit: r1187477 - in /cassandra/branches/cassandra-0.8: CHANGES.txt src/java/org/apache/cassandra/io/sstable/SSTableWriter.java

[slebresne]

Author: slebresne
Date: Fri Oct 21 17:34:02 2011
New Revision: 1187477

URL: http://svn.apache.org/viewvc?rev=1187477&view=rev
Log:
Don't expire counter tombstones after streaming
patch by slebresne; reviewed by jbellis for CASSANDRA-3394

Modified:
    cassandra/branches/cassandra-0.8/CHANGES.txt
    
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1187477&r1=1187476&r2=1187477&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Fri Oct 21 17:34:02 2011
@@ -28,6 +28,7 @@
  * avoid locking on update when no indexes are involved (CASSANDRA-3386)
  * fix assertionError during repair with ordered partitioners (CASSANDRA-3369)
  * correctly serialize key_validation_class for avro (CASSANDRA-3391)
+ * don't expire counter tombstone after streaming (CASSANDRA-3394)
 
 
 0.8.7

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java?rev=1187477&r1=1187476&r2=1187477&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
 Fri Oct 21 17:34:02 2011
@@ -491,7 +491,7 @@ public class SSTableWriter extends SSTab
             long rows = 0L;
             DecoratedKey key;
 
-            CompactionController controller = new CompactionController(cfs, 
Collections.<SSTableReader>emptyList(), Integer.MAX_VALUE, true);
+            CompactionController controller = new CompactionController(cfs, 
Collections.<SSTableReader>emptyList(), Integer.MIN_VALUE, true);
             while (!dfile.isEOF())
             {
                 // read key
@@ -502,6 +502,9 @@ public class SSTableWriter extends SSTab
                 SSTableIdentityIterator iter = new 
SSTableIdentityIterator(cfs.metadata, dfile, key, dfile.getFilePointer(), 
dataSize, true);
 
                 AbstractCompactedRow row = controller.getCompactedRow(iter);
+                // We don't remove any tombstone, so we can't have an empty 
row here
+                assert !row.isEmpty();
+
                 updateCache(key, dataSize, row);
 
                 rowSizes.add(dataSize);