From 0a0baee45ebcff44635907d457c4ff6810b09c87 Mon Sep 17 00:00:00 2001 From: Alex Rudyy Date: Wed, 15 Apr 2015 09:47:28 +0000 Subject: QPID-6481: Move java source tree to top level git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1673693 13f79535-47bb-0310-9956-ffa450edef68 --- .../1001-MessageSize-Transient-ByteSec.chartdef | 37 - .../1002-MessageSize-Persistent-ByteSec.chartdef | 37 - .../1003-MessageSize-Transient-MsgSec.chartdef | 37 - .../1004-MessageSize-Persistent-MsgSec.chartdef | 37 - ...-VaryingNumberOfProducers-SessionTrans.chartdef | 57 - ...-VaryingNumberOfConsumers-SessionTrans.chartdef | 57 - .../1021-AcknowledgementModes-Persistent.chartdef | 38 - .../1022-AcknowledgementModes-Transient.chartdef | 36 - .../etc/chartdefs/1030-BatchSize-Equal.chartdef | 37 - .../etc/chartdefs/1031-BatchSize-Unequal.chartdef | 53 - .../etc/chartdefs/1040-QueueTypes.chartdef | 36 - ...mberOfProducerSessionsSingleConnection.chartdef | 49 - .../etc/chartdefs/1060-SSLConnections.chartdef | 49 - ...sWithNonOverlappingSelectors-Transient.chartdef | 37 - ...WithNonOverlappingSelectors-Persistent.chartdef | 43 - ...mersWithOverlappingSelectors-Transient.chartdef | 36 - ...ersWithOverlappingSelectors-Persistent.chartdef | 42 - .../1500-Topic-NumberOfConsumers.chartdef | 37 - .../chartdefs/1501-Topic-NumberOfTopics.chartdef | 37 - .../etc/chartdefs/1502-Topic-Persistence.chartdef | 37 - .../etc/chartdefs/1503-Topic-AckModes.chartdef | 37 - .../2001-Latency-MessageSize-Transient.chartdef | 41 - .../2002-Latency-MessageSize-Persistent.chartdef | 41 - ...31-Latency-VaryingNumberOfParticipants.chartdef | 51 - .../1001-Large-Messages-Transient.chartdef | 29 - .../1002-Large-Messages-Persistent.chartdef | 29 - ...ltipleProducersAndConsumers-Persistent.chartdef | 30 - .../timeseries/1030-Batch-Size-Small.chartdef | 30 - .../timeseries/1031-Batch-Size-Large.chartdef | 30 - .../chartdefs/timeseries/1040-SortedQueue.chartdef | 30 - .../ha/chardefs/1001-ScalingParticipants.chartdef | 48 - qpid/java/perftests/etc/ha/readme.txt | 33 - .../etc/ha/testdefs/ScalingParticipants.js | 92 - qpid/java/perftests/etc/json_config_tool.py | 74 - qpid/java/perftests/etc/log4j.properties | 28 - qpid/java/perftests/etc/perftests-jndi.properties | 27 - qpid/java/perftests/etc/run-perftests.sh | 37 - .../etc/testdefs/AcknowledgementModes.json | 138 - qpid/java/perftests/etc/testdefs/BatchSize.js | 102 - .../etc/testdefs/BatchSizeConsumerVaries.js | 102 - .../etc/testdefs/BatchSizeProducerVaries.js | 102 - .../etc/testdefs/Latency-MessageSize.json | 180 - .../Latency-VaryingNumberOfParticipants.json | 706 - qpid/java/perftests/etc/testdefs/MessageSize.json | 196 - .../QueueConsumersWithNonOverlappingSelectors.js | 120 - .../QueueConsumersWithOverlappingSelectors.js | 132 - qpid/java/perftests/etc/testdefs/QueueTypes.json | 16198 ------------------- qpid/java/perftests/etc/testdefs/Topic-AckModes.js | 88 - .../etc/testdefs/Topic-NumberOfConsumers.js | 90 - .../perftests/etc/testdefs/Topic-NumberOfTopics.js | 95 - .../perftests/etc/testdefs/Topic-Persistence.js | 94 - .../etc/testdefs/VaryingNumberOfParticipants.js | 104 - .../etc/testdefs/VaryingNumberOfParticipantsSSL.js | 104 - ...yingNumberOfProducerSessionsSingleConnection.js | 95 - 54 files changed, 20162 deletions(-) delete mode 100644 qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/1060-SSLConnections.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/timeseries/1001-Large-Messages-Transient.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/timeseries/1002-Large-Messages-Persistent.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/timeseries/1011-MultipleProducersAndConsumers-Persistent.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/timeseries/1030-Batch-Size-Small.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/timeseries/1031-Batch-Size-Large.chartdef delete mode 100644 qpid/java/perftests/etc/chartdefs/timeseries/1040-SortedQueue.chartdef delete mode 100644 qpid/java/perftests/etc/ha/chardefs/1001-ScalingParticipants.chartdef delete mode 100644 qpid/java/perftests/etc/ha/readme.txt delete mode 100644 qpid/java/perftests/etc/ha/testdefs/ScalingParticipants.js delete mode 100755 qpid/java/perftests/etc/json_config_tool.py delete mode 100644 qpid/java/perftests/etc/log4j.properties delete mode 100644 qpid/java/perftests/etc/perftests-jndi.properties delete mode 100755 qpid/java/perftests/etc/run-perftests.sh delete mode 100644 qpid/java/perftests/etc/testdefs/AcknowledgementModes.json delete mode 100644 qpid/java/perftests/etc/testdefs/BatchSize.js delete mode 100644 qpid/java/perftests/etc/testdefs/BatchSizeConsumerVaries.js delete mode 100644 qpid/java/perftests/etc/testdefs/BatchSizeProducerVaries.js delete mode 100644 qpid/java/perftests/etc/testdefs/Latency-MessageSize.json delete mode 100644 qpid/java/perftests/etc/testdefs/Latency-VaryingNumberOfParticipants.json delete mode 100644 qpid/java/perftests/etc/testdefs/MessageSize.json delete mode 100644 qpid/java/perftests/etc/testdefs/QueueConsumersWithNonOverlappingSelectors.js delete mode 100644 qpid/java/perftests/etc/testdefs/QueueConsumersWithOverlappingSelectors.js delete mode 100644 qpid/java/perftests/etc/testdefs/QueueTypes.json delete mode 100644 qpid/java/perftests/etc/testdefs/Topic-AckModes.js delete mode 100644 qpid/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js delete mode 100644 qpid/java/perftests/etc/testdefs/Topic-NumberOfTopics.js delete mode 100644 qpid/java/perftests/etc/testdefs/Topic-Persistence.js delete mode 100644 qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js delete mode 100644 qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipantsSSL.js delete mode 100644 qpid/java/perftests/etc/testdefs/VaryingNumberOfProducerSessionsSingleConnection.js (limited to 'qpid/java/perftests/etc') diff --git a/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef b/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef deleted file mode 100644 index dd8d0f9918..0000000000 --- a/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef +++ /dev/null @@ -1,37 +0,0 @@ -# -# 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=XYLINE -chartTitle=Impact of Message Size Bytes/S -chartSubtitle=Transient messages -chartDescription=1P 1C, single queue, transient, auto-ack, with message payload between 256-262144 bytes ${baselineName}. - -xAxisTitle=Message Size (B) -yAxisTitle=Throughput (KB/s) - -series.1.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All' -series.1.legend=Current -series.1.dir=${csvCurrentDir} -series.1.colourName=red - -series.2.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All' -series.2.legend=Baseline ${baselineName} -series.2.dir=${csvBaselineDir} -series.2.colourName=dark_red -series.2.strokeWidth=-1 diff --git a/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef b/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef deleted file mode 100644 index 42b91bacf8..0000000000 --- a/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef +++ /dev/null @@ -1,37 +0,0 @@ -# -# 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=XYLINE -chartTitle=Impact of Message Size Bytes/S -chartSubtitle=Persistent messages -chartDescription=1P 1C, single queue, persistent, session-transacted, with message payload between 256-262144 bytes. - -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} -series.1.colourName=red - -series.2.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '% PERSISTENT' AND participantName = 'All' -series.2.legend=Baseline ${baselineName} -series.2.dir=${csvBaselineDir} -series.2.colourName=dark_red -series.2.strokeWidth=-1 diff --git a/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef b/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef deleted file mode 100644 index bea3be0521..0000000000 --- a/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef +++ /dev/null @@ -1,37 +0,0 @@ -# -# 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=XYLINE -chartTitle=Impact of Message Size -chartSubtitle=Transient messages -chartDescription=1P 1C, single queue, transient, auto-ack, with message payload between 256-262144 bytes. - -xAxisTitle=Message Size (B) -yAxisTitle=Throughput (messages/s) - -series.1.statement=SELECT payloadSizeB, throughputMessagesPerS FROM MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All' -series.1.legend=Current -series.1.dir=${csvCurrentDir} -series.1.colourName=red - -series.2.statement=SELECT payloadSizeB, throughputMessagesPerS FROM MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All' -series.2.legend=Baseline ${baselineName} -series.2.dir=${csvBaselineDir} -series.2.colourName=dark_red -series.2.strokeWidth=-1 diff --git a/qpid/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef b/qpid/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef deleted file mode 100644 index 993d54c9ca..0000000000 --- a/qpid/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef +++ /dev/null @@ -1,37 +0,0 @@ -# -# 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=XYLINE -chartTitle=Impact of Message Size -chartSubtitle=Persistent messages -chartDescription=1P 1C, single queue, persistent, session-transacted, with message payload between 256-262144 bytes. - -xAxisTitle=Message Size (B) -yAxisTitle=Throughput (messages/s) - -series.1.statement=SELECT payloadSizeB, throughputMessagesPerS FROM MessageSize WHERE testName like '% PERSISTENT' AND participantName = 'All' -series.1.legend=Current -series.1.dir=${csvCurrentDir} -series.2.colourName=red - -series.2.statement=SELECT payloadSizeB, throughputMessagesPerS FROM MessageSize WHERE testName like '% PERSISTENT' AND participantName = 'All' -series.2.legend=Baseline ${baselineName} -series.2.dir=${csvBaselineDir} -series.2.colourName=dark_red -series.2.strokeWidth=-1 diff --git a/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef b/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef deleted file mode 100644 index 0d11f7014b..0000000000 --- a/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef +++ /dev/null @@ -1,57 +0,0 @@ -# -# 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=XYLINE -chartTitle=Varying number of producers - transacted -chartSubtitle=Persistent 1KB messages -chartDescription=1,2,5,10,20,40 P/Cs, single queue, persistent, transacted, with message payload 1KB. - -xAxisTitle=Producers -yAxisTitle=Throughput (messages/s) - -series.1.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '1' and acknowledgeMode = '0' -series.1.legend=1 Consumer -series.1.dir=${csvCurrentDir} -series.1.colourName=red - -series.2.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '5' and acknowledgeMode = '0' -series.2.legend=5 Consumer -series.2.dir=${csvCurrentDir} -series.2.colourName=blue - -series.3.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '10' and acknowledgeMode = '0' -series.3.legend=10 Consumer -series.3.dir=${csvCurrentDir} -series.3.colourName=green - -series.4.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '20' and acknowledgeMode = '0' -series.4.legend=20 Consumer -series.4.dir=${csvCurrentDir} -series.4.colourName=magenta - -series.5.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '40' and acknowledgeMode = '0' -series.5.legend=40 Consumer -series.5.dir=${csvCurrentDir} -series.5.colourName=orange - -series.6.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '1' and acknowledgeMode = '0' -series.6.legend=1 Consumer (baseline ${baselineName}) -series.6.dir=${csvBaselineDir} -series.6.colourName=dark_red -series.6.strokeWidth=-1 diff --git a/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef b/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef deleted file mode 100644 index bd3f6a457a..0000000000 --- a/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef +++ /dev/null @@ -1,57 +0,0 @@ -# -# 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=XYLINE -chartTitle=Varying number of consumers - transacted -chartSubtitle=Persistent 1KB messages -chartDescription=1,2,5,10,20,40 P/Cs, single queue, persistent, transacted, with message payload 1KB. - -xAxisTitle=Consumers -yAxisTitle=Throughput (messages/s) - -series.1.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '1' and acknowledgeMode = '0' -series.1.legend=1 Producer -series.1.dir=${csvCurrentDir} -series.1.colourName=blue - -series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '5' and acknowledgeMode = '0' -series.2.legend=5 Producers -series.2.dir=${csvCurrentDir} -series.2.colourName=green - -series.3.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '10' and acknowledgeMode = '0' -series.3.legend=10 Producers -series.3.dir=${csvCurrentDir} -series.3.colourName=red - -series.4.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '20' and acknowledgeMode = '0' -series.4.legend=20 Producers -series.4.dir=${csvCurrentDir} -series.4.colourName=magenta - -series.5.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '40' and acknowledgeMode = '0' -series.5.legend=40 Producers -series.5.dir=${csvCurrentDir} -series.5.colourName=yellow - -series.6.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '10' and acknowledgeMode = '0' -series.6.legend=10 Producers (baseline ${baselineName}) -series.6.dir=${csvBaselineDir} -series.6.colourName=dark_red -series.6.strokeWidth=-1 diff --git a/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef deleted file mode 100644 index 5028ce17fc..0000000000 --- a/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef +++ /dev/null @@ -1,38 +0,0 @@ -# -# 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 -chartSubtitle=Persistent messages (1KB) -chartDescription=1P 1C, single queue, persistent, with message payload 1KB. - -xAxisTitle=Acknowledge mode (0=session transacted; 1=auto-acknowledge) -yAxisTitle=Throughput (messages/s) - -series.1.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM AcknowledgementModes WHERE testName like 'Persistent%' AND participantName = 'All' ORDER BY acknowledgeMode -series.1.legend=Current -series.1.dir=${csvCurrentDir} -series.1.colourName=blue - - -series.2.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM AcknowledgementModes WHERE testName like 'Persistent%' AND participantName = 'All' ORDER BY acknowledgeMode -series.2.legend=Baseline ${baselineName} -series.2.dir=${csvBaselineDir} -series.2.colourName=dark_red - diff --git a/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef deleted file mode 100644 index 88d5cd9137..0000000000 --- a/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef +++ /dev/null @@ -1,36 +0,0 @@ -# -# 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 -chartSubtitle=Transient messages (1024b) -chartDescription=1P 1C, single queue, transient, with message payload 1KB. - -xAxisTitle=Acknowledge mode (0=session transacted; 1=auto-acknowledge) -yAxisTitle=Throughput (messages/s) - -series.1.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM AcknowledgementModes WHERE testName like 'Transient%' AND participantName = 'All' ORDER BY acknowledgeMode -series.1.legend=Current -series.1.dir=${csvCurrentDir} -series.1.colourName=blue - -series.2.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM AcknowledgementModes WHERE testName like 'Transient%' AND participantName = 'All' ORDER BY acknowledgeMode -series.2.legend=Baseline ${baselineName} -series.2.dir=${csvBaselineDir} -series.2.colourName=dark_red diff --git a/qpid/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef b/qpid/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef deleted file mode 100644 index cfc5efb71c..0000000000 --- a/qpid/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef +++ /dev/null @@ -1,37 +0,0 @@ -# -# 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=XYLINE -chartTitle=Transaction Batch Sizes Equal -chartSubtitle=Persistent 1KB messages -chartDescription=1P 1C, single queue, persistent, transacted with message payload 1KB with producer/consumer batch size varying between 1-400 messages for both P and C. - -xAxisTitle=Batch Size -yAxisTitle=Throughput (messages/s) - -series.1.statement=SELECT batchSize, throughputMessagesPerS FROM BatchSize WHERE participantName = 'All' -series.1.legend=Equal Producer/Consumer -series.1.dir=${csvCurrentDir} -series.1.colourName=red - -series.2.statement=SELECT batchSize, throughputMessagesPerS FROM BatchSize WHERE participantName = 'All' -series.2.legend=Equal Producer/Consumer (Baseline ${baselineName}) -series.2.dir=${csvBaselineDir} -series.2.colourName=dark_red -series.2.strokeWidth=-1 diff --git a/qpid/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef b/qpid/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef deleted file mode 100644 index ac8de3d290..0000000000 --- a/qpid/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef +++ /dev/null @@ -1,53 +0,0 @@ -# -# 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=XYLINE -chartTitle=Transaction Batch Size Unequal -chartSubtitle=Persistent 1KB messages -chartDescription=1P 1C, single queue, persistent, transacted with message payload 1KB with fixed batch size 1 for one party whilst other varies between 1-400 messages. - -xAxisTitle=Batch Size -yAxisTitle=Throughput (messages/s) - -# -# If csvjdbc could do sub-selects (allowing us to extract the consumer/producer batch size from the All Consumers/All Producers rows), -# we would not need the workaround where we have testdef place the consumer/producer batch size into testName field -# - -series.1.statement=SELECT testName, throughputMessagesPerS FROM BatchSizeProducerVaries WHERE participantName = 'All' -series.1.legend=Variable Producer, Fixed Consumer -series.1.dir=${csvCurrentDir} -series.1.colourName=red - -series.2.statement=SELECT testName, throughputMessagesPerS FROM BatchSizeProducerVaries WHERE participantName = 'All' -series.2.legend=Variable Producer, Fixed Consumer (Baseline ${baselineName}) -series.2.dir=${csvBaselineDir} -series.2.colourName=dark_red -series.2.strokeWidth=-1 - -series.3.statement=SELECT testName, throughputMessagesPerS FROM BatchSizeConsumerVaries WHERE participantName = 'All' -series.3.legend=Fixed Producer, Variable Consumer -series.3.dir=${csvCurrentDir} -series.3.colourName=blue - -series.4.statement=SELECT testName, throughputMessagesPerS FROM BatchSizeConsumerVaries WHERE participantName = 'All' -series.4.legend=Fixed Producer, Variable Consumer (Baseline ${baselineName}) -series.4.dir=${csvBaselineDir} -series.4.colourName=dark_blue -series.4.strokeWidth=-1 diff --git a/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef b/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef deleted file mode 100644 index 64fbda8953..0000000000 --- a/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef +++ /dev/null @@ -1,36 +0,0 @@ -# -# 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 -chartSubtitle=Persistent 1KB messages -chartDescription=1P 1C, single queue, persistent, session-transacted with message payload 1KB. Sorted queue - 160,000 random keys, Priority - iteriates priority 0..9. - -xAxisTitle=Queue Types -yAxisTitle=Throughput (messages/s) - -series.1.statement=SELECT testName, throughputMessagesPerS FROM QueueTypes WHERE participantName = 'All' -series.1.legend=Current -series.1.dir=${csvCurrentDir} -series.1.colourName=blue - -series.2.statement=SELECT testName, throughputMessagesPerS FROM QueueTypes WHERE participantName = 'All' -series.2.legend=Baseline ${baselineName} -series.2.dir=${csvBaselineDir} -series.2.colourName=dark_red diff --git a/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef b/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef deleted file mode 100644 index 7aeeb37508..0000000000 --- a/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef +++ /dev/null @@ -1,49 +0,0 @@ -# -# 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=XYLINE -chartTitle=Varying number of producer sessions on single connection -chartSubtitle=Persistent messages (1024b) -chartDescription=1-80P single queue, transacted on single connection, 20C transacted on separate connections, persistent, message payload 1KB. - -xAxisTitle=Number of producer sessions -yAxisTitle=Throughput (KB/s) - -# testName contains the number of sessions -series.1.statement=SELECT testName, throughputKbPerS FROM VaryingNumberOfProducerSessionsSingleConnection WHERE participantName = 'All' -series.1.legend=Current - End-to-end throughput -series.1.dir=${csvCurrentDir} -series.1.colourName=red - -series.2.statement=SELECT testName, throughputKbPerS FROM VaryingNumberOfProducerSessionsSingleConnection WHERE participantName = 'All Producers' -series.2.legend=Current - Producer only throughput -series.2.dir=${csvCurrentDir} -series.2.colourName=blue - -series.3.statement=SELECT testName, throughputKbPerS FROM VaryingNumberOfProducerSessionsSingleConnection WHERE participantName = 'All' -series.3.legend=Baseline ${baselineName} - End-to-end throughput -series.3.dir=${csvBaselineDir} -series.3.colourName=dark_red -series.3.strokeWidth=-1 - -series.4.statement=SELECT testName, throughputKbPerS FROM VaryingNumberOfProducerSessionsSingleConnection WHERE participantName = 'All Producers' -series.4.legend=Baseline ${baselineName} - Producer only throughput -series.4.dir=${csvBaselineDir} -series.4.colourName=dark_blue -series.4.strokeWidth=-1 diff --git a/qpid/java/perftests/etc/chartdefs/1060-SSLConnections.chartdef b/qpid/java/perftests/etc/chartdefs/1060-SSLConnections.chartdef deleted file mode 100644 index 90cb06d5c7..0000000000 --- a/qpid/java/perftests/etc/chartdefs/1060-SSLConnections.chartdef +++ /dev/null @@ -1,49 +0,0 @@ -# -# 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=Effect of SSL - transacted -chartSubtitle=Persistent 1KB messages -chartDescription=Matching number of P/Cs, single queue, persistent, transacted, with message payload 1KB. - -xAxisTitle=Number of producers and consumers on separate connections -yAxisTitle=Throughput (messages/s) - -series.1.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = totalNumberOfProducers and acknowledgeMode = '0' -series.1.legend=Plain -series.1.dir=${csvCurrentDir} -series.1.colourName=red - -series.2.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = totalNumberOfProducers and acknowledgeMode = '0' -series.2.legend=Plain (baseline ${baselineName}) -series.2.dir=${csvBaselineDir} -series.2.colourName=dark_red -series.2.strokeWidth=-1 - -series.3.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipantsSSL WHERE participantName = 'All' and totalNumberOfConsumers = totalNumberOfProducers and acknowledgeMode = '0' -series.3.legend=SSL -series.3.dir=${csvCurrentDir} -series.3.colourName=blue - -series.4.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipantsSSL WHERE participantName = 'All' and totalNumberOfConsumers = totalNumberOfProducers and acknowledgeMode = '0' -series.4.legend=SSL (baseline ${baselineName}) -series.4.dir=${csvBaselineDir} -series.4.colourName=dark_blue -series.4.strokeWidth=-1 - diff --git a/qpid/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef deleted file mode 100644 index d806acda4b..0000000000 --- a/qpid/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef +++ /dev/null @@ -1,37 +0,0 @@ -# -# 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=XYLINE -chartTitle=Impact of non-overlapping selectors on queue consumers with transient messages -chartSubtitle=Transient 1KB messages -xAxisTitle=Consumers -yAxisTitle=Throughput (messages/s) -chartDescription=Impact of non-overlapping selectors on queue consumers with single queue, transient messages, auto-ack, message payload of 1024 bytes, 1 producer, varying number of consumers from 1 to 32. - -series.1.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM QueueConsumersWithNonOverlappingSelectors WHERE participantName = 'All' and testName like '%non overlapping - NON_PERSISTENT%' -series.1.legend=Current -series.1.dir=${csvCurrentDir} -series.1.colourName=blue - -series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM QueueConsumersWithNonOverlappingSelectors WHERE participantName = 'All' and testName like '%non overlapping - NON_PERSISTENT%' -series.2.legend=Baseline ${baselineName} -series.2.dir=${csvBaselineDir} -series.2.colourName=dark_red -series.2.stokeWidth=-1 - diff --git a/qpid/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef deleted file mode 100644 index 94b354a3c4..0000000000 --- a/qpid/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef +++ /dev/null @@ -1,43 +0,0 @@ -# -# 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=XYLINE -chartTitle=Impact of non-overlapping selectors on queue consumers with persistent messages -chartSubtitle=Persistent 1KB messages -xAxisTitle=Consumers -yAxisTitle=Throughput (messages/s) -chartDescription=Impact of non-overlapping selectors on queue consumers with single queue, persistent messages, session-transacted, message payload of 1024 bytes, 1 producer, varying number of consumers from 1 to 32. - - -series.1.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM QueueConsumersWithNonOverlappingSelectors WHERE participantName = 'All' and testName like '%non overlapping - PERSISTENT' -series.1.legend=Current -series.1.dir=${csvCurrentDir} -series.1.colourName=blue - -series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM QueueConsumersWithNonOverlappingSelectors WHERE participantName = 'All' and testName like '%non overlapping - PERSISTENT' -series.2.legend=Baseline ${baselineName} -series.2.dir=${csvBaselineDir} -series.2.colourName=dark_red -series.2.stokeWidth=-1 - -series.3.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '1' and acknowledgeMode = '1' -series.3.legend=Current: no selectors -series.3.dir=${csvCurrentDir} -series.3.colourName=green - diff --git a/qpid/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef deleted file mode 100644 index 319485ffba..0000000000 --- a/qpid/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef +++ /dev/null @@ -1,36 +0,0 @@ -# -# 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=XYLINE -chartTitle=Impact of 50%-overlapping selectors in queue consumers with transient messages -chartSubtitle=Transient 1KB messages -xAxisTitle=Consumers -yAxisTitle=Throughput (messages/s) -chartDescription=Impact of 50%-overlapping selectors in queue consumers with single queue, transient messages, auto-ack, message payload 1KB, 1 producer, varying number of consumers from 2 to 32. - -series.1.statement=SELECT totalNumberOfConsumers,throughputMessagesPerS FROM QueueConsumersWithOverlappingSelectors WHERE participantName = 'All' and testName like '%50_ overlapping - NON_PERSISTENT%' -series.1.legend=Current -series.1.dir=${csvCurrentDir} -series.1.colourName=blue - -series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM QueueConsumersWithOverlappingSelectors WHERE participantName = 'All' and testName like '%50_ overlapping - NON_PERSISTENT%' -series.2.legend=Baseline ${baselineName} -series.2.dir=${csvBaselineDir} -series.2.colourName=dark_red -series.2.stokeWidth=-1 diff --git a/qpid/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef deleted file mode 100644 index 17cfee2e62..0000000000 --- a/qpid/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef +++ /dev/null @@ -1,42 +0,0 @@ -# -# 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=XYLINE -chartTitle=Impact of 50%-overlapping selectors in queue consumers with persistent messages -chartDescription=Impact of 50%-overlapping selectors in queue consumers with single queue, persistent messages, session-transacted, message payload of 1KB, 1 producer, varying number of consumers from 2 to 32. -chartSubtitle=Persistent 1KB messages -xAxisTitle=Consumers -yAxisTitle=Throughput (messages/s) - -series.1.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM QueueConsumersWithOverlappingSelectors WHERE participantName = 'All' and testName like '%50_ overlapping - PERSISTENT%' -series.1.legend=Current -series.1.dir=${csvCurrentDir} -series.1.colourName=blue - -series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM QueueConsumersWithOverlappingSelectors WHERE participantName = 'All' and testName like '%50_ overlapping - PERSISTENT%' -series.2.legend=Baseline ${baselineName} -series.2.dir=${csvBaselineDir} -series.2.colourName=dark_red -series.2.stokeWidth=-1 - -series.3.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '1' and acknowledgeMode = '1' -series.3.legend=Current: no selectors -series.3.dir=${csvCurrentDir} -series.3.colourName=green - diff --git a/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef b/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef deleted file mode 100644 index 22b6f4c9ca..0000000000 --- a/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef +++ /dev/null @@ -1,37 +0,0 @@ -# -# 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=XYLINE -chartTitle=Number of topic consumers -chartSubtitle=Transient 1KB messages -chartDescription=1P 1-100C single topic, transient, transacted, with message payload 1KB. - -xAxisTitle=Numer of consumers -yAxisTitle=Throughput (messages/s) - -series.1.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM Topic-NumberOfConsumers WHERE participantName = 'All' -series.1.legend=Current -series.1.dir=${csvCurrentDir} -series.1.colourName=red - -series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM Topic-NumberOfConsumers WHERE participantName = 'All' -series.2.legend=Baseline ${baselineName} -series.2.dir=${csvBaselineDir} -series.2.colourName=dark_red -series.2.strokeWidth=-1 diff --git a/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef b/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef deleted file mode 100644 index c0a67243dc..0000000000 --- a/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef +++ /dev/null @@ -1,37 +0,0 @@ -# -# 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=XYLINE -chartTitle=Number of topics -chartSubtitle=Transient 1KB messages -chartDescription=1,10,50,100 PC, single topic, transient, transacted, with each PC pair having own topic, message payload 1KB. - -xAxisTitle=Numer of topics -yAxisTitle=Throughput (messages/s) - -series.1.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM Topic-NumberOfTopics WHERE participantName = 'All' -series.1.legend=Current -series.1.dir=${csvCurrentDir} -series.1.colourName=red - -series.2.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM Topic-NumberOfTopics WHERE participantName = 'All' -series.2.legend=Baseline ${baselineName} -series.2.dir=${csvBaselineDir} -series.2.colourName=dark_red -series.2.strokeWidth=-1 diff --git a/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef b/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef deleted file mode 100644 index 1a60ced1cf..0000000000 --- a/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef +++ /dev/null @@ -1,37 +0,0 @@ -# -# 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=Topic transient/durable subscriptions -chartSubtitle=1KB messages -chartDescription=1P 10C, single topic, transacted, message payload 1KB, transient messages on non-durable sub, persistent messages on durable sub. - -xAxisTitle=Subscription type (true durable, false non durable) -yAxisTitle=Throughput (messages/s) - -series.1.statement=SELECT isDurableSubscription, throughputMessagesPerS FROM Topic-Persistence WHERE participantName = 'All Consumers' -series.1.legend=Current -series.1.dir=${csvCurrentDir} -series.1.colourName=blue - -series.2.statement=SELECT isDurableSubscription, throughputMessagesPerS FROM Topic-Persistence WHERE participantName = 'All Consumers' -series.2.legend=Baseline ${baselineName} -series.2.dir=${csvBaselineDir} -series.2.colourName=dark_red -series.2.stokeWidth=2 diff --git a/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef b/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef deleted file mode 100644 index c6decf0c4c..0000000000 --- a/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef +++ /dev/null @@ -1,37 +0,0 @@ -# -# 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=Topic acknowledge modes -chartSubtitle=Transient 1KB messages -chartDescription=1P 10C, single topic, transient, non-durable subscription, message payload 1KB. - -xAxisTitle=Ack Mode (0=transaction 1=auto-ack) -yAxisTitle=Throughput (messages/s) - -series.1.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM Topic-AckModes WHERE participantName = 'All' -series.1.legend=Current -series.1.dir=${csvCurrentDir} -series.1.colourName=blue - -series.2.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM Topic-AckModes WHERE participantName = 'All' -series.2.legend=Baseline ${baselineName} -series.2.dir=${csvBaselineDir} -series.2.colourName=dark_red -series.2.stokeWidth=2 diff --git a/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef deleted file mode 100644 index 7d0738fd7b..0000000000 --- a/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef +++ /dev/null @@ -1,41 +0,0 @@ -# -# 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=STATISTICAL_BAR -chartTitle=Impact of message size on latency -chartSubtitle=Transient messages -chartDescription=1P 1C, single queue, transient, auto-ack, with message payload between 256-262144 bytes. - -xAxisTitle=Message Size (B) -yAxisTitle=Latency (millis) - -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=red - -series.2.statement=SELECT payloadSizeB, averageLatency,latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers' -series.2.legend=Average latency (baseline ${baselineName}) -series.2.dir=${csvBaselineDir} -series.2.colourName=dark_red - -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/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef deleted file mode 100644 index 5fd5a3c414..0000000000 --- a/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef +++ /dev/null @@ -1,41 +0,0 @@ -# -# 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=STATISTICAL_BAR -chartTitle=Impact of message size on latency -chartSubtitle=Persistent messages -chartDescription=1P 1C, single queue, persistent, session-transacted, with message payload between 256-262144 bytes. - -xAxisTitle=Message Size (B) -yAxisTitle=Latency (millis) - -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=red - -series.2.statement=SELECT payloadSizeB, averageLatency, latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers' -series.2.legend=Average latency (baseline ${baselineName}) -series.2.dir=${csvBaselineDir} -series.2.colourName=dark_red - -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/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef b/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef deleted file mode 100644 index 91d3cbe0f7..0000000000 --- a/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef +++ /dev/null @@ -1,51 +0,0 @@ -# -# 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=STATISTICAL_BAR -chartTitle=Latency, varying number of participants -chartSubtitle=Persistent 1KB messages -chartDescription=1,2,5,10 P/Cs, single queue, persistent, session-transacted, with message payload 1KB. - -xAxisTitle=Consumers -yAxisTitle=Latency (millis) - -series.1.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-VaryingNumberOfParticipants WHERE participantName = 'All Consumers' and testName like '% - 1 producer - PERSISTENT' -series.1.legend=1 producer -series.1.dir=${csvCurrentDir} -series.1.colourName=blue - -series.2.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-VaryingNumberOfParticipants WHERE participantName = 'All Consumers' and testName like '% - 2 producers - PERSISTENT' -series.2.legend=2 producers -series.2.dir=${csvCurrentDir} -series.2.colourName=green - -series.3.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-VaryingNumberOfParticipants WHERE participantName = 'All Consumers' and testName like '% - 5 producers - PERSISTENT' -series.3.legend=5 producers -series.3.dir=${csvCurrentDir} -series.3.colourName=magenta - -series.4.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-VaryingNumberOfParticipants WHERE participantName = 'All Consumers' and testName like '% - 10 producers - PERSISTENT' -series.4.legend=10 producers -series.4.dir=${csvCurrentDir} -series.4.colourName=red - -series.5.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-VaryingNumberOfParticipants WHERE participantName = 'All Consumers' and testName like '% - 10 producers - PERSISTENT' -series.5.legend=10 producers (baseline ${baselineName}) -series.5.dir=${csvBaselineDir} -series.5.colourName=dark_red diff --git a/qpid/java/perftests/etc/chartdefs/timeseries/1001-Large-Messages-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/timeseries/1001-Large-Messages-Transient.chartdef deleted file mode 100644 index e77f7b4eff..0000000000 --- a/qpid/java/perftests/etc/chartdefs/timeseries/1001-Large-Messages-Transient.chartdef +++ /dev/null @@ -1,29 +0,0 @@ -# -# 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=Large transient messages -chartDescription=1P 1C, transient, auto-ack, with message payload 65536 bytes. - -xAxisTitle=Date -yAxisTitle=Throughput (KB/s) - -series.1.statement=SELECT insertedTimestamp, throughputKbPerS FROM RESULTS WHERE participantName = 'All' AND testName = 'Message Size - 1P-1C - TRANSIENT' and payloadSizeB = 65536 -series.1.colourName=red -series.1.legend=Throughput diff --git a/qpid/java/perftests/etc/chartdefs/timeseries/1002-Large-Messages-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/timeseries/1002-Large-Messages-Persistent.chartdef deleted file mode 100644 index ffcf8c26b8..0000000000 --- a/qpid/java/perftests/etc/chartdefs/timeseries/1002-Large-Messages-Persistent.chartdef +++ /dev/null @@ -1,29 +0,0 @@ -# -# 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=Large persistent messages -chartDescription=1P 1C, persistent, auto-ack, with message payload 65536 bytes. - -xAxisTitle=Date -yAxisTitle=Throughput (KB/s) - -series.1.statement=SELECT insertedTimestamp, throughputKbPerS FROM RESULTS WHERE participantName = 'All' AND testName = 'Message Size - 1P-1C - PERSISTENT' and payloadSizeB = 65536 -series.1.colourName=red -series.1.legend=Throughput diff --git a/qpid/java/perftests/etc/chartdefs/timeseries/1011-MultipleProducersAndConsumers-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/timeseries/1011-MultipleProducersAndConsumers-Persistent.chartdef deleted file mode 100644 index 8f9b4cec9c..0000000000 --- a/qpid/java/perftests/etc/chartdefs/timeseries/1011-MultipleProducersAndConsumers-Persistent.chartdef +++ /dev/null @@ -1,30 +0,0 @@ -# -# 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=Multiple producers and consumers - auto ack -chartSubtitle=Persistent 1KB messages -chartDescription=10 P/Cs, persistent, auto-ack, with message payload 1KB. - -xAxisTitle=Date -yAxisTitle=Throughput (KB/s) - -series.1.statement=SELECT insertedTimestamp, throughputKbPerS FROM RESULTS WHERE participantName = 'All' AND testName = 'Varying number of participants: 10 consumers - 10 producers - PERSISTENT' and acknowledgemode=1 -series.1.colourName=red -series.1.legend=Throughput \ No newline at end of file diff --git a/qpid/java/perftests/etc/chartdefs/timeseries/1030-Batch-Size-Small.chartdef b/qpid/java/perftests/etc/chartdefs/timeseries/1030-Batch-Size-Small.chartdef deleted file mode 100644 index f755bf4a5b..0000000000 --- a/qpid/java/perftests/etc/chartdefs/timeseries/1030-Batch-Size-Small.chartdef +++ /dev/null @@ -1,30 +0,0 @@ -# -# 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=Transactions -chartSubtitle=Persistent 1KB messages -chartDescription=1P 1C, persistent, transacted with message payload 1KB with batch size 1 for both P and C - -xAxisTitle=Date -yAxisTitle=Throughput (KB/s) - -series.1.statement=SELECT insertedTimestamp, throughputKbPerS FROM RESULTS WHERE participantName = 'All' AND testName = 'Batch Size 1-1 - PERSISTENT' -series.1.colourName=red -series.1.legend=Throughput \ No newline at end of file diff --git a/qpid/java/perftests/etc/chartdefs/timeseries/1031-Batch-Size-Large.chartdef b/qpid/java/perftests/etc/chartdefs/timeseries/1031-Batch-Size-Large.chartdef deleted file mode 100644 index ca390f8226..0000000000 --- a/qpid/java/perftests/etc/chartdefs/timeseries/1031-Batch-Size-Large.chartdef +++ /dev/null @@ -1,30 +0,0 @@ -# -# 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=Transactions with large batches -chartSubtitle=Persistent 1KB messages -chartDescription=1P 1C, persistent, transacted with message payload 1KB with batch size 100 for both P and C - -xAxisTitle=Date -yAxisTitle=Throughput (KB/s) - -series.1.statement=SELECT insertedTimestamp, throughputKbPerS FROM RESULTS WHERE participantName = 'All' AND testName = 'Batch Size 100-100 - PERSISTENT' -series.1.colourName=red -series.1.legend=Throughput diff --git a/qpid/java/perftests/etc/chartdefs/timeseries/1040-SortedQueue.chartdef b/qpid/java/perftests/etc/chartdefs/timeseries/1040-SortedQueue.chartdef deleted file mode 100644 index 6dce3a1a77..0000000000 --- a/qpid/java/perftests/etc/chartdefs/timeseries/1040-SortedQueue.chartdef +++ /dev/null @@ -1,30 +0,0 @@ -# -# 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=Sorted queue -chartSubtitle=Persistent 1KB messages -chartDescription=1P 1C, persistent, auto-ack with message payload 1KB. Sorted queue with 160,000 random keys - -xAxisTitle=Date -yAxisTitle=Throughput (KB/s) - -series.1.statement=SELECT insertedTimestamp, throughputKbPerS FROM RESULTS WHERE participantName = 'All' AND testName = 'queue-type:sorted-queue' -series.1.colourName=red -series.1.legend=Throughput \ No newline at end of file diff --git a/qpid/java/perftests/etc/ha/chardefs/1001-ScalingParticipants.chartdef b/qpid/java/perftests/etc/ha/chardefs/1001-ScalingParticipants.chartdef deleted file mode 100644 index c1450714a0..0000000000 --- a/qpid/java/perftests/etc/ha/chardefs/1001-ScalingParticipants.chartdef +++ /dev/null @@ -1,48 +0,0 @@ -# -# 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=XYLINE -chartTitle=Scaling participants in non-HA and HA scenarios -chartSubtitle=Persistent 1KB messages, transacted -chartDescription=1,2,5,10 producers/consumers, single queue, persistent, transacted, with message payload 1KB. - -xAxisTitle=Participants -yAxisTitle=Throughput (messages/s) - -series.1.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM ScalingParticipants WHERE participantName = 'All' -series.1.legend=Non HA -series.1.dir=${csvCurrentDir} -series.1.colourName=blue - -#series.1.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM ScalingParticipants-non-ha WHERE participantName = 'All' -#series.1.legend=Non HA -#series.1.dir=${csvCurrentDir} -#series.1.colourName=blue - -#series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM ScalingParticipants-3-node-cluster WHERE participantName = 'All' -#series.2.legend=3 Nodes Cluster -#series.2.dir=${csvCurrentDir} -#series.2.colourName=dark_green - -#series.3.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM ScalingParticipants-3-node-cluster-1-node-down WHERE participantName = 'All' -#series.3.legend=3 Nodes Cluster with one node down -#series.3.dir=${csvCurrentDir} -#series.3.colourName=red - - diff --git a/qpid/java/perftests/etc/ha/readme.txt b/qpid/java/perftests/etc/ha/readme.txt deleted file mode 100644 index f23793b26c..0000000000 --- a/qpid/java/perftests/etc/ha/readme.txt +++ /dev/null @@ -1,33 +0,0 @@ -# -# 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. -# - -This folder contains test definitions and chart definitions for the tests measuring throughput on scaling participants. -They could be useful for testing performance in HA scenarios. - -The tests can be executed with: - -perfetsts> java -cp './target/*:./target/dependency/*:./etc/' -Dqpid.amqp.version=0-91 -Dqpid.disttest.duration=50000 \ - -Dqpid.dest_syntax=BURL org.apache.qpid.disttest.ControllerRunner jndi-config=./etc/perftests-jndi.properties \ - test-config=./etc/ha/testdefs/ScalingParticipants.js distributed=false writeToDb=false - -Graphs can be built with: - -perfetsts> java -cp './visualisation-jfc/target/dependency/*:./visualisation-jfc/target/*' -Djava.awt.headless=true \ - -Dlog4j.configuration=file://./etc/log4j.properties -DcsvCurrentDir=. -DcsvBaselineDir=. -DbaselineName=na \ - org.apache.qpid.disttest.charting.ChartingUtil chart-defs=./etc/ha/1001-ScalingParticipants.chartdef diff --git a/qpid/java/perftests/etc/ha/testdefs/ScalingParticipants.js b/qpid/java/perftests/etc/ha/testdefs/ScalingParticipants.js deleted file mode 100644 index eb092b6fa2..0000000000 --- a/qpid/java/perftests/etc/ha/testdefs/ScalingParticipants.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * - * 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. - * - */ -var jsonObject = { _tests:[] }; - -var duration = 30000; -var queueName = "direct://amq.direct//scaling-participants?durable='true'"; - -var numbersOfParticipants = [1, 2, 5, 10]; - -for(participantIndex=0; participantIndex < numbersOfParticipants.length; participantIndex++) -{ - var participantNumber = numbersOfParticipants[participantIndex]; - var test = { - "_name": "Varying number of participants: " + participantNumber + " consumers - " + participantNumber + " producers - PERSISTENT", - "_queues":[ - { - "_name": queueName, - "_durable": true - } - ], - "_clients": - QPID.times(participantNumber, - { - "_name": "producingClient__PRODUCING_CLIENT_INDEX", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer__PRODUCING_CLIENT_INDEX", - "_destinationName": queueName, - "_maximumDuration": duration, - "_deliveryMode": 2, - "_messageSize": 1024 - } - ] - } - ] - } - ] - }, - "__PRODUCING_CLIENT_INDEX") - .concat(QPID.times(participantNumber, - { - "_name": "consumingClient__CONSUMING_CLIENT_INDEX", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": 0, - "_consumers": [ - { - "_name": "Consumer__CONSUMING_CLIENT_INDEX", - "_destinationName": queueName, - "_maximumDuration": duration - } - ] - } - ] - } - ] - }, - "__CONSUMING_CLIENT_INDEX")) - }; - jsonObject._tests= jsonObject._tests.concat(test); -} diff --git a/qpid/java/perftests/etc/json_config_tool.py b/qpid/java/perftests/etc/json_config_tool.py deleted file mode 100755 index 38a994f81b..0000000000 --- a/qpid/java/perftests/etc/json_config_tool.py +++ /dev/null @@ -1,74 +0,0 @@ -#!/usr/bin/env python -# -# 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. -# - -from StringIO import StringIO -import json -import sys -import re - -objname = None -attrname = None -attrvalue = None - -try: - import argparse - - parser = argparse.ArgumentParser(description='Adds (or updates) a attribute name/value pair of an existing object within a Java Broker config.json') - parser.add_argument("objectname", help='Name of the object e.g. httpManagement') - parser.add_argument("attrname", help='Name of the attribute to add or update e.g. httpBasicAuthenticationEnabled') - parser.add_argument("attrvalue", help='Value of the attribute e.g. true') - args = parser.parse_args() - - objname = args.objectname - attrname = args.attrname - attrvalue = args.attrvalue -except ImportError: - objname = sys.argv[1] - attrname = sys.argv[2] - attrvalue = sys.argv[3] - pass - - -def transform(data): - if isinstance(data, tuple): - (k, v) = data; - return k, transform(v) - elif isinstance(data, list): - return [transform(i) for i in data] - elif isinstance(data, dict): - if "name" in data and data["name"] == objname: - data[attrname] = attrvalue - return data - else: - return data - -# Expects a config.json to be provided on stdin, write the resulting json to stdout. - -lines = [] -for line in sys.stdin: - lines.append(line.rstrip()) - -# naive strip C style comments - this deals with the Apache licence comment present on the default config -input = re.sub("/\*.*?\*/", " ", "".join(lines), re.S) - -data = json.load(StringIO(input)) -data = dict([transform((k, v)) for k,v in data.items()]) - -json.dump(data, sys.stdout, sort_keys=True, indent=2) diff --git a/qpid/java/perftests/etc/log4j.properties b/qpid/java/perftests/etc/log4j.properties deleted file mode 100644 index ec00e022ac..0000000000 --- a/qpid/java/perftests/etc/log4j.properties +++ /dev/null @@ -1,28 +0,0 @@ -# -# 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. -# -log4j.rootLogger=ERROR,console - -log4j.logger.org.apache.qpid=WARN -log4j.logger.org.apache.qpid.disttest=INFO - -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.Threshold=all -log4j.appender.console.layout=org.apache.log4j.PatternLayout - -log4j.appender.console.layout.ConversionPattern=%d %p [%t] [%c{1}] %m%n diff --git a/qpid/java/perftests/etc/perftests-jndi.properties b/qpid/java/perftests/etc/perftests-jndi.properties deleted file mode 100644 index deb0a8d57b..0000000000 --- a/qpid/java/perftests/etc/perftests-jndi.properties +++ /dev/null @@ -1,27 +0,0 @@ -# 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. - -java.naming.factory.initial = org.apache.qpid.jndi.PropertiesFileInitialContextFactory - -connectionfactory.connectionfactory = amqp://guest:guest@clientid/?brokerlist='tcp://localhost:5672' -connectionfactory.sslconnectionfactory = amqp://guest:guest@clientid/?ssl='true'&brokerlist='tcp://localhost:5671' - -destination.controllerqueue = direct://amq.direct//controllerqueue?autodelete='true' - -jdbcDriverClass=org.apache.derby.jdbc.EmbeddedDriver -# writes to a results database in ./perftestResultsDb by default. -jdbcUrl=jdbc:derby:perftestResultsDb;create=true diff --git a/qpid/java/perftests/etc/run-perftests.sh b/qpid/java/perftests/etc/run-perftests.sh deleted file mode 100755 index de435ecfca..0000000000 --- a/qpid/java/perftests/etc/run-perftests.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash -# -# 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. -# - -# Runs the perftests using a typical configuration. - -BASE_DIR=`dirname $0` -DURATION=${1:-5000} -AMQP_VERSION=${2:-0-91} - -echo Will run perftests using a maximum duration of ${DURATION}ms and AMQP protocol version ${AMQP_VERSION}. -echo - -java -cp "${BASE_DIR}:${BASE_DIR}/../../build/lib/*" \ - -Dqpid.amqp.version=${AMQP_VERSION} -Dqpid.dest_syntax=BURL \ - -Dqpid.disttest.duration=$DURATION \ - org.apache.qpid.disttest.ControllerRunner \ - jndi-config=${BASE_DIR}/perftests-jndi.properties \ - test-config=${BASE_DIR}/testdefs/VaryingNumberOfParticipants.js \ - distributed=false \ - writeToDb=true diff --git a/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json b/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json deleted file mode 100644 index 071edf3f0e..0000000000 --- a/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json +++ /dev/null @@ -1,138 +0,0 @@ -{ - "_tests":[ - { - "_name": "Transient Ack Modes"; - "_iterations":[ - { - "_messageSize": 1024, - "_acknowledgeMode": 1, - "_deliveryMode": 1 - }, - { - "_messageSize": 1024, - "_acknowledgeMode": 0, - "_deliveryMode": 1 - } - ], - "_queues":[ - { - "_name": "direct://amq.direct//testQueue", - "_attributes": - { - "x-qpid-capacity": 10485760, - "x-qpid-flow-resume-capacity": 8388608 - } - } - ], - "_clients":[ - { - "_name": "producingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_producers": [ - { - "_name": "Producer1", - "_destinationName": "direct://amq.direct//testQueue", - "_maximumDuration": 30000 - } - ] - } - ] - } - ] - }, - { - "_name": "consumingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_consumers": [ - { - "_name": "Consumer1", - "_destinationName": "direct://amq.direct//testQueue", - "_maximumDuration": 30000 - } - ] - } - ] - } - ] - } - ] - }, - { - "_name": "Persistent Ack Modes"; - "_iterations":[ - { - "_messageSize": 1024, - "_acknowledgeMode": 1, - "_deliveryMode": 2 - }, - { - "_messageSize": 1024, - "_acknowledgeMode": 0, - "_deliveryMode": 2 - } - ], - "_queues":[ - { - "_name": "direct://amq.direct//testQueue?durable='true'", - "_durable" : "true" - } - ], - "_clients":[ - { - "_name": "producingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_producers": [ - { - "_name": "Producer1", - "_destinationName": "direct://amq.direct//testQueue?durable='true'", - "_maximumDuration": 30000 - } - ] - } - ] - } - ] - }, - { - "_name": "consumingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_consumers": [ - { - "_name": "Consumer1", - "_destinationName": "direct://amq.direct//testQueue?durable='true'", - "_maximumDuration": 30000 - } - ] - } - ] - } - ] - } - ] - } - ] -} diff --git a/qpid/java/perftests/etc/testdefs/BatchSize.js b/qpid/java/perftests/etc/testdefs/BatchSize.js deleted file mode 100644 index f17751b7b5..0000000000 --- a/qpid/java/perftests/etc/testdefs/BatchSize.js +++ /dev/null @@ -1,102 +0,0 @@ -/* - * - * 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. - * - */ - -var jsonObject = { - _tests:[] -}; - -var duration = 30000; - -var txBatchSizes = [[1,1], [2,2], [5,5], [10,10], [20,20], [50,50], [100,100], [200,200], [400,400]]; - -var acknowledgeMode = 0; -var deliveryMode = 2; -var messageSize = 1024; - -for(i=0; i < txBatchSizes.length ; i++) -{ - var producerBatchSize = txBatchSizes[i][0]; - var consumerBatchSize = txBatchSizes[i][1]; - var queueName = "txBatchSize" + producerBatchSize + "_" + consumerBatchSize; - var destination = "direct://amq.direct//" + queueName + "?durable='true'"; - - var test = { - "_name": "Batch Size " + producerBatchSize + "-" + consumerBatchSize + " - PERSISTENT", - "_queues":[ - { - "_name": queueName, - "_durable": true - } - ], - "_clients":[ - { - "_name": "producingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": acknowledgeMode, - "_producers": [ - { - "_name": "Producer1", - "_destinationName": destination, - "_messageSize": messageSize, - "_deliveryMode": deliveryMode, - "_batchSize": producerBatchSize, - "_maximumDuration": duration - } - ] - } - ] - } - ] - }, - { - "_name": "consumingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": acknowledgeMode, - "_consumers": [ - { - "_name": "Consumer1", - "_destinationName": destination, - "_batchSize": consumerBatchSize, - "_maximumDuration": duration - } - ] - } - ] - } - ] - } - ] - }; - - jsonObject._tests= jsonObject._tests.concat(test); -} diff --git a/qpid/java/perftests/etc/testdefs/BatchSizeConsumerVaries.js b/qpid/java/perftests/etc/testdefs/BatchSizeConsumerVaries.js deleted file mode 100644 index b491f431c9..0000000000 --- a/qpid/java/perftests/etc/testdefs/BatchSizeConsumerVaries.js +++ /dev/null @@ -1,102 +0,0 @@ -/* - * - * 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. - * - */ - -var jsonObject = { - _tests:[] -}; - -var duration = 30000; - -var txBatchSizes = [[1,1], [1,2], [1,5], [1,10], [1,20], [1,50], [1,100], [1,200], [1,400]]; - -var acknowledgeMode = 0; -var deliveryMode = 2; -var messageSize = 1024; - -for(i=0; i < txBatchSizes.length ; i++) -{ - var producerBatchSize = txBatchSizes[i][0]; - var consumerBatchSize = txBatchSizes[i][1]; - var queueName = "txBatchSize" + producerBatchSize + "_" + consumerBatchSize; - var destination = "direct://amq.direct//" + queueName + "?durable='true'"; - - var test = { - "_name": consumerBatchSize,// hack - use test name to expose the consumer batch size on the All result rows - "_queues":[ - { - "_name": queueName, - "_durable": true - } - ], - "_clients":[ - { - "_name": "producingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": acknowledgeMode, - "_producers": [ - { - "_name": "Producer1", - "_destinationName": destination, - "_messageSize": messageSize, - "_deliveryMode": deliveryMode, - "_batchSize": producerBatchSize, - "_maximumDuration": duration - } - ] - } - ] - } - ] - }, - { - "_name": "consumingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": acknowledgeMode, - "_consumers": [ - { - "_name": "Consumer1", - "_destinationName": destination, - "_batchSize": consumerBatchSize, - "_maximumDuration": duration - } - ] - } - ] - } - ] - } - ] - }; - - jsonObject._tests= jsonObject._tests.concat(test); -} diff --git a/qpid/java/perftests/etc/testdefs/BatchSizeProducerVaries.js b/qpid/java/perftests/etc/testdefs/BatchSizeProducerVaries.js deleted file mode 100644 index ac23c52c9e..0000000000 --- a/qpid/java/perftests/etc/testdefs/BatchSizeProducerVaries.js +++ /dev/null @@ -1,102 +0,0 @@ -/* - * - * 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. - * - */ - -var jsonObject = { - _tests:[] -}; - -var duration = 30000; - -var txBatchSizes = [[1,1], [2,1], [5,1], [10,1], [20,1], [50,1], [100,1], [200,1], [400,1]]; - -var acknowledgeMode = 0; -var deliveryMode = 2; -var messageSize = 1024; - -for(i=0; i < txBatchSizes.length ; i++) -{ - var producerBatchSize = txBatchSizes[i][0]; - var consumerBatchSize = txBatchSizes[i][1]; - var queueName = "txBatchSize" + producerBatchSize + "_" + consumerBatchSize; - var destination = "direct://amq.direct//" + queueName + "?durable='true'"; - - var test = { - "_name": producerBatchSize,// hack - use test name to expose the producer batch size on the All result rows - "_queues":[ - { - "_name": queueName, - "_durable": true - } - ], - "_clients":[ - { - "_name": "producingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": acknowledgeMode, - "_producers": [ - { - "_name": "Producer1", - "_destinationName": destination, - "_messageSize": messageSize, - "_deliveryMode": deliveryMode, - "_batchSize": producerBatchSize, - "_maximumDuration": duration - } - ] - } - ] - } - ] - }, - { - "_name": "consumingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": acknowledgeMode, - "_consumers": [ - { - "_name": "Consumer1", - "_destinationName": destination, - "_batchSize": consumerBatchSize, - "_maximumDuration": duration - } - ] - } - ] - } - ] - } - ] - }; - - jsonObject._tests= jsonObject._tests.concat(test); -} diff --git a/qpid/java/perftests/etc/testdefs/Latency-MessageSize.json b/qpid/java/perftests/etc/testdefs/Latency-MessageSize.json deleted file mode 100644 index f93d1ecaab..0000000000 --- a/qpid/java/perftests/etc/testdefs/Latency-MessageSize.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "_tests":[ - { - "_name": "Latency - Message Size - TRANSIENT"; - "_iterations":[ - { - "_messageSize": 256 - }, - { - "_messageSize": 1024 - }, - { - "_messageSize": 4096 - }, - { - "_messageSize": 16384 - }, - { - "_messageSize": 32768 - }, - { - "_messageSize": 65536 - }, - { - "_messageSize": 131072 - }, - { - "_messageSize": 262144 - } - ], - "_queues":[ - { - "_name": "direct://amq.direct//latency-message-size-transient" - } - ], - "_clients":[ - { - "_name": "producingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": 1, - "_producers": [ - { - "_name": "Producer1", - "_destinationName": "direct://amq.direct//latency-message-size-transient", - "_deliveryMode": 1, - "_maximumDuration": 60000, - "_interval": 1000 - } - ] - } - ] - } - ] - }, - { - "_name": "consumingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": 1, - "_consumers": [ - { - "_name": "Consumer1", - "_destinationName": "direct://amq.direct//latency-message-size-transient", - "_maximumDuration": 60000, - "_evaluateLatency": true - } - ] - } - ] - } - ] - } - ] - }, - { - "_name": "Latency - Message Size - PERSISTENT"; - "_iterations":[ - { - "_messageSize": 256 - }, - { - "_messageSize": 512 - }, - { - "_messageSize": 1024 - }, - { - "_messageSize": 2048 - }, - { - "_messageSize": 4096 - }, - { - "_messageSize": 8192 - }, - { - "_messageSize": 16384 - }, - { - "_messageSize": 32768 - }, - { - "_messageSize": 65536 - }, - { - "_messageSize": 131072 - }, - { - "_messageSize": 262144 - } - ], - "_queues":[ - { - "_name": "direct://amq.direct//latency-message-size-persistent?durable='true'", - "_durable": true - } - ], - "_clients":[ - { - "_name": "producingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer1", - "_destinationName": "direct://amq.direct//latency-message-size-persistent?durable='true'", - "_deliveryMode": 2, - "_maximumDuration": 60000, - "_interval": 1000 - } - ] - } - ] - } - ] - }, - { - "_name": "consumingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": 0, - "_consumers": [ - { - "_name": "Consumer1", - "_destinationName": "direct://amq.direct//latency-message-size-persistent?durable='true'", - "_maximumDuration": 60000, - "_evaluateLatency": true - } - ] - } - ] - } - ] - } - ] - } - ] -} diff --git a/qpid/java/perftests/etc/testdefs/Latency-VaryingNumberOfParticipants.json b/qpid/java/perftests/etc/testdefs/Latency-VaryingNumberOfParticipants.json deleted file mode 100644 index 50f00a8c45..0000000000 --- a/qpid/java/perftests/etc/testdefs/Latency-VaryingNumberOfParticipants.json +++ /dev/null @@ -1,706 +0,0 @@ -{ - "_tests":[ - { - "_name": "Latency of varying number of participants: 1 consumer - 1 producer - PERSISTENT", - "_queues":[ - { - "_name": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_durable": true - } - ], - "_clients":[ - { - "_name": "producingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer1", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_deliveryMode": 2, - "_messageSize": 1024, - "_maximumDuration": 60000, - "_interval": 1000 - } - ] - } - ] - } - ] - }, - { - "_name": "consumingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": 0, - "_consumers": [ - { - "_name": "Consumer1", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_evaluateLatency": true - } - ] - } - ] - } - ] - } - ] - }, - - - { - "_name": "Latency of varying number of participants: 1 consumer - 10 producers - PERSISTENT", - "_queues":[ - { - "_name": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_durable": true - } - ], - "_clients":[ - { - "_name": "producingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer1", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_interval": 3000, - "_deliveryMode": 2, - "_messageSize": 1024 - } - ] - } - ] - }, - { - "_name": "connection2", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session2", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer2", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_interval": 3000, - "_deliveryMode": 2, - "_messageSize": 1024 - } - ] - } - ] - }, - { - "_name": "connection3", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session3", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer3", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_interval": 3000, - "_deliveryMode": 2, - "_messageSize": 1024 - } - ] - } - ] - }, - { - "_name": "connection4", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session4", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer4", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_interval": 3000, - "_deliveryMode": 2, - "_messageSize": 1024 - } - ] - } - ] - }, - { - "_name": "connection5", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session5", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer5", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_interval": 3000, - "_deliveryMode": 2, - "_messageSize": 1024 - } - ] - } - ] - }, - { - "_name": "connection6", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session6", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer6", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_interval": 3000, - "_deliveryMode": 2, - "_messageSize": 1024 - } - ] - } - ] - }, - { - "_name": "connection7", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session7", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer7", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_interval": 3000, - "_deliveryMode": 2, - "_messageSize": 1024 - } - ] - } - ] - }, - { - "_name": "connection8", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session8", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer8", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_interval": 3000, - "_deliveryMode": 2, - "_messageSize": 1024 - } - ] - } - ] - }, - { - "_name": "connection9", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session9", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer9", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_interval": 3000, - "_deliveryMode": 2, - "_messageSize": 1024 - } - ] - } - ] - }, - { - "_name": "connection10", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session10", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer10", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_interval": 3000, - "_deliveryMode": 2, - "_messageSize": 1024 - } - ] - } - ] - } - ] - }, - { - "_name": "consumingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": 0, - "_consumers": [ - { - "_name": "Consumer1", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_evaluateLatency": true - } - ] - } - ] - } - ] - } - ] - }, - - { - "_name": "Latency of varying number of participants: 10 consumers - 10 producers - PERSISTENT", - "_queues":[ - { - "_name": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_durable": true - } - ], - "_clients":[ - { - "_name": "producingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer1", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_interval": 3000, - "_deliveryMode": 2, - "_messageSize": 1024 - } - ] - } - ] - }, - { - "_name": "connection2", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session2", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer2", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_interval": 3000, - "_deliveryMode": 2, - "_messageSize": 1024 - } - ] - } - ] - }, - { - "_name": "connection3", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session3", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer3", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_interval": 3000, - "_deliveryMode": 2, - "_messageSize": 1024 - } - ] - } - ] - }, - { - "_name": "connection4", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session4", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer4", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_interval": 3000, - "_deliveryMode": 2, - "_messageSize": 1024 - } - ] - } - ] - }, - { - "_name": "connection5", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session5", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer5", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_interval": 3000, - "_deliveryMode": 2, - "_messageSize": 1024 - } - ] - } - ] - }, - { - "_name": "connection6", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session6", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer6", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_interval": 3000, - "_deliveryMode": 2, - "_messageSize": 1024 - } - ] - } - ] - }, - { - "_name": "connection7", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session7", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer7", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_interval": 3000, - "_deliveryMode": 2, - "_messageSize": 1024 - } - ] - } - ] - }, - { - "_name": "connection8", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session8", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer8", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_interval": 3000, - "_deliveryMode": 2, - "_messageSize": 1024 - } - ] - } - ] - }, - { - "_name": "connection9", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session9", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer9", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_interval": 3000, - "_deliveryMode": 2, - "_messageSize": 1024 - } - ] - } - ] - }, - { - "_name": "connection10", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session10", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer10", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_interval": 3000, - "_deliveryMode": 2, - "_messageSize": 1024 - } - ] - } - ] - } - ] - }, - { - "_name": "consumingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": 0, - "_consumers": [ - { - "_name": "Consumer1", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_evaluateLatency": true - } - ] - } - ] - }, - { - "_name": "connection2", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session2", - "_acknowledgeMode": 0, - "_consumers": [ - { - "_name": "Consumer2", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_evaluateLatency": true - } - ] - } - ] - }, - { - "_name": "connection3", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session3", - "_acknowledgeMode": 0, - "_consumers": [ - { - "_name": "Consumer3", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_evaluateLatency": true - } - ] - } - ] - }, - { - "_name": "connection4", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session4", - "_acknowledgeMode": 0, - "_consumers": [ - { - "_name": "Consumer4", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_evaluateLatency": true - } - ] - } - ] - }, - { - "_name": "connection5", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session5", - "_acknowledgeMode": 0, - "_consumers": [ - { - "_name": "Consumer5", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_evaluateLatency": true - } - ] - } - ] - }, - { - "_name": "connection6", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session6", - "_acknowledgeMode": 0, - "_consumers": [ - { - "_name": "Consumer6", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_evaluateLatency": true - } - ] - } - ] - }, - { - "_name": "connection7", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session7", - "_acknowledgeMode": 0, - "_consumers": [ - { - "_name": "Consumer7", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_evaluateLatency": true - } - ] - } - ] - }, - { - "_name": "connection8", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session8", - "_acknowledgeMode": 0, - "_consumers": [ - { - "_name": "Consumer8", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_evaluateLatency": true - } - ] - } - ] - }, - { - "_name": "connection9", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session9", - "_acknowledgeMode": 0, - "_consumers": [ - { - "_name": "Consumer9", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_evaluateLatency": true - } - ] - } - ] - }, - { - "_name": "connection10", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session10", - "_acknowledgeMode": 0, - "_consumers": [ - { - "_name": "Consumer10", - "_destinationName": "direct://amq.direct//latency-varying-consumers?durable='true'", - "_maximumDuration": 60000, - "_evaluateLatency": true - } - ] - } - ] - } - ] - } - ] - } - ] -} diff --git a/qpid/java/perftests/etc/testdefs/MessageSize.json b/qpid/java/perftests/etc/testdefs/MessageSize.json deleted file mode 100644 index c97815507b..0000000000 --- a/qpid/java/perftests/etc/testdefs/MessageSize.json +++ /dev/null @@ -1,196 +0,0 @@ -{ - "_tests":[ - { - "_name": "Message Size - 1P-1C - TRANSIENT"; - "_iterations":[ - { - "_messageSize": 256 - }, - { - "_messageSize": 512 - }, - { - "_messageSize": 1024 - }, - { - "_messageSize": 2048 - }, - { - "_messageSize": 4096 - }, - { - "_messageSize": 8192 - }, - { - "_messageSize": 16384 - }, - { - "_messageSize": 32768 - }, - { - "_messageSize": 65536 - }, - { - "_messageSize": 131072 - }, - { - "_messageSize": 262144 - } - ], - "_queues":[ - { - "_name": "direct://amq.direct//messageSize", - "_attributes": - { - "x-qpid-capacity": 10485760, - "x-qpid-flow-resume-capacity": 8388608 - } - } - ], - "_clients":[ - { - "_name": "producingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": 1, - "_producers": [ - { - "_name": "Producer1", - "_destinationName": "direct://amq.direct//messageSize", - "_deliveryMode": 1, - "_maximumDuration": 30000 - } - ] - } - ] - } - ] - }, - { - "_name": "consumingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": 1, - "_consumers": [ - { - "_name": "Consumer1", - "_destinationName": "direct://amq.direct//messageSize", - "_maximumDuration": 30000 - } - ] - } - ] - } - ] - } - ] - }, - { - "_name": "Message Size - 1P-1C - PERSISTENT"; - "_iterations":[ - { - "_messageSize": 256 - }, - { - "_messageSize": 512 - }, - { - "_messageSize": 1024 - }, - { - "_messageSize": 2048 - }, - { - "_messageSize": 4096 - }, - { - "_messageSize": 8192 - }, - { - "_messageSize": 16384 - }, - { - "_messageSize": 32768 - }, - { - "_messageSize": 65536 - }, - { - "_messageSize": 131072 - }, - { - "_messageSize": 262144 - } - ], - "_queues":[ - { - "_name": "direct://amq.direct//messageSize?durable='true'", - "_durable": true, - "_attributes": - { - "x-qpid-capacity": 10485760, - "x-qpid-flow-resume-capacity": 8388608 - } - } - ], - "_clients":[ - { - "_name": "producingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer1", - "_destinationName": "direct://amq.direct//messageSize?durable='true'", - "_deliveryMode": 2, - "_maximumDuration": 30000 - - } - ] - } - ] - } - ] - }, - { - "_name": "consumingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": 0, - "_consumers": [ - { - "_name": "Consumer1", - "_destinationName": "direct://amq.direct//messageSize?durable='true'", - "_maximumDuration": 30000 - } - ] - } - ] - } - ] - } - ] - } - ] -} diff --git a/qpid/java/perftests/etc/testdefs/QueueConsumersWithNonOverlappingSelectors.js b/qpid/java/perftests/etc/testdefs/QueueConsumersWithNonOverlappingSelectors.js deleted file mode 100644 index 72b77e0e93..0000000000 --- a/qpid/java/perftests/etc/testdefs/QueueConsumersWithNonOverlappingSelectors.js +++ /dev/null @@ -1,120 +0,0 @@ -/* - * - * 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. - * - */ -var jsonObject = { - _tests:[] -}; - -for (var i=0; i<2; i++) -{ - var deliveryMode = i+1; - var acknowledgeMode = ((i==0) ? 1 : 0); - var durable = (deliveryMode == 2); - var suffix = durable ? "PERSISTENT" : "NON-PERSISTENT"; - var queueName = "direct://amq.direct//queue-selectors-" + suffix + "?durable='" + durable + "'"; - var consumerNumbers = [1, 2, 4, 8, 16, 32]; - for (var j=0; j