From a8a2ffb976f124e55576bac37cfb73e3bea92b4d Mon Sep 17 00:00:00 2001
From: Brandon Williams <brandonwilliams@apache.org>
Date: Tue, 8 Oct 2013 13:37:36 -0500
Subject: [PATCH] Revert metrics upgrade from stress. Patch by Mikhail Stepura,
 reviewed by brandonwilliams for CASSANDRA-6153

---
 .../org/apache/cassandra/stress/StressAction.java   |  4 +---
 .../apache/cassandra/stress/StressStatistics.java   | 13 +++----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/tools/stress/src/org/apache/cassandra/stress/StressAction.java b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
index 46005a112c..7098d0bab6 100644
--- a/tools/stress/src/org/apache/cassandra/stress/StressAction.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
@@ -140,9 +140,7 @@ public class StressAction extends Thread
                                              total,
                                              opDelta / interval,
                                              keyDelta / interval,
-                                             StressStatistics.nanosToMillis(latency.getMedian()), 
-                                             StressStatistics.nanosToMillis(latency.get95thPercentile()), 
-                                             StressStatistics.nanosToMillis(latency.get999thPercentile()),
+                                             latency.getMedian(), latency.get95thPercentile(), latency.get999thPercentile(),
                                              currentTimeInSeconds));
 
                 if (client.outputStatistics()) {
diff --git a/tools/stress/src/org/apache/cassandra/stress/StressStatistics.java b/tools/stress/src/org/apache/cassandra/stress/StressStatistics.java
index 2f7d72d016..b739c8e457 100644
--- a/tools/stress/src/org/apache/cassandra/stress/StressStatistics.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressStatistics.java
@@ -19,7 +19,6 @@
 package org.apache.cassandra.stress;
 
 import java.io.PrintStream;
-
 import org.apache.commons.lang3.time.DurationFormatUtils;
 
 import com.yammer.metrics.stats.Snapshot;
@@ -30,7 +29,6 @@ import com.yammer.metrics.stats.Snapshot;
  */
 public class StressStatistics
 {
-    private static final double NANOS_PER_MILLI = 1_000_000.0;
     
     private Session client;
     private PrintStream output;
@@ -95,11 +93,11 @@ public class StressStatistics
                 tallyOpRateCount += 1;
                 tallyKeyRateSum += intervalKeyRate;
                 tallyKeyRateCount += 1;
-                tallyLatencySum += nanosToMillis(latency.getMedian());
+                tallyLatencySum += latency.getMedian();
                 tallyLatencyCount += 1;
-                tally95thLatencySum += nanosToMillis(latency.get95thPercentile());
+                tally95thLatencySum += latency.get95thPercentile();
                 tally95thLatencyCount += 1;
-                tally999thLatencySum += nanosToMillis(latency.get999thPercentile());
+                tally999thLatencySum += latency.get999thPercentile();
                 tally999thLatencyCount += 1;
             }
         durationInSeconds = currentTimeInSeconds;
@@ -124,10 +122,5 @@ public class StressStatistics
         output.println("Total operation time      : " + DurationFormatUtils.formatDuration(
             durationInSeconds*1000, "HH:mm:ss", true));
     }
-    
-    public static double nanosToMillis(double nanos)
-    {
-        return nanos / NANOS_PER_MILLI;
-    }
 
 }