From 9c73ef7a5ac10acd6a50d5d52bd721fc2faa5919 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Thu, 28 Feb 2013 16:14:30 +0000 Subject: Update from trunk r1375509 through r1450773 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1451244 13f79535-47bb-0310-9956-ffa450edef68 --- .../1001-MessageSize-Transient-ByteSec.chartdef | 37 +++ .../chartdefs/1001-MessageSize-Transient.chartdef | 32 --- .../1002-MessageSize-Persistent-ByteSec.chartdef | 37 +++ .../chartdefs/1002-MessageSize-Persistent.chartdef | 32 --- .../1003-MessageSize-Transient-MsgSec.chartdef | 37 +++ .../1004-MessageSize-Persistent-MsgSec.chartdef | 37 +++ .../1011-VaryingNumberOfProducers-AutoAck.chartdef | 47 ++++ .../1011-VaryingNumberOfProducers.chartdef | 40 --- .../1012-VaryingNumberOfConsumers-AutoAck.chartdef | 47 ++++ .../1012-VaryingNumberOfConsumers.chartdef | 40 --- ...-VaryingNumberOfProducers-SessionTrans.chartdef | 47 ++++ ...-VaryingNumberOfConsumers-SessionTrans.chartdef | 47 ++++ .../1021-AcknowledgementModes-Persistent.chartdef | 13 +- .../1022-AcknowledgementModes-Transient.chartdef | 10 +- .../etc/chartdefs/1030-BatchSize-Equal.chartdef | 37 +++ .../etc/chartdefs/1030-BatchSize.chartdef | 33 --- .../etc/chartdefs/1031-BatchSize-Unequal.chartdef | 53 ++++ .../etc/chartdefs/1040-QueueTypes.chartdef | 10 +- ...mberOfProducerSessionsSingleConnection.chartdef | 49 ++++ ...sWithNonOverlappingSelectors-Transient.chartdef | 37 +++ ...WithNonOverlappingSelectors-Persistent.chartdef | 43 ++++ ...mersWithOverlappingSelectors-Transient.chartdef | 36 +++ ...ersWithOverlappingSelectors-Persistent.chartdef | 42 ++++ .../1500-Topic-NumberOfConsumers.chartdef | 11 +- .../chartdefs/1501-Topic-NumberOfTopics.chartdef | 11 +- .../etc/chartdefs/1502-Topic-Persistence.chartdef | 13 +- .../etc/chartdefs/1503-Topic-AckModes.chartdef | 13 +- .../2001-Latency-MessageSize-Transient.chartdef | 6 + .../2002-Latency-MessageSize-Persistent.chartdef | 6 + ...sWithNonOverlappingSelectors-Transient.chartdef | 6 + ...euesWithOverlappingSelectors-Transient.chartdef | 6 + ...WithNonOverlappingSelectors-Persistent.chartdef | 6 + ...uesWithOverlappingSelectors-Persistent.chartdef | 6 + ...31-Latency-VaryingNumberOfParticipants.chartdef | 7 + .../etc/chartdefs/2041-Latency-QueueTypes.chartdef | 6 + .../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 +++ java/perftests/etc/perftests-jndi.properties | 4 + java/perftests/etc/run-perftests.sh | 37 +++ java/perftests/etc/testdefs/BatchSize.js | 102 ++++++++ java/perftests/etc/testdefs/BatchSize.json | 84 ------- .../etc/testdefs/BatchSizeConsumerVaries.js | 102 ++++++++ .../etc/testdefs/BatchSizeProducerVaries.js | 102 ++++++++ .../QueueConsumersWithNonOverlappingSelectors.js | 120 +++++++++ .../QueueConsumersWithOverlappingSelectors.js | 131 ++++++++++ java/perftests/etc/testdefs/Topic-AckModes.js | 9 +- .../etc/testdefs/Topic-NumberOfConsumers.js | 4 + .../perftests/etc/testdefs/Topic-NumberOfTopics.js | 4 + java/perftests/etc/testdefs/Topic-Persistence.js | 8 +- .../etc/testdefs/VaryingNumberOfParticipants.json | 272 ++++++++++----------- ...yingNumberOfProducerSessionsSingleConnection.js | 95 +++++++ java/perftests/etc/visualisation-timeseries.sh | 33 +++ java/perftests/etc/visualisation.sh | 35 +++ 57 files changed, 1823 insertions(+), 437 deletions(-) create mode 100644 java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef delete mode 100644 java/perftests/etc/chartdefs/1001-MessageSize-Transient.chartdef create mode 100644 java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef delete mode 100644 java/perftests/etc/chartdefs/1002-MessageSize-Persistent.chartdef create mode 100644 java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef create mode 100644 java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef create mode 100644 java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef delete mode 100644 java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers.chartdef create mode 100644 java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef delete mode 100644 java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers.chartdef create mode 100644 java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef create mode 100644 java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef create mode 100644 java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef delete mode 100644 java/perftests/etc/chartdefs/1030-BatchSize.chartdef create mode 100644 java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef create mode 100644 java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef create mode 100644 java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef create mode 100644 java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef create mode 100644 java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef create mode 100644 java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef create mode 100644 java/perftests/etc/chartdefs/timeseries/1001-Large-Messages-Transient.chartdef create mode 100644 java/perftests/etc/chartdefs/timeseries/1002-Large-Messages-Persistent.chartdef create mode 100644 java/perftests/etc/chartdefs/timeseries/1011-MultipleProducersAndConsumers-Persistent.chartdef create mode 100644 java/perftests/etc/chartdefs/timeseries/1030-Batch-Size-Small.chartdef create mode 100644 java/perftests/etc/chartdefs/timeseries/1031-Batch-Size-Large.chartdef create mode 100644 java/perftests/etc/chartdefs/timeseries/1040-SortedQueue.chartdef create mode 100755 java/perftests/etc/run-perftests.sh create mode 100644 java/perftests/etc/testdefs/BatchSize.js delete mode 100644 java/perftests/etc/testdefs/BatchSize.json create mode 100644 java/perftests/etc/testdefs/BatchSizeConsumerVaries.js create mode 100644 java/perftests/etc/testdefs/BatchSizeProducerVaries.js create mode 100644 java/perftests/etc/testdefs/QueueConsumersWithNonOverlappingSelectors.js create mode 100644 java/perftests/etc/testdefs/QueueConsumersWithOverlappingSelectors.js create mode 100644 java/perftests/etc/testdefs/VaryingNumberOfProducerSessionsSingleConnection.js create mode 100755 java/perftests/etc/visualisation-timeseries.sh create mode 100755 java/perftests/etc/visualisation.sh (limited to 'java/perftests/etc') diff --git a/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef b/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef new file mode 100644 index 0000000000..7559b5934e --- /dev/null +++ b/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef @@ -0,0 +1,37 @@ +# +# 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, transient, auto-ack, 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 '%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 +series.2.dir=${csvBaselineDir} +series.2.colourName=dark_red +series.2.strokeWidth=-1 diff --git a/java/perftests/etc/chartdefs/1001-MessageSize-Transient.chartdef b/java/perftests/etc/chartdefs/1001-MessageSize-Transient.chartdef deleted file mode 100644 index 757a396dff..0000000000 --- a/java/perftests/etc/chartdefs/1001-MessageSize-Transient.chartdef +++ /dev/null @@ -1,32 +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 -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.2.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All' -series.2.legend=Baseline -series.2.dir=${csvBaselineDir} diff --git a/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef b/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef new file mode 100644 index 0000000000..db8a5f3896 --- /dev/null +++ b/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef @@ -0,0 +1,37 @@ +# +# 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, persistent, auto-ack, 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 +series.2.dir=${csvBaselineDir} +series.2.colourName=dark_red +series.2.strokeWidth=-1 diff --git a/java/perftests/etc/chartdefs/1002-MessageSize-Persistent.chartdef b/java/perftests/etc/chartdefs/1002-MessageSize-Persistent.chartdef deleted file mode 100644 index 58c280e227..0000000000 --- a/java/perftests/etc/chartdefs/1002-MessageSize-Persistent.chartdef +++ /dev/null @@ -1,32 +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 -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.2.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '% PERSISTENT' AND participantName = 'All' -series.2.legend=Baseline -series.2.dir=${csvBaselineDir} diff --git a/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef b/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef new file mode 100644 index 0000000000..7f18fcc986 --- /dev/null +++ b/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef @@ -0,0 +1,37 @@ +# +# 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, 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 +series.2.dir=${csvBaselineDir} +series.2.colourName=dark_red +series.2.strokeWidth=-1 diff --git a/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef b/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef new file mode 100644 index 0000000000..667be044bc --- /dev/null +++ b/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef @@ -0,0 +1,37 @@ +# +# 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, persistent, 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 '% 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 +series.2.dir=${csvBaselineDir} +series.2.colourName=dark_red +series.2.strokeWidth=-1 diff --git a/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef b/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef new file mode 100644 index 0000000000..b3038c1671 --- /dev/null +++ b/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef @@ -0,0 +1,47 @@ +# +# 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 - auto ack +chartSubtitle=Persistent 1KB messages +chartDescription=1,2,5,10 P/Cs, persistent, auto-ack, 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 = '1' +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 = '1' +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 = '1' +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 = '1' and acknowledgeMode = '1' +series.4.legend=1 Consumer (baseline) +series.4.dir=${csvBaselineDir} +series.4.colourName=dark_red +series.4.strokeWidth=-1 diff --git a/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers.chartdef b/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers.chartdef deleted file mode 100644 index f39e7c3d0d..0000000000 --- a/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers.chartdef +++ /dev/null @@ -1,40 +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 -chartSubtitle=Persistent 1KB messages -xAxisTitle=Producers -yAxisTitle=Throughput (KB/s) - -series.1.statement=SELECT totalNumberOfProducers, throughputKbPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '1' -series.1.legend=1 Consumer -series.1.dir=${csvCurrentDir} - -series.2.statement=SELECT totalNumberOfProducers, throughputKbPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '5' -series.2.legend=5 Consumer -series.2.dir=${csvCurrentDir} - -series.3.statement=SELECT totalNumberOfProducers, throughputKbPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '10' -series.3.legend=10 Consumer -series.3.dir=${csvCurrentDir} - -series.4.statement=SELECT totalNumberOfProducers, throughputKbPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '1' -series.4.legend=1 Consumer (baseline) -series.4.dir=${csvBaselineDir} diff --git a/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef b/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef new file mode 100644 index 0000000000..d1f3d6e9a4 --- /dev/null +++ b/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef @@ -0,0 +1,47 @@ +# +# 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 - auto ack +chartSubtitle=Persistent 1KB messages +chartDescription=1,2,5,10 P/Cs, persistent, auto-ack, 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 = '1' +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 = '1' +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 = '1' +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 = '10' and acknowledgeMode = '1' +series.4.legend=10 Producers (baseline) +series.4.dir=${csvBaselineDir} +series.4.colourName=dark_red +series.4.strokeWidth=-1 diff --git a/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers.chartdef b/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers.chartdef deleted file mode 100644 index 0f0b35a7c8..0000000000 --- a/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers.chartdef +++ /dev/null @@ -1,40 +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 -chartSubtitle=Persistent 1KB messages -xAxisTitle=Consumers -yAxisTitle=Throughput (KB/s) - -series.1.statement=SELECT totalNumberOfConsumers, throughputKbPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '1' -series.1.legend=1 Producer -series.1.dir=${csvCurrentDir} - -series.2.statement=SELECT totalNumberOfConsumers, throughputKbPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '5' -series.2.legend=5 Producers -series.2.dir=${csvCurrentDir} - -series.3.statement=SELECT totalNumberOfConsumers, throughputKbPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '10' -series.3.legend=10 Producers -series.3.dir=${csvCurrentDir} - -series.4.statement=SELECT totalNumberOfConsumers, throughputKbPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '10' -series.4.legend=10 Producers (baseline) -series.4.dir=${csvBaselineDir} diff --git a/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef b/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef new file mode 100644 index 0000000000..42ba6f8f20 --- /dev/null +++ b/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef @@ -0,0 +1,47 @@ +# +# 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 P/Cs, 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 = '1' and acknowledgeMode = '0' +series.4.legend=1 Consumer (baseline) +series.4.dir=${csvBaselineDir} +series.4.colourName=dark_red +series.4.strokeWidth=-1 diff --git a/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef b/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef new file mode 100644 index 0000000000..0afd162ad0 --- /dev/null +++ b/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef @@ -0,0 +1,47 @@ +# +# 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 P/Cs, 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 = '10' and acknowledgeMode = '0' +series.4.legend=10 Producers (baseline) +series.4.dir=${csvBaselineDir} +series.4.colourName=dark_red +series.4.strokeWidth=-1 diff --git a/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef b/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef index 30aee40c27..827f8b5567 100644 --- a/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef +++ b/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef @@ -19,17 +19,20 @@ chartType=BAR chartTitle=Performance of acknowledgement modes -chartSubtitle=Persistent messages (1024b) +chartSubtitle=Persistent messages (1KB) +chartDescription=1P 1C, persistent, with message payload 1KB. + xAxisTitle=Acknowledge mode (0=session transacted; 1=auto-acknowledge) -yAxisTitle=Throughput (KB/s) +yAxisTitle=Throughput (messages/s) -series.1.statement=SELECT acknowledgeMode, throughputKbPerS FROM AcknowledgementModes WHERE testName like 'Persistent%' AND participantName = 'All' ORDER BY acknowledgeMode +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, throughputKbPerS FROM AcknowledgementModes WHERE testName like 'Persistent%' AND participantName = 'All' ORDER BY acknowledgeMode +series.2.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM AcknowledgementModes WHERE testName like 'Persistent%' AND participantName = 'All' ORDER BY acknowledgeMode series.2.legend=Baseline series.2.dir=${csvBaselineDir} +series.2.colourName=dark_red diff --git a/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef b/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef index 7a26391deb..8ca5d838e2 100644 --- a/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef +++ b/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef @@ -20,13 +20,17 @@ chartType=BAR chartTitle=Performance of acknowledgement modes chartSubtitle=Transient messages (1024b) +chartDescription=1P 1C, transient, with message payload 1KB. + xAxisTitle=Acknowledge mode (0=session transacted; 1=auto-acknowledge) -yAxisTitle=Throughput (KB/s) +yAxisTitle=Throughput (messages/s) -series.1.statement=SELECT acknowledgeMode, throughputKbPerS FROM AcknowledgementModes WHERE testName like 'Transient%' AND participantName = 'All' ORDER BY acknowledgeMode +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, throughputKbPerS FROM AcknowledgementModes WHERE testName like 'Transient%' AND participantName = 'All' ORDER BY acknowledgeMode +series.2.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM AcknowledgementModes WHERE testName like 'Transient%' AND participantName = 'All' ORDER BY acknowledgeMode series.2.legend=Baseline series.2.dir=${csvBaselineDir} +series.2.colourName=dark_red diff --git a/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef b/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef new file mode 100644 index 0000000000..97b712e027 --- /dev/null +++ b/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef @@ -0,0 +1,37 @@ +# +# 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, 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) +series.2.dir=${csvBaselineDir} +series.2.colourName=dark_red +series.2.strokeWidth=-1 diff --git a/java/perftests/etc/chartdefs/1030-BatchSize.chartdef b/java/perftests/etc/chartdefs/1030-BatchSize.chartdef deleted file mode 100644 index 1f01aa85aa..0000000000 --- a/java/perftests/etc/chartdefs/1030-BatchSize.chartdef +++ /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. -# - -chartType=XYLINE -chartTitle=Transaction Batch Size -chartSubtitle=Persistent 1KB messages -xAxisTitle=Batch Size -yAxisTitle=Throughput (KB/s) - -series.1.statement=SELECT batchSize, throughputKbPerS FROM BatchSize WHERE participantName = 'All' -series.1.legend=Current -series.1.dir=${csvCurrentDir} - -series.2.statement=SELECT batchSize, throughputKbPerS FROM BatchSize WHERE participantName = 'All' -series.2.legend=Baseline -series.2.dir=${csvBaselineDir} - diff --git a/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef b/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef new file mode 100644 index 0000000000..51b3bb2144 --- /dev/null +++ b/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef @@ -0,0 +1,53 @@ +# +# 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, 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) +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) +series.4.dir=${csvBaselineDir} +series.4.colourName=dark_blue +series.4.strokeWidth=-1 diff --git a/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef b/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef index 42ed69c19d..aacedab421 100644 --- a/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef +++ b/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef @@ -20,13 +20,17 @@ chartType=BAR chartTitle=Queue Types chartSubtitle=Persistent 1KB messages +chartDescription=1P 1C, persistent, auto-ack with message payload 1KB. Sorted queue - 160,000 random keys, Priority - iteriates priority 0..9. + xAxisTitle=Queue Types -yAxisTitle=Throughput (KB/s) +yAxisTitle=Throughput (messages/s) -series.1.statement=SELECT testName, throughputKbPerS FROM QueueTypes WHERE participantName = 'All' +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, throughputKbPerS FROM QueueTypes WHERE participantName = 'All' +series.2.statement=SELECT testName, throughputMessagesPerS FROM QueueTypes WHERE participantName = 'All' series.2.legend=Baseline series.2.dir=${csvBaselineDir} +series.2.colourName=dark_red diff --git a/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef b/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef new file mode 100644 index 0000000000..46696bf942 --- /dev/null +++ b/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef @@ -0,0 +1,49 @@ +# +# 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 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 - 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 - Producer only throughput +series.4.dir=${csvBaselineDir} +series.4.colourName=dark_blue +series.4.strokeWidth=-1 diff --git a/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef b/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef new file mode 100644 index 0000000000..5081b379e7 --- /dev/null +++ b/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef @@ -0,0 +1,37 @@ +# +# 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 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 +series.2.dir=${csvBaselineDir} +series.2.colourName=dark_red +series.2.stokeWidth=-1 + diff --git a/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef b/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef new file mode 100644 index 0000000000..137f7bde36 --- /dev/null +++ b/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef @@ -0,0 +1,43 @@ +# +# 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 persistent 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 - 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 +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/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef b/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef new file mode 100644 index 0000000000..74f370317b --- /dev/null +++ b/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef @@ -0,0 +1,36 @@ +# +# 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 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 +series.2.dir=${csvBaselineDir} +series.2.colourName=dark_red +series.2.stokeWidth=-1 diff --git a/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef b/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef new file mode 100644 index 0000000000..0dd78e02ef --- /dev/null +++ b/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef @@ -0,0 +1,42 @@ +# +# 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 persistent messages, auto-ack, 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 +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/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef b/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef index 305c5009e2..073cee810d 100644 --- a/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef +++ b/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef @@ -20,13 +20,18 @@ chartType=XYLINE chartTitle=Number of topic consumers chartSubtitle=Transient 1KB messages +chartDescription=1P 1-100C transient, transacted, with message payload 1KB. + xAxisTitle=Numer of consumers -yAxisTitle=Throughput (KB/s) +yAxisTitle=Throughput (messages/s) -series.1.statement=SELECT testName, throughputKbPerS FROM Topic-NumberOfConsumers WHERE participantName = 'All' +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 testName, throughputKbPerS FROM Topic-NumberOfConsumers WHERE participantName = 'All' +series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM Topic-NumberOfConsumers WHERE participantName = 'All' series.2.legend=Baseline series.2.dir=${csvBaselineDir} +series.2.colourName=dark_red +series.2.strokeWidth=-1 diff --git a/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef b/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef index 9bc53e5a9e..b32f43d0c2 100644 --- a/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef +++ b/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef @@ -20,13 +20,18 @@ chartType=XYLINE chartTitle=Number of topics chartSubtitle=Transient 1KB messages +chartDescription=1,10,50,100 PC, transient, transacted, with each PC pair having own topic, message payload 1KB. + xAxisTitle=Numer of topics -yAxisTitle=Throughput (KB/s) +yAxisTitle=Throughput (messages/s) -series.1.statement=SELECT testName, throughputKbPerS FROM Topic-NumberOfTopics WHERE participantName = 'All' +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 testName, throughputKbPerS FROM Topic-NumberOfTopics WHERE participantName = 'All' +series.2.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM Topic-NumberOfTopics WHERE participantName = 'All' series.2.legend=Baseline series.2.dir=${csvBaselineDir} +series.2.colourName=dark_red +series.2.strokeWidth=-1 diff --git a/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef b/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef index ce64d14ac4..5fd905ab4f 100644 --- a/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef +++ b/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef @@ -20,13 +20,18 @@ chartType=BAR chartTitle=Topic transient/durable subscriptions chartSubtitle=1KB messages -xAxisTitle=Durable subscription -yAxisTitle=Throughput (KB/s) +chartDescription=1P 10C, transacted, message payload 1KB, transient messages on non-durable sub, persistent messages on durable sub -series.1.statement=SELECT isDurableSubscription, throughputKbPerS FROM Topic-Persistence WHERE participantName = 'All Consumers' +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, throughputKbPerS FROM Topic-Persistence WHERE participantName = 'All Consumers' +series.2.statement=SELECT isDurableSubscription, throughputMessagesPerS FROM Topic-Persistence WHERE participantName = 'All Consumers' series.2.legend=Baseline series.2.dir=${csvBaselineDir} +series.2.colourName=dark_red +series.2.stokeWidth=2 diff --git a/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef b/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef index 5ccc166fc8..9edb1950a4 100644 --- a/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef +++ b/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef @@ -20,13 +20,18 @@ chartType=BAR chartTitle=Topic acknowledge modes chartSubtitle=Transient 1KB messages -xAxisTitle=Ack Mode -yAxisTitle=Throughput (KB/s) +chartDescription=1P 10C, transient, non-durable subscription, message payload 1KB -series.1.statement=SELECT acknowledgeMode, throughputKbPerS FROM Topic-AckModes WHERE participantName = 'All' +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, throughputKbPerS FROM Topic-AckModes WHERE participantName = 'All' +series.2.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM Topic-AckModes WHERE participantName = 'All' series.2.legend=Baseline series.2.dir=${csvBaselineDir} +series.2.colourName=dark_red +series.2.stokeWidth=2 diff --git a/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef b/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef index c892ea16cf..67a0278bff 100644 --- a/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef +++ b/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef @@ -20,21 +20,27 @@ chartType=STATISTICAL_BAR chartTitle=Impact of message size on latency chartSubtitle=Transient messages +chartDescription=1P 1C, transient, auto-ack, with message payload between 256-262144 bytes. + xAxisTitle=Message Size (B) yAxisTitle=Latency (millis) series.1.statement=SELECT payloadSizeB, maxLatency, 0 FROM Latency-MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers' series.1.legend=Maximum latency series.1.dir=${csvCurrentDir} +series.1.colourName=blue series.2.statement=SELECT payloadSizeB, averageLatency,latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers' series.2.legend=Average latency series.2.dir=${csvCurrentDir} +series.2.colourName=red series.3.statement=SELECT payloadSizeB, averageLatency,latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers' series.3.legend=Average latency (baseline) series.3.dir=${csvBaselineDir} +series.3.colourName=dark_red series.4.statement=SELECT payloadSizeB, minLatency,0 FROM Latency-MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers' series.4.legend=Minimum latency series.4.dir=${csvCurrentDir} +series.4.colourName=green diff --git a/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef b/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef index 167e62603a..e9761f07d8 100644 --- a/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef +++ b/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef @@ -20,21 +20,27 @@ chartType=STATISTICAL_BAR chartTitle=Impact of message size on latency chartSubtitle=Persistent messages +chartDescription=1P 1C, persistent, auto-ack, with message payload between 256-262144 bytes. + xAxisTitle=Message Size (B) yAxisTitle=Latency (millis) series.1.statement=SELECT payloadSizeB, maxLatency, 0 FROM Latency-MessageSize WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers' series.1.legend=Maximum latency series.1.dir=${csvCurrentDir} +series.1.colourName=blue series.2.statement=SELECT payloadSizeB, averageLatency, latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers' series.2.legend=Average latency series.2.dir=${csvCurrentDir} +series.2.colourName=red series.3.statement=SELECT payloadSizeB, averageLatency, latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers' series.3.legend=Average latency (baseline) series.3.dir=${csvBaselineDir} +series.3.colourName=dark_red series.4.statement=SELECT payloadSizeB, minLatency, 0 FROM Latency-MessageSize WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers' series.4.legend=Minimum latency series.4.dir=${csvCurrentDir} +series.4.colourName=green diff --git a/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef b/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef index 45c6031b1e..663912b622 100644 --- a/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef +++ b/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef @@ -20,21 +20,27 @@ chartType=STATISTICAL_BAR chartTitle=Latency with consumers having non-overlapping selectors chartSubtitle=Transient 1KB messages +chartDescription=1P 1-10C, transient, auto-ack, with message payload 1KB. + xAxisTitle=Consumers yAxisTitle=Latency (millis) series.1.statement=SELECT totalNumberOfConsumers, maxLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - NON_PERSISTENT%' series.1.legend=Max latency series.1.dir=${csvCurrentDir} +series.1.colourName=blue series.2.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - NON_PERSISTENT%' series.2.legend=Average latency series.2.dir=${csvCurrentDir} +series.2.colourName=red series.3.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - NON_PERSISTENT%' series.3.legend=Average latency (baseline) series.3.dir=${csvBaselineDir} +series.3.colourName=dark_red series.4.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - NON_PERSISTENT%' series.4.legend=Min latency series.4.dir=${csvCurrentDir} +series.4.colourName=green diff --git a/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef b/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef index 351a4639b1..3b9e207e10 100644 --- a/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef +++ b/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef @@ -20,21 +20,27 @@ chartType=STATISTICAL_BAR chartTitle=Latency with consumers having 50%-overlapping selectors chartSubtitle=Transient 1KB messages +chartDescription=1P 1-10C, transient, auto-ack, with message payload 1KB. + xAxisTitle=Consumers yAxisTitle=Latency (millis) series.1.statement=SELECT totalNumberOfConsumers, maxLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - NON_PERSISTENT%' series.1.legend=Max latency series.1.dir=${csvCurrentDir} +series.1.colourName=blue series.2.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - NON_PERSISTENT%' series.2.legend=Average latency series.2.dir=${csvCurrentDir} +series.2.colourName=red series.3.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - NON_PERSISTENT%' series.3.legend=Average latency (baseline) series.3.dir=${csvBaselineDir} +series.3.colourName=dark_red series.4.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - NON_PERSISTENT%' series.4.legend=Min latency series.4.dir=${csvCurrentDir} +series.4.colourName=green diff --git a/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef b/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef index 9d95075b3d..296d115d3f 100644 --- a/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef +++ b/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef @@ -20,21 +20,27 @@ chartType=STATISTICAL_BAR chartTitle=Latency with consumers having non-overlapping selectors chartSubtitle=Persistent 1KB messages +chartDescription=1P 1-10C, persistent, auto-ack, with message payload 1KB. + xAxisTitle=Consumers yAxisTitle=Latency (millis) series.1.statement=SELECT totalNumberOfConsumers, maxLatency,0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - PERSISTENT' series.1.legend=Max latency series.1.dir=${csvCurrentDir} +series.1.colourName=blue series.2.statement=SELECT totalNumberOfConsumers, averageLatency, latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - PERSISTENT' series.2.legend=Average latency series.2.dir=${csvCurrentDir} +series.2.colourName=red series.3.statement=SELECT totalNumberOfConsumers, averageLatency, latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - PERSISTENT' series.3.legend=Average latency (baseline) series.3.dir=${csvBaselineDir} +series.3.colourName=dark_red series.4.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - PERSISTENT' series.4.legend=Min latency series.4.dir=${csvCurrentDir} +series.4.colourName=green diff --git a/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef b/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef index 9a323d4044..65be60b5e5 100644 --- a/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef +++ b/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef @@ -20,21 +20,27 @@ chartType=STATISTICAL_BAR chartTitle=Latency with consumers having 50%-overlapping selectors chartSubtitle=Persistent 1KB messages +chartDescription=1P 1-10C, persistent, auto-ack, with message payload 1KB. + xAxisTitle=Consumers yAxisTitle=Latency (millis) series.1.statement=SELECT totalNumberOfConsumers, maxLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - PERSISTENT%' series.1.legend=Max latency series.1.dir=${csvCurrentDir} +series.1.colourName=blue series.2.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - PERSISTENT%' series.2.legend=Average latency series.2.dir=${csvCurrentDir} +series.2.colourName=red series.3.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - PERSISTENT%' series.3.legend=Average latency (baseline) series.3.dir=${csvBaselineDir} +series.3.colourName=dark_red series.4.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - PERSISTENT%' series.4.legend=Min latency series.4.dir=${csvCurrentDir} +series.4.colourName=green diff --git a/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef b/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef index 82cf1168ef..d52b05d870 100644 --- a/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef +++ b/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef @@ -20,25 +20,32 @@ chartType=STATISTICAL_BAR chartTitle=Latency, varying number of participants chartSubtitle=Persistent 1KB messages +chartDescription=1,2,5,10 P/Cs, persistent, auto-ack, 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) series.5.dir=${csvBaselineDir} +series.5.colourName=dark_red diff --git a/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef b/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef index c1aae19376..dac8a52f89 100644 --- a/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef +++ b/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef @@ -20,21 +20,27 @@ chartType=STATISTICAL_BAR chartTitle=Latency on different queues chartSubtitle=Persistent 1KB messages +chartDescription=1P 1C, persistent, auto-ack with message payload 1KB. Sorted queue - 400 varied keys, Priority - 200 varied priorities. + xAxisTitle=Queue type yAxisTitle=Latency (millis) series.1.statement=SELECT testName, maxLatency,0 FROM Latency-QueueTypes WHERE participantName = 'All Consumers' series.1.legend=Maximum latency series.1.dir=${csvCurrentDir} +series.1.colourName=blue series.2.statement=SELECT testName, averageLatency,latencyStandardDeviation FROM Latency-QueueTypes WHERE participantName = 'All Consumers' series.2.legend=Average Latency series.2.dir=${csvCurrentDir} +series.2.colourName=red series.3.statement=SELECT testName, averageLatency,latencyStandardDeviation FROM Latency-QueueTypes WHERE participantName = 'All Consumers' series.3.legend=Average Latency (baseline) series.3.dir=${csvBaselineDir} +series.3.colourName=dark_red series.4.statement=SELECT testName, minLatency,0 FROM Latency-QueueTypes WHERE participantName = 'All Consumers' series.4.legend=Minimum latency series.4.dir=${csvCurrentDir} +series.4.colourName=green diff --git a/java/perftests/etc/chartdefs/timeseries/1001-Large-Messages-Transient.chartdef b/java/perftests/etc/chartdefs/timeseries/1001-Large-Messages-Transient.chartdef new file mode 100644 index 0000000000..e77f7b4eff --- /dev/null +++ b/java/perftests/etc/chartdefs/timeseries/1001-Large-Messages-Transient.chartdef @@ -0,0 +1,29 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +chartType=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/java/perftests/etc/chartdefs/timeseries/1002-Large-Messages-Persistent.chartdef b/java/perftests/etc/chartdefs/timeseries/1002-Large-Messages-Persistent.chartdef new file mode 100644 index 0000000000..ffcf8c26b8 --- /dev/null +++ b/java/perftests/etc/chartdefs/timeseries/1002-Large-Messages-Persistent.chartdef @@ -0,0 +1,29 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +chartType=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/java/perftests/etc/chartdefs/timeseries/1011-MultipleProducersAndConsumers-Persistent.chartdef b/java/perftests/etc/chartdefs/timeseries/1011-MultipleProducersAndConsumers-Persistent.chartdef new file mode 100644 index 0000000000..ba01d4b7ad --- /dev/null +++ b/java/perftests/etc/chartdefs/timeseries/1011-MultipleProducersAndConsumers-Persistent.chartdef @@ -0,0 +1,30 @@ +# +# 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' +series.1.colourName=red +series.1.legend=Throughput \ No newline at end of file diff --git a/java/perftests/etc/chartdefs/timeseries/1030-Batch-Size-Small.chartdef b/java/perftests/etc/chartdefs/timeseries/1030-Batch-Size-Small.chartdef new file mode 100644 index 0000000000..f755bf4a5b --- /dev/null +++ b/java/perftests/etc/chartdefs/timeseries/1030-Batch-Size-Small.chartdef @@ -0,0 +1,30 @@ +# +# 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/java/perftests/etc/chartdefs/timeseries/1031-Batch-Size-Large.chartdef b/java/perftests/etc/chartdefs/timeseries/1031-Batch-Size-Large.chartdef new file mode 100644 index 0000000000..ca390f8226 --- /dev/null +++ b/java/perftests/etc/chartdefs/timeseries/1031-Batch-Size-Large.chartdef @@ -0,0 +1,30 @@ +# +# 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/java/perftests/etc/chartdefs/timeseries/1040-SortedQueue.chartdef b/java/perftests/etc/chartdefs/timeseries/1040-SortedQueue.chartdef new file mode 100644 index 0000000000..6dce3a1a77 --- /dev/null +++ b/java/perftests/etc/chartdefs/timeseries/1040-SortedQueue.chartdef @@ -0,0 +1,30 @@ +# +# 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/java/perftests/etc/perftests-jndi.properties b/java/perftests/etc/perftests-jndi.properties index f33af6fdd5..ce6493b49a 100644 --- a/java/perftests/etc/perftests-jndi.properties +++ b/java/perftests/etc/perftests-jndi.properties @@ -20,3 +20,7 @@ java.naming.factory.initial = org.apache.qpid.jndi.PropertiesFileInitialContextF connectionfactory.connectionfactory = amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672' 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/java/perftests/etc/run-perftests.sh b/java/perftests/etc/run-perftests.sh new file mode 100755 index 0000000000..f963879e7e --- /dev/null +++ b/java/perftests/etc/run-perftests.sh @@ -0,0 +1,37 @@ +#!/bin/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 \ + distributed=false \ + writeToDb=true diff --git a/java/perftests/etc/testdefs/BatchSize.js b/java/perftests/etc/testdefs/BatchSize.js new file mode 100644 index 0000000000..f17751b7b5 --- /dev/null +++ b/java/perftests/etc/testdefs/BatchSize.js @@ -0,0 +1,102 @@ +/* + * + * 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/java/perftests/etc/testdefs/BatchSize.json b/java/perftests/etc/testdefs/BatchSize.json deleted file mode 100644 index eeb446bad6..0000000000 --- a/java/perftests/etc/testdefs/BatchSize.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "_tests":[ - { - "_name": "Batch Size- PERSISTENT"; - "_iterations":[ - { - "_batchSize": 1 - }, - { - "_batchSize": 2 - }, - { - "_batchSize": 5 - }, - { - "_batchSize": 10 - }, - { - "_batchSize": 20 - }, - { - "_batchSize": 50 - }, - { - "_batchSize": 100 - } - ], - "_queues":[ - { - "_name": "direct://amq.direct//batchSize?durable='true'", - "_durable": true - } - ], - "_clients":[ - { - "_name": "producingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": 0, - "_producers": [ - { - "_name": "Producer1", - "_destinationName": "direct://amq.direct//batchSize?durable='true'", - "_messageSize": 1024, - "_maximumDuration": 30000, - "_deliveryMode": 2 - } - ] - } - ] - } - ] - }, - { - "_name": "consumingClient", - "_connections":[ - { - "_name": "connection1", - "_factory": "connectionfactory", - "_sessions": [ - { - "_sessionName": "session1", - "_acknowledgeMode": 0, - "_consumers": [ - { - "_name": "Consumer1", - "_destinationName": "direct://amq.direct//batchSize?durable='true'", - "_maximumDuration": 30000 - } - ] - } - ] - } - ] - } - ] - } - ] -} diff --git a/java/perftests/etc/testdefs/BatchSizeConsumerVaries.js b/java/perftests/etc/testdefs/BatchSizeConsumerVaries.js new file mode 100644 index 0000000000..b491f431c9 --- /dev/null +++ b/java/perftests/etc/testdefs/BatchSizeConsumerVaries.js @@ -0,0 +1,102 @@ +/* + * + * 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/java/perftests/etc/testdefs/BatchSizeProducerVaries.js b/java/perftests/etc/testdefs/BatchSizeProducerVaries.js new file mode 100644 index 0000000000..ac23c52c9e --- /dev/null +++ b/java/perftests/etc/testdefs/BatchSizeProducerVaries.js @@ -0,0 +1,102 @@ +/* + * + * 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/java/perftests/etc/testdefs/QueueConsumersWithNonOverlappingSelectors.js b/java/perftests/etc/testdefs/QueueConsumersWithNonOverlappingSelectors.js new file mode 100644 index 0000000000..0dd45b0392 --- /dev/null +++ b/java/perftests/etc/testdefs/QueueConsumersWithNonOverlappingSelectors.js @@ -0,0 +1,120 @@ +/* + * + * 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 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]; + var consumerAcknowledgeMode = 1; + for (var j=0; j