cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject git commit: fix offline scrub to catch >= out of order rows patch by Omid Aladini; reviewed by jbellis for CASSANDRA-4411
Date Thu, 09 Aug 2012 14:41:14 GMT
Updated Branches:
  refs/heads/cassandra-1.1 8e6962f01 -> 115f380a8


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/115f380a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/115f380a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/115f380a

Branch: refs/heads/cassandra-1.1
Commit: 115f380a86912e5918f534db2ec2935253909fad
Parents: 8e6962f
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Aug 9 09:36:32 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Aug 9 09:37:42 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/115f380a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5aaf910..aa40626 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+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/115f380a/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 314a873..ac8862f 100644
--- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java
+++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
@@ -175,7 +175,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));


Mime
View raw message