diff options
author | Alan Conway <aconway@apache.org> | 2009-11-19 17:50:34 +0000 |
---|---|---|
committer | Alan Conway <aconway@apache.org> | 2009-11-19 17:50:34 +0000 |
commit | f46585b940fc4b320fa28535b05e5bc6e89228cf (patch) | |
tree | 454b17188da7ea7e89950424478edbb31e728afd /qpid/cpp/src | |
parent | d4b4744b393d6228ccb5488a01792aeab5bd4865 (diff) | |
download | qpid-python-f46585b940fc4b320fa28535b05e5bc6e89228cf.tar.gz |
Added getStoreDir() to MessageStore
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@882218 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r-- | qpid/cpp/src/qpid/broker/MessageStore.h | 2 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/broker/MessageStoreModule.cpp | 2 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/broker/MessageStoreModule.h | 1 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/broker/NullMessageStore.cpp | 1 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/broker/NullMessageStore.h | 2 | ||||
-rw-r--r-- | qpid/cpp/src/tests/QueueTest.cpp | 2 |
6 files changed, 10 insertions, 0 deletions
diff --git a/qpid/cpp/src/qpid/broker/MessageStore.h b/qpid/cpp/src/qpid/broker/MessageStore.h index 143e860ec7..f507e2a989 100644 --- a/qpid/cpp/src/qpid/broker/MessageStore.h +++ b/qpid/cpp/src/qpid/broker/MessageStore.h @@ -192,6 +192,8 @@ class MessageStore : public TransactionalStore, public Recoverable { */ virtual uint32_t outstandingQueueAIO(const PersistableQueue& queue) = 0; + /**@return store directory or empty string if this is a null store. */ + virtual std::string getStoreDir() const = 0; virtual ~MessageStore(){} }; diff --git a/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp b/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp index 5f7cceebd3..9a3a697547 100644 --- a/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp +++ b/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp @@ -176,4 +176,6 @@ bool MessageStoreModule::isNull() const return NullMessageStore::isNullStore(store.get()); } +std::string MessageStoreModule::getStoreDir() const { return store->getStoreDir(); } + }} // namespace qpid::broker diff --git a/qpid/cpp/src/qpid/broker/MessageStoreModule.h b/qpid/cpp/src/qpid/broker/MessageStoreModule.h index 56b5a3c1ae..279090a2f9 100644 --- a/qpid/cpp/src/qpid/broker/MessageStoreModule.h +++ b/qpid/cpp/src/qpid/broker/MessageStoreModule.h @@ -77,6 +77,7 @@ class MessageStoreModule : public MessageStore void flush(const qpid::broker::PersistableQueue& queue); bool isNull() const; + virtual std::string getStoreDir() const; ~MessageStoreModule(); }; diff --git a/qpid/cpp/src/qpid/broker/NullMessageStore.cpp b/qpid/cpp/src/qpid/broker/NullMessageStore.cpp index 6339b655f8..d94aa321eb 100644 --- a/qpid/cpp/src/qpid/broker/NullMessageStore.cpp +++ b/qpid/cpp/src/qpid/broker/NullMessageStore.cpp @@ -162,4 +162,5 @@ bool NullMessageStore::isNullStore(const MessageStore* store) } } +std::string NullMessageStore::getStoreDir() const { return std::string(); } }} // namespace qpid::broker diff --git a/qpid/cpp/src/qpid/broker/NullMessageStore.h b/qpid/cpp/src/qpid/broker/NullMessageStore.h index e148ec4d51..8615258fc9 100644 --- a/qpid/cpp/src/qpid/broker/NullMessageStore.h +++ b/qpid/cpp/src/qpid/broker/NullMessageStore.h @@ -89,6 +89,8 @@ class NullMessageStore : public MessageStore QPID_BROKER_EXTERN virtual bool isNull() const; static bool isNullStore(const MessageStore*); + + std::string getStoreDir() const; }; } diff --git a/qpid/cpp/src/tests/QueueTest.cpp b/qpid/cpp/src/tests/QueueTest.cpp index 6c2adf5c87..cda9728dd4 100644 --- a/qpid/cpp/src/tests/QueueTest.cpp +++ b/qpid/cpp/src/tests/QueueTest.cpp @@ -409,6 +409,8 @@ class TestMessageStoreOC : public MessageStore void collectPreparedXids(std::set<std::string>& out) { out.insert(prepared.begin(), prepared.end()); } void recover(RecoveryManager&) {} + + std::string getStoreDir() const { return std::string(); } }; |