NO-JIRA: removing maximum latency from Java performance charts because it is not very useful and makes it harder to read the average

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1481726 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 91 insertions, 111 deletions

diff --git a/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef b/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef
index 84a3c4b6c3..6b7939157a 100644
--- a/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef
+++ b/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef
@@ -25,22 +25,17 @@ chartDescription=1P 1C, transient, auto-ack, with message payload between 256-26
 xAxisTitle=Message Size (B)
 yAxisTitle=Latency (millis)
 
-series.1.statement=SELECT payloadSizeB, maxLatency, 0 FROM Latency-MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers'
-series.1.legend=Maximum latency
+series.1.statement=SELECT payloadSizeB, averageLatency,latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers'
+series.1.legend=Average latency
 series.1.dir=${csvCurrentDir}
-series.1.colourName=blue
+series.1.colourName=red
 
 series.2.statement=SELECT payloadSizeB, averageLatency,latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers'
-series.2.legend=Average latency
-series.2.dir=${csvCurrentDir}
-series.2.colourName=red
+series.2.legend=Average latency (baseline ${baselineName})
+series.2.dir=${csvBaselineDir}
+series.2.colourName=dark_red
 
-series.3.statement=SELECT payloadSizeB, averageLatency,latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers'
-series.3.legend=Average latency (baseline ${baselineName})
-series.3.dir=${csvBaselineDir}
-series.3.colourName=dark_red
-
-series.4.statement=SELECT payloadSizeB, minLatency,0 FROM Latency-MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers'
-series.4.legend=Minimum latency
-series.4.dir=${csvCurrentDir}
-series.4.colourName=green
+series.3.statement=SELECT payloadSizeB, minLatency, 0 FROM Latency-MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers'
+series.3.legend=Minimum latency
+series.3.dir=${csvCurrentDir}
+series.3.colourName=green
diff --git a/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef b/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef
index c2ae16e207..c04e393046 100644
--- a/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef
+++ b/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef
@@ -25,22 +25,17 @@ chartDescription=1P 1C, persistent, auto-ack, with message payload between 256-2
 xAxisTitle=Message Size (B)
 yAxisTitle=Latency (millis)
 
-series.1.statement=SELECT payloadSizeB, maxLatency, 0 FROM Latency-MessageSize WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers'
-series.1.legend=Maximum latency
+series.1.statement=SELECT payloadSizeB, averageLatency, latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers'
+series.1.legend=Average latency
 series.1.dir=${csvCurrentDir}
-series.1.colourName=blue
+series.1.colourName=red
 
 series.2.statement=SELECT payloadSizeB, averageLatency, latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers'
-series.2.legend=Average latency
-series.2.dir=${csvCurrentDir}
-series.2.colourName=red
+series.2.legend=Average latency (baseline ${baselineName})
+series.2.dir=${csvBaselineDir}
+series.2.colourName=dark_red
 
-series.3.statement=SELECT payloadSizeB, averageLatency, latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers'
-series.3.legend=Average latency (baseline ${baselineName})
-series.3.dir=${csvBaselineDir}
-series.3.colourName=dark_red
-
-series.4.statement=SELECT payloadSizeB, minLatency, 0 FROM Latency-MessageSize WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers'
-series.4.legend=Minimum latency
-series.4.dir=${csvCurrentDir}
-series.4.colourName=green
+series.3.statement=SELECT payloadSizeB, minLatency, 0 FROM Latency-MessageSize WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers'
+series.3.legend=Minimum latency
+series.3.dir=${csvCurrentDir}
+series.3.colourName=green
diff --git a/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef b/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef
index ea8d82af2d..e22b31934f 100644
--- a/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef
+++ b/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef
@@ -25,22 +25,17 @@ chartDescription=1P 1-10C, transient, auto-ack, with message payload 1KB.
 xAxisTitle=Consumers
 yAxisTitle=Latency (millis)
 
-series.1.statement=SELECT totalNumberOfConsumers, maxLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - NON_PERSISTENT%'
-series.1.legend=Max latency
+series.1.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - NON_PERSISTENT%'
+series.1.legend=Average latency
 series.1.dir=${csvCurrentDir}
-series.1.colourName=blue
+series.1.colourName=red
 
 series.2.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - NON_PERSISTENT%'
-series.2.legend=Average latency
-series.2.dir=${csvCurrentDir}
-series.2.colourName=red
+series.2.legend=Average latency (baseline ${baselineName})
+series.2.dir=${csvBaselineDir}
+series.2.colourName=dark_red
 
