Updated Branches: refs/heads/cassandra-2.0 750247448 -> 6fae7a650 refs/heads/trunk facb81dc4 -> 228e67e59
cleanup Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6fae7a65 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6fae7a65 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6fae7a65 Branch: refs/heads/cassandra-2.0 Commit: 6fae7a6509c516c403c8b343ab208225669095d7 Parents: 7502474 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Oct 9 15:22:25 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Oct 9 15:22:25 2013 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/db/CounterColumn.java | 2 +- .../apache/cassandra/net/MessagingService.java | 2 +- .../apache/cassandra/service/StorageProxy.java | 18 ++++++++---------- 3 files changed, 10 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fae7a65/src/java/org/apache/cassandra/db/CounterColumn.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/CounterColumn.java b/src/java/org/apache/cassandra/db/CounterColumn.java index 2993485..b470c5a 100644 --- a/src/java/org/apache/cassandra/db/CounterColumn.java +++ b/src/java/org/apache/cassandra/db/CounterColumn.java @@ -362,7 +362,7 @@ public class CounterColumn extends Column Set<InetAddress> remotes = Sets.difference(ImmutableSet.copyOf(targets), ImmutableSet.of(local)); // Fake local response to be a good lad but we won't wait on the responseHandler responseHandler.response(null); - StorageProxy.sendToHintedEndpoints((RowMutation) mutation, remotes, responseHandler, localDataCenter, consistency_level); + StorageProxy.sendToHintedEndpoints((RowMutation) mutation, remotes, responseHandler, localDataCenter); } }, null, WriteType.SIMPLE); http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fae7a65/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java index ad15dd2..bda7038 100644 --- a/src/java/org/apache/cassandra/net/MessagingService.java +++ b/src/java/org/apache/cassandra/net/MessagingService.java @@ -348,7 +348,7 @@ public final class MessagingService implements MessagingServiceMBean if (expiredCallbackInfo.shouldHint()) { RowMutation rm = (RowMutation) ((WriteCallbackInfo) expiredCallbackInfo).sentMessage.payload; - return StorageProxy.submitHint(rm, expiredCallbackInfo.target, null, null); + return StorageProxy.submitHint(rm, expiredCallbackInfo.target, null); } return null; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fae7a65/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 3c68121..cac38a3 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -116,7 +116,7 @@ public class StorageProxy implements StorageProxyMBean throws OverloadedException { assert mutation instanceof RowMutation; - sendToHintedEndpoints((RowMutation) mutation, targets, responseHandler, localDataCenter, consistency_level); + sendToHintedEndpoints((RowMutation) mutation, targets, responseHandler, localDataCenter); } }; @@ -530,7 +530,7 @@ public class StorageProxy implements StorageProxyMBean List<InetAddress> naturalEndpoints = StorageService.instance.getNaturalEndpoints(mutation.getKeyspaceName(), tk); Collection<InetAddress> pendingEndpoints = StorageService.instance.getTokenMetadata().pendingEndpointsFor(tk, mutation.getKeyspaceName()); for (InetAddress target : Iterables.concat(naturalEndpoints, pendingEndpoints)) - submitHint((RowMutation) mutation, target, null, consistency_level); + submitHint((RowMutation) mutation, target, null); } Tracing.trace("Wrote hint to satisfy CL.ANY after no replicas acknowledged the write"); } @@ -689,7 +689,7 @@ public class StorageProxy implements StorageProxyMBean for (WriteResponseHandlerWrapper wrapper : wrappers) { Iterable<InetAddress> endpoints = Iterables.concat(wrapper.handler.naturalEndpoints, wrapper.handler.pendingEndpoints); - sendToHintedEndpoints(wrapper.mutation, endpoints, wrapper.handler, localDataCenter, consistencyLevel); + sendToHintedEndpoints(wrapper.mutation, endpoints, wrapper.handler, localDataCenter); } for (WriteResponseHandlerWrapper wrapper : wrappers) @@ -824,8 +824,7 @@ public class StorageProxy implements StorageProxyMBean public static void sendToHintedEndpoints(final RowMutation rm, Iterable<InetAddress> targets, AbstractWriteResponseHandler responseHandler, - String localDataCenter, - ConsistencyLevel consistency_level) + String localDataCenter) throws OverloadedException { // extra-datacenter replicas, grouped by dc @@ -884,7 +883,7 @@ public class StorageProxy implements StorageProxyMBean continue; // Schedule a local hint - submitHint(rm, destination, responseHandler, consistency_level); + submitHint(rm, destination, responseHandler); } } @@ -913,8 +912,7 @@ public class StorageProxy implements StorageProxyMBean public static Future<Void> submitHint(final RowMutation mutation, final InetAddress target, - final AbstractWriteResponseHandler responseHandler, - final ConsistencyLevel consistencyLevel) + final AbstractWriteResponseHandler responseHandler) { // local write that time out should be handled by LocalMutationRunnable assert !target.equals(FBUtilities.getBroadcastAddress()) : target; @@ -929,7 +927,7 @@ public class StorageProxy implements StorageProxyMBean logger.debug("Adding hint for {}", target); writeHintForMutation(mutation, ttl, target); // Notify the handler only for CL == ANY - if (responseHandler != null && consistencyLevel == ConsistencyLevel.ANY) + if (responseHandler != null && responseHandler.consistencyLevel == ConsistencyLevel.ANY) responseHandler.response(null); } else @@ -1124,7 +1122,7 @@ public class StorageProxy implements StorageProxyMBean public void runMayThrow() throws OverloadedException { // send mutation to other replica - sendToHintedEndpoints(cm.makeReplicationMutation(), remotes, responseHandler, localDataCenter, consistency_level); + sendToHintedEndpoints(cm.makeReplicationMutation(), remotes, responseHandler, localDataCenter); } }); }