Repository: cassandra Updated Branches: refs/heads/trunk dcfd6f308 -> 07d38b03a
remove StorageProxy.OPTIMIZE_LOCAL_REQUESTS patch by Stefania Alborghetti; reviewed by Robert Stupp for CASSANDRA-9697 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/07d38b03 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07d38b03 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/07d38b03 Branch: refs/heads/trunk Commit: 07d38b03aed48d733faa06f16eb69954322f10fc Parents: dcfd6f3 Author: Stefania <stefania.alborghe...@datastax.com> Authored: Thu Jul 2 19:01:14 2015 +0700 Committer: Robert Stupp <sn...@snazy.de> Committed: Thu Jul 2 19:01:14 2015 +0700 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageProxy.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/07d38b03/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index 22831ca..bf0c664 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -69,7 +69,6 @@ public class StorageProxy implements StorageProxyMBean { public static final String MBEAN_NAME = "org.apache.cassandra.db:type=StorageProxy"; private static final Logger logger = LoggerFactory.getLogger(StorageProxy.class); - static final boolean OPTIMIZE_LOCAL_REQUESTS = true; // set to false to test messagingservice path on single node public static final String UNREACHABLE = "UNREACHABLE"; @@ -705,7 +704,7 @@ public class StorageProxy implements StorageProxyMBean public static boolean canDoLocalRequest(InetAddress replica) { - return replica.equals(FBUtilities.getBroadcastAddress()) && OPTIMIZE_LOCAL_REQUESTS; + return replica.equals(FBUtilities.getBroadcastAddress()); } @@ -1849,9 +1848,6 @@ public class StorageProxy implements StorageProxyMBean throws UnavailableException, ReadFailureException, ReadTimeoutException { Tracing.trace("Computing ranges to query"); - long startTime = System.nanoTime(); - - List<FilteredPartition> partitions = new ArrayList<>(); Keyspace keyspace = Keyspace.open(command.metadata().ksName); RangeIterator ranges = new RangeIterator(command, keyspace, consistencyLevel);
