You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2012/12/19 22:23:57 UTC

svn commit: r1424134 - in /qpid/trunk/qpid/cpp/src/qpid/broker: MessageStore.h MessageStoreModule.cpp MessageStoreModule.h NullMessageStore.cpp NullMessageStore.h

Author: aconway
Date: Wed Dec 19 21:23:57 2012
New Revision: 1424134

URL: http://svn.apache.org/viewvc?rev=1424134&view=rev
Log:
QPID-4514: Remove obsolete cluster code: MessageStore

Modified:
    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/MessageStore.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h?rev=1424134&r1=1424133&r2=1424134&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h Wed Dec 19 21:23:57 2012
@@ -46,20 +46,6 @@ class MessageStore : public Transactiona
   public:
 
     /**
-     * If called after initialization but before recovery, will discard the database
-     * content and reinitialize as though it were a new installation. If the parameter
-     * saveStoreContent is true, the content of the store will be saved in such a way
-     * that the truncate can be reversed. This is used when cluster nodes recover and
-     *  must get their content from a cluster sync rather than directly from the store.
-     *
-     * @param saveStoreContent If true, will move content of the store to a backup
-     *                         location where they may be restored later if needed. It is
-     *                         not necessary to save more than one prior version of the
-     *                         store.
-     */
-    virtual void truncateInit(const bool saveStoreContent = false) = 0;
-
-    /**
      * Record the existence of a durable queue
      */
     virtual void create(PersistableQueue& 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=1424134&r1=1424133&r2=1424134&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp Wed Dec 19 21:23:57 2012
@@ -42,11 +42,6 @@ MessageStoreModule::~MessageStoreModule(
 
 bool MessageStoreModule::init(const Options*) { return true; }
 
-void MessageStoreModule::truncateInit(const bool pushDownStoreFiles)
-{
-    TRANSFER_EXCEPTION(store->truncateInit(pushDownStoreFiles));
-}
-
 void MessageStoreModule::create(PersistableQueue& queue, const FieldTable& args)
 {
     TRANSFER_EXCEPTION(store->create(queue, 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=1424134&r1=1424133&r2=1424134&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h Wed Dec 19 21:23:57 2012
@@ -41,7 +41,6 @@ class MessageStoreModule : public Messag
     MessageStoreModule(boost::shared_ptr<MessageStore>& store);
 
     bool init(const Options* options);
-    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=1424134&r1=1424133&r2=1424134&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp Wed Dec 19 21:23:57 2012
@@ -52,8 +52,6 @@ NullMessageStore::NullMessageStore() : n
 
 bool NullMessageStore::init(const Options* /*options*/) {return true;}
 
-void NullMessageStore::truncateInit(const bool /*pushDownStoreFiles*/) {}
-
 void NullMessageStore::create(PersistableQueue& queue, const framing::FieldTable& /*args*/)
 {
     queue.setPersistenceId(nextPersistenceId++);

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=1424134&r1=1424133&r2=1424134&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h Wed Dec 19 21:23:57 2012
@@ -44,7 +44,6 @@ class QPID_BROKER_CLASS_EXTERN NullMessa
     QPID_BROKER_EXTERN NullMessageStore();
 
     QPID_BROKER_EXTERN virtual bool init(const Options* options);
-    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);



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org