You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2009/08/10 01:26:10 UTC
svn commit: r802625 - in /qpid/trunk/qpid/java:
broker/src/main/java/org/apache/qpid/server/
broker/src/main/java/org/apache/qpid/server/logging/messages/
systests/src/main/java/org/apache/qpid/server/logging/
Author: ritchiem
Date: Sun Aug 9 23:26:10 2009
New Revision: 802625
URL: http://svn.apache.org/viewvc?rev=802625&view=rev
Log:
QPID-2002 : Added new message CHN-1004, to allow the reporting of prefetch sizes.
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages_en_US.properties
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java?rev=802625&r1=802624&r2=802625&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java Sun Aug 9 23:26:10 2009
@@ -884,8 +884,7 @@
public void setCredit(final long prefetchSize, final int prefetchCount)
{
- //fixme
-// _actor.message(ChannelMessages.CHN_100X(prefetchSize, prefetchCount);
+ _actor.message(ChannelMessages.CHN_1004(prefetchSize, prefetchCount));
_creditManager.setCreditLimits(prefetchSize, prefetchCount);
}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages_en_US.properties
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages_en_US.properties?rev=802625&r1=802624&r2=802625&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages_en_US.properties (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages_en_US.properties Sun Aug 9 23:26:10 2009
@@ -240,10 +240,12 @@
#Channel
CHN-1001 = Create
-# : Prefetch Size {0,number} : Count {1,number}
# 0 - flow
CHN-1002 = Flow {0}
CHN-1003 = Close
+# 0 - bytes allowed in prefetch
+# 1 - number of messagse.
+CHN-1004 = Prefetch Size (bytes) {0,number} : Count {1,number}
#Queue
# 0 - owner
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java?rev=802625&r1=802624&r2=802625&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java Sun Aug 9 23:26:10 2009
@@ -20,6 +20,8 @@
*/
package org.apache.qpid.server.logging;
+import org.apache.qpid.client.AMQConnection;
+
import javax.jms.Connection;
import javax.jms.MessageConsumer;
import javax.jms.Queue;
@@ -52,11 +54,12 @@
* 2. New JMS Session/Channel creation
*
* Output:
- * <date> CHN-1001 : Create : Prefetch <count>
+ * <date> CHN-1001 : Create
+ * <date> CHN-1004 : Prefetch Size (bytes) {0,number} : Count {1,number}
*
* Validation Steps:
- * 3. The CHN ID is correct
- * 4. The prefetch value matches that defined by the requesting client.
+ * 1. The CHN ID is correct
+ * 2. The prefetch value matches that defined by the requesting client.
*
* @throws Exception - if an error occurs
*/
@@ -66,14 +69,16 @@
Connection connection = getConnection();
+ int PREFETCH = 12;
+
// Test that calling session.close gives us the expected output
- connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ ((AMQConnection)connection).createSession(false, Session.AUTO_ACKNOWLEDGE,PREFETCH);
List<String> results = _monitor.findMatches(CHANNEL_PREFIX);
// Validation
- assertEquals("CHN messages not logged", 1, results.size());
+ assertEquals("CHN messages not logged", 2, results.size());
String log = getLog(results.get(0));
// MESSAGE [con:0(guest@anonymous(3273383)/test)/ch:1] CHN-1001 : Create
@@ -81,6 +86,13 @@
validateMessageID("CHN-1001", log);
assertEquals("Incorrect Channel in actor:"+fromActor(log), 1, getChannelID(fromActor(log)));
+ log = getLog(results.get(1));
+ // MESSAGE [con:0(guest@anonymous(3273383)/test)/ch:1] CHN-1004 : Prefetch Size (bytes) {0,number} : Count {1,number}
+ //1 & 2
+ validateMessageID("CHN-1004", log);
+ assertEquals("Incorrect Channel in actor:"+fromActor(log), 1, getChannelID(fromActor(log)));
+ assertTrue("Prefetch Count not correct",getMessageString(fromMessage(log)).endsWith("Count "+PREFETCH));
+
connection.close();
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org