[core] Merge Pull Request #371 from 'YCSB-hdr-default/master'

- *incompatible* Default measurement changed from histogram to hdrhistogram
  Users who want previous behavior can set the 'measurementtype' property to 'histogram'

- *incompatible* Reported 95th and 99th percentile latencies now in microseconds (previously in milliseconds)

Conflicts:
	core/src/main/java/com/yahoo/ycsb/measurements/OneMeasurementHdrHistogram.java

closes #371

core/src/main/java/com/yahoo/ycsb/measurements/Measurements.java

@@ -33,8 +33,8 @@ public class Measurements
 {
 
   public static final String MEASUREMENT_TYPE_PROPERTY = "measurementtype";
-
-  private static final String MEASUREMENT_TYPE_PROPERTY_DEFAULT = "histogram";
+  private static final String MEASUREMENT_TYPE_PROPERTY_DEFAULT = "hdrhistogram";
+  
   public static final String MEASUREMENT_INTERVAL = "measurement.interval";
   private static final String MEASUREMENT_INTERVAL_DEFAULT = "op";
 

core/src/main/java/com/yahoo/ycsb/measurements/OneMeasurement.java

@@ -29,8 +29,8 @@ import com.yahoo.ycsb.measurements.exporter.MeasurementsExporter;
  */
 public abstract class OneMeasurement {
 
-  String _name;
-  final ConcurrentHashMap<Integer, AtomicInteger> returncodes;
+  private final String _name;
+  private  final ConcurrentHashMap<Integer, AtomicInteger> _returncodes;
 
   public String getName() {
     return _name;
@@ -41,7 +41,7 @@ public abstract class OneMeasurement {
    */
   public OneMeasurement(String _name) {
     this._name = _name;
-    this.returncodes = new ConcurrentHashMap<Integer, AtomicInteger>();
+    this._returncodes = new ConcurrentHashMap<Integer, AtomicInteger>();
   }
 
   public abstract void measure(int latency);
@@ -53,10 +53,10 @@ public abstract class OneMeasurement {
    */
   public void reportReturnCode(int code) {
     Integer Icode = code;
-    AtomicInteger counter = returncodes.get(Icode);
+    AtomicInteger counter = _returncodes.get(Icode);
 
     if (counter == null) {
-      AtomicInteger other = returncodes.putIfAbsent(Icode, counter = new AtomicInteger());
+      AtomicInteger other = _returncodes.putIfAbsent(Icode, counter = new AtomicInteger());
       if (other != null) {
         counter = other;
       }
@@ -73,4 +73,9 @@ public abstract class OneMeasurement {
    */
   public abstract void exportMeasurements(MeasurementsExporter exporter) throws IOException;
 
+  protected final void exportReturnCodes(MeasurementsExporter exporter) throws IOException {
+    for (Map.Entry<Integer, AtomicInteger> entry : _returncodes.entrySet()) {
+      exporter.write(getName(), "Return=" + entry.getKey(), entry.getValue().get());
+    }
+  }
 }

core/src/main/java/com/yahoo/ycsb/measurements/OneMeasurementHdrHistogram.java

@@ -34,8 +34,8 @@ import org.HdrHistogram.Recorder;
 import com.yahoo.ycsb.measurements.exporter.MeasurementsExporter;
 
 /**
- * Take measurements and maintain a HdrHistogram of a given metric, such as
- * READ LATENCY.
+ * Take measurements and maintain a HdrHistogram of a given metric, such as READ
+ * LATENCY.
  *
  * @author nitsanw
  *
@@ -92,7 +92,7 @@ public class OneMeasurementHdrHistogram extends OneMeasurement {
   public void exportMeasurements(MeasurementsExporter exporter) throws IOException {
     // accumulate the last interval which was not caught by status thread
     Histogram intervalHistogram = getIntervalHistogramAndAccumulate();
-    if(histogramLogWriter != null) {
+    if (histogramLogWriter != null) {
       histogramLogWriter.outputIntervalHistogram(intervalHistogram);
       // we can close now
       log.close();
@@ -101,49 +101,45 @@ public class OneMeasurementHdrHistogram extends OneMeasurement {
     exporter.write(getName(), "AverageLatency(us)", totalHistogram.getMean());
     exporter.write(getName(), "MinLatency(us)", totalHistogram.getMinValue());
     exporter.write(getName(), "MaxLatency(us)", totalHistogram.getMaxValue());
-    exporter.write(getName(), "95thPercentileLatency(ms)", totalHistogram.getValueAtPercentile(90)/1000);
-    exporter.write(getName(), "99thPercentileLatency(ms)", totalHistogram.getValueAtPercentile(99)/1000);
-
-    for (Map.Entry<Integer, AtomicInteger> entry : returncodes.entrySet()) {
-      exporter.write(getName(), "Return=" + entry.getKey(), entry.getValue().get());
-    }
+    exporter.write(getName(), "95thPercentileLatency(us)", totalHistogram.getValueAtPercentile(90));
+    exporter.write(getName(), "99thPercentileLatency(us)", totalHistogram.getValueAtPercentile(99));
+    
+    exportReturnCodes(exporter);
   }
 
-  /**
-    * This is called periodically from the StatusThread. There's a single StatusThread per Client process.
-    * We optionally serialize the interval to log on this opportunity.
-    * @see com.yahoo.ycsb.measurements.OneMeasurement#getSummary()
-    */
-  @Override
-  public String getSummary() {
-    Histogram intervalHistogram = getIntervalHistogramAndAccumulate();
-    // we use the summary interval as the histogram file interval.
-    if(histogramLogWriter != null) {
-      histogramLogWriter.outputIntervalHistogram(intervalHistogram);
-    }
+	/**
+	 * This is called periodically from the StatusThread. There's a single
+	 * StatusThread per Client process. We optionally serialize the interval to
+	 * log on this opportunity.
+	 * 
+	 * @see com.yahoo.ycsb.measurements.OneMeasurement#getSummary()
+	 */
+	@Override
+	public String getSummary() {
+		Histogram intervalHistogram = getIntervalHistogramAndAccumulate();
+		// we use the summary interval as the histogram file interval.
+		if (histogramLogWriter != null) {
+			histogramLogWriter.outputIntervalHistogram(intervalHistogram);
+		}
 
-    DecimalFormat d = new DecimalFormat("#.##");
-    return "[" + getName() +
-            ": Count=" + intervalHistogram.getTotalCount() +
-            ", Max=" + intervalHistogram.getMaxValue() +
-            ", Min=" + intervalHistogram.getMinValue() +
-            ", Avg=" + d.format(intervalHistogram.getMean()) +
-            ", 90=" + d.format(intervalHistogram.getValueAtPercentile(90)) +
-            ", 99=" + d.format(intervalHistogram.getValueAtPercentile(99)) +
-            ", 99.9=" + d.format(intervalHistogram.getValueAtPercentile(99.9)) +
-            ", 99.99=" + d.format(intervalHistogram.getValueAtPercentile(99.99)) +"]";
-  }
+		DecimalFormat d = new DecimalFormat("#.##");
+		return "[" + getName() + ": Count=" + intervalHistogram.getTotalCount() + ", Max="
+				+ intervalHistogram.getMaxValue() + ", Min=" + intervalHistogram.getMinValue() + ", Avg="
+				+ d.format(intervalHistogram.getMean()) + ", 90=" + d.format(intervalHistogram.getValueAtPercentile(90))
+				+ ", 99=" + d.format(intervalHistogram.getValueAtPercentile(99)) + ", 99.9="
+				+ d.format(intervalHistogram.getValueAtPercentile(99.9)) + ", 99.99="
+				+ d.format(intervalHistogram.getValueAtPercentile(99.99)) + "]";
+	}
 
-  private Histogram getIntervalHistogramAndAccumulate() {
-      Histogram intervalHistogram = histogram.getIntervalHistogram();
-      // add this to the total time histogram.
-      if (totalHistogram == null) {
-        totalHistogram = intervalHistogram;
-      }
-      else {
-        totalHistogram.add(intervalHistogram);
-      }
-      return intervalHistogram;
-  }
+	private Histogram getIntervalHistogramAndAccumulate() {
+		Histogram intervalHistogram = histogram.getIntervalHistogram();
+		// add this to the total time histogram.
+		if (totalHistogram == null) {
+			totalHistogram = intervalHistogram;
+		} else {
+			totalHistogram.add(intervalHistogram);
+		}
+		return intervalHistogram;
+	}
 
 }

core/src/main/java/com/yahoo/ycsb/measurements/OneMeasurementHistogram.java

@@ -109,19 +109,17 @@ public class OneMeasurementHistogram extends OneMeasurement
       opcounter+=histogram[i];
       if ( (!done95th) && (((double)opcounter)/((double)operations)>=0.95) )
       {
-        exporter.write(getName(), "95thPercentileLatency(ms)", i);
+        exporter.write(getName(), "95thPercentileLatency(us)", i*1000);
         done95th=true;
       }
       if (((double)opcounter)/((double)operations)>=0.99)
       {
-        exporter.write(getName(), "99thPercentileLatency(ms)", i);
+        exporter.write(getName(), "99thPercentileLatency(us)", i*1000);
         break;
       }
     }
 
-    for (Map.Entry<Integer, AtomicInteger> entry : returncodes.entrySet()) {
-      exporter.write(getName(), "Return=" + entry.getKey(), entry.getValue().get());
-    }
+    exportReturnCodes(exporter);
 
     for (int i=0; i<_buckets; i++)
     {

core/src/main/java/com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.java

@@ -125,24 +125,18 @@ public class OneMeasurementTimeSeries extends OneMeasurement
 
 
   @Override
-  public void exportMeasurements(MeasurementsExporter exporter) throws IOException
-  {
+  public void exportMeasurements(MeasurementsExporter exporter) throws IOException {
     checkEndOfUnit(true);
 
     exporter.write(getName(), "Operations", operations);
-    exporter.write(getName(), "AverageLatency(us)", (((double)totallatency)/((double)operations)));
+    exporter.write(getName(), "AverageLatency(us)", (((double) totallatency) / ((double) operations)));
     exporter.write(getName(), "MinLatency(us)", min);
     exporter.write(getName(), "MaxLatency(us)", max);
 
-    //TODO: 95th and 99th percentile latency
-
+    // TODO: 95th and 99th percentile latency
 
-    for (Map.Entry<Integer, AtomicInteger> entry : returncodes.entrySet()) {
-      exporter.write(getName(), "Return=" + entry.getKey(), entry.getValue().get());
-    }
-
-    for (SeriesUnit unit : _measurements)
-    {
+    exportReturnCodes(exporter);
+    for (SeriesUnit unit : _measurements) {
       exporter.write(getName(), Long.toString(unit.time), unit.average);
     }
   }

core/src/test/java/com/yahoo/ycsb/measurements/exporter/TestMeasurementsExporter.java

@@ -32,7 +32,9 @@ import static org.testng.AssertJUnit.assertTrue;
 public class TestMeasurementsExporter {
     @Test
     public void testJSONArrayMeasurementsExporter() throws IOException {
-        Measurements mm = new Measurements(new Properties());
+        Properties props = new Properties();
+        props.put(Measurements.MEASUREMENT_TYPE_PROPERTY, "histogram");
+        Measurements mm = new Measurements(props);
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         JSONArrayMeasurementsExporter export = new JSONArrayMeasurementsExporter(out);