svn commit: r1066486 - /cassandra/trunk/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java

[jb...@apache.org]

Author: jbellis
Date: Wed Feb  2 14:45:12 2011
New Revision: 1066486

URL: http://svn.apache.org/viewvc?rev=1066486&view=rev
Log:
When creating an SST for AES of a commutative/counter CF, do not clean non-commutative/counter columns. i.e. deleted columns
patch by Kelvin Kakugawa; reviewed by slebresne for CASSANDRA-2095

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java?rev=1066486&r1=1066485&r2=1066486&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java Wed Feb  2 14:45:12 2011
@@ -86,6 +86,8 @@ public class CounterColumnType extends A
 
         for (IColumn column : cc.getSortedColumns())
         {
+            if (!(column instanceof CounterColumn)) // DeletedColumn
+                continue;
             CounterColumn counterColumn = (CounterColumn)column;
             CounterColumn cleanedColumn = counterColumn.cleanNodeCounts(node);
             if (cleanedColumn == counterColumn)