Repository: cassandra Updated Branches: refs/heads/trunk 23787b5f8 -> 478c1a9fd
a map is the same size as it's keySet or values collection, so just use that Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/478c1a9f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/478c1a9f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/478c1a9f Branch: refs/heads/trunk Commit: 478c1a9fdf027af0f373f9e26521803ae8775fdb Parents: 23787b5 Author: Dave Brosius <[email protected]> Authored: Thu Apr 5 22:54:02 2018 -0400 Committer: Dave Brosius <[email protected]> Committed: Thu Apr 5 22:54:02 2018 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java | 2 +- src/java/org/apache/cassandra/tools/nodetool/Status.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/478c1a9f/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java index d2a0d86..989d154 100644 --- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java +++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java @@ -438,7 +438,7 @@ class CqlRecordWriter extends RecordWriter<Map<String, ByteBuffer>, List<ByteBuf return true; if (e instanceof NoHostAvailableException) { - if (((NoHostAvailableException) e).getErrors().values().size() == 1) + if (((NoHostAvailableException) e).getErrors().size() == 1) { Throwable cause = ((NoHostAvailableException) e).getErrors().values().iterator().next(); if (cause != null && cause.getCause() instanceof java.nio.channels.ClosedByInterruptException) http://git-wip-us.apache.org/repos/asf/cassandra/blob/478c1a9f/src/java/org/apache/cassandra/tools/nodetool/Status.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Status.java b/src/java/org/apache/cassandra/tools/nodetool/Status.java index 10c7fdf..b2f9c19 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Status.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Status.java @@ -91,7 +91,7 @@ public class Status extends NodeToolCmd SortedMap<String, SetHostStatWithPort> dcs = NodeTool.getOwnershipByDcWithPort(probe, resolveIp, tokensToEndpoints, ownerships); // More tokens than nodes (aka vnodes)? - if (dcs.values().size() < tokensToEndpoints.keySet().size()) + if (dcs.size() < tokensToEndpoints.size()) isTokenPerNode = false; findMaxAddressLengthWithPort(dcs); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