-series.3.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - NON_PERSISTENT%'
-series.3.legend=Average latency (baseline ${baselineName})
-series.3.dir=${csvBaselineDir}
-series.3.colourName=dark_red
-
-series.4.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - NON_PERSISTENT%'
-series.4.legend=Min latency
-series.4.dir=${csvCurrentDir}
-series.4.colourName=green
+series.3.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - NON_PERSISTENT%'
+series.3.legend=Min latency
+series.3.dir=${csvCurrentDir}
+series.3.colourName=green
diff --git a/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef b/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef
index 96efcd64ba..921861fd4c 100644
--- a/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef
+++ b/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef
@@ -25,22 +25,17 @@ chartDescription=1P 1-10C, transient, auto-ack, with message payload 1KB.
 xAxisTitle=Consumers
 yAxisTitle=Latency (millis)
 
-series.1.statement=SELECT totalNumberOfConsumers, maxLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers'  and testName like '%overlapping 50% - NON_PERSISTENT%'
-series.1.legend=Max latency
+series.1.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers'  and testName like '%overlapping 50% - NON_PERSISTENT%'
+series.1.legend=Average latency
 series.1.dir=${csvCurrentDir}
-series.1.colourName=blue
+series.1.colourName=red
 
 series.2.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers'  and testName like '%overlapping 50% - NON_PERSISTENT%'
-series.2.legend=Average latency
-series.2.dir=${csvCurrentDir}
-series.2.colourName=red
+series.2.legend=Average latency (baseline ${baselineName})
+series.2.dir=${csvBaselineDir}
+series.2.colourName=dark_red
 
-series.3.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers'  and testName like '%overlapping 50% - NON_PERSISTENT%'
-series.3.legend=Average latency (baseline ${baselineName})
-series.3.dir=${csvBaselineDir}
-series.3.colourName=dark_red
-
-series.4.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - NON_PERSISTENT%'
-series.4.legend=Min latency
-series.4.dir=${csvCurrentDir}
-series.4.colourName=green
+series.3.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - NON_PERSISTENT%'
+series.3.legend=Min latency
+series.3.dir=${csvCurrentDir}
+series.3.colourName=green
diff --git a/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef b/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef
index a457e3cd3c..a93c16ec76 100644
--- a/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef
+++ b/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef
@@ -25,22 +25,18 @@ chartDescription=1P 1-10C, persistent, auto-ack, with message payload 1KB.
 xAxisTitle=Consumers
 yAxisTitle=Latency (millis)
 
-series.1.statement=SELECT totalNumberOfConsumers, maxLatency,0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - PERSISTENT'
-series.1.legend=Max latency
+
+series.1.statement=SELECT totalNumberOfConsumers, averageLatency, latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - PERSISTENT'
+series.1.legend=Average latency
 series.1.dir=${csvCurrentDir}
-series.1.colourName=blue
+series.1.colourName=red
 
 series.2.statement=SELECT totalNumberOfConsumers, averageLatency, latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - PERSISTENT'
-series.2.legend=Average latency
-series.2.dir=${csvCurrentDir}
-series.2.colourName=red
-
-series.3.statement=SELECT totalNumberOfConsumers, averageLatency, latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - PERSISTENT'
-series.3.legend=Average latency (baseline ${baselineName})
-series.3.dir=${csvBaselineDir}
-series.3.colourName=dark_red
+series.2.legend=Average latency (baseline ${baselineName})
+series.2.dir=${csvBaselineDir}
+series.2.colourName=dark_red
 
-series.4.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - PERSISTENT'
-series.4.legend=Min latency
-series.4.dir=${csvCurrentDir}
-series.4.colourName=green
+series.3.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - PERSISTENT'
+series.3.legend=Min latency
+series.3.dir=${csvCurrentDir}
+series.3.colourName=green
diff --git a/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef b/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef
index 84f58fc5f2..e89f988ff4 100644
--- a/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef
+++ b/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef
@@ -25,22 +25,17 @@ chartDescription=1P 1-10C, persistent, auto-ack, with message payload 1KB.
 xAxisTitle=Consumers
 yAxisTitle=Latency (millis)
 
-series.1.statement=SELECT totalNumberOfConsumers, maxLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - PERSISTENT%'
-series.1.legend=Max latency
+series.1.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - PERSISTENT%'
+series.1.legend=Average latency
 series.1.dir=${csvCurrentDir}
-series.1.colourName=blue
+series.1.colourName=red
 
 series.2.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - PERSISTENT%'
