You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2015/09/17 23:17:26 UTC
svn commit: r1703692 - in /qpid/java/trunk/perftests: ./
etc/chartdefs/timeseries/ src/main/java/org/apache/qpid/disttest/db/
visualisation-jfc/
Author: kwall
Date: Thu Sep 17 21:17:26 2015
New Revision: 1703692
URL: http://svn.apache.org/viewvc?rev=1703692&view=rev
Log:
QPID-6732: [Java Perf Tests] Add timeserties charts to visualise Java Broker Performance over time
Also change perftest framework to include message throughput/s in the results table
Added:
qpid/java/trunk/perftests/etc/chartdefs/timeseries/persistent_transaction.chartdef
qpid/java/trunk/perftests/etc/chartdefs/timeseries/transient_autoack.chartdef
Modified:
qpid/java/trunk/perftests/pom.xml
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/db/ResultsDbWriter.java
qpid/java/trunk/perftests/visualisation-jfc/pom.xml
Added: qpid/java/trunk/perftests/etc/chartdefs/timeseries/persistent_transaction.chartdef
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/etc/chartdefs/timeseries/persistent_transaction.chartdef?rev=1703692&view=auto
==============================================================================
--- qpid/java/trunk/perftests/etc/chartdefs/timeseries/persistent_transaction.chartdef (added)
+++ qpid/java/trunk/perftests/etc/chartdefs/timeseries/persistent_transaction.chartdef Thu Sep 17 21:17:26 2015
@@ -0,0 +1,33 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+chartType=TIMELINE
+chartTitle=Persistent Transacted
+chartDescription=10P 10C, persistent, transacted, 1K message, plain/SSL
+
+xAxisTitle=Date
+yAxisTitle=Messages Per Second
+
+series.1.statement=SELECT insertedTimestamp, throughputMessagesPerS FROM RESULTS WHERE participantName = 'All' AND testName = 'persistent_transaction_plain'
+series.1.colourName=red
+series.1.legend=Plain
+
+series.2.statement=SELECT insertedTimestamp, throughputMessagesPerS FROM RESULTS WHERE participantName = 'All' AND testName = 'persistent_transaction_ssl'
+series.2.colourName=blue
+series.2.legend=SSL
Added: qpid/java/trunk/perftests/etc/chartdefs/timeseries/transient_autoack.chartdef
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/etc/chartdefs/timeseries/transient_autoack.chartdef?rev=1703692&view=auto
==============================================================================
--- qpid/java/trunk/perftests/etc/chartdefs/timeseries/transient_autoack.chartdef (added)
+++ qpid/java/trunk/perftests/etc/chartdefs/timeseries/transient_autoack.chartdef Thu Sep 17 21:17:26 2015
@@ -0,0 +1,33 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+chartType=TIMELINE
+chartTitle=Transient Auto-Ack
+chartDescription=10P 10C, transient, auto-ack, 1K message, plain/SSL
+
+xAxisTitle=Date
+yAxisTitle=Messages Per Second
+
+series.1.statement=SELECT insertedTimestamp, throughputMessagesPerS FROM RESULTS WHERE participantName = 'All' AND testName = 'transient_autoack_plain'
+series.1.colourName=red
+series.1.legend=Plain
+
+series.2.statement=SELECT insertedTimestamp, throughputMessagesPerS FROM RESULTS WHERE participantName = 'All' AND testName = 'transient_autoack_ssl'
+series.2.colourName=blue
+series.2.legend=SSL
Modified: qpid/java/trunk/perftests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/pom.xml?rev=1703692&r1=1703691&r2=1703692&view=diff
==============================================================================
--- qpid/java/trunk/perftests/pom.xml (original)
+++ qpid/java/trunk/perftests/pom.xml Thu Sep 17 21:17:26 2015
@@ -94,7 +94,7 @@
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derby-version}</version>
- <scope>runtime</scope>
+ <scope>provided</scope>
</dependency>
<!-- test deps -->
Modified: qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/db/ResultsDbWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/db/ResultsDbWriter.java?rev=1703692&r1=1703691&r2=1703692&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/db/ResultsDbWriter.java (original)
+++ qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/db/ResultsDbWriter.java Thu Sep 17 21:17:26 2015
@@ -95,8 +95,9 @@ public class ResultsDbWriter
", %28$s bigint" + // MIN_LATENCY
", %29$s bigint" + // MAX_LATENCY
", %30$s double" + // LATENCY_STANDARD_DEVIATION
- ", %31$s varchar(200) not null" +
- ", %32$s timestamp not null" +
+ ", %31$s double" + // MESSAGE_THROUGHPUT
+ ", %32$s varchar(200) not null" +
+ ", %33$s timestamp not null" +
")",
RESULTS_TABLE_NAME,
TEST_NAME.getDisplayName(),
@@ -128,6 +129,7 @@ public class ResultsDbWriter
MIN_LATENCY.getDisplayName(),
MAX_LATENCY.getDisplayName(),
LATENCY_STANDARD_DEVIATION.getDisplayName(),
+ MESSAGE_THROUGHPUT.getDisplayName(),
RUN_ID,
INSERTED_TIMESTAMP
);
@@ -328,8 +330,8 @@ public class ResultsDbWriter
try
{
String sqlTemplate = String.format(
- "INSERT INTO %s (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) " +
- "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+ "INSERT INTO %s (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) " +
+ "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
RESULTS_TABLE_NAME,
TEST_NAME.getDisplayName(),
ITERATION_NUMBER.getDisplayName(),
@@ -360,6 +362,7 @@ public class ResultsDbWriter
MIN_LATENCY.getDisplayName(),
MAX_LATENCY.getDisplayName(),
LATENCY_STANDARD_DEVIATION.getDisplayName(),
+ MESSAGE_THROUGHPUT.getDisplayName(),
RUN_ID,
INSERTED_TIMESTAMP
);
@@ -395,6 +398,7 @@ public class ResultsDbWriter
statement.setLong(columnIndex++, participantResult.getMinLatency());
statement.setLong(columnIndex++, participantResult.getMaxLatency());
statement.setDouble(columnIndex++, participantResult.getLatencyStandardDeviation());
+ statement.setDouble(columnIndex++, participantResult.getMessageThroughput());
statement.setString(columnIndex++, _runId);
statement.setTimestamp(columnIndex++, new Timestamp(_clock.currentTimeMillis()));
Modified: qpid/java/trunk/perftests/visualisation-jfc/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/visualisation-jfc/pom.xml?rev=1703692&r1=1703691&r2=1703692&view=diff
==============================================================================
--- qpid/java/trunk/perftests/visualisation-jfc/pom.xml (original)
+++ qpid/java/trunk/perftests/visualisation-jfc/pom.xml Thu Sep 17 21:17:26 2015
@@ -49,7 +49,6 @@
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -60,7 +59,7 @@
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derby-version}</version>
- <scope>runtime</scope>
+ <scope>provided</scope>
</dependency>
<!-- Non Apache Licence deps, use provided scope so users must supply -->
@@ -126,7 +125,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.3.2</version>
+ <version>${exec-maven-plugin-version}</version>
<executions>
<execution>
<goals>
@@ -136,7 +135,7 @@
</executions>
<configuration>
<mainClass>org.apache.qpid.disttest.charting.ChartingUtil</mainClass>
- <includePluginDependencies>true</includePluginDependencies>
+ <classpathScope>compile</classpathScope>
<arguments>
<argument>chart-defs=${basedir}/../etc/chartdefs</argument>
</arguments>
@@ -152,18 +151,6 @@
</systemProperty>
</systemProperties>
</configuration>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.csvjdbc</groupId>
- <artifactId>csvjdbc</artifactId>
- <version>${csvjdbc-version}</version>
- </dependency>
- <dependency>
- <groupId>jfree</groupId>
- <artifactId>jfreechart</artifactId>
- <version>${jfreechart-version}</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org