Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9342dddc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9342dddc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9342dddc Branch: refs/heads/cassandra-1.2 Commit: 9342dddc5c95c222536ebc4efd420493d2820e29 Parents: 1df03b3 e1206f3 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Jan 4 07:39:26 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Jan 4 07:39:26 2013 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/service/MoveTest.java | 147 ++++++++------- 1 files changed, 76 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9342dddc/test/unit/org/apache/cassandra/service/MoveTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/service/MoveTest.java index 65d934b,1a33d7f..e30bbde --- a/test/unit/org/apache/cassandra/service/MoveTest.java +++ b/test/unit/org/apache/cassandra/service/MoveTest.java @@@ -88,23 -86,19 +88,20 @@@ public class MoveTes ArrayList<Token> endpointTokens = new ArrayList<Token>(); ArrayList<Token> keyTokens = new ArrayList<Token>(); List<InetAddress> hosts = new ArrayList<InetAddress>(); + List<UUID> hostIds = new ArrayList<UUID>(); - Util.createInitialRing(ss, partitioner, endpointTokens, keyTokens, hosts, RING_SIZE); + Util.createInitialRing(ss, partitioner, endpointTokens, keyTokens, hosts, hostIds, RING_SIZE); Map<Token, List<InetAddress>> expectedEndpoints = new HashMap<Token, List<InetAddress>>(); - for (String table : Schema.instance.getNonSystemTables()) + for (Token token : keyTokens) { - for (Token token : keyTokens) + List<InetAddress> endpoints = new ArrayList<InetAddress>(); + Iterator<Token> tokenIter = TokenMetadata.ringIterator(tmd.sortedTokens(), token, false); + while (tokenIter.hasNext()) { - List<InetAddress> endpoints = new ArrayList<InetAddress>(); - Iterator<Token> tokenIter = TokenMetadata.ringIterator(tmd.sortedTokens(), token, false); - while (tokenIter.hasNext()) - { - endpoints.add(tmd.getEndpoint(tokenIter.next())); - } - expectedEndpoints.put(token, endpoints); + endpoints.add(tmd.getEndpoint(tokenIter.next())); } + expectedEndpoints.put(token, endpoints); } // node LEAVING_NODE should move to this token
