cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Date Mon, 16 Nov 2015 16:45:49 GMT
Merge branch 'cassandra-3.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/0010fce6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0010fce6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0010fce6

Branch: refs/heads/trunk
Commit: 0010fce6d2c9a811eb66de077b69a83dce29a6ff
Parents: 269c5d4 36e7677
Author: Robert Stupp <snazy@snazy.de>
Authored: Mon Nov 16 17:42:42 2015 +0100
Committer: Robert Stupp <snazy@snazy.de>
Committed: Mon Nov 16 17:42:42 2015 +0100

----------------------------------------------------------------------
 tools/stress/src/org/apache/cassandra/stress/StressMetrics.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0010fce6/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
----------------------------------------------------------------------
diff --cc tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
index 991edf9,a640058..0190ed8
--- a/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
@@@ -177,8 -177,6 +177,8 @@@ public class StressMetric
  
      public static final String HEADFORMAT = "%-10s%10s,%8s,%8s,%8s,%8s,%8s,%8s,%8s,%8s,%8s,%7s,%9s,%7s,%7s,%8s,%8s,%8s,%8s";
      public static final String ROWFORMAT =  "%-10s%10d,%8.0f,%8.0f,%8.0f,%8.1f,%8.1f,%8.1f,%8.1f,%8.1f,%8.1f,%7.1f,%9.5f,%7d,%7.0f,%8.0f,%8.0f,%8.0f,%8.0f";
 +    public static final String[] HEADMETRICS = new String[]{"type", "total ops","op/s","pk/s","row/s","mean","med",".95",".99",".999","max","time","stderr",
"errors", "gc: #", "max ms", "sum ms", "sdv ms", "mb"};
-     public static final String HEAD = String.format(HEADFORMAT, HEADMETRICS);
++    public static final String HEAD = String.format(HEADFORMAT, (Object[]) HEADMETRICS);
  
      private static void printHeader(String prefix, PrintStream output)
      {


Mime
View raw message