Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4F2B41844B for ; Mon, 16 Nov 2015 16:45:48 +0000 (UTC) Received: (qmail 7457 invoked by uid 500); 16 Nov 2015 16:45:48 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 7402 invoked by uid 500); 16 Nov 2015 16:45:48 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 7192 invoked by uid 99); 16 Nov 2015 16:45:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Nov 2015 16:45:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C9247E090B; Mon, 16 Nov 2015 16:45:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: snazy@apache.org To: commits@cassandra.apache.org Date: Mon, 16 Nov 2015 16:45:49 -0000 Message-Id: In-Reply-To: <68b56bec775142009ecd330b4ea0f34a@git.apache.org> References: <68b56bec775142009ecd330b4ea0f34a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk 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 Authored: Mon Nov 16 17:42:42 2015 +0100 Committer: Robert Stupp 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) {