Updated Branches: refs/heads/trunk dcc479303 -> 4725bf71e
Fix leveled promote integrity check Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4725bf71 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4725bf71 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4725bf71 Branch: refs/heads/trunk Commit: 4725bf71e18550ac60f90d9c3561d81c38894124 Parents: dcc4793 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Jun 28 12:39:08 2012 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Jun 28 12:39:08 2012 +0200 ---------------------------------------------------------------------- .../cassandra/db/compaction/LeveledManifest.java | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4725bf71/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 eb82e0d..095e0c6 100644 --- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java @@ -194,12 +194,16 @@ public class LeveledManifest for (SSTableReader ssTableReader : added) add(ssTableReader, newLevel); - DecoratedKey last = null; - Collections.sort(generations[newLevel], SSTable.sstableComparator); - for (SSTableReader sstable : generations[newLevel]) + if (newLevel != 0) { - assert last == null || sstable.first.compareTo(last) > 0; - last = sstable.last; + // Integerity check + DecoratedKey last = null; + Collections.sort(generations[newLevel], SSTable.sstableComparator); + for (SSTableReader sstable : generations[newLevel]) + { + assert last == null || sstable.first.compareTo(last) > 0; + last = sstable.last; + } } serialize();
