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

adopt RM code of CASSANDRA-4698 to trunk

This commit is contained in:
Pavel Yaskevich 2012-09-27 17:35:05 +03:00
parent 5df3f13b6c
commit a0d7d9713d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -431,14 +431,18 @@ public class RowMutation implements IMutation
RowMutation mutation = deserialize(dis, version);
long now = FBUtilities.timestampMicros();
Map<Integer, ColumnFamily> fixedModifications = new HashMap<Integer, ColumnFamily>();
Map<UUID, ColumnFamily> fixedModifications = new HashMap<UUID, ColumnFamily>();
for (Map.Entry<Integer, ColumnFamily> modification : mutation.modifications_.entrySet())
for (Map.Entry<UUID, ColumnFamily> modification : mutation.modifications.entrySet())
{
ColumnFamily cf = ColumnFamily.create(modification.getValue().metadata());
if (cf.isMarkedForDelete())
cf.delete(cf.getLocalDeletionTime(), cf.getMarkedForDeleteAt() > now ? now : cf.getMarkedForDeleteAt());
{
DeletionTime delTime = cf.deletionInfo().getTopLevelDeletion();
cf.delete(new DeletionInfo(delTime.markedForDeleteAt > now ? now : delTime.markedForDeleteAt,
delTime.localDeletionTime));
}
for (IColumn column : modification.getValue().columns)
{