cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xe...@apache.org
Subject git commit: adopt RM code of CASSANDRA-4698 to trunk
Date Thu, 27 Sep 2012 14:35:20 GMT
Updated Branches:
  refs/heads/trunk 5df3f13b6 -> a0d7d9713


adopt RM code of CASSANDRA-4698 to trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a0d7d971
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0d7d971
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a0d7d971

Branch: refs/heads/trunk
Commit: a0d7d9713d776506ce6c2eea577eea3b7c5099bd
Parents: 5df3f13
Author: Pavel Yaskevich <xedin@apache.org>
Authored: Thu Sep 27 17:35:05 2012 +0300
Committer: Pavel Yaskevich <xedin@apache.org>
Committed: Thu Sep 27 17:35:05 2012 +0300

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/RowMutation.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0d7d971/src/java/org/apache/cassandra/db/RowMutation.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/RowMutation.java b/src/java/org/apache/cassandra/db/RowMutation.java
index 695c96d..1a5f871 100644
--- a/src/java/org/apache/cassandra/db/RowMutation.java
+++ b/src/java/org/apache/cassandra/db/RowMutation.java
@@ -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)
                 {


Mime
View raw message