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 <[email protected]> Authored: Mon Feb 24 20:36:22 2014 -0600 Committer: Jonathan Ellis <[email protected]> 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
