You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kp...@apache.org on 2009/08/05 16:21:27 UTC
svn commit: r801239 - in /qpid/trunk/qpid/cpp/src/qpid/broker: Broker.cpp
MessageStore.h MessageStoreModule.cpp MessageStoreModule.h
NullMessageStore.cpp NullMessageStore.h
Author: kpvdr
Date: Wed Aug 5 14:21:26 2009
New Revision: 801239
URL: http://svn.apache.org/viewvc?rev=801239&view=rev
Log:
Rename of MessageStore::discardInit() to MessageStore::truncateInint(), resulting from a cleanup of the code logic in the store.
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h
qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h
qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=801239&r1=801238&r2=801239&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Wed Aug 5 14:21:26 2009
@@ -223,7 +223,7 @@
}
else {
QPID_LOG(notice, "Cluster recovery: recovered journal data discarded and journal files pushed down");
- store->discardInit(true);
+ store->truncateInit(true); // save old files in subdir
}
}
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h?rev=801239&r1=801238&r2=801239&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h Wed Aug 5 14:21:26 2009
@@ -63,7 +63,7 @@
* @param pushDownStoreFiles If true, will move content of the store dir into a
* subdir, leaving the store dir otherwise empty.
*/
- virtual void discardInit(const bool pushDownStoreFiles = false) = 0;
+ virtual void truncateInit(const bool pushDownStoreFiles = false) = 0;
/**
* Record the existence of a durable queue
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp?rev=801239&r1=801238&r2=801239&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp Wed Aug 5 14:21:26 2009
@@ -41,9 +41,9 @@
bool MessageStoreModule::init(const Options*) { return true; }
-void MessageStoreModule::discardInit(const bool pushDownStoreFiles)
+void MessageStoreModule::truncateInit(const bool pushDownStoreFiles)
{
- TRANSFER_EXCEPTION(store->discardInit(pushDownStoreFiles));
+ TRANSFER_EXCEPTION(store->truncateInit(pushDownStoreFiles));
}
void MessageStoreModule::create(PersistableQueue& queue, const FieldTable& args)
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h?rev=801239&r1=801238&r2=801239&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h Wed Aug 5 14:21:26 2009
@@ -40,7 +40,7 @@
MessageStoreModule(MessageStore* store);
bool init(const Options* options);
- void discardInit(const bool pushDownStoreFiles = false);
+ void truncateInit(const bool pushDownStoreFiles = false);
std::auto_ptr<TransactionContext> begin();
std::auto_ptr<TPCTransactionContext> begin(const std::string& xid);
void prepare(TPCTransactionContext& txn);
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp?rev=801239&r1=801238&r2=801239&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp Wed Aug 5 14:21:26 2009
@@ -54,7 +54,7 @@
bool NullMessageStore::init(const Options* /*options*/) {return true;}
-void NullMessageStore::discardInit(const bool /*pushDownStoreFiles*/) {}
+void NullMessageStore::truncateInit(const bool /*pushDownStoreFiles*/) {}
void NullMessageStore::create(PersistableQueue& queue, const framing::FieldTable& /*args*/)
{
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h?rev=801239&r1=801238&r2=801239&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h Wed Aug 5 14:21:26 2009
@@ -42,7 +42,7 @@
QPID_BROKER_EXTERN NullMessageStore();
QPID_BROKER_EXTERN virtual bool init(const Options* options);
- QPID_BROKER_EXTERN virtual void discardInit(const bool pushDownStoreFiles = false);
+ QPID_BROKER_EXTERN virtual void truncateInit(const bool pushDownStoreFiles = false);
QPID_BROKER_EXTERN virtual std::auto_ptr<TransactionContext> begin();
QPID_BROKER_EXTERN virtual std::auto_ptr<TPCTransactionContext> begin(const std::string& xid);
QPID_BROKER_EXTERN virtual void prepare(TPCTransactionContext& txn);
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org