Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c9a906c4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9a906c4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9a906c4 Branch: refs/heads/trunk Commit: c9a906c473d14f2c51a0541de4388e5dd64231ed Parents: 3e7ebf8 4284d98 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Sun Oct 13 17:52:36 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Sun Oct 13 17:52:36 2013 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/cql3/statements/CreateUserStatement.java | 2 +- .../org/apache/cassandra/cql3/statements/DropUserStatement.java | 2 +- src/java/org/apache/cassandra/service/StorageProxy.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9a906c4/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageProxy.java index cac38a3,f195285..259d2f5 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@@ -736,14 -384,14 +736,14 @@@ public class StorageProxy implements St return responseHandler; } - // same as above except does not initiate writes (but does perfrom availability checks). + // same as above except does not initiate writes (but does perform availability checks). private static WriteResponseHandlerWrapper wrapResponseHandler(RowMutation mutation, ConsistencyLevel consistency_level, WriteType writeType) { - AbstractReplicationStrategy rs = Table.open(mutation.getTable()).getReplicationStrategy(); - String table = mutation.getTable(); + AbstractReplicationStrategy rs = Keyspace.open(mutation.getKeyspaceName()).getReplicationStrategy(); + String keyspaceName = mutation.getKeyspaceName(); Token tk = StorageService.getPartitioner().getToken(mutation.key()); - List<InetAddress> naturalEndpoints = StorageService.instance.getNaturalEndpoints(table, tk); - Collection<InetAddress> pendingEndpoints = StorageService.instance.getTokenMetadata().pendingEndpointsFor(tk, table); + List<InetAddress> naturalEndpoints = StorageService.instance.getNaturalEndpoints(keyspaceName, tk); + Collection<InetAddress> pendingEndpoints = StorageService.instance.getTokenMetadata().pendingEndpointsFor(tk, keyspaceName); AbstractWriteResponseHandler responseHandler = rs.getWriteResponseHandler(naturalEndpoints, pendingEndpoints, consistency_level, null, writeType); return new WriteResponseHandlerWrapper(responseHandler, mutation); }
