cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ble...@apache.org
Subject [2/3] cassandra git commit: Fix unecessary and broken (when reversed) condition
Date Wed, 05 Aug 2015 11:57:03 GMT
Fix unecessary and broken (when reversed) condition

patch by Sylvain Lebresne; reviewed by Benjamin Lerer for CASSANDRA-9775


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

Branch: refs/heads/cassandra-3.0
Commit: 028df729b7bc0f63359990d9cc7ebb7d653232d5
Parents: 6aa8399
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Aug 5 12:19:32 2015 +0200
Committer: blerer <benjamin.lerer@datastax.com>
Committed: Wed Aug 5 12:19:32 2015 +0200

----------------------------------------------------------------------
 .../apache/cassandra/db/filter/ClusteringIndexNamesFilter.java  | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/028df729/src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java b/src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java
index a6f2179..f2c81a7 100644
--- a/src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java
@@ -80,11 +80,6 @@ public class ClusteringIndexNamesFilter extends AbstractClusteringIndexFilter
 
     public ClusteringIndexNamesFilter forPaging(ClusteringComparator comparator, Clustering
lastReturned, boolean inclusive)
     {
-        // TODO: Consider removal of the initial check.
-        int cmp = comparator.compare(lastReturned, clusteringsInQueryOrder.first());
-        if (cmp < 0 || (inclusive && cmp == 0))
-            return this;
-
         NavigableSet<Clustering> newClusterings = reversed ?
                                                   clusterings.headSet(lastReturned, inclusive)
:
                                                   clusterings.tailSet(lastReturned, inclusive);


Mime
View raw message