You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/02/25 03:36:49 UTC
[1/6] git commit: correct more uses of isMinimum (CASSANDRA-6734)
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 468cc72fa -> 3bfb7644f
refs/heads/cassandra-2.1 f0c9bd1c9 -> 6f4e0ba6b
refs/heads/trunk e41486847 -> 3f8816f98
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/cassandra-2.0
Commit: 3bfb7644fa0f91465d0b1066ba4800314d8cdc18
Parents: 468cc72
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Feb 24 20:36:22 2014 -0600
Committer: Jonathan Ellis <jb...@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
[2/6] git commit: correct more uses of isMinimum (CASSANDRA-6734)
Posted by jb...@apache.org.
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/cassandra-2.1
Commit: 3bfb7644fa0f91465d0b1066ba4800314d8cdc18
Parents: 468cc72
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Feb 24 20:36:22 2014 -0600
Committer: Jonathan Ellis <jb...@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
[5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6f4e0ba6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f4e0ba6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f4e0ba6
Branch: refs/heads/cassandra-2.1
Commit: 6f4e0ba6b028ef9cc453c74804bd14d558d1e0d0
Parents: f0c9bd1 3bfb764
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Feb 24 20:36:35 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Feb 24 20:36:35 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/6f4e0ba6/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3f8816f9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f8816f9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f8816f9
Branch: refs/heads/trunk
Commit: 3f8816f98f13ef1092c72c2f4ef94fc1dab3a76d
Parents: e414868 6f4e0ba
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Feb 24 20:36:43 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Feb 24 20:36:43 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6f4e0ba6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f4e0ba6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f4e0ba6
Branch: refs/heads/trunk
Commit: 6f4e0ba6b028ef9cc453c74804bd14d558d1e0d0
Parents: f0c9bd1 3bfb764
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Feb 24 20:36:35 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Feb 24 20:36:35 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/6f4e0ba6/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
[3/6] git commit: correct more uses of isMinimum (CASSANDRA-6734)
Posted by jb...@apache.org.
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 <jb...@apache.org>
Authored: Mon Feb 24 20:36:22 2014 -0600
Committer: Jonathan Ellis <jb...@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