natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor cleanup of getRangeSlices. patch by jbellis 

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@979898 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2010-07-27 22:43:13 +00:00
parent df728f48cd
commit e4fe6f3bcf
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/java/org/apache/cassandra/service/StorageProxy.java
View File

@ -493,8 +493,6 @@ public class StorageProxy implements StorageProxyMBean
logger.debug(command.toString());
long startTime = System.nanoTime();
final String table = command.keyspace;
List<AbstractBounds> ranges = getRestrictedRanges(command.range);
// now scan until we have enough results
List<Row> rows = new ArrayList<Row>(command.max_keys);
@ -531,8 +529,8 @@ public class StorageProxy implements StorageProxyMBean
// collect replies and resolve according to consistency level
RangeSliceResponseResolver resolver = new RangeSliceResponseResolver(command.keyspace, liveEndpoints);
AbstractReplicationStrategy rs = StorageService.instance.getReplicationStrategy(table);
QuorumResponseHandler<List<Row>> handler = rs.getQuorumResponseHandler(resolver, consistency_level, table);
AbstractReplicationStrategy rs = StorageService.instance.getReplicationStrategy(command.keyspace);
QuorumResponseHandler<List<Row>> handler = rs.getQuorumResponseHandler(resolver, consistency_level, command.keyspace);
// TODO bail early if live endpoints can't satisfy requested
// consistency level
for (InetAddress endpoint : liveEndpoints)
@ -557,8 +555,7 @@ public class StorageProxy implements StorageProxyMBean
}
catch (DigestMismatchException e)
{
throw new AssertionError(e); // no digests in range slices
// yet
throw new AssertionError(e); // no digests in range slices yet
}
}