From e4fe6f3bcf385659e322cb644567919729f658a4 Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Tue, 27 Jul 2010 22:43:13 +0000 Subject: [PATCH] minor cleanup of getRangeSlices. patch by jbellis git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@979898 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/cassandra/service/StorageProxy.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index 5a40d8db1f..fcd40f3a1c 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -493,8 +493,6 @@ public class StorageProxy implements StorageProxyMBean logger.debug(command.toString()); long startTime = System.nanoTime(); - final String table = command.keyspace; - List ranges = getRestrictedRanges(command.range); // now scan until we have enough results List rows = new ArrayList(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> handler = rs.getQuorumResponseHandler(resolver, consistency_level, table); + AbstractReplicationStrategy rs = StorageService.instance.getReplicationStrategy(command.keyspace); + QuorumResponseHandler> 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 } }