Repository: cassandra Updated Branches: refs/heads/trunk ebe592173 -> 7358fe318
Remove adjusted op rate from stress output patch by Benedict Elliott Smith; reviewed by Aleksey Yeschenko for CASSANDRA-6921 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ebaa755b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ebaa755b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ebaa755b Branch: refs/heads/trunk Commit: ebaa755b1b05e2b4c3671efa242afbf59dfd0497 Parents: 7610102 Author: Benedict Elliott Smith <[email protected]> Authored: Wed Mar 26 22:02:47 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Wed Mar 26 22:04:06 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../src/org/apache/cassandra/stress/StressMetrics.java | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ebaa755b/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index bf65757..7f88d0f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -32,6 +32,7 @@ * Make OpOrder AutoCloseable (CASSANDRA-6901) * Remove sync repair JMX interface (CASSANDRA-6900) * Add multiple memory allocation options for memtables (CASSANDRA-6689) + * Remove adjusted op rate from stress output (CASSANDRA-6921) Merged from 2.0: * Restrict Windows to parallel repairs (CASSANDRA-6907) * (Hadoop) Allow manually specifying start/end tokens in CFIF (CASSANDRA-6436) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ebaa755b/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java b/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java index c31665b..54a1e2c 100644 --- a/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java +++ b/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java @@ -26,11 +26,12 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ThreadFactory; +import org.apache.commons.lang3.time.DurationFormatUtils; + import org.apache.cassandra.concurrent.NamedThreadFactory; import org.apache.cassandra.stress.util.Timing; import org.apache.cassandra.stress.util.TimingInterval; import org.apache.cassandra.stress.util.Uncertainty; -import org.apache.commons.lang3.time.DurationFormatUtils; public class StressMetrics { @@ -126,12 +127,12 @@ public class StressMetrics // PRINT FORMATTING - public static final String HEADFORMAT = "%-10s,%8s,%8s,%8s,%8s,%8s,%8s,%8s,%8s,%8s,%7s,%9s"; - public static final String ROWFORMAT = "%-10d,%8.0f,%8.0f,%8.0f,%8.1f,%8.1f,%8.1f,%8.1f,%8.1f,%8.1f,%7.1f,%9.5f"; + public static final String HEADFORMAT = "%-10s,%8s,%8s,%8s,%8s,%8s,%8s,%8s,%8s,%7s,%9s"; + public static final String ROWFORMAT = "%-10d,%8.0f,%8.0f,%8.1f,%8.1f,%8.1f,%8.1f,%8.1f,%8.1f,%7.1f,%9.5f"; private static void printHeader(String prefix, PrintStream output) { - output.println(prefix + String.format(HEADFORMAT, "ops","op/s", "adj op/s","key/s","mean","med",".95",".99",".999","max","time","stderr")); + output.println(prefix + String.format(HEADFORMAT, "ops","op/s", "key/s","mean","med",".95",".99",".999","max","time","stderr")); } private static void printRow(String prefix, TimingInterval interval, TimingInterval total, Uncertainty opRateUncertainty, PrintStream output) @@ -139,7 +140,6 @@ public class StressMetrics output.println(prefix + String.format(ROWFORMAT, total.operationCount, interval.realOpRate(), - interval.adjustedOpRate(), interval.keyRate(), interval.meanLatency(), interval.medianLatency(), @@ -157,7 +157,6 @@ public class StressMetrics output.println("Results:"); TimingInterval history = timing.getHistory(); output.println(String.format("real op rate : %.0f", history.realOpRate())); - output.println(String.format("adjusted op rate : %.0f", history.adjustedOpRate())); output.println(String.format("adjusted op rate stderr : %.0f", opRateUncertainty.getUncertainty())); output.println(String.format("key rate : %.0f", history.keyRate())); output.println(String.format("latency mean : %.1f", history.meanLatency()));
