From 05da045bbfe29bf472982d3c5da90050176202df Mon Sep 17 00:00:00 2001 From: Dmitrij Koniajev Date: Wed, 12 Mar 2014 17:05:31 +0200 Subject: [PATCH] fixed bug in CompactionManager.needsCleanup Patch by Dmitrij Koniajev, reviewed by marcuse for CASSANDRA-6845. --- CHANGES.txt | 2 +- .../org/apache/cassandra/db/compaction/CompactionManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 42dc4ee5f4..35317372f8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,7 +4,7 @@ * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838) * Fix static counter columns (CASSANDRA-6827) * Restore expiring->deleted (cell) compaction optimization (CASSANDRA-6844) - + * Fix CompactionManager.needsCleanup (CASSANDRA-6845) 2.0.6 * Avoid race-prone second "scrub" of system keyspace (CASSANDRA-6797) diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java index 02cf4337a0..453176edb3 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@ -493,7 +493,7 @@ public class CompactionManager implements CompactionManagerMBean return false; } - if (i == (ownedRanges.size() - 1)) + if (i == (sortedRanges.size() - 1)) { // we're at the last range and we found a key beyond the end of the range return true;