Updated Branches: refs/heads/trunk 7f2c3a8e4 -> 1aa987402
remove unused assignments Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1aa98740 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1aa98740 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1aa98740 Branch: refs/heads/trunk Commit: 1aa987402d43b4a6ca7af8725e0e9fcb5477b6d2 Parents: 7f2c3a8 Author: Dave Brosius <dbros...@apache.org> Authored: Fri Apr 26 22:23:48 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Fri Apr 26 22:23:48 2013 -0400 ---------------------------------------------------------------------- .../cassandra/cql3/statements/SelectStatement.java | 1 - .../apache/cassandra/service/StorageService.java | 4 +--- 2 files changed, 1 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1aa98740/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java index 38fa361..e857104 100644 --- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java @@ -273,7 +273,6 @@ public class SelectStatement implements CQLStatement // to account for the grouping of columns. // Since that doesn't work for maps/sets/lists, we now use the compositesToGroup option of SliceQueryFilter. // But we must preserve backward compatibility too (for mixed version cluster that is). - int multiplier = cfDef.isCompact ? 1 : (cfDef.metadata.size() + 1); int toGroup = cfDef.isCompact ? -1 : cfDef.columns.size(); ColumnSlice slice = new ColumnSlice(getRequestedBound(Bound.START, variables), getRequestedBound(Bound.END, variables)); http://git-wip-us.apache.org/repos/asf/cassandra/blob/1aa98740/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index d720df2..c950e20 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -1496,9 +1496,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE private void handleStateLeft(InetAddress endpoint, String[] pieces) { assert pieces.length >= 2; - Collection<Token> tokens; - Integer version = MessagingService.instance().getVersion(endpoint); - tokens = getTokensFor(endpoint, pieces[1]); + Collection<Token> tokens = getTokensFor(endpoint, pieces[1]); if (logger.isDebugEnabled()) logger.debug("Node " + endpoint + " state left, tokens " + tokens);
