You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/09/15 04:02:13 UTC
[1/2] git commit: don't call getCompactions thru the proxy twice for
compactionstats
Repository: cassandra
Updated Branches:
refs/heads/trunk 0494cf75c -> c3d10abc7
don't call getCompactions thru the proxy twice for compactionstats
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/db3cc3e6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db3cc3e6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db3cc3e6
Branch: refs/heads/trunk
Commit: db3cc3e65163dbb6ef0f75a158f632d168e314d9
Parents: 2c28fde
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sun Sep 14 22:01:27 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sun Sep 14 22:01:27 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeTool.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/db3cc3e6/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 08a8055..fbdce0f 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -1175,13 +1175,14 @@ public class NodeTool
CompactionManagerMBean cm = probe.getCompactionManagerProxy();
System.out.println("pending tasks: " + probe.getCompactionMetric("PendingTasks"));
long remainingBytes = 0;
- if (cm.getCompactions().size() > 0)
+ List<Map<String, String>> compactions = cm.getCompactions();
+ if (!compactions.isEmpty())
{
List<String[]> lines = new ArrayList<>();
int[] columnSizes = new int[] { 0, 0, 0, 0, 0, 0, 0 };
addLine(lines, columnSizes, "compaction type", "keyspace", "table", "completed", "total", "unit", "progress");
- for (Map<String, String> c : cm.getCompactions())
+ for (Map<String, String> c : compactions)
{
long total = Long.parseLong(c.get("total"));
long completed = Long.parseLong(c.get("completed"));
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3d10abc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3d10abc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3d10abc
Branch: refs/heads/trunk
Commit: c3d10abc7dc2c4bb9db358c3d510de29d5ae51ca
Parents: 0494cf7 db3cc3e
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sun Sep 14 22:01:53 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sun Sep 14 22:01:53 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeTool.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3d10abc/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------