From 2b72be0347e8cdc7bf85ed14b6490afc811e363e Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Wed, 21 Sep 2011 14:56:03 +0000
Subject: QPID-2920: Remove deferred dequeue, not needed.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-2920-active@1173696 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/src/qpid/broker/Cluster.h               | 2 +-
 qpid/cpp/src/qpid/broker/NullCluster.h           | 2 +-
 qpid/cpp/src/qpid/broker/Queue.cpp               | 3 +--
 qpid/cpp/src/qpid/cluster/exp/BrokerContext.cpp  | 3 +--
 qpid/cpp/src/qpid/cluster/exp/BrokerContext.h    | 2 +-
 qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp | 2 --
 6 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/qpid/cpp/src/qpid/broker/Cluster.h b/qpid/cpp/src/qpid/broker/Cluster.h
index 83c5361f3b..cb606ba52d 100644
--- a/qpid/cpp/src/qpid/broker/Cluster.h
+++ b/qpid/cpp/src/qpid/broker/Cluster.h
@@ -74,7 +74,7 @@ class Cluster
      *@return true if the message should be dequeued now, false if it
      * will be dequeued later.
      */
-    virtual bool dequeue(const QueuedMessage&) = 0;
+    virtual void dequeue(const QueuedMessage&) = 0;
 
     // Consumers
 
diff --git a/qpid/cpp/src/qpid/broker/NullCluster.h b/qpid/cpp/src/qpid/broker/NullCluster.h
index e3ac6b7594..8e82526ef8 100644
--- a/qpid/cpp/src/qpid/broker/NullCluster.h
+++ b/qpid/cpp/src/qpid/broker/NullCluster.h
@@ -42,7 +42,7 @@ class NullCluster : public Cluster
     virtual void routed(const boost::intrusive_ptr<Message>&) {}
     virtual void acquire(const QueuedMessage&) {}
     virtual void requeue(const QueuedMessage&) {}
-    virtual bool dequeue(const QueuedMessage&) { return false; }
+    virtual void dequeue(const QueuedMessage&) {}
 
     // Consumers
 
diff --git a/qpid/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp
index 3d7b27738f..632e512a32 100644
--- a/qpid/cpp/src/qpid/broker/Queue.cpp
+++ b/qpid/cpp/src/qpid/broker/Queue.cpp
@@ -702,8 +702,7 @@ void Queue::enqueueAborted(boost::intrusive_ptr<Message> msg)
 bool Queue::dequeue(TransactionContext* ctxt, const QueuedMessage& msg)
 {
     // FIXME aconway 2011-09-13: new cluster needs tx/dtx support.
-    if (!ctxt && broker)
-        if (!broker->getCluster().dequeue(msg)) return false;
+    if (!ctxt && broker) broker->getCluster().dequeue(msg);
 
     ScopedUse u(barrier);
     if (!u.acquired) return false;
diff --git a/qpid/cpp/src/qpid/cluster/exp/BrokerContext.cpp b/qpid/cpp/src/qpid/cluster/exp/BrokerContext.cpp
index e06068fd38..eac9854aa1 100644
--- a/qpid/cpp/src/qpid/cluster/exp/BrokerContext.cpp
+++ b/qpid/cpp/src/qpid/cluster/exp/BrokerContext.cpp
@@ -110,14 +110,13 @@ void BrokerContext::acquire(const broker::QueuedMessage& qm) {
                    ProtocolVersion(), qm.queue->getName(), qm.position));
 }
 
-bool BrokerContext::dequeue(const broker::QueuedMessage& qm) {
+void BrokerContext::dequeue(const broker::QueuedMessage& qm) {
     // FIXME aconway 2011-09-15: should dequeue locally immediately
     // instead of waiting for redeliver. No need for CPG order on
     // dequeues.
     if (!tssNoReplicate)
         core.mcast(ClusterMessageDequeueBody(
                        ProtocolVersion(), qm.queue->getName(), qm.position));
-    return false;               // FIXME aconway 2011-09-14: needed?
 }
 
 void BrokerContext::requeue(const broker::QueuedMessage& qm) {
diff --git a/qpid/cpp/src/qpid/cluster/exp/BrokerContext.h b/qpid/cpp/src/qpid/cluster/exp/BrokerContext.h
index 0583b7edc7..ea759eb53c 100644
--- a/qpid/cpp/src/qpid/cluster/exp/BrokerContext.h
+++ b/qpid/cpp/src/qpid/cluster/exp/BrokerContext.h
@@ -57,7 +57,7 @@ class BrokerContext : public broker::Cluster
     bool enqueue(broker::Queue&, const boost::intrusive_ptr<broker::Message>&);
     void routed(const boost::intrusive_ptr<broker::Message>&);
     void acquire(const broker::QueuedMessage&);
-    bool dequeue(const broker::QueuedMessage&);
+    void dequeue(const broker::QueuedMessage&);
     void requeue(const broker::QueuedMessage&);
 
     // Consumers
diff --git a/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp b/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp
index dbe008e33e..d3c6b763e8 100644
--- a/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp
+++ b/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp
@@ -119,8 +119,6 @@ void MessageHandler::dequeue(const std::string& q, uint32_t position) {
     // BrokerContext::dequeue
 
     if (sender() != self()) {
-        // FIXME aconway 2011-09-15: new cluster, inefficient looks up
-        // message by position multiple times?
         boost::shared_ptr<Queue> queue = findQueue(q, "Cluster dequeue failed");
         // Remove fom the unacked list
         QueueContext::get(*queue)->dequeue(position);
-- 
cgit v1.2.1