svn commit: r1143437 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java

[slebresne]

Author: slebresne
Date: Wed Jul  6 14:35:35 2011
New Revision: 1143437

URL: http://svn.apache.org/viewvc?rev=1143437&view=rev
Log:
Fix describeOwnership for OPP
patch by jhermes; reviewed by slebresne for CASSANDRA-2800

Modified:
    cassandra/branches/cassandra-0.7/CHANGES.txt
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1143437&r1=1143436&r2=1143437&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Wed Jul  6 14:35:35 2011
@@ -32,6 +32,7 @@
  * allow deleting a row and updating indexed columns in it in the
    same mutation (CASSANDRA-2773)
  * improve cli treatment of multiline comments (CASSANDRA-2852)
+ * fix describeOwnership for OPP (CASSANDRA-2800)
 
 
 0.7.6

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java?rev=1143437&r1=1143436&r2=1143437&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
 Wed Jul  6 14:35:35 2011
@@ -188,7 +188,7 @@ public class OrderPreservingPartitioner 
                 for (Range r : sortedRanges)
                 {
                     // Looping over every KS:CF:Range, get the splits size and 
add it to the count
-                    allTokens.put(r.right, allTokens.get(r.right) + 
StorageService.instance.getSplits(ks, cfmd.cfName, r, 1).size());
+                    allTokens.put(r.right, allTokens.get(r.right) + 
StorageService.instance.getSplits(ks, cfmd.cfName, r, 
DatabaseDescriptor.getIndexInterval()).size());
                 }
             }
         }