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

[jbellis]

Author: jbellis
Date: Thu Oct  7 15:51:29 2010
New Revision: 1005503

URL: http://svn.apache.org/viewvc?rev=1005503&view=rev
Log:
revert parts of 1442 that were committed accidentally

Modified:
    
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java
    cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/Util.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=1005503&r1=1005502&r2=1005503&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 Oct  7 15:51:29 2010
@@ -613,7 +613,7 @@ public class StorageProxy implements Sto
      *     D, but we don't want any other results from it until after the (D, 
T] range.  Unwrapping so that
      *     the ranges we consider are (D, T], (T, MIN], (MIN, D] fixes this.
      */
-    static List<AbstractBounds> getRestrictedRanges(final AbstractBounds 
queryRange)
+    private static List<AbstractBounds> getRestrictedRanges(final 
AbstractBounds queryRange)
     {
         TokenMetadata tokenMetadata = 
StorageService.instance.getTokenMetadata();
 

Modified: 
cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/Util.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/Util.java?rev=1005503&r1=1005502&r2=1005503&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/Util.java 
(original)
+++ cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/Util.java 
Thu Oct  7 15:51:29 2010
@@ -31,7 +31,9 @@ import org.apache.commons.lang.ArrayUtil
 
 import org.apache.cassandra.db.*;
 import org.apache.cassandra.db.filter.QueryPath;
-import org.apache.cassandra.dht.*;
+import org.apache.cassandra.dht.Bounds;
+import org.apache.cassandra.dht.Range;
+import org.apache.cassandra.dht.Token;
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.thrift.SliceRange;
 
@@ -42,21 +44,6 @@ public class Util
         return new Column(name.getBytes(), value.getBytes(), timestamp);
     }
 
-    public static Token token(String key)
-    {
-        return StorageService.getPartitioner().getToken(key);
-    }
-
-    public static Range range(String left, String right)
-    {
-        return new Range(token(left), token(right));
-    }
-
-    public static Bounds bounds(String left, String right)
-    {
-        return new Bounds(token(left), token(right));
-    }
-
     public static void addMutation(RowMutation rm, String columnFamilyName, 
String superColumnName, long columnName, String value, long timestamp)
     {
         rm.add(new QueryPath(columnFamilyName, superColumnName.getBytes(), 
getBytes(columnName)), value.getBytes(), timestamp);