You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/10/10 11:59:58 UTC
svn commit: r1630749 [6/6] - in
/qpid/branches/QPID-6125-ProtocolRefactoring/java: ./
bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
bdbstore/src/main/java/org/apa...
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef?rev=1630749&r1=1630748&r2=1630749&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef Fri Oct 10 09:59:55 2014
@@ -20,7 +20,7 @@
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.
+chartDescription=1-80P transacted on single connection, 20C transacted on separate connections, persistent, message payload 1KB, single queue.
xAxisTitle=Number of producer sessions
yAxisTitle=Throughput (KB/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef?rev=1630749&r1=1630748&r2=1630749&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef Fri Oct 10 09:59:55 2014
@@ -22,7 +22,7 @@ chartTitle=Impact of non-overlapping sel
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.
+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, single queue.
series.1.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM QueueConsumersWithNonOverlappingSelectors WHERE participantName = 'All' and testName like '%non overlapping - NON_PERSISTENT%'
series.1.legend=Current
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef?rev=1630749&r1=1630748&r2=1630749&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef Fri Oct 10 09:59:55 2014
@@ -22,7 +22,7 @@ chartTitle=Impact of non-overlapping sel
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..
+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, single queue.
series.1.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM QueueConsumersWithNonOverlappingSelectors WHERE participantName = 'All' and testName like '%non overlapping - PERSISTENT'
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef?rev=1630749&r1=1630748&r2=1630749&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef Fri Oct 10 09:59:55 2014
@@ -22,7 +22,7 @@ chartTitle=Impact of 50%-overlapping sel
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.
+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, single queue.
series.1.statement=SELECT totalNumberOfConsumers,throughputMessagesPerS FROM QueueConsumersWithOverlappingSelectors WHERE participantName = 'All' and testName like '%50_ overlapping - NON_PERSISTENT%'
series.1.legend=Current
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef?rev=1630749&r1=1630748&r2=1630749&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef Fri Oct 10 09:59:55 2014
@@ -19,7 +19,7 @@
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.
+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, single queue.
chartSubtitle=Persistent 1KB messages
xAxisTitle=Consumers
yAxisTitle=Throughput (messages/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef?rev=1630749&r1=1630748&r2=1630749&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef Fri Oct 10 09:59:55 2014
@@ -20,7 +20,7 @@
chartType=XYLINE
chartTitle=Number of topic consumers
chartSubtitle=Transient 1KB messages
-chartDescription=1P 1-100C transient, transacted, with message payload 1KB.
+chartDescription=1P 1-100C transient, transacted, with message payload 1KB, single queue.
xAxisTitle=Numer of consumers
yAxisTitle=Throughput (messages/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef?rev=1630749&r1=1630748&r2=1630749&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef Fri Oct 10 09:59:55 2014
@@ -20,7 +20,7 @@
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.
+chartDescription=1,10,50,100 PC, transient, transacted, with each PC pair having own topic, message payload 1KB, single topic.
xAxisTitle=Numer of topics
yAxisTitle=Throughput (messages/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef?rev=1630749&r1=1630748&r2=1630749&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef Fri Oct 10 09:59:55 2014
@@ -20,7 +20,7 @@
chartType=BAR
chartTitle=Topic transient/durable subscriptions
chartSubtitle=1KB messages
-chartDescription=1P 10C, transacted, message payload 1KB, transient messages on non-durable sub, persistent messages on durable sub
+chartDescription=1P 10C, transacted, message payload 1KB, transient messages on non-durable sub, persistent messages on durable sub, single topic,
xAxisTitle=Subscription type (true durable, false non durable)
yAxisTitle=Throughput (messages/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef?rev=1630749&r1=1630748&r2=1630749&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef Fri Oct 10 09:59:55 2014
@@ -20,7 +20,7 @@
chartType=BAR
chartTitle=Topic acknowledge modes
chartSubtitle=Transient 1KB messages
-chartDescription=1P 10C, transient, non-durable subscription, message payload 1KB
+chartDescription=1P 10C, transient, non-durable subscription, message payload 1KB, single topic.
xAxisTitle=Ack Mode (0=transaction 1=auto-ack)
yAxisTitle=Throughput (messages/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef?rev=1630749&r1=1630748&r2=1630749&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef Fri Oct 10 09:59:55 2014
@@ -20,7 +20,7 @@
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.
+chartDescription=1P 1C, transient, auto-ack, with message payload between 256-262144 bytes, single queue.
xAxisTitle=Message Size (B)
yAxisTitle=Latency (millis)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef?rev=1630749&r1=1630748&r2=1630749&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef Fri Oct 10 09:59:55 2014
@@ -20,7 +20,7 @@
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.
+chartDescription=1P 1C, persistent, auto-ack, with message payload between 256-262144 bytes, single queue.
xAxisTitle=Message Size (B)
yAxisTitle=Latency (millis)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef?rev=1630749&r1=1630748&r2=1630749&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef Fri Oct 10 09:59:55 2014
@@ -20,7 +20,7 @@
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.
+chartDescription=1,2,5,10 P/Cs, persistent, auto-ack, with message payload 1KB, single queue.
xAxisTitle=Consumers
yAxisTitle=Latency (millis)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/Latency-MessageSize.json
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/Latency-MessageSize.json?rev=1630749&r1=1630748&r2=1630749&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/Latency-MessageSize.json (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/Latency-MessageSize.json Fri Oct 10 09:59:55 2014
@@ -136,7 +136,7 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer1",
@@ -160,7 +160,7 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_consumers": [
{
"_name": "Consumer1",
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/Latency-VaryingNumberOfParticipants.json
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/Latency-VaryingNumberOfParticipants.json?rev=1630749&r1=1630748&r2=1630749&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/Latency-VaryingNumberOfParticipants.json (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/Latency-VaryingNumberOfParticipants.json Fri Oct 10 09:59:55 2014
@@ -18,7 +18,7 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer1",
@@ -43,7 +43,7 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_consumers": [
{
"_name": "Consumer1",
@@ -79,7 +79,7 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer1",
@@ -99,7 +99,7 @@
"_sessions": [
{
"_sessionName": "session2",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer2",
@@ -119,7 +119,7 @@
"_sessions": [
{
"_sessionName": "session3",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer3",
@@ -139,7 +139,7 @@
"_sessions": [
{
"_sessionName": "session4",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer4",
@@ -159,7 +159,7 @@
"_sessions": [
{
"_sessionName": "session5",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer5",
@@ -179,7 +179,7 @@
"_sessions": [
{
"_sessionName": "session6",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer6",
@@ -199,7 +199,7 @@
"_sessions": [
{
"_sessionName": "session7",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer7",
@@ -219,7 +219,7 @@
"_sessions": [
{
"_sessionName": "session8",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer8",
@@ -239,7 +239,7 @@
"_sessions": [
{
"_sessionName": "session9",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer9",
@@ -259,7 +259,7 @@
"_sessions": [
{
"_sessionName": "session10",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer10",
@@ -284,7 +284,7 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_consumers": [
{
"_name": "Consumer1",
@@ -319,7 +319,7 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer1",
@@ -339,7 +339,7 @@
"_sessions": [
{
"_sessionName": "session2",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer2",
@@ -359,7 +359,7 @@
"_sessions": [
{
"_sessionName": "session3",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer3",
@@ -379,7 +379,7 @@
"_sessions": [
{
"_sessionName": "session4",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer4",
@@ -399,7 +399,7 @@
"_sessions": [
{
"_sessionName": "session5",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer5",
@@ -419,7 +419,7 @@
"_sessions": [
{
"_sessionName": "session6",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer6",
@@ -439,7 +439,7 @@
"_sessions": [
{
"_sessionName": "session7",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer7",
@@ -459,7 +459,7 @@
"_sessions": [
{
"_sessionName": "session8",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer8",
@@ -479,7 +479,7 @@
"_sessions": [
{
"_sessionName": "session9",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer9",
@@ -499,7 +499,7 @@
"_sessions": [
{
"_sessionName": "session10",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer10",
@@ -524,7 +524,7 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_consumers": [
{
"_name": "Consumer1",
@@ -542,7 +542,7 @@
"_sessions": [
{
"_sessionName": "session2",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_consumers": [
{
"_name": "Consumer2",
@@ -560,7 +560,7 @@
"_sessions": [
{
"_sessionName": "session3",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_consumers": [
{
"_name": "Consumer3",
@@ -578,7 +578,7 @@
"_sessions": [
{
"_sessionName": "session4",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_consumers": [
{
"_name": "Consumer4",
@@ -596,7 +596,7 @@
"_sessions": [
{
"_sessionName": "session5",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_consumers": [
{
"_name": "Consumer5",
@@ -614,7 +614,7 @@
"_sessions": [
{
"_sessionName": "session6",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_consumers": [
{
"_name": "Consumer6",
@@ -632,7 +632,7 @@
"_sessions": [
{
"_sessionName": "session7",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_consumers": [
{
"_name": "Consumer7",
@@ -650,7 +650,7 @@
"_sessions": [
{
"_sessionName": "session8",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_consumers": [
{
"_name": "Consumer8",
@@ -668,7 +668,7 @@
"_sessions": [
{
"_sessionName": "session9",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_consumers": [
{
"_name": "Consumer9",
@@ -686,7 +686,7 @@
"_sessions": [
{
"_sessionName": "session10",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_consumers": [
{
"_name": "Consumer10",
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/MessageSize.json
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/MessageSize.json?rev=1630749&r1=1630748&r2=1630749&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/MessageSize.json (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/MessageSize.json Fri Oct 10 09:59:55 2014
@@ -153,7 +153,7 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer1",
@@ -177,7 +177,7 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_consumers": [
{
"_name": "Consumer1",
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/QueueConsumersWithNonOverlappingSelectors.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/QueueConsumersWithNonOverlappingSelectors.js?rev=1630749&r1=1630748&r2=1630749&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/QueueConsumersWithNonOverlappingSelectors.js (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/QueueConsumersWithNonOverlappingSelectors.js Fri Oct 10 09:59:55 2014
@@ -25,11 +25,11 @@ var jsonObject = {
for (var i=0; i<2; i++)
{
var deliveryMode = i+1;
+ var acknowledgeMode = ((i==0) ? 1 : 0);
var durable = (deliveryMode == 2);
var suffix = durable ? "PERSISTENT" : "NON-PERSISTENT";
var queueName = "direct://amq.direct//queue-selectors-" + suffix + "?durable='" + durable + "'";
var consumerNumbers = [1, 2, 4, 8, 16, 32];
- var consumerAcknowledgeMode = 1;
for (var j=0; j<consumerNumbers.length; j++)
{
var consumerNumber = consumerNumbers[j];
@@ -70,7 +70,7 @@ for (var i=0; i<2; i++)
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": acknowledgeMode,
"_producers": [
{
"_name": "Producer1",
@@ -100,7 +100,7 @@ for (var i=0; i<2; i++)
"_sessions": [
{
"_sessionName": "session" + n,
- "_acknowledgeMode": consumerAcknowledgeMode,
+ "_acknowledgeMode": acknowledgeMode,
"_consumers": [
{
"_name": "Consumer" + n,
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/QueueConsumersWithOverlappingSelectors.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/QueueConsumersWithOverlappingSelectors.js?rev=1630749&r1=1630748&r2=1630749&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/QueueConsumersWithOverlappingSelectors.js (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/QueueConsumersWithOverlappingSelectors.js Fri Oct 10 09:59:55 2014
@@ -26,6 +26,7 @@ for (var i=0; i<2; i++)
{
var deliveryMode = i+1;
var durable = (deliveryMode == 2);
+ var acknowledgeMode = ((i==0) ? 1 : 0);
var suffix = durable ? "PERSISTENT" : "NON-PERSISTENT";
var queueName = "direct://amq.direct//queue-selectors-overlapping-" + suffix + "?durable='" + durable + "'";
var consumerNumbers = [2, 4, 8, 16, 32];
@@ -70,7 +71,7 @@ for (var i=0; i<2; i++)
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": acknowledgeMode,
"_producers": [
{
"_name": "Producer1",
@@ -111,7 +112,7 @@ for (var i=0; i<2; i++)
"_sessions": [
{
"_sessionName": "session" + n,
- "_acknowledgeMode": consumerAcknowledgeMode,
+ "_acknowledgeMode": acknowledgeMode,
"_consumers": [
{
"_name": "Consumer" + n,
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/pom.xml?rev=1630749&r1=1630748&r2=1630749&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/pom.xml (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/pom.xml Fri Oct 10 09:59:55 2014
@@ -156,6 +156,48 @@
<skip>true</skip>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.3.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <mainClass>org.apache.qpid.disttest.ControllerRunner</mainClass>
+ <includePluginDependencies>true</includePluginDependencies>
+ <arguments>
+ <argument>jndi-config=${basedir}/etc/perftests-jndi.properties</argument>
+ <argument>test-config=${basedir}/etc/testdefs</argument>
+ <argument>distributed=false</argument>
+ <argument>writeToDb=false</argument>
+ </arguments>
+ <systemProperties>
+ <systemProperty>
+ <key>qpid.amqp</key><value>0-91</value>
+ </systemProperty>
+ <systemProperty>
+ <key>qpid.dest_syntax</key><value>BURL</value>
+ </systemProperty>
+ <systemProperty>
+ <key>qpid.disttest.duration</key><value>5000</value>
+ </systemProperty>
+ </systemProperties>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>${geronimo-jms-1-1-version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
</plugins>
</build>
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java?rev=1630749&r1=1630748&r2=1630749&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/TestFileUtils.java Fri Oct 10 09:59:55 2014
@@ -121,33 +121,38 @@ public class TestFileUtils
File file = createTempFile(testcase, suffix);
if (content != null)
{
- FileOutputStream fos = null;
- try
- {
- fos = new FileOutputStream(file);
- fos.write(content.getBytes("UTF-8"));
- fos.flush();
- }
- catch (Exception e)
- {
- throw new RuntimeException("Cannot add the content into temp file " + file.getAbsolutePath(), e);
- }
- finally
+ saveTextContentInFile(content, file);
+ }
+ return file;
+ }
+
+ public static void saveTextContentInFile(String content, File file)
+ {
+ FileOutputStream fos = null;
+ try
+ {
+ fos = new FileOutputStream(file);
+ fos.write(content.getBytes("UTF-8"));
+ fos.flush();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Cannot add the content into temp file " + file.getAbsolutePath(), e);
+ }
+ finally
+ {
+ if (fos != null)
{
- if (fos != null)
+ try
{
- try
- {
- fos.close();
- }
- catch (IOException e)
- {
- throw new RuntimeException("Cannot close output stream into temp file " + file.getAbsolutePath(), e);
- }
+ fos.close();
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException("Cannot close output stream into temp file " + file.getAbsolutePath(), e);
}
}
}
- return file;
}
/**
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java?rev=1630749&r1=1630748&r2=1630749&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java Fri Oct 10 09:59:55 2014
@@ -49,6 +49,7 @@ import org.apache.qpid.server.model.Acce
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.BrokerModel;
+import org.apache.qpid.server.model.BrokerShutdownProvider;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.GroupProvider;
import org.apache.qpid.server.model.JsonSystemConfigImpl;
@@ -105,7 +106,8 @@ public class TestBrokerConfiguration
final AbstractSystemConfig parentObject = new JsonSystemConfigImpl(taskExecutor,
mock(EventLogger.class),
mock(LogRecorder.class),
- brokerOptions);
+ brokerOptions,
+ mock(BrokerShutdownProvider.class));
ConfiguredObjectRecordConverter converter = new ConfiguredObjectRecordConverter(BrokerModel.getInstance());
@@ -215,7 +217,8 @@ public class TestBrokerConfiguration
final SystemConfig parentObject = configFactory.newInstance(_taskExecutor,
mock(EventLogger.class),
mock(LogRecorder.class),
- brokerOptions);
+ brokerOptions,
+ mock(BrokerShutdownProvider.class));
parentObject.open();
DurableConfigurationStore configurationStore = parentObject.getConfigurationStore();
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java?rev=1630749&r1=1630748&r2=1630749&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java Fri Oct 10 09:59:55 2014
@@ -358,9 +358,9 @@ public class PortRestTest extends QpidRe
attributes.put(Port.AUTHENTICATION_PROVIDER, TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER);
int responseCode = getRestTestHelper().submitRequest("port/" + newPortName, "PUT", attributes);
- assertEquals("Unexpected response code for port creation", 201, responseCode);
+ assertEquals("Unexpected response code for port creation", 409, responseCode);
- portData = getRestTestHelper().getJsonAsSingletonList("port/" + URLDecoder.decode(newPortName, "UTF-8"));
- Asserts.assertPortAttributes(portData, State.ERRORED);
+ List<Map<String,Object>> ports = getRestTestHelper().getJsonAsList("port/" + URLDecoder.decode(newPortName, "UTF-8"));
+ assertTrue("Port should not be created", ports.isEmpty());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org