diff --git a/CHANGES.txt b/CHANGES.txt index 611954cc83..46d95e5ef2 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -37,6 +37,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: * (Hadoop) Allow manually specifying start/end tokens in CFIF (CASSANDRA-6436) * Fix NPE in MeteredFlusher (CASSANDRA-6820) diff --git a/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java b/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java index c31665b22f..54a1e2c2d2 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()));