qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r1165889 - in /qpid/branches/qpid-2920-1/qpid/cpp: src/qpid/cluster/exp/MessageHandler.cpp src/qpid/cluster/exp/Multicaster.h src/tests/BrokerClusterCalls.cpp xml/cluster.xml
Date Tue, 06 Sep 2011 21:47:43 GMT
Author: aconway
Date: Tue Sep  6 21:47:43 2011
New Revision: 1165889

URL: http://svn.apache.org/viewvc?rev=1165889&view=rev
Log:
QPID-2920: Rebased on trunk, fix up minor conflicts.

Modified:
    qpid/branches/qpid-2920-1/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp
    qpid/branches/qpid-2920-1/qpid/cpp/src/qpid/cluster/exp/Multicaster.h
    qpid/branches/qpid-2920-1/qpid/cpp/src/tests/BrokerClusterCalls.cpp
    qpid/branches/qpid-2920-1/qpid/cpp/xml/cluster.xml

Modified: qpid/branches/qpid-2920-1/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2920-1/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp?rev=1165889&r1=1165888&r2=1165889&view=diff
==============================================================================
--- qpid/branches/qpid-2920-1/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp (original)
+++ qpid/branches/qpid-2920-1/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp Tue Sep  6
21:47:43 2011
@@ -85,7 +85,7 @@ void MessageHandler::routed(RoutingId ro
 }
 
 void MessageHandler::acquire(const std::string& q, uint32_t position) {
-    // Note acquires from other members. My own acquires were exeuted in
+    // Note acquires from other members. My own acquires were executed in
     // the connection thread
     if (sender() != self()) {
         // FIXME aconway 2010-10-28: need to store acquired messages on QueueContext

Modified: qpid/branches/qpid-2920-1/qpid/cpp/src/qpid/cluster/exp/Multicaster.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2920-1/qpid/cpp/src/qpid/cluster/exp/Multicaster.h?rev=1165889&r1=1165888&r2=1165889&view=diff
==============================================================================
--- qpid/branches/qpid-2920-1/qpid/cpp/src/qpid/cluster/exp/Multicaster.h (original)
+++ qpid/branches/qpid-2920-1/qpid/cpp/src/qpid/cluster/exp/Multicaster.h Tue Sep  6 21:47:43
2011
@@ -25,6 +25,7 @@
 #include "BufferFactory.h"
 #include "qpid/sys/PollableQueue.h"
 #include <sys/uio.h>            // For struct iovec
+#include <vector>
 
 namespace qpid {
 

Modified: qpid/branches/qpid-2920-1/qpid/cpp/src/tests/BrokerClusterCalls.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2920-1/qpid/cpp/src/tests/BrokerClusterCalls.cpp?rev=1165889&r1=1165888&r2=1165889&view=diff
==============================================================================
--- qpid/branches/qpid-2920-1/qpid/cpp/src/tests/BrokerClusterCalls.cpp (original)
+++ qpid/branches/qpid-2920-1/qpid/cpp/src/tests/BrokerClusterCalls.cpp Tue Sep  6 21:47:43
2011
@@ -229,7 +229,7 @@ QPID_AUTO_TEST_CASE(testReleaseReject) {
     i = 0;
     f.s.reject(m);
     BOOST_CHECK_EQUAL(h.at(i++), "routing(a)"); // Routing to alt exchange
-    BOOST_CHECK_EQUAL(h.at(i++), "enqueue(amq.fanout_altq, a)");
+    BOOST_CHECK_EQUAL(h.at(i++), "enqueue(altq, a)");
     BOOST_CHECK_EQUAL(h.at(i++), "routed(a)");
     BOOST_CHECK_EQUAL(h.at(i++), "dequeue(q, 1, a)");
     BOOST_CHECK_EQUAL(h.size(), i);
@@ -300,8 +300,8 @@ QPID_AUTO_TEST_CASE(testFanout) {
     sender.send(Message("a"));
     f.s.sync();
     BOOST_CHECK_EQUAL(h.at(i++), "routing(a)");
-    BOOST_CHECK_EQUAL(0u, h.at(i++).find("enqueue(amq.fanout_r"));
-    BOOST_CHECK_EQUAL(0u, h.at(i++).find("enqueue(amq.fanout_r"));
+    BOOST_CHECK_EQUAL(0u, h.at(i++).find("enqueue(r"));
+    BOOST_CHECK_EQUAL(0u, h.at(i++).find("enqueue(r"));
     BOOST_CHECK(h.at(i-1) != h.at(i-2));
     BOOST_CHECK_EQUAL(h.at(i++), "routed(a)");
     BOOST_CHECK_EQUAL(h.size(), i);
@@ -312,10 +312,10 @@ QPID_AUTO_TEST_CASE(testFanout) {
     Message m2 = r2.fetch(Duration::SECOND);
     f.s.acknowledge(m2, true);
 
-    BOOST_CHECK_EQUAL(h.at(i++), "acquire(amq.fanout_r1, 1, a)");
-    BOOST_CHECK_EQUAL(h.at(i++), "dequeue(amq.fanout_r1, 1, a)");
-    BOOST_CHECK_EQUAL(h.at(i++), "acquire(amq.fanout_r2, 1, a)");
-    BOOST_CHECK_EQUAL(h.at(i++), "dequeue(amq.fanout_r2, 1, a)");
+    BOOST_CHECK_EQUAL(h.at(i++), "acquire(r1, 1, a)");
+    BOOST_CHECK_EQUAL(h.at(i++), "dequeue(r1, 1, a)");
+    BOOST_CHECK_EQUAL(h.at(i++), "acquire(r2, 1, a)");
+    BOOST_CHECK_EQUAL(h.at(i++), "dequeue(r2, 1, a)");
     BOOST_CHECK_EQUAL(h.size(), i);
 }
 

Modified: qpid/branches/qpid-2920-1/qpid/cpp/xml/cluster.xml
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2920-1/qpid/cpp/xml/cluster.xml?rev=1165889&r1=1165888&r2=1165889&view=diff
==============================================================================
--- qpid/branches/qpid-2920-1/qpid/cpp/xml/cluster.xml (original)
+++ qpid/branches/qpid-2920-1/qpid/cpp/xml/cluster.xml Tue Sep  6 21:47:43 2011
@@ -78,10 +78,6 @@
       <field name="left" type="vbin16"/> <!-- packed member-id array -->
     </control>
 
-    <control name="message-expired" code="0x12">
-      <field name="id" type="uint64"/>
-    </control>
-
     <domain name="error-type" type="uint8" label="Types of error">
       <enum>
 	<choice name="none" value="0"/>



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message