backport CASSANDRA-1722 from 0.7

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.6@1034172 13f79535-47bb-0310-9956-ffa450edef68
apache · Nov 11, 2010 · 2331b01 · 2331b01
1 parent e6b0191
commit 2331b01
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -602,8 +602,8 @@ public static List<Row> getRangeSlice(RangeSliceCommand command, ConsistencyLeve
      */
     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);

diff --git a/test/unit/org/apache/cassandra/service/StorageProxyTest.java b/test/unit/org/apache/cassandra/service/StorageProxyTest.java
@@ -104,5 +104,7 @@ public void testGRRExactBounds() throws Throwable
     {
         // 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", ""));
     }
 }