cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject git commit: Revert "move setting lastCompactedKey to before the return-if-nothing-added"
Date Thu, 16 Jan 2014 14:27:07 GMT
Updated Branches:
  refs/heads/trunk 49439ac9a -> d3a9e8f13


Revert "move setting lastCompactedKey to before the return-if-nothing-added"

This reverts commit f3dc188e203b3db980ee81df05390968043cb601.


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

Branch: refs/heads/trunk
Commit: d3a9e8f13fc304daf9cedf6e8a21b1d76575020c
Parents: 49439ac
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Jan 16 08:21:47 2014 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Jan 16 08:21:47 2014 -0600

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/compaction/LeveledManifest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3a9e8f1/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
index e08b9f7..c8459c9 100644
--- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
@@ -138,7 +138,6 @@ public class LeveledManifest
             int thisLevel = remove(sstable);
             minLevel = Math.min(minLevel, thisLevel);
         }
-        lastCompactedKeys[minLevel] = SSTableReader.sstableOrdering.max(added).last;
 
         // it's valid to do a remove w/o an add (e.g. on truncate)
         if (added.isEmpty())
@@ -149,6 +148,7 @@ public class LeveledManifest
 
         for (SSTableReader ssTableReader : added)
             add(ssTableReader);
+        lastCompactedKeys[minLevel] = SSTableReader.sstableOrdering.max(added).last;
     }
 
     public synchronized void repairOverlappingSSTables(int level)


Mime
View raw message