cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject cassandra git commit: simplify
Date Mon, 30 Mar 2015 00:46:20 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 7ea642c89 -> ce643ff99


simplify


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ce643ff9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce643ff9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce643ff9

Branch: refs/heads/trunk
Commit: ce643ff99f57784577f2067f2ae4c95d3a02ecff
Parents: 7ea642c
Author: Dave Brosius <dbrosius@mebigfatguy.com>
Authored: Sun Mar 29 20:46:04 2015 -0400
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Sun Mar 29 20:46:04 2015 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/tools/NodeTool.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce643ff9/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java
index 9c804c0..4ef2469 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -2133,12 +2133,11 @@ public class NodeTool
         @Option(title = "resolve_ip", name = {"-r", "--resolve-ip"}, description = "Show
node domain names instead of IPs")
         private boolean resolveIp = false;
 
-        private boolean hasEffectiveOwns = false;
         private boolean isTokenPerNode = true;
         private int maxAddressLength = 0;
         private String format = null;
         private Collection<String> joiningNodes, leavingNodes, movingNodes, liveNodes,
unreachableNodes;
-        private Map<String, String> loadMap, hostIDMap, tokensToEndpoints;
+        private Map<String, String> loadMap, hostIDMap;
         private EndpointSnitchInfoMBean epSnitchInfo;
 
         @Override
@@ -2148,7 +2147,7 @@ public class NodeTool
             leavingNodes = probe.getLeavingNodes();
             movingNodes = probe.getMovingNodes();
             loadMap = probe.getLoadMap();
-            tokensToEndpoints = probe.getTokenToEndpointMap();
+            Map<String, String> tokensToEndpoints = probe.getTokenToEndpointMap();
             liveNodes = probe.getLiveNodes();
             unreachableNodes = probe.getUnreachableNodes();
             hostIDMap = probe.getHostIdMap();
@@ -2157,6 +2156,7 @@ public class NodeTool
             StringBuffer errors = new StringBuffer();
 
             Map<InetAddress, Float> ownerships = null;
+            boolean hasEffectiveOwns = false;
             try
             {
                 ownerships = probe.effectiveOwnership(keyspace);


Mime
View raw message