Return-Path: 
 <commits-return-92625-apmail-cassandra-commits-archive=cassandra.apache.org@cassandra.apache.org>
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 3E16C104AC
	for <apmail-cassandra-commits-archive@www.apache.org>;
 Tue, 25 Feb 2014 02:36:54 +0000 (UTC)
Received: (qmail 59685 invoked by uid 500); 25 Feb 2014 02:36:50 -0000
Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org
Received: (qmail 59466 invoked by uid 500); 25 Feb 2014 02:36:50 -0000
Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cassandra.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cassandra.apache.org>
List-Post: <mailto:commits@cassandra.apache.org>
List-Id: <commits.cassandra.apache.org>
Reply-To: dev@cassandra.apache.org
Delivered-To: mailing list commits@cassandra.apache.org
Received: (qmail 59412 invoked by uid 99); 25 Feb 2014 02:36:49 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Feb 2014 02:36:49 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 4F309925571; Tue, 25 Feb 2014 02:36:49 +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
Date: Tue, 25 Feb 2014 02:36:51 -0000
Message-Id: <9e6eba120841414990547b00e23aa19a@git.apache.org>
In-Reply-To: <b788a66681e644b3bcd4cb6cdf72c885@git.apache.org>
References: <b788a66681e644b3bcd4cb6cdf72c885@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [3/6] git commit: correct more uses of isMinimum (CASSANDRA-6734)

correct more uses of isMinimum (CASSANDRA-6734)


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3bfb7644
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3bfb7644
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3bfb7644

Branch: refs/heads/trunk
Commit: 3bfb7644fa0f91465d0b1066ba4800314d8cdc18
Parents: 468cc72
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Feb 24 20:36:22 2014 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Feb 24 20:36:22 2014 -0600

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3bfb7644/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index f25f934..2604375 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -1478,7 +1478,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
      */
     public ViewFragment markReferenced(final DecoratedKey key)
     {
-        assert !key.isMinimum();
+        assert !key.isMinimum(partitioner);
         return markReferenced(new Function<DataTracker.View, List<SSTableReader>>()
         {
             public List<SSTableReader> apply(DataTracker.View view)
@@ -1579,7 +1579,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
      */
     private AbstractScanIterator getSequentialIterator(final DataRange range, long now)
     {
-        assert !(range.keyRange() instanceof Range) || !((Range)range.keyRange()).isWrapAround() || range.keyRange().right.isMinimum() : range.keyRange();
+        assert !(range.keyRange() instanceof Range) || !((Range)range.keyRange()).isWrapAround() || range.keyRange().right.isMinimum(partitioner) : range.keyRange();
 
         final ViewFragment view = markReferenced(range.keyRange());
         Tracing.trace("Executing seq scan across {} sstables for {}", view.sstables.size(), range.keyRange().getString(metadata.getKeyValidator()));
@@ -1600,7 +1600,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
                     Row current = iterator.next();
                     DecoratedKey key = current.key;
 
-                    if (!range.stopKey().isMinimum() && range.stopKey().compareTo(key) < 0)
+                    if (!range.stopKey().isMinimum(partitioner) && range.stopKey().compareTo(key) < 0)
                         return endOfData();
 
                     // skipping outside of assigned range