Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 609C5CEF7 for ; Thu, 9 Aug 2012 14:41:15 +0000 (UTC) Received: (qmail 4742 invoked by uid 500); 9 Aug 2012 14:41:15 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 4714 invoked by uid 500); 9 Aug 2012 14:41:15 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 4704 invoked by uid 99); 9 Aug 2012 14:41:15 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Aug 2012 14:41:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C35673CC8B; Thu, 9 Aug 2012 14:41:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: fix offline scrub to catch >= out of order rows patch by Omid Aladini; reviewed by jbellis for CASSANDRA-4411 Message-Id: <20120809144114.C35673CC8B@tyr.zones.apache.org> Date: Thu, 9 Aug 2012 14:41:14 +0000 (UTC) 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 Authored: Thu Aug 9 09:36:32 2012 -0500 Committer: Jonathan Ellis 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));