From 915a6ed85f42b9472267193290cbc7dbc860961c Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 19 Dec 2012 21:24:13 +0000 Subject: QPID-4514: Remove obsolete cluster code: MessageStorePlugin git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1424136 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/store/MessageStorePlugin.cpp | 6 ------ qpid/cpp/src/qpid/store/MessageStorePlugin.h | 12 ------------ qpid/cpp/src/qpid/store/StorageProvider.h | 14 -------------- qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp | 19 ------------------- qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp | 19 ------------------- 5 files changed, 70 deletions(-) (limited to 'qpid/cpp/src') diff --git a/qpid/cpp/src/qpid/store/MessageStorePlugin.cpp b/qpid/cpp/src/qpid/store/MessageStorePlugin.cpp index c6b0e1a53a..b876bd6b6d 100644 --- a/qpid/cpp/src/qpid/store/MessageStorePlugin.cpp +++ b/qpid/cpp/src/qpid/store/MessageStorePlugin.cpp @@ -136,12 +136,6 @@ MessageStorePlugin::providerAvailable(const std::string name, QPID_LOG(warning, "Storage provider " << name << " duplicate; ignored."); } -void -MessageStorePlugin::truncateInit(const bool /*saveStoreContent*/) -{ - QPID_LOG(info, "Store: truncateInit"); -} - /** * Record the existence of a durable queue diff --git a/qpid/cpp/src/qpid/store/MessageStorePlugin.h b/qpid/cpp/src/qpid/store/MessageStorePlugin.h index 4a9bb2aecb..2631f592a3 100644 --- a/qpid/cpp/src/qpid/store/MessageStorePlugin.h +++ b/qpid/cpp/src/qpid/store/MessageStorePlugin.h @@ -82,18 +82,6 @@ class MessageStorePlugin : /** * @name Methods inherited from qpid::broker::MessageStore */ - //@{ - /** - * If called before recovery, will discard the database and reinitialize - * using an empty store. 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, the store's contents should be - * saved to a backup location before - * reinitializing the store content. - */ - virtual void truncateInit(const bool saveStoreContent = false); /** * Record the existence of a durable queue diff --git a/qpid/cpp/src/qpid/store/StorageProvider.h b/qpid/cpp/src/qpid/store/StorageProvider.h index d162cc58ec..de12ffb869 100644 --- a/qpid/cpp/src/qpid/store/StorageProvider.h +++ b/qpid/cpp/src/qpid/store/StorageProvider.h @@ -143,20 +143,6 @@ public: /** * @name Methods inherited from qpid::broker::MessageStore */ - //@{ - /** - * If called after init() but before recovery, will discard the database - * and reinitialize using an empty store dir. If @a pushDownStoreFiles - * is true, the content of the store dir will be moved to a backup dir - * inside the store dir. This is used when cluster nodes recover and must - * get thier content from a cluster sync rather than directly fromt the - * store. - * - * @param pushDownStoreFiles If true, will move content of the store dir - * into a subdir, leaving the store dir - * otherwise empty. - */ - virtual void truncateInit(const bool pushDownStoreFiles = false) = 0; /** * Record the existence of a durable queue diff --git a/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp b/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp index 586aaaf980..919bdc6eab 100644 --- a/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp +++ b/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp @@ -108,20 +108,6 @@ public: /** * @name Methods inherited from qpid::broker::MessageStore */ - //@{ - /** - * If called after init() but before recovery, will discard the database - * and reinitialize using an empty store dir. If @a pushDownStoreFiles - * is true, the content of the store dir will be moved to a backup dir - * inside the store dir. This is used when cluster nodes recover and must - * get their content from a cluster sync rather than directly from the - * store. - * - * @param pushDownStoreFiles If true, will move content of the store dir - * into a subdir, leaving the store dir - * otherwise empty. - */ - virtual void truncateInit(const bool pushDownStoreFiles = false); /** * Record the existence of a durable queue @@ -466,11 +452,6 @@ MSSqlClfsProvider::activate(MessageStorePlugin &store) QPID_LOG(info, "MS SQL/CLFS Provider is up"); } -void -MSSqlClfsProvider::truncateInit(const bool pushDownStoreFiles) -{ -} - void MSSqlClfsProvider::create(PersistableQueue& queue, const qpid::framing::FieldTable& /*args needed for jrnl*/) diff --git a/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp b/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp index 7f22db3d02..1432cc8fca 100644 --- a/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp +++ b/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp @@ -92,20 +92,6 @@ public: /** * @name Methods inherited from qpid::broker::MessageStore */ - //@{ - /** - * If called after init() but before recovery, will discard the database - * and reinitialize using an empty store dir. If @a pushDownStoreFiles - * is true, the content of the store dir will be moved to a backup dir - * inside the store dir. This is used when cluster nodes recover and must - * get thier content from a cluster sync rather than directly fromt the - * store. - * - * @param pushDownStoreFiles If true, will move content of the store dir - * into a subdir, leaving the store dir - * otherwise empty. - */ - virtual void truncateInit(const bool pushDownStoreFiles = false); /** * Record the existence of a durable queue @@ -391,11 +377,6 @@ MSSqlProvider::activate(MessageStorePlugin &store) QPID_LOG(info, "MS SQL Provider is up"); } -void -MSSqlProvider::truncateInit(const bool pushDownStoreFiles) -{ -} - void MSSqlProvider::create(PersistableQueue& queue, const qpid::framing::FieldTable& /*args needed for jrnl*/) -- cgit v1.2.1