Author: robbie
Date: Sun Sep 23 20:50:48 2012
New Revision: 1389143
URL: http://svn.apache.org/viewvc?rev=1389143&view=rev
Log:
QPID-4341: ensure the Topic perftests actually use Topic destinations
Modified:
qpid/trunk/qpid/java/perftests/etc/testdefs/Topic-AckModes.js
qpid/trunk/qpid/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js
qpid/trunk/qpid/java/perftests/etc/testdefs/Topic-NumberOfTopics.js
qpid/trunk/qpid/java/perftests/etc/testdefs/Topic-Persistence.js
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConsumerConfig.java
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ProducerConfig.java
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateConsumerCommand.java
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateParticpantCommand.java
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ParticipantConfigTest.java
Modified: qpid/trunk/qpid/java/perftests/etc/testdefs/Topic-AckModes.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/Topic-AckModes.js?rev=1389143&r1=1389142&r2=1389143&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/testdefs/Topic-AckModes.js (original)
+++ qpid/trunk/qpid/java/perftests/etc/testdefs/Topic-AckModes.js Sun Sep 23
20:50:48 2012
@@ -47,6 +47,7 @@ var jsonObject = {
{
"_name": "Producer",
"_destinationName": topicName,
+ "_isTopic": true,
"_deliveryMode": 1,
"_maximumDuration": duration,
"_startDelay": 2000 // gives the consumers time to
implicitly create the topic
@@ -72,6 +73,7 @@ var jsonObject = {
{
"_name": "Consumer-__INDEX",
"_destinationName": topicName,
+ "_isTopic": true,
"_maximumDuration": duration,
}
]
Modified: qpid/trunk/qpid/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js?rev=1389143&r1=1389142&r2=1389143&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js
(original)
+++ qpid/trunk/qpid/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js Sun
Sep 23 20:50:48 2012
@@ -46,6 +46,7 @@ for(i=0; i < numbersOfConsumers.length ;
{
"_name": "Producer1",
"_destinationName": topicName,
+ "_isTopic": true,
"_deliveryMode": 1,
"_maximumDuration": duration,
"_startDelay": 2000 // gives the consumers time to
implicitly create the topic
@@ -70,6 +71,7 @@ for(i=0; i < numbersOfConsumers.length ;
{
"_name": "Consumer-__INDEX",
"_destinationName": topicName,
+ "_isTopic": true,
"_maximumDuration": duration
}
]
Modified: qpid/trunk/qpid/java/perftests/etc/testdefs/Topic-NumberOfTopics.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/Topic-NumberOfTopics.js?rev=1389143&r1=1389142&r2=1389143&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/testdefs/Topic-NumberOfTopics.js
(original)
+++ qpid/trunk/qpid/java/perftests/etc/testdefs/Topic-NumberOfTopics.js Sun Sep
23 20:50:48 2012
@@ -49,6 +49,7 @@ for(i=0; i < numbersOfTopics.length ; i+
{
"_name": "Producer-__INDEX",
"_destinationName": topicName,
+ "_isTopic": true,
"_deliveryMode": 1,
"_maximumDuration": duration,
"_startDelay": 2000 // gives the consumers time to
implicitly create the topic
@@ -75,6 +76,7 @@ for(i=0; i < numbersOfTopics.length ; i+
{
"_name": "Consumer-__INDEX",
"_destinationName": topicName,
+ "_isTopic": true,
"_maximumDuration": duration
}
]
Modified: qpid/trunk/qpid/java/perftests/etc/testdefs/Topic-Persistence.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/Topic-Persistence.js?rev=1389143&r1=1389142&r2=1389143&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/testdefs/Topic-Persistence.js (original)
+++ qpid/trunk/qpid/java/perftests/etc/testdefs/Topic-Persistence.js Sun Sep 23
20:50:48 2012
@@ -52,6 +52,7 @@ var jsonObject = {
{
"_name": "Producer",
"_destinationName": topicName,
+ "_isTopic": true,
"_maximumDuration": duration,
"_startDelay": 2000 // gives the consumers time to
implicitly create the topic
}
Modified:
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConsumerConfig.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConsumerConfig.java?rev=1389143&r1=1389142&r2=1389143&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConsumerConfig.java
(original)
+++
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConsumerConfig.java
Sun Sep 23 20:50:48 2012
@@ -24,7 +24,6 @@ import org.apache.qpid.disttest.message.
public class ConsumerConfig extends ParticipantConfig
{
- private boolean _isTopic;
private boolean _isDurableSubscription;
private boolean _isBrowsingSubscription;
private String _selector;
@@ -35,7 +34,6 @@ public class ConsumerConfig extends Part
// For Gson
public ConsumerConfig()
{
- _isTopic = false;
_isDurableSubscription = false;
_isBrowsingSubscription = false;
_selector = null;
@@ -56,9 +54,8 @@ public class ConsumerConfig extends Part
boolean noLocal,
boolean synchronous)
{
- super(consumerName, destinationName, numberOfMessages, batchSize,
maximumDuration);
+ super(consumerName, destinationName, isTopic, numberOfMessages,
batchSize, maximumDuration);
- _isTopic = isTopic;
_isDurableSubscription = isDurableSubscription;
_isBrowsingSubscription = isBrowsingSubscription;
_selector = selector;
@@ -73,7 +70,6 @@ public class ConsumerConfig extends Part
setParticipantProperties(createConsumerCommand);
createConsumerCommand.setSessionName(sessionName);
- createConsumerCommand.setTopic(_isTopic);
createConsumerCommand.setDurableSubscription(_isDurableSubscription);
createConsumerCommand.setBrowsingSubscription(_isBrowsingSubscription);
createConsumerCommand.setSelector(_selector);
Modified:
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java?rev=1389143&r1=1389142&r2=1389143&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java
(original)
+++
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java
Sun Sep 23 20:50:48 2012
@@ -33,6 +33,7 @@ public abstract class ParticipantConfig
private boolean _alreadyLoggedAboutOverriddenDuration;
private String _destinationName;
+ private boolean _isTopic;
private long _numberOfMessages;
private String _name;
private int _batchSize;
@@ -51,12 +52,14 @@ public abstract class ParticipantConfig
public ParticipantConfig(
String name,
String destinationName,
+ boolean isTopic,
long numberOfMessages,
int batchSize,
long maximumDuration)
{
_name = name;
_destinationName = destinationName;
+ _isTopic = isTopic;
_numberOfMessages = numberOfMessages;
_batchSize = batchSize;
_maximumDuration = maximumDuration;
@@ -66,6 +69,7 @@ public abstract class ParticipantConfig
{
createParticipantCommand.setParticipantName(_name);
createParticipantCommand.setDestinationName(_destinationName);
+ createParticipantCommand.setTopic(_isTopic);
createParticipantCommand.setNumberOfMessages(_numberOfMessages);
createParticipantCommand.setBatchSize(_batchSize);
Modified:
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ProducerConfig.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ProducerConfig.java?rev=1389143&r1=1389142&r2=1389143&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ProducerConfig.java
(original)
+++
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ProducerConfig.java
Sun Sep 23 20:50:48 2012
@@ -59,7 +59,7 @@ public class ProducerConfig extends Part
long startDelay,
String messageProviderName)
{
- super(producerName, destinationName, numberOfMessages, batchSize,
maximumDuration);
+ super(producerName, destinationName, false, numberOfMessages,
batchSize, maximumDuration);
_deliveryMode = deliveryMode;
_messageSize = messageSize;
Modified:
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java?rev=1389143&r1=1389142&r2=1389143&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java
(original)
+++
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java
Sun Sep 23 20:50:48 2012
@@ -218,7 +218,15 @@ public class ClientJmsDelegate
synchronized(session)
{
- final Destination destination =
session.createQueue(command.getDestinationName());
+ final Destination destination;
+ if(command.isTopic())
+ {
+ destination =
session.createTopic(command.getDestinationName());
+ }
+ else
+ {
+ destination =
session.createQueue(command.getDestinationName());
+ }
final MessageProducer jmsProducer =
session.createProducer(destination);
Modified:
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateConsumerCommand.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateConsumerCommand.java?rev=1389143&r1=1389142&r2=1389143&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateConsumerCommand.java
(original)
+++
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateConsumerCommand.java
Sun Sep 23 20:50:48 2012
@@ -21,7 +21,6 @@ package org.apache.qpid.disttest.message
public class CreateConsumerCommand extends CreateParticpantCommand
{
- private boolean _isTopic;
private boolean _isDurableSubscription;
private boolean _isBrowsingSubscription;
private String _selector;
@@ -75,16 +74,6 @@ public class CreateConsumerCommand exten
this._noLocal = noLocal;
}
- public boolean isTopic()
- {
- return _isTopic;
- }
-
- public void setTopic(boolean isTopic)
- {
- this._isTopic = isTopic;
- }
-
public boolean isSynchronous()
{
return _synchronous;
Modified:
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateParticpantCommand.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateParticpantCommand.java?rev=1389143&r1=1389142&r2=1389143&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateParticpantCommand.java
(original)
+++
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateParticpantCommand.java
Sun Sep 23 20:50:48 2012
@@ -23,6 +23,7 @@ import org.apache.commons.lang.builder.T
public abstract class CreateParticpantCommand extends Command
{
+ private boolean _isTopic;
private String _participantName;
private String _sessionName;
private String _destinationName;
@@ -65,6 +66,16 @@ public abstract class CreateParticpantCo
_destinationName = destinationName;
}
+ public boolean isTopic()
+ {
+ return _isTopic;
+ }
+
+ public void setTopic(boolean isTopic)
+ {
+ _isTopic = isTopic;
+ }
+
public long getNumberOfMessages()
{
return _numberOfMessages;
Modified:
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ParticipantConfigTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ParticipantConfigTest.java?rev=1389143&r1=1389142&r2=1389143&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ParticipantConfigTest.java
(original)
+++
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ParticipantConfigTest.java
Sun Sep 23 20:50:48 2012
@@ -32,7 +32,7 @@ public class ParticipantConfigTest exten
setTestSystemProperty(ParticipantConfig.DURATION_OVERRIDE_SYSTEM_PROPERTY,
String.valueOf(overriddenDuration));
CreateParticpantCommand createParticipantCommand =
mock(CreateParticpantCommand.class);
- ParticipantConfig participantConfig = new ParticipantConfig("name",
"destinationName", 1, 2, 5000)
+ ParticipantConfig participantConfig = new ParticipantConfig("name",
"destinationName", false, 1, 2, 5000)
{
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
