Author: kwall
Date: Mon Apr 30 07:43:38 2012
New Revision: 1332087
URL: http://svn.apache.org/viewvc?rev=1332087&view=rev
Log:
QPID-3977: Add charting framework for new distributed test tool.
Added:
qpid/trunk/qpid/java/perftests/etc/chartdefs/
qpid/trunk/qpid/java/perftests/etc/chartdefs/AcknowledgementModesAutoAck.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/AcknowledgementModesTransacted.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/BatchSize.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/MessageSizeNonPersistent.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/MessageSizePersistent.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/QueueTypes.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/VaryingNumberOfConsumers.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/VaryingNumberOfProducers.chartdef
qpid/trunk/qpid/java/perftests/etc/testdefs/
qpid/trunk/qpid/java/perftests/etc/testdefs/short/
qpid/trunk/qpid/java/perftests/etc/testdefs/short/AcknowledgementModes.json
- copied, changed from r1332057,
qpid/trunk/qpid/java/perftests/etc/suite/MessageSize.json
qpid/trunk/qpid/java/perftests/etc/testdefs/short/BatchSize.json
qpid/trunk/qpid/java/perftests/etc/testdefs/short/MessageSize.json
- copied, changed from r1332057,
qpid/trunk/qpid/java/perftests/etc/suite/MessageSize.json
qpid/trunk/qpid/java/perftests/etc/testdefs/short/QueueTypes.json
- copied, changed from r1332057,
qpid/trunk/qpid/java/perftests/etc/perftests.json
qpid/trunk/qpid/java/perftests/etc/testdefs/short/VaryingNumberOfParticipants.json
- copied, changed from r1332057,
qpid/trunk/qpid/java/perftests/etc/suite/VaryingNumberOfParticipants.json
qpid/trunk/qpid/java/perftests/etc/testdefs/standard/
qpid/trunk/qpid/java/perftests/etc/testdefs/standard/AcknowledgementModes.json
- copied, changed from r1332057,
qpid/trunk/qpid/java/perftests/etc/suite/MessageSize.json
qpid/trunk/qpid/java/perftests/etc/testdefs/standard/BatchSize.json
qpid/trunk/qpid/java/perftests/etc/testdefs/standard/MessageSize.json
- copied, changed from r1332057,
qpid/trunk/qpid/java/perftests/etc/suite/MessageSize.json
qpid/trunk/qpid/java/perftests/etc/testdefs/standard/QueueTypes.json
- copied, changed from r1332057,
qpid/trunk/qpid/java/perftests/etc/suite/QueueTypes.json
qpid/trunk/qpid/java/perftests/etc/testdefs/standard/QueuesWithSelectors.json
- copied, changed from r1332057,
qpid/trunk/qpid/java/perftests/etc/suite/QueuesWithSelectors.json
qpid/trunk/qpid/java/perftests/etc/testdefs/standard/VaryingNumberOfParticipants.json
- copied, changed from r1332057,
qpid/trunk/qpid/java/perftests/etc/suite/VaryingNumberOfParticipants.json
qpid/trunk/qpid/java/perftests/visualisation-jfc/
qpid/trunk/qpid/java/perftests/visualisation-jfc/build.xml
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartType.java
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingException.java
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/chartbuilder/
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/BarChartBuilder.java
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/ChartBuilder.java
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/ChartBuilderFactory.java
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/DataPointCallback.java
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/DataSetBasedChartBuilder.java
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/LineChartBuilder.java
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/SeriesBuilder.java
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinition.java
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreator.java
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinition.java
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreator.java
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartBuilderFactoryTest.java
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/SeriesBuilderTest.java
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java
Removed:
qpid/trunk/qpid/java/perftests/etc/perftests.json
qpid/trunk/qpid/java/perftests/etc/suite/MessageSize.json
qpid/trunk/qpid/java/perftests/etc/suite/QueueTypes.json
qpid/trunk/qpid/java/perftests/etc/suite/QueuesWithSelectors.json
qpid/trunk/qpid/java/perftests/etc/suite/VaryingNumberOfParticipants.json
Modified:
qpid/trunk/qpid/java/build.deps
Modified: qpid/trunk/qpid/java/build.deps
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=1332087&r1=1332086&r2=1332087&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Mon Apr 30 07:43:38 2012
@@ -157,3 +157,9 @@ bdb-je=lib/bdbstore/je-5.0.34.jar
bdbstore.libs=${bdb-je}
bdbstore.test.libs=${test.libs}
+# optional perftests-visualisation-jfc module deps
+jfreechart.jar=lib/jfree/jfreechart-1.0.13.jar
+jfreecommon.jar=lib/jfree/jfreecommon-1.0.16.jar
+csvjdbc.jar=lib/csvjdbc/csvjdbc-1.0.8.jar
+perftests-visualisation-jfc.libs=${jfreechart.jar} ${jfreecommon.jar}
${csvjdbc.jar}
+perftests-visualisation-jfc.test.libs=${test.libs}
Added:
qpid/trunk/qpid/java/perftests/etc/chartdefs/AcknowledgementModesAutoAck.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/AcknowledgementModesAutoAck.chartdef?rev=1332087&view=auto
==============================================================================
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/AcknowledgementModesAutoAck.chartdef
(added)
+++
qpid/trunk/qpid/java/perftests/etc/chartdefs/AcknowledgementModesAutoAck.chartdef
Mon Apr 30 07:43:38 2012
@@ -0,0 +1,28 @@
+#
+# 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=BAR
+chartTitle=Performance of acknowledgement modes (Auto-acknowledgement)
+xAxisTitle=Persistence
+yAxisTitle=Throughput (KB/s)
+
+series.1.statement=SELECT testName, throughputKbPerS FROM AcknowledgementModes
WHERE acknowledgeMode = '1' AND participantName = 'All'
+series.1.legend=Current
+series.1.dir=${csvCurrentDir}
+
Added:
qpid/trunk/qpid/java/perftests/etc/chartdefs/AcknowledgementModesTransacted.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/AcknowledgementModesTransacted.chartdef?rev=1332087&view=auto
==============================================================================
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/AcknowledgementModesTransacted.chartdef
(added)
+++
qpid/trunk/qpid/java/perftests/etc/chartdefs/AcknowledgementModesTransacted.chartdef
Mon Apr 30 07:43:38 2012
@@ -0,0 +1,28 @@
+#
+# 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=BAR
+chartTitle=Performance of acknowledgement modes (Transacted)
+xAxisTitle=Persistence
+yAxisTitle=Throughput (KB/s)
+
+series.1.statement=SELECT testName, throughputKbPerS FROM AcknowledgementModes
WHERE acknowledgeMode = '0' AND participantName = 'All'
+series.1.legend=Current
+series.1.dir=${csvCurrentDir}
+
Added: qpid/trunk/qpid/java/perftests/etc/chartdefs/BatchSize.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/BatchSize.chartdef?rev=1332087&view=auto
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/BatchSize.chartdef (added)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/BatchSize.chartdef Mon Apr 30
07:43:38 2012
@@ -0,0 +1,28 @@
+#
+# 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=LINE
+chartTitle=Transaction Batch Size
+xAxisTitle=Batch Size
+yAxisTitle=Throughput (KB/s)
+
+series.1.statement=SELECT batchSize, throughputKbPerS FROM BatchSize WHERE
participantName = 'All'
+series.1.legend=Current
+series.1.dir=${csvCurrentDir}
+
Added:
qpid/trunk/qpid/java/perftests/etc/chartdefs/MessageSizeNonPersistent.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/MessageSizeNonPersistent.chartdef?rev=1332087&view=auto
==============================================================================
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/MessageSizeNonPersistent.chartdef
(added)
+++
qpid/trunk/qpid/java/perftests/etc/chartdefs/MessageSizeNonPersistent.chartdef
Mon Apr 30 07:43:38 2012
@@ -0,0 +1,27 @@
+#
+# 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=LINE
+chartTitle=Impact of Message Size (Non-Persistent)
+xAxisTitle=Message Size (B)
+yAxisTitle=Throughput (KB/s)
+
+series.1.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize
WHERE testName like '%NON_PERSISTENT' AND participantName = 'All'
+series.1.legend=Current
+series.1.dir=${csvCurrentDir}
Added:
qpid/trunk/qpid/java/perftests/etc/chartdefs/MessageSizePersistent.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/MessageSizePersistent.chartdef?rev=1332087&view=auto
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/MessageSizePersistent.chartdef
(added)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/MessageSizePersistent.chartdef
Mon Apr 30 07:43:38 2012
@@ -0,0 +1,29 @@
+#
+# 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=LINE
+chartTitle=Impact of Message Size (Persistent)
+xAxisTitle=Message Size (B)
+yAxisTitle=Throughput (KB/s)
+
+series.1.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize
WHERE testName like '% PERSISTENT' AND participantName = 'All'
+series.1.legend=Current
+series.1.dir=${csvCurrentDir}
+
+# Define series3/4 to chart the baseline
Added: qpid/trunk/qpid/java/perftests/etc/chartdefs/QueueTypes.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/QueueTypes.chartdef?rev=1332087&view=auto
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/QueueTypes.chartdef (added)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/QueueTypes.chartdef Mon Apr 30
07:43:38 2012
@@ -0,0 +1,28 @@
+#
+# 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=BAR
+chartTitle=Queue Types
+xAxisTitle=Queue Types
+yAxisTitle=Throughput (KB/s)
+
+series.1.statement=SELECT testName, throughputKbPerS FROM QueueTypes WHERE
participantName = 'All'
+series.1.legend=Current
+series.1.dir=${csvCurrentDir}
+
Added:
qpid/trunk/qpid/java/perftests/etc/chartdefs/VaryingNumberOfConsumers.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/VaryingNumberOfConsumers.chartdef?rev=1332087&view=auto
==============================================================================
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/VaryingNumberOfConsumers.chartdef
(added)
+++
qpid/trunk/qpid/java/perftests/etc/chartdefs/VaryingNumberOfConsumers.chartdef
Mon Apr 30 07:43:38 2012
@@ -0,0 +1,35 @@
+#
+# 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=LINE
+chartTitle=Varying number of consumers
+xAxisTitle=Consumers
+yAxisTitle=Throughput (KB/s)
+
+series.1.statement=SELECT totalNumberOfConsumers, throughputKbPerS FROM
VaryingNumberOfParticipants WHERE participantName = 'All' and
totalNumberOfProducers = '1'
+series.1.legend=1 Producer
+series.1.dir=${csvCurrentDir}
+
+series.2.statement=SELECT totalNumberOfConsumers, throughputKbPerS FROM
VaryingNumberOfParticipants WHERE participantName = 'All' and
totalNumberOfProducers = '5'
+series.2.legend=5 Producers
+series.2.dir=${csvCurrentDir}
+
+series.3.statement=SELECT totalNumberOfConsumers, throughputKbPerS FROM
VaryingNumberOfParticipants WHERE participantName = 'All' and
totalNumberOfProducers = '10'
+series.3.legend=10 Producers
+series.3.dir=${csvCurrentDir}
Added:
qpid/trunk/qpid/java/perftests/etc/chartdefs/VaryingNumberOfProducers.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/VaryingNumberOfProducers.chartdef?rev=1332087&view=auto
==============================================================================
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/VaryingNumberOfProducers.chartdef
(added)
+++
qpid/trunk/qpid/java/perftests/etc/chartdefs/VaryingNumberOfProducers.chartdef
Mon Apr 30 07:43:38 2012
@@ -0,0 +1,35 @@
+#
+# 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=LINE
+chartTitle=Varying number of producers
+xAxisTitle=Producers
+yAxisTitle=Throughput (KB/s)
+
+series.1.statement=SELECT totalNumberOfProducers, throughputKbPerS FROM
VaryingNumberOfParticipants WHERE participantName = 'All' and
totalNumberOfConsumers = '1'
+series.1.legend=1 Consumer
+series.1.dir=${csvCurrentDir}
+
+series.2.statement=SELECT totalNumberOfProducers, throughputKbPerS FROM
VaryingNumberOfParticipants WHERE participantName = 'All' and
totalNumberOfConsumers = '5'
+series.2.legend=5 Consumer
+series.2.dir=${csvCurrentDir}
+
+series.3.statement=SELECT totalNumberOfProducers, throughputKbPerS FROM
VaryingNumberOfParticipants WHERE participantName = 'All' and
totalNumberOfConsumers = '10'
+series.3.legend=10 Consumer
+series.3.dir=${csvCurrentDir}
Copied:
qpid/trunk/qpid/java/perftests/etc/testdefs/short/AcknowledgementModes.json
(from r1332057, qpid/trunk/qpid/java/perftests/etc/suite/MessageSize.json)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/short/AcknowledgementModes.json?p2=qpid/trunk/qpid/java/perftests/etc/testdefs/short/AcknowledgementModes.json&p1=qpid/trunk/qpid/java/perftests/etc/suite/MessageSize.json&r1=1332057&r2=1332087&rev=1332087&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/suite/MessageSize.json (original)
+++ qpid/trunk/qpid/java/perftests/etc/testdefs/short/AcknowledgementModes.json
Mon Apr 30 07:43:38 2012
@@ -1,51 +1,19 @@
{
"_tests":[
{
- "_name": "Message Size - 1P-1C - NON_PERSISTENT";
+ "_name": "Acknowledgement Modes - NON_PERSISTENT";
"_iterations":[
{
- "_messageSize": 256,
- "_numberOfMessages": 10000000
- },
- {
- "_messageSize": 512,
- "_numberOfMessages": 5000000
- },
- {
"_messageSize": 1024,
- "_numberOfMessages": "2500000"
- },
- {
- "_messageSize": 2048,
- "_numberOfMessages": "1250000"
- },
- {
- "_messageSize": 4096,
- "_numberOfMessages": "625000"
- },
- {
- "_messageSize": 8192,
- "_numberOfMessages": 312500
- },
- {
- "_messageSize": 16384,
- "_numberOfMessages": 156250
+ "_numberOfMessages": 1000000,
+ "_acknowledgeMode": 1,
+ "_deliveryMode": 1
},
{
- "_messageSize": 32768,
- "_numberOfMessages": 78125
- },
- {
- "_messageSize": 65536,
- "_numberOfMessages": 39062
- },
- {
- "_messageSize": 131072,
- "_numberOfMessages": 1953
- },
- {
- "_messageSize": 262144,
- "_numberOfMessages": 9765
+ "_messageSize": 1024,
+ "_numberOfMessages": 250000,
+ "_acknowledgeMode": 0,
+ "_deliveryMode": 1
}
],
"_queues":[
@@ -68,12 +36,10 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
"_producers": [
{
"_name": "Producer1",
- "_destinationName": "direct://amq.direct//testQueue",
- "_deliveryMode": 1
+ "_destinationName": "direct://amq.direct//testQueue"
}
]
}
@@ -90,7 +56,6 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
"_consumers": [
{
"_name": "Consumer1",
@@ -105,62 +70,25 @@
]
},
{
- "_name": "Message Size - 1P-1C - PERSISTENT";
+ "_name": "Acknowledgement Modes - PERSISTENT";
"_iterations":[
{
- "_messageSize": 256,
- "_numberOfMessages": 200000
- },
- {
- "_messageSize": 512,
- "_numberOfMessages": 200000
- },
- {
"_messageSize": 1024,
- "_numberOfMessages": 200000
- },
- {
- "_messageSize": 2048,
- "_numberOfMessages": 200000
- },
- {
- "_messageSize": 4096,
- "_numberOfMessages": 40000
- },
- {
- "_messageSize": 8192,
- "_numberOfMessages": 40000
- },
- {
- "_messageSize": 16384,
- "_numberOfMessages": 40000
- },
- {
- "_messageSize": 32768,
- "_numberOfMessages": 20000
+ "_numberOfMessages": 100000,
+ "_acknowledgeMode": 1,
+ "_deliveryMode": 2
},
{
- "_messageSize": 65536,
- "_numberOfMessages": 20000
- },
- {
- "_messageSize": 131072,
- "_numberOfMessages": 20000
- },
- {
- "_messageSize": 262144,
- "_numberOfMessages": 20000
+ "_messageSize": 1024,
+ "_numberOfMessages": 25000,
+ "_acknowledgeMode": 0,
+ "_deliveryMode": 2
}
],
"_queues":[
{
- "_name": "direct://amq.direct//testQueuei?durable='true'",
- "_durable": true,
- "_attributes":
- {
- "x-qpid-capacity": 10485760,
- "x-qpid-flow-resume-capacity": 8388608
- }
+ "_name": "direct://amq.direct//testQueue?durable='true'",
+ "_durable" : "true"
}
],
"_clients":[
@@ -173,12 +101,10 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
"_producers": [
{
"_name": "Producer1",
- "_destinationName": "direct://amq.direct//testQueue",
- "_deliveryMode": 2
+ "_destinationName":
"direct://amq.direct//testQueue?durable='true'"
}
]
}
@@ -195,11 +121,10 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
"_consumers": [
{
"_name": "Consumer1",
- "_destinationName": "direct://amq.direct//testQueue"
+ "_destinationName":
"direct://amq.direct//testQueue?durable='true'"
}
]
}
Added: qpid/trunk/qpid/java/perftests/etc/testdefs/short/BatchSize.json
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/short/BatchSize.json?rev=1332087&view=auto
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/testdefs/short/BatchSize.json (added)
+++ qpid/trunk/qpid/java/perftests/etc/testdefs/short/BatchSize.json Mon Apr 30
07:43:38 2012
@@ -0,0 +1,84 @@
+{
+ "_tests":[
+ {
+ "_name": "Batch Size- PERSISTENT";
+ "_iterations":[
+ {
+ "_batchSize": 1
+ },
+ {
+ "_batchSize": 2
+ },
+ {
+ "_batchSize": 5
+ },
+ {
+ "_batchSize": 10
+ },
+ {
+ "_batchSize": 20
+ },
+ {
+ "_batchSize": 50
+ },
+ {
+ "_batchSize": 100
+ }
+ ],
+ "_queues":[
+ {
+ "_name": "direct://amq.direct//batchSize?durable='true'",
+ "_durable": true
+ }
+ ],
+ "_clients":[
+ {
+ "_name": "producingClient",
+ "_connections":[
+ {
+ "_name": "connection1",
+ "_factory": "connectionfactory",
+ "_sessions": [
+ {
+ "_sessionName": "session1",
+ "_acknowledgeMode": 0,
+ "_producers": [
+ {
+ "_name": "Producer1",
+ "_destinationName":
"direct://amq.direct//batchSize?durable='true'",
+ "_messageSize": 1024,
+ "_maximumDuration": 30000,
+ "_deliveryMode": 2
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "_name": "consumingClient",
+ "_connections":[
+ {
+ "_name": "connection1",
+ "_factory": "connectionfactory",
+ "_sessions": [
+ {
+ "_sessionName": "session1",
+ "_acknowledgeMode": 0,
+ "_consumers": [
+ {
+ "_name": "Consumer1",
+ "_destinationName":
"direct://amq.direct//batchSize?durable='true'",
+ "_maximumDuration": 30000
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
Copied: qpid/trunk/qpid/java/perftests/etc/testdefs/short/MessageSize.json
(from r1332057, qpid/trunk/qpid/java/perftests/etc/suite/MessageSize.json)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/short/MessageSize.json?p2=qpid/trunk/qpid/java/perftests/etc/testdefs/short/MessageSize.json&p1=qpid/trunk/qpid/java/perftests/etc/suite/MessageSize.json&r1=1332057&r2=1332087&rev=1332087&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/suite/MessageSize.json (original)
+++ qpid/trunk/qpid/java/perftests/etc/testdefs/short/MessageSize.json Mon Apr
30 07:43:38 2012
@@ -5,52 +5,52 @@
"_iterations":[
{
"_messageSize": 256,
- "_numberOfMessages": 10000000
+ "_numberOfMessages": 1000000
},
{
"_messageSize": 512,
- "_numberOfMessages": 5000000
+ "_numberOfMessages": 500000
},
{
"_messageSize": 1024,
- "_numberOfMessages": "2500000"
+ "_numberOfMessages": "250000"
},
{
"_messageSize": 2048,
- "_numberOfMessages": "1250000"
+ "_numberOfMessages": "125000"
},
{
"_messageSize": 4096,
- "_numberOfMessages": "625000"
+ "_numberOfMessages": "62500"
},
{
"_messageSize": 8192,
- "_numberOfMessages": 312500
+ "_numberOfMessages": 31250
},
{
"_messageSize": 16384,
- "_numberOfMessages": 156250
+ "_numberOfMessages": 15625
},
{
"_messageSize": 32768,
- "_numberOfMessages": 78125
+ "_numberOfMessages": 7812
},
{
"_messageSize": 65536,
- "_numberOfMessages": 39062
+ "_numberOfMessages": 3906
},
{
"_messageSize": 131072,
- "_numberOfMessages": 1953
+ "_numberOfMessages": 195
},
{
"_messageSize": 262144,
- "_numberOfMessages": 9765
+ "_numberOfMessages": 97
}
],
"_queues":[
{
- "_name": "direct://amq.direct//testQueue",
+ "_name": "direct://amq.direct//messageSize",
"_attributes":
{
"x-qpid-capacity": 10485760,
@@ -72,7 +72,7 @@
"_producers": [
{
"_name": "Producer1",
- "_destinationName": "direct://amq.direct//testQueue",
+ "_destinationName": "direct://amq.direct//messageSize",
"_deliveryMode": 1
}
]
@@ -94,7 +94,7 @@
"_consumers": [
{
"_name": "Consumer1",
- "_destinationName": "direct://amq.direct//testQueue"
+ "_destinationName": "direct://amq.direct//messageSize"
}
]
}
@@ -109,52 +109,52 @@
"_iterations":[
{
"_messageSize": 256,
- "_numberOfMessages": 200000
+ "_numberOfMessages": 20000
},
{
"_messageSize": 512,
- "_numberOfMessages": 200000
+ "_numberOfMessages": 20000
},
{
"_messageSize": 1024,
- "_numberOfMessages": 200000
+ "_numberOfMessages": 20000
},
{
"_messageSize": 2048,
- "_numberOfMessages": 200000
+ "_numberOfMessages": 20000
},
{
"_messageSize": 4096,
- "_numberOfMessages": 40000
+ "_numberOfMessages": 4000
},
{
"_messageSize": 8192,
- "_numberOfMessages": 40000
+ "_numberOfMessages": 4000
},
{
"_messageSize": 16384,
- "_numberOfMessages": 40000
+ "_numberOfMessages": 4000
},
{
"_messageSize": 32768,
- "_numberOfMessages": 20000
+ "_numberOfMessages": 2000
},
{
"_messageSize": 65536,
- "_numberOfMessages": 20000
+ "_numberOfMessages": 2000
},
{
"_messageSize": 131072,
- "_numberOfMessages": 20000
+ "_numberOfMessages": 2000
},
{
"_messageSize": 262144,
- "_numberOfMessages": 20000
+ "_numberOfMessages": 2000
}
],
"_queues":[
{
- "_name": "direct://amq.direct//testQueuei?durable='true'",
+ "_name": "direct://amq.direct//messageSize?durable='true'",
"_durable": true,
"_attributes":
{
@@ -177,7 +177,7 @@
"_producers": [
{
"_name": "Producer1",
- "_destinationName": "direct://amq.direct//testQueue",
+ "_destinationName":
"direct://amq.direct//messageSize?durable='true'",
"_deliveryMode": 2
}
]
@@ -199,7 +199,7 @@
"_consumers": [
{
"_name": "Consumer1",
- "_destinationName": "direct://amq.direct//testQueue"
+ "_destinationName":
"direct://amq.direct//messageSize?durable='true'"
}
]
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
