cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject git commit: move setting lastCompactedKey to before the return-if-nothing-added
Date Fri, 22 Nov 2013 23:33:14 GMT
Updated Branches:
  refs/heads/trunk a10150542 -> f3dc188e2


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


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

Branch: refs/heads/trunk
Commit: f3dc188e203b3db980ee81df05390968043cb601
Parents: a101505
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Nov 22 17:33:07 2013 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Nov 22 17:33:07 2013 -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/f3dc188e/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 76f51d1..232d1f7 100644
--- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
@@ -142,6 +142,7 @@ 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())
@@ -152,7 +153,6 @@ 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