more fixes to scrub catching >= 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/9fb63a2f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9fb63a2f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9fb63a2f Branch: refs/heads/cassandra-1.1 Commit: 9fb63a2f93997ffa5b70a291f5045c7f6100eea9 Parents: 115f380 Author: Jonathan Ellis <[email protected]> Authored: Thu Aug 9 11:37:52 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Aug 9 11:37:52 2012 -0500 ---------------------------------------------------------------------- .../apache/cassandra/db/compaction/Scrubber.java | 2 +- .../apache/cassandra/tools/StandaloneScrubber.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9fb63a2f/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 ac8862f..9a6b8dd 100644 --- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java +++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java @@ -211,7 +211,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)); http://git-wip-us.apache.org/repos/asf/cassandra/blob/9fb63a2f/src/java/org/apache/cassandra/tools/StandaloneScrubber.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/StandaloneScrubber.java b/src/java/org/apache/cassandra/tools/StandaloneScrubber.java index 0ac6a80..e3a15b9 100644 --- a/src/java/org/apache/cassandra/tools/StandaloneScrubber.java +++ b/src/java/org/apache/cassandra/tools/StandaloneScrubber.java @@ -179,7 +179,7 @@ public class StandaloneScrubber { SSTableReader current = iter.next(); - if (previous.last.compareTo(current.first) > 0) + if (previous.last.compareTo(current.first) >= 0) { System.err.println(String.format("At level %d, %s [%s, %s] overlaps %s [%s, %s]", i, previous, previous.first, previous.last,
