svn commit: r1036273 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/db/ColumnFamilyStore.java

[jbellis]

Author: jbellis
Date: Wed Nov 17 23:08:10 2010
New Revision: 1036273

URL: http://svn.apache.org/viewvc?rev=1036273&view=rev
Log:
truncate includes secondary indexes
patch by jbellis; reviewed by gdusbabek for CASSANDRA-1747

Modified:
    cassandra/branches/cassandra-0.7/CHANGES.txt
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1036273&r1=1036272&r2=1036273&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Wed Nov 17 23:08:10 2010
@@ -36,6 +36,7 @@ dev
  * fix tombstoning of supercolumns in range queries (CASSANDRA-1734)
  * clear endpoint cache after updating keyspace metadata (CASSANDRA-1741)
  * fix wrapping-range queries on non-minimum token (CASSANDRA-1700)
+ * truncate includes secondary indexes (CASSANDRA-1747)
 
 
 0.7.0-beta3

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1036273&r1=1036272&r2=1036273&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 Wed Nov 17 23:08:10 2010
@@ -1640,13 +1640,16 @@ public class ColumnFamilyStore implement
             {
                 // putting markCompacted on the commitlogUpdater thread 
ensures it will run
                 // after any compactions that were in progress when truncate 
was called, are finished
-                List<SSTableReader> truncatedSSTables = new 
ArrayList<SSTableReader>();
-                for (SSTableReader sstable : ssTables.getSSTables())
+                for (ColumnFamilyStore cfs : 
Iterables.concat(indexedColumns.values(), 
Arrays.asList(ColumnFamilyStore.this)))
                 {
-                    if (!sstable.newSince(truncatedAt))
-                        truncatedSSTables.add(sstable);
+                    List<SSTableReader> truncatedSSTables = new 
ArrayList<SSTableReader>();
+                    for (SSTableReader sstable : cfs.getSSTables())
+                    {
+                        if (!sstable.newSince(truncatedAt))
+                            truncatedSSTables.add(sstable);
+                    }
+                    cfs.markCompacted(truncatedSSTables);
                 }
-                markCompacted(truncatedSSTables);
 
                 // Invalidate row cache
                 invalidateRowCache();