QPID-3858: Updated branch - merged from trunk r.1333987

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

8 files changed, 238 insertions, 0 deletions

diff --git a/java/perftests/etc/chartdefs/AcknowledgementModesAutoAck.chartdef b/java/perftests/etc/chartdefs/AcknowledgementModesAutoAck.chartdef
new file mode 100644
index 0000000000..42e4a0c11e
--- /dev/null
+++ b/java/perftests/etc/chartdefs/AcknowledgementModesAutoAck.chartdef
@@ -0,0 +1,28 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+chartType=BAR
+chartTitle=Performance of acknowledgement modes (Auto-acknowledgement)
+xAxisTitle=Persistence
+yAxisTitle=Throughput (KB/s)
+
+series.1.statement=SELECT testName, throughputKbPerS FROM AcknowledgementModes WHERE acknowledgeMode = '1' AND participantName = 'All'
+series.1.legend=Current
+series.1.dir=${csvCurrentDir}
+
diff --git a/java/perftests/etc/chartdefs/AcknowledgementModesTransacted.chartdef b/java/perftests/etc/chartdefs/AcknowledgementModesTransacted.chartdef
new file mode 100644
index 0000000000..3bbee462a0
--- /dev/null
+++ b/java/perftests/etc/chartdefs/AcknowledgementModesTransacted.chartdef
@@ -0,0 +1,28 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+chartType=BAR
+chartTitle=Performance of acknowledgement modes (Transacted)
+xAxisTitle=Persistence
+yAxisTitle=Throughput (KB/s)
+
+series.1.statement=SELECT testName, throughputKbPerS FROM AcknowledgementModes WHERE acknowledgeMode = '0' AND participantName = 'All'
+series.1.legend=Current
+series.1.dir=${csvCurrentDir}
+
diff --git a/java/perftests/etc/chartdefs/BatchSize.chartdef b/java/perftests/etc/chartdefs/BatchSize.chartdef
new file mode 100644
index 0000000000..13c42b2ebf
--- /dev/null
+++ b/java/perftests/etc/chartdefs/BatchSize.chartdef
@@ -0,0 +1,28 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+chartType=LINE
+chartTitle=Transaction Batch Size
+xAxisTitle=Batch Size
+yAxisTitle=Throughput (KB/s)
+
+series.1.statement=SELECT batchSize, throughputKbPerS FROM BatchSize WHERE participantName = 'All'
+series.1.legend=Current
+series.1.dir=${csvCurrentDir}
+
diff --git a/java/perftests/etc/chartdefs/MessageSizeNonPersistent.chartdef b/java/perftests/etc/chartdefs/MessageSizeNonPersistent.chartdef
new file mode 100644
index 0000000000..22d78042d8
--- /dev/null
+++ b/java/perftests/etc/chartdefs/MessageSizeNonPersistent.chartdef
@@ -0,0 +1,27 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+chartType=LINE
+chartTitle=Impact of Message Size (Non-Persistent)
+xAxisTitle=Message Size (B)
+yAxisTitle=Throughput (KB/s)
+
+series.1.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '%NON_PERSISTENT' AND participantName = 'All'
+series.1.legend=Current
+series.1.dir=${csvCurrentDir}
diff --git a/java/perftests/etc/chartdefs/MessageSizePersistent.chartdef b/java/perftests/etc/chartdefs/MessageSizePersistent.chartdef
new file mode 100644
index 0000000000..4a57215714
--- /dev/null
+++ b/java/perftests/etc/chartdefs/MessageSizePersistent.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=LINE
+chartTitle=Impact of Message Size (Persistent)
+xAxisTitle=Message Size (B)
+yAxisTitle=Throughput (KB/s)
+
+series.1.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '% PERSISTENT' AND participantName = 'All'
+series.1.legend=Current
+series.1.dir=${csvCurrentDir}
+
+# Define series3/4 to chart the baseline
diff --git a/java/perftests/etc/chartdefs/QueueTypes.chartdef b/java/perftests/etc/chartdefs/QueueTypes.chartdef
new file mode 100644
index 0000000000..770b5cc719
--- /dev/null
+++ b/java/perftests/etc/chartdefs/QueueTypes.chartdef
@@ -0,0 +1,28 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+chartType=BAR
+chartTitle=Queue Types
+xAxisTitle=Queue Types
+yAxisTitle=Throughput (KB/s)
+
+series.1.statement=SELECT testName, throughputKbPerS FROM QueueTypes WHERE participantName = 'All'
+series.1.legend=Current
+series.1.dir=${csvCurrentDir}
+
diff --git a/java/perftests/etc/chartdefs/VaryingNumberOfConsumers.chartdef b/java/perftests/etc/chartdefs/VaryingNumberOfConsumers.chartdef
new file mode 100644
index 0000000000..83d6fe2659
--- /dev/null
+++ b/java/perftests/etc/chartdefs/VaryingNumberOfConsumers.chartdef
@@ -0,0 +1,35 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+chartType=LINE
+chartTitle=Varying number of consumers
+xAxisTitle=Consumers
+yAxisTitle=Throughput (KB/s)
+
+series.1.statement=SELECT totalNumberOfConsumers, throughputKbPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '1'
+series.1.legend=1 Producer
+series.1.dir=${csvCurrentDir}
+
+series.2.statement=SELECT totalNumberOfConsumers, throughputKbPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '5'
+series.2.legend=5 Producers
+series.2.dir=${csvCurrentDir}
+
+series.3.statement=SELECT totalNumberOfConsumers, throughputKbPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '10'
+series.3.legend=10 Producers
+series.3.dir=${csvCurrentDir}
diff --git a/java/perftests/etc/chartdefs/VaryingNumberOfProducers.chartdef b/java/perftests/etc/chartdefs/VaryingNumberOfProducers.chartdef
new file mode 100644
index 0000000000..51ea92b909
--- /dev/null
+++ b/java/perftests/etc/chartdefs/VaryingNumberOfProducers.chartdef
@@ -0,0 +1,35 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+chartType=LINE
+chartTitle=Varying number of producers
+xAxisTitle=Producers
+yAxisTitle=Throughput (KB/s)
+
+series.1.statement=SELECT totalNumberOfProducers, throughputKbPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '1'
+series.1.legend=1 Consumer
+series.1.dir=${csvCurrentDir}
+
+series.2.statement=SELECT totalNumberOfProducers, throughputKbPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '5'
+series.2.legend=5 Consumer
+series.2.dir=${csvCurrentDir}
+
+series.3.statement=SELECT totalNumberOfProducers, throughputKbPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '10'
+series.3.legend=10 Consumer
+series.3.dir=${csvCurrentDir}