svn commit: r1033489 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/service/StorageProxy.java test/unit/org/apache/cassandra/service/StorageProxyTest.java

[jb...@apache.org]

Author: jbellis
Date: Wed Nov 10 14:30:31 2010
New Revision: 1033489

URL: http://svn.apache.org/viewvc?rev=1033489&view=rev
Log:
special case the special case
> patch by Stu Hood; reviewed by jbellis for CASSANDRA-1722

Modified:
    cassandra/branches/cassandra-0.7/CHANGES.txt
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java
    cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/service/StorageProxyTest.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1033489&r1=1033488&r2=1033489&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Wed Nov 10 14:30:31 2010
@@ -1,9 +1,6 @@
-0.6.7
+dev
  * Update windows .bat files to work outside of main Cassandra
    directory (CASSANDRA-1713)
-
-
-0.6.7
  * log threshold causing memtable flush (CASSANDRA-1675)
  * log type of dropped messages (CASSANDRA-1677)
  * upgrade to SLF4J 1.6.1
@@ -24,6 +21,7 @@
  * r/m extra subcomparator line in cli keyspaces output (CASSANDRA-1712)
  * add read repair chance to cli "show keyspaces"
  * upgrade to ConcurrentLinkedHashMap 1.1 (CASSANDRA-975)
+ * fix index scan routing (CASSANDRA-1722)
 
 
 0.7.0-beta3

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java?rev=1033489&r1=1033488&r2=1033489&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageProxy.java Wed Nov 10 14:30:31 2010
@@ -562,8 +562,8 @@ public class StorageProxy implements Sto
      */
     static List<AbstractBounds> getRestrictedRanges(final AbstractBounds queryRange)
     {
-        // special case for bounds containing exactly 1 token
-        if (queryRange instanceof Bounds && queryRange.left.equals(queryRange.right))
+        // special case for bounds containing exactly 1 (non-minimum) token
+        if (queryRange instanceof Bounds && queryRange.left.equals(queryRange.right) && !queryRange.left.equals(StorageService.getPartitioner().getMinimumToken()))
         {
             if (logger.isDebugEnabled())
                 logger.debug("restricted single token match for query " + queryRange);

Modified: cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/service/StorageProxyTest.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/service/StorageProxyTest.java?rev=1033489&r1=1033488&r2=1033489&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/service/StorageProxyTest.java (original)
+++ cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/service/StorageProxyTest.java Wed Nov 10 14:30:31 2010
@@ -107,5 +107,7 @@ public class StorageProxyTest extends Cl
     {
         // equal tokens are special cased as non-wrapping for bounds
         testGRR(bounds("0", "0"), bounds("0", "0"));
+        // completely empty bounds match everything
+        testGRR(bounds("", ""), bounds("", "1"), range("1", "6"), range("6", ""));
     }
 }