Author: jbellis
Date: Tue Jun 29 03:13:57 2010
New Revision: 958811
URL: http://svn.apache.org/viewvc?rev=958811&view=rev
Log:
r/m unused parameter and exception from getRestrictedRanges. patch by jbellis
Modified:
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.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=958811&r1=958810&r2=958811&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
Tue Jun 29 03:13:57 2010
@@ -557,7 +557,7 @@ public class StorageProxy implements Sto
final String table = command.keyspace;
int responseCount =
determineBlockFor(DatabaseDescriptor.getReplicationFactor(table),
consistency_level);
- List<AbstractBounds> ranges = getRestrictedRanges(command.range,
command.keyspace);
+ List<AbstractBounds> ranges = getRestrictedRanges(command.range);
// now scan until we have enough results
List<Row> rows = new ArrayList<Row>(command.max_keys);
@@ -659,8 +659,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.
*/
- private static List<AbstractBounds> getRestrictedRanges(AbstractBounds
queryRange, String keyspace)
- throws UnavailableException
+ private static List<AbstractBounds> getRestrictedRanges(AbstractBounds
queryRange)
{
TokenMetadata tokenMetadata =
StorageService.instance.getTokenMetadata();
