Updated Branches: refs/heads/trunk dec5eedd3 -> ce368f812
fix offline scrub to catch >= out of order rows patch by Omid Aladini; reviewed by jbellis for CASSANDRA-4411 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ce368f81 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce368f81 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce368f81 Branch: refs/heads/trunk Commit: ce368f812cc494e13221a208aba20f91019716e8 Parents: dec5eed Author: Jonathan Ellis <[email protected]> Authored: Thu Aug 9 09:36:32 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Aug 9 09:43:03 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ .../apache/cassandra/db/compaction/Scrubber.java | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce368f81/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 9b4a5bd..4001b0a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -36,6 +36,10 @@ * improve DynamicEndpointSnitch by using reservoir sampling (CASSANDRA-4038) +1.1.4 + * fix offline scrub to catch >= out of order rows (CASSANDRA-4411) + + 1.1.3 * munmap commitlog segments before rename (CASSANDRA-4337) * (JMX) rename getRangeKeySample to sampleKeyRange to avoid returning http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce368f81/src/java/org/apache/cassandra/db/compaction/Scrubber.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/Scrubber.java b/src/java/org/apache/cassandra/db/compaction/Scrubber.java index faf7e60..b014d0b 100644 --- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java +++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java @@ -177,7 +177,7 @@ public class Scrubber implements Closeable } else { - if (prevRow != null && acrComparator.compare(prevRow, compactedRow) > 0) + if (prevRow != null && acrComparator.compare(prevRow, compactedRow) >= 0) { outOfOrderRows.add(compactedRow); outputHandler.warn(String.format("Out of order row detected (%s found after %s)", compactedRow.key, prevRow.key));
