natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

generate supercolumn tombstone when a 2-tuple delete is passed to a super CF. 

patch by jbellis; reviewed by Sandeep Tata for #84

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@765451 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-04-16 02:09:24 +00:00
parent 040bfd4c29
commit cb7cacfea7
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/org/apache/cassandra/db/RowMutation.java
View File

@ -42,6 +42,7 @@ import org.apache.cassandra.service.batch_mutation_t;
import org.apache.cassandra.service.column_t;
import org.apache.cassandra.service.superColumn_t;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.config.DatabaseDescriptor;
/**
@ -187,7 +188,16 @@ public class RowMutation implements Serializable
columnFamily = new ColumnFamily(cfName);
if (values.length == 2)
{
columnFamily.addColumn(values[1], ArrayUtils.EMPTY_BYTE_ARRAY, timestamp, true);
if (DatabaseDescriptor.getColumnFamilyType(cfName).equals("Standard"))
{
columnFamily.addColumn(values[1], ArrayUtils.EMPTY_BYTE_ARRAY, timestamp, true);
}
else
{
SuperColumn sc = new SuperColumn(values[1]);
sc.markForDeleteAt(timestamp);
columnFamily.addColumn(sc);
}
}
else if (values.length == 3)
{