Author: philharveyonline Date: Mon May 13 08:01:45 2013 New Revision: 1481726
URL: http://svn.apache.org/r1481726 Log: NO-JIRA: removing maximum latency from Java performance charts because it is not very useful and makes it harder to read the average Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingUtil.java qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinition.java Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef?rev=1481726&r1=1481725&r2=1481726&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef Mon May 13 08:01:45 2013 @@ -25,22 +25,17 @@ chartDescription=1P 1C, transient, auto- 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 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef?rev=1481726&r1=1481725&r2=1481726&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef Mon May 13 08:01:45 2013 @@ -25,22 +25,17 @@ chartDescription=1P 1C, persistent, auto 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 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef?rev=1481726&r1=1481725&r2=1481726&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef Mon May 13 08:01:45 2013 @@ -25,22 +25,17 @@ chartDescription=1P 1-10C, transient, au 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 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef?rev=1481726&r1=1481725&r2=1481726&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef Mon May 13 08:01:45 2013 @@ -25,22 +25,17 @@ chartDescription=1P 1-10C, transient, au 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 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef?rev=1481726&r1=1481725&r2=1481726&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef Mon May 13 08:01:45 2013 @@ -25,22 +25,18 @@ chartDescription=1P 1-10C, persistent, a 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 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef?rev=1481726&r1=1481725&r2=1481726&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef Mon May 13 08:01:45 2013 @@ -25,22 +25,17 @@ chartDescription=1P 1-10C, persistent, a 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 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef?rev=1481726&r1=1481725&r2=1481726&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef Mon May 13 08:01:45 2013 @@ -25,22 +25,17 @@ chartDescription=1P 1C, persistent, auto 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 Modified: qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingUtil.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingUtil.java?rev=1481726&r1=1481725&r2=1481726&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingUtil.java (original) +++ qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingUtil.java Mon May 13 08:01:45 2013 @@ -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); Modified: qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinition.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinition.java?rev=1481726&r1=1481725&r2=1481726&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinition.java (original) +++ qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinition.java Mon May 13 08:01:45 2013 @@ -22,6 +22,7 @@ package org.apache.qpid.disttest.chartin 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(); + } + } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
