You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/07/04 19:35:55 UTC
git commit: Only consider whole row tombstone in collation controller
Updated Branches:
refs/heads/trunk e7d323009 -> 45ad66895
Only consider whole row tombstone in collation controller
patch by slebresne; reviewed by jbellis for CASSANDRA-4409
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/45ad6689
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45ad6689
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45ad6689
Branch: refs/heads/trunk
Commit: 45ad66895d0e5b99feaa74ec061b887c1a9688a3
Parents: e7d3230
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Jul 4 19:35:03 2012 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Jul 4 19:35:03 2012 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/CollationController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/45ad6689/src/java/org/apache/cassandra/db/CollationController.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/CollationController.java b/src/java/org/apache/cassandra/db/CollationController.java
index c10caef..193d892 100644
--- a/src/java/org/apache/cassandra/db/CollationController.java
+++ b/src/java/org/apache/cassandra/db/CollationController.java
@@ -126,7 +126,7 @@ public class CollationController
if (cf.isMarkedForDelete())
{
// track the most recent row level tombstone we encounter
- mostRecentRowTombstone = cf.deletionInfo().maxTimestamp();
+ mostRecentRowTombstone = cf.deletionInfo().getTopLevelDeletion().markedForDeleteAt;
}
container.delete(cf);
@@ -257,7 +257,7 @@ public class CollationController
{
ColumnFamily cf = iter.getColumnFamily();
if (cf.isMarkedForDelete())
- mostRecentRowTombstone = cf.deletionInfo().maxTimestamp();
+ mostRecentRowTombstone = cf.deletionInfo().getTopLevelDeletion().markedForDeleteAt;
returnCF.delete(cf);
sstablesIterated++;