Repository: cassandra Updated Branches: refs/heads/trunk 82a526863 -> e617d8461
fixup Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e617d846 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e617d846 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e617d846 Branch: refs/heads/trunk Commit: e617d84616893c974e6132f9dab7748645466632 Parents: 82a5268 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Wed Apr 1 15:55:02 2015 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Wed Apr 1 15:55:02 2015 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/locator/NetworkTopologyStrategy.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e617d846/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java b/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java index fb291b5..6959f29 100644 --- a/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java +++ b/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java @@ -85,7 +85,7 @@ public class NetworkTopologyStrategy extends AbstractReplicationStrategy // replicas we have found in each DC Map<String, Set<InetAddress>> dcReplicas = new HashMap<>(datacenters.size()); for (Map.Entry<String, Integer> dc : datacenters.entrySet()) - dcReplicas.put(dc.getKey(), new HashSet<>(dc.getValue())); + dcReplicas.put(dc.getKey(), new HashSet<InetAddress>(dc.getValue())); Topology topology = tokenMetadata.getTopology(); // all endpoints in each DC, so we can check when we have exhausted all the members of a DC @@ -97,13 +97,13 @@ public class NetworkTopologyStrategy extends AbstractReplicationStrategy // tracks the racks we have already placed replicas in Map<String, Set<String>> seenRacks = new HashMap<>(datacenters.size()); for (Map.Entry<String, Integer> dc : datacenters.entrySet()) - seenRacks.put(dc.getKey(), new HashSet<>()); + seenRacks.put(dc.getKey(), new HashSet<String>()); // tracks the endpoints that we skipped over while looking for unique racks // when we relax the rack uniqueness we can append this to the current result so we don't have to wind back the iterator Map<String, Set<InetAddress>> skippedDcEndpoints = new HashMap<>(datacenters.size()); for (Map.Entry<String, Integer> dc : datacenters.entrySet()) - skippedDcEndpoints.put(dc.getKey(), new LinkedHashSet<>()); + skippedDcEndpoints.put(dc.getKey(), new LinkedHashSet<InetAddress>()); Iterator<Token> tokenIter = TokenMetadata.ringIterator(tokenMetadata.sortedTokens(), searchToken, false); while (tokenIter.hasNext() && !hasSufficientReplicas(dcReplicas, allEndpoints))
