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 2009/11/20 16:57:13 UTC
svn commit: r882623 - in /qpid/trunk/qpid/cpp/src:
qpid/broker/MessageStore.h qpid/broker/MessageStoreModule.cpp
qpid/broker/MessageStoreModule.h qpid/broker/NullMessageStore.cpp
qpid/broker/NullMessageStore.h tests/QueueTest.cpp
Author: aconway
Date: Fri Nov 20 15:57:10 2009
New Revision: 882623
URL: http://svn.apache.org/viewvc?rev=882623&view=rev
Log:
Revert "Added getStoreDir() to MessageStore"
This reverts revision 882218 which broke the Windows.
It also assumes that a MessageStore has an associated directory, which
is not the case for all stores. We need a portable way to associate
extra state with a store.
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
qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp
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=882623&r1=882622&r2=882623&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h Fri Nov 20 15:57:10 2009
@@ -192,8 +192,6 @@
*/
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(){}
};
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=882623&r1=882622&r2=882623&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp Fri Nov 20 15:57:10 2009
@@ -176,6 +176,4 @@
return NullMessageStore::isNullStore(store.get());
}
-std::string MessageStoreModule::getStoreDir() const { return store->getStoreDir(); }
-
}} // namespace qpid::broker
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=882623&r1=882622&r2=882623&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h Fri Nov 20 15:57:10 2009
@@ -77,7 +77,6 @@
void flush(const qpid::broker::PersistableQueue& queue);
bool isNull() const;
- virtual std::string getStoreDir() const;
~MessageStoreModule();
};
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=882623&r1=882622&r2=882623&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp Fri Nov 20 15:57:10 2009
@@ -162,5 +162,4 @@
}
}
-std::string NullMessageStore::getStoreDir() const { return std::string(); }
}} // namespace qpid::broker
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=882623&r1=882622&r2=882623&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h Fri Nov 20 15:57:10 2009
@@ -89,8 +89,6 @@
QPID_BROKER_EXTERN virtual bool isNull() const;
static bool isNullStore(const MessageStore*);
-
- std::string getStoreDir() const;
};
}
Modified: qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp?rev=882623&r1=882622&r2=882623&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp Fri Nov 20 15:57:10 2009
@@ -409,8 +409,6 @@
void collectPreparedXids(std::set<std::string>& out) { out.insert(prepared.begin(), prepared.end()); }
void recover(RecoveryManager&) {}
-
- std::string getStoreDir() const { return std::string(); }
};
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org