QPID-6138: [Java Perf Tests] Update perf test defs to remove redundant tests

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1633162 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 1 insertions, 98 deletions

diff --git a/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef b/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef
deleted file mode 100644
index af73ff35cd..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef
+++ /dev/null
@@ -1,47 +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 - auto ack
-chartSubtitle=Persistent 1KB messages
-chartDescription=1,2,5,10 P/Cs, single queue, 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 ${baselineName})
-series.4.dir=${csvBaselineDir}
-series.4.colourName=dark_red
-series.4.strokeWidth=-1
diff --git a/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef b/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef
deleted file mode 100644
index 64765de1fc..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef
+++ /dev/null
@@ -1,47 +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 - auto ack
-chartSubtitle=Persistent 1KB messages
-chartDescription=1,2,5,10 P/Cs, single queue, 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 ${baselineName})
-series.4.dir=${csvBaselineDir}
-series.4.colourName=dark_red
-series.4.strokeWidth=-1
diff --git a/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js b/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js
index 00827c07ad..4e557e3571 100644
--- a/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js
+++ b/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.js
@@ -45,9 +45,6 @@ for(producersIndex=0; producersIndex < numbersOfProducers.length; producersIndex
          "_iterations":[
             {
               "_acknowledgeMode": 0
-            },
-            {
-              "_acknowledgeMode": 1
             }
           ],
           "_clients":
diff --git a/qpid/java/perftests/etc/testdefs/VaryingNumberOfProducerSessionsSingleConnection.js b/qpid/java/perftests/etc/testdefs/VaryingNumberOfProducerSessionsSingleConnection.js
index c62a8344b1..08c4acbd38 100644
--- a/qpid/java/perftests/etc/testdefs/VaryingNumberOfProducerSessionsSingleConnection.js
+++ b/qpid/java/perftests/etc/testdefs/VaryingNumberOfProducerSessionsSingleConnection.js
@@ -78,7 +78,7 @@ for(i=0; i < numbersOfSessions.length ; i++)
                     {
                       "_name": "client__CONSUMING_CLIENT_INDEXConsumer1Session1",
                       "_destinationName": queueName,
-                      "_acknowledgeMode": 1,
+                      "_acknowledgeMode": 0,
                       "_maximumDuration": duration
                     }
                   ]