svn commit: r1034172 - in /cassandra/branches/cassandra-0.6: src/java/org/apache/cassandra/service/StorageProxy.java test/unit/org/apache/cassandra/service/StorageProxyTest.java

[jbellis]

Author: jbellis
Date: Thu Nov 11 22:03:21 2010
New Revision: 1034172

URL: http://svn.apache.org/viewvc?rev=1034172&view=rev
Log:
backport CASSANDRA-1722 from 0.7

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

Modified: 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java?rev=1034172&r1=1034171&r2=1034172&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java
 (original)
+++ 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java
 Thu Nov 11 22:03:21 2010
@@ -602,8 +602,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.6/test/unit/org/apache/cassandra/service/StorageProxyTest.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/service/StorageProxyTest.java?rev=1034172&r1=1034171&r2=1034172&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/service/StorageProxyTest.java
 (original)
+++ 
cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/service/StorageProxyTest.java
 Thu Nov 11 22:03:21 2010
@@ -104,5 +104,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", 
""));
     }
 }