Updated Branches: refs/heads/cassandra-1.1 3f31642c3 -> 0d44159e6 refs/heads/trunk 780ccc8ba -> b07e53cfb
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b07e53cf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b07e53cf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b07e53cf Branch: refs/heads/trunk Commit: b07e53cfb95c3a28727744699edc333cdab325c3 Parents: 780ccc8 0d44159 Author: Jonathan Ellis <[email protected]> Authored: Thu Oct 4 10:35:07 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Oct 4 10:35:07 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- src/java/org/apache/cassandra/db/RowMutation.java | 13 +++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b07e53cf/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b07e53cf/src/java/org/apache/cassandra/db/RowMutation.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/RowMutation.java index 1a5f871,3a05df9..c37bcfb --- a/src/java/org/apache/cassandra/db/RowMutation.java +++ b/src/java/org/apache/cassandra/db/RowMutation.java @@@ -431,20 -458,17 +431,21 @@@ public class RowMutation implements IMu 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()); + ColumnFamily cfOld = modification.getValue(); + ColumnFamily cf = ColumnFamily.create(cfOld.metadata()); - if (cf.isMarkedForDelete()) + if (cfOld.isMarkedForDelete()) - cf.delete(cfOld.getLocalDeletionTime(), cfOld.getMarkedForDeleteAt() > now ? now : cfOld.getMarkedForDeleteAt()); + { - DeletionTime delTime = cf.deletionInfo().getTopLevelDeletion(); - cf.delete(new DeletionInfo(delTime.markedForDeleteAt > now ? now : delTime.markedForDeleteAt, - delTime.localDeletionTime)); ++ DeletionTime dt = cfOld.deletionInfo().getTopLevelDeletion(); ++ cf.delete(new DeletionInfo(dt.markedForDeleteAt > now ? now : dt.markedForDeleteAt, ++ dt.localDeletionTime)); + } - for (IColumn column : modification.getValue().columns) + for (IColumn column : cfOld.columns) { // don't clone if column already has a correct timestamp if (column.timestamp() <= now)