-series.2.legend=Average latency
-series.2.dir=${csvCurrentDir}
-series.2.colourName=red
+series.2.legend=Average latency (baseline ${baselineName})
+series.2.dir=${csvBaselineDir}
+series.2.colourName=dark_red
 
-series.3.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - PERSISTENT%'
-series.3.legend=Average latency (baseline ${baselineName})
-series.3.dir=${csvBaselineDir}
-series.3.colourName=dark_red
-
-series.4.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - PERSISTENT%'
-series.4.legend=Min latency
-series.4.dir=${csvCurrentDir}
-series.4.colourName=green
+series.3.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - PERSISTENT%'
+series.3.legend=Min latency
+series.3.dir=${csvCurrentDir}
+series.3.colourName=green
diff --git a/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef b/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef
index a669fcd227..e76f7554d3 100644
--- a/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef
+++ b/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef
@@ -25,22 +25,17 @@ chartDescription=1P 1C, persistent, auto-ack with message payload 1KB. Sorted qu
 xAxisTitle=Queue type
 yAxisTitle=Latency (millis)
 
-series.1.statement=SELECT testName, maxLatency,0 FROM Latency-QueueTypes WHERE participantName = 'All Consumers'
-series.1.legend=Maximum latency
+series.1.statement=SELECT testName, averageLatency,latencyStandardDeviation FROM Latency-QueueTypes WHERE participantName = 'All Consumers'
+series.1.legend=Average Latency
 series.1.dir=${csvCurrentDir}
-series.1.colourName=blue
+series.1.colourName=red
 
 series.2.statement=SELECT testName, averageLatency,latencyStandardDeviation FROM Latency-QueueTypes WHERE participantName = 'All Consumers'
-series.2.legend=Average Latency
-series.2.dir=${csvCurrentDir}
-series.2.colourName=red
+series.2.legend=Average Latency (baseline ${baselineName})
+series.2.dir=${csvBaselineDir}
+series.2.colourName=dark_red
 
-series.3.statement=SELECT testName, averageLatency,latencyStandardDeviation FROM Latency-QueueTypes WHERE participantName = 'All Consumers'
-series.3.legend=Average Latency (baseline ${baselineName})
-series.3.dir=${csvBaselineDir}
-series.3.colourName=dark_red
-
-series.4.statement=SELECT testName, minLatency,0 FROM Latency-QueueTypes WHERE participantName = 'All Consumers'
-series.4.legend=Minimum latency
-series.4.dir=${csvCurrentDir}
-series.4.colourName=green
+series.3.statement=SELECT testName, minLatency,0 FROM Latency-QueueTypes WHERE participantName = 'All Consumers'
+series.3.legend=Minimum latency
+series.3.dir=${csvCurrentDir}
+series.3.colourName=green
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingUtil.java b/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingUtil.java
index 91eafe324b..9401b77ab0 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingUtil.java
+++ b/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingUtil.java
@@ -115,12 +115,19 @@ public class ChartingUtil
 
         for (ChartingDefinition chartingDefinition : loadChartDefinitions())
         {
-            ChartBuilder chartBuilder = ChartBuilderFactory.createChartBuilder(
-                    chartingDefinition.getChartType(),
-                    seriesBuilder);
-
-            JFreeChart chart = chartBuilder.buildChart(chartingDefinition);
-            writer.writeChartToFileSystem(chart, chartingDefinition);
+            try
+            {
+                ChartBuilder chartBuilder = ChartBuilderFactory.createChartBuilder(
+                        chartingDefinition.getChartType(),
+                        seriesBuilder);
+
+                JFreeChart chart = chartBuilder.buildChart(chartingDefinition);
+                writer.writeChartToFileSystem(chart, chartingDefinition);
+            }
+            catch (Exception e)
+            {
+                LOGGER.error("Couldn't produce chart " + chartingDefinition, e);
+            }
         }
 
         final String summaryChartTitle = _cliOptions.get(SUMMARY_TITLE_PROP);
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinition.java b/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinition.java
index bfe47e598e..5030c42e89 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinition.java
+++ b/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinition.java
@@ -22,6 +22,7 @@ package org.apache.qpid.disttest.charting.definition;
 import java.util.Collections;
 import java.util.List;
 
+import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.qpid.disttest.charting.ChartType;
 
 public class ChartingDefinition
@@ -94,4 +95,10 @@ public class ChartingDefinition
         return Collections.unmodifiableList(_seriesDefinitions);
     }
 
+    @Override
+    public String toString()
+    {
+        return new ToStringBuilder(this).append("chartTitle", _chartTitle).toString();
+    }
+
 }