cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/2] git commit: Fix intersection with Bound computation
Date Mon, 13 May 2013 10:13:16 GMT
Updated Branches:
  refs/heads/trunk aecd63011 -> 49a7311f5


Fix intersection with Bound computation

patch by wy96f; reviewed by slebresne for CASSANDRA-5551


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

Branch: refs/heads/trunk
Commit: 2e2dd48ff911a84ef46dae3fe05331ce8f669791
Parents: d349787
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Mon May 13 12:11:08 2013 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Mon May 13 12:11:08 2013 +0200

----------------------------------------------------------------------
 CHANGES.txt                                  |    1 +
 src/java/org/apache/cassandra/dht/Range.java |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e2dd48f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index dfe3015..cf218d6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -23,6 +23,7 @@
  * Add custom secondary index support to CQL3 (CASSANDRA-5484)
  * Fix repair hanging silently on unexpected error (CASSANDRA-5229)
  * Fix Ec2Snitch regression introduced by CASSANDRA-5171 (CASSANDRA-5432)
+ * Fix Bound intersection computation (CASSANDRA-5551)
 Merged from 1.1
  * Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393)
  * Use allocator information to improve memtable memory usage estimate

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e2dd48f/src/java/org/apache/cassandra/dht/Range.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/Range.java b/src/java/org/apache/cassandra/dht/Range.java
index 99286fe..c2d7b63 100644
--- a/src/java/org/apache/cassandra/dht/Range.java
+++ b/src/java/org/apache/cassandra/dht/Range.java
@@ -136,7 +136,7 @@ public class Range<T extends RingPosition> extends AbstractBounds<T>
implements
      */
     public boolean intersects(Bounds<T> that)
     {
-        return intersects(new Range<T>(that.left, that.right)) || contains(that.right);
+        return intersects(new Range<T>(that.left, that.right)) || contains(that.left);
     }
 
     public static <T extends RingPosition> Set<Range<T>> rangeSet(Range<T>
... ranges)


Mime
View raw message