You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2011/06/17 04:41:54 UTC
svn commit: r1136752 - in /qpid/branches/qpid-3079/qpid/cpp/src/qpid/store:
MessageStorePlugin.h StorageProvider.h ms-clfs/MSSqlClfsProvider.cpp
ms-sql/MSSqlProvider.cpp
Author: kgiusti
Date: Fri Jun 17 02:41:53 2011
New Revision: 1136752
URL: http://svn.apache.org/viewvc?rev=1136752&view=rev
Log:
QPID-3079: update stores to use new api
Modified:
qpid/branches/qpid-3079/qpid/cpp/src/qpid/store/MessageStorePlugin.h
qpid/branches/qpid-3079/qpid/cpp/src/qpid/store/StorageProvider.h
qpid/branches/qpid-3079/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp
qpid/branches/qpid-3079/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp
Modified: qpid/branches/qpid-3079/qpid/cpp/src/qpid/store/MessageStorePlugin.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3079/qpid/cpp/src/qpid/store/MessageStorePlugin.h?rev=1136752&r1=1136751&r2=1136752&view=diff
==============================================================================
--- qpid/branches/qpid-3079/qpid/cpp/src/qpid/store/MessageStorePlugin.h (original)
+++ qpid/branches/qpid-3079/qpid/cpp/src/qpid/store/MessageStorePlugin.h Fri Jun 17 02:41:53 2011
@@ -215,7 +215,7 @@ class MessageStorePlugin :
*/
virtual void dequeue(broker::TransactionContext* ctxt,
const boost::intrusive_ptr<broker::PersistableMessage>& msg,
- const broker::PersistableQueue& queue);
+ const boost::shared_ptr<broker::PersistableQueue>& queue);
/**
* Flushes all async messages to disk for the specified queue
Modified: qpid/branches/qpid-3079/qpid/cpp/src/qpid/store/StorageProvider.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3079/qpid/cpp/src/qpid/store/StorageProvider.h?rev=1136752&r1=1136751&r2=1136752&view=diff
==============================================================================
--- qpid/branches/qpid-3079/qpid/cpp/src/qpid/store/StorageProvider.h (original)
+++ qpid/branches/qpid-3079/qpid/cpp/src/qpid/store/StorageProvider.h Fri Jun 17 02:41:53 2011
@@ -277,7 +277,7 @@ public:
*/
virtual void dequeue(qpid::broker::TransactionContext* ctxt,
const boost::intrusive_ptr<PersistableMessage>& msg,
- const PersistableQueue& queue) = 0;
+ const boost::shared_ptr<PersistableQueue>& queue) = 0;
/**
* Flushes all async messages to disk for the specified queue
Modified: qpid/branches/qpid-3079/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3079/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp?rev=1136752&r1=1136751&r2=1136752&view=diff
==============================================================================
--- qpid/branches/qpid-3079/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp (original)
+++ qpid/branches/qpid-3079/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp Fri Jun 17 02:41:53 2011
@@ -827,7 +827,7 @@ MSSqlClfsProvider::enqueue(qpid::broker:
void
MSSqlClfsProvider::dequeue(qpid::broker::TransactionContext* ctxt,
const boost::intrusive_ptr<PersistableMessage>& msg,
- const PersistableQueue& queue)
+ const boost::shared_ptr<PersistableQueue>& queue)
{
Transaction::shared_ptr t;
TransactionContext *ctx = dynamic_cast<TransactionContext*>(ctxt);
@@ -839,8 +839,8 @@ MSSqlClfsProvider::dequeue(qpid::broker:
if (tctx)
t = tctx->getTransaction();
}
- messages.dequeue(msg->getPersistenceId(), queue.getPersistenceId(), t);
- msg->dequeueComplete();
+ messages.dequeue(msg->getPersistenceId(), queue->getPersistenceId(), t);
+ queue->dequeueComplete(msg);
}
std::auto_ptr<qpid::broker::TransactionContext>
Modified: qpid/branches/qpid-3079/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3079/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp?rev=1136752&r1=1136751&r2=1136752&view=diff
==============================================================================
--- qpid/branches/qpid-3079/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp (original)
+++ qpid/branches/qpid-3079/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp Fri Jun 17 02:41:53 2011
@@ -784,7 +784,7 @@ MSSqlProvider::enqueue(qpid::broker::Tra
void
MSSqlProvider::dequeue(qpid::broker::TransactionContext* ctxt,
const boost::intrusive_ptr<PersistableMessage>& msg,
- const PersistableQueue& queue)
+ const boost::shared_ptr<PersistableQueue>& queue)
{
// If this dequeue is in the context of a transaction, use the specified
// transaction to nest a new transaction for this operation. However, if
@@ -821,12 +821,12 @@ MSSqlProvider::dequeue(qpid::broker::Tra
// transaction doesn't commit.
if (!xid.empty()) {
rsMap.pendingRemove(msg->getPersistenceId(),
- queue.getPersistenceId(),
+ queue->getPersistenceId(),
xid);
}
else {
rsMap.remove(msg->getPersistenceId(),
- queue.getPersistenceId());
+ queue->getPersistenceId());
}
if (atxn)
atxn->sqlCommit();
@@ -848,7 +848,7 @@ MSSqlProvider::dequeue(qpid::broker::Tra
db->rollbackTransaction();
throw ADOException("Error dequeuing message", e, errs);
}
- msg->dequeueComplete();
+ queue->dequeueComplete(msg);
}
std::auto_ptr<qpid::broker::TransactionContext>
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org