QPID-5197: Remove obsolete --cluster-durable/persistLastNode options in C++ and python.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1529198 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 0 insertions, 40 deletions

diff --git a/qpid/cpp/src/qpid/client/QueueOptions.cpp b/qpid/cpp/src/qpid/client/QueueOptions.cpp
index 460f3f5490..e589bd76cd 100644
--- a/qpid/cpp/src/qpid/client/QueueOptions.cpp
+++ b/qpid/cpp/src/qpid/client/QueueOptions.cpp
@@ -38,7 +38,6 @@ const std::string QueueOptions::strFLOW_TO_DISK("flow_to_disk");
 const std::string QueueOptions::strRING("ring");
 const std::string QueueOptions::strRING_STRICT("ring_strict");
 const std::string QueueOptions::strLastValueQueue("qpid.last_value_queue");
-const std::string QueueOptions::strPersistLastNode("qpid.persist_last_node");
 const std::string QueueOptions::strLVQMatchProperty("qpid.LVQ_key");
 const std::string QueueOptions::strLastValueQueueNoBrowse("qpid.last_value_queue_no_browse");
 const std::string QueueOptions::strQueueEventMode("qpid.queue_event_generation");
@@ -74,11 +73,6 @@ void QueueOptions::setSizePolicy(QueueSizePolicy sp, uint64_t maxSize, uint32_t
 }
 
 
-void QueueOptions::setPersistLastNode()
-{
-    setInt(strPersistLastNode, 1);
-}
-
 void QueueOptions::setOrdering(QueueOrderingPolicy op)
 {
     if (op == LVQ){
@@ -102,11 +96,6 @@ void QueueOptions::clearSizePolicy()
     erase(strTypeKey);
 }
 
-void QueueOptions::clearPersistLastNode()
-{
-    erase(strPersistLastNode);
-}
-
 void QueueOptions::clearOrdering()
 {
     erase(strLastValueQueue);
diff --git a/qpid/cpp/src/qpid/client/QueueOptions.h b/qpid/cpp/src/qpid/client/QueueOptions.h
index 3984b63fdd..a2f30a50b5 100644
--- a/qpid/cpp/src/qpid/client/QueueOptions.h
+++ b/qpid/cpp/src/qpid/client/QueueOptions.h
@@ -56,12 +56,6 @@ class QPID_CLIENT_CLASS_EXTERN QueueOptions: public framing::FieldTable
     QPID_CLIENT_EXTERN void setSizePolicy(QueueSizePolicy sp, uint64_t maxSize, uint32_t maxCount );
 
     /**
-     * Enables the persisting of a queue to the store module when a cluster fails down to it's last
-     * node. Does so optimistically. Will start persisting when cluster count >1 again.
-     */
-    QPID_CLIENT_EXTERN void setPersistLastNode();
-
-    /**
      * Sets the odering policy on the Queue, default ordering is FIFO.
      */
     QPID_CLIENT_EXTERN void setOrdering(QueueOrderingPolicy op);
@@ -72,11 +66,6 @@ class QPID_CLIENT_CLASS_EXTERN QueueOptions: public framing::FieldTable
     QPID_CLIENT_EXTERN void clearSizePolicy();
 
     /**
-     * Clear Persist Last Node Policy
-     */
-    QPID_CLIENT_EXTERN void clearPersistLastNode();
-
-    /**
      * get the key used match LVQ in args for message transfer
      */
     QPID_CLIENT_EXTERN void getLVQKey(std::string& key);
@@ -116,7 +105,6 @@ class QPID_CLIENT_CLASS_EXTERN QueueOptions: public framing::FieldTable
     static QPID_CLIENT_EXTERN const std::string strRING;
     static QPID_CLIENT_EXTERN const std::string strRING_STRICT;
     static QPID_CLIENT_EXTERN const std::string strLastValueQueue;
-    static QPID_CLIENT_EXTERN const std::string strPersistLastNode;
     static QPID_CLIENT_EXTERN const std::string strLVQMatchProperty;
     static QPID_CLIENT_EXTERN const std::string strLastValueQueueNoBrowse;
     static QPID_CLIENT_EXTERN const std::string strQueueEventMode;
diff --git a/qpid/cpp/src/tests/QueueOptionsTest.cpp b/qpid/cpp/src/tests/QueueOptionsTest.cpp
index f2fbaba2c1..bdb83d7d22 100644
--- a/qpid/cpp/src/tests/QueueOptionsTest.cpp
+++ b/qpid/cpp/src/tests/QueueOptionsTest.cpp
@@ -63,16 +63,9 @@ QPID_AUTO_TEST_CASE(testFlags)
 {
     QueueOptions ft;
 
-    ft.setPersistLastNode();
     ft.setOrdering(LVQ);
-
-    BOOST_CHECK(1 == ft.getAsInt(QueueOptions::strPersistLastNode));
     BOOST_CHECK(1 == ft.getAsInt(QueueOptions::strLastValueQueue));
-
-    ft.clearPersistLastNode();
     ft.setOrdering(FIFO);
-
-    BOOST_CHECK(!ft.isSet(QueueOptions::strPersistLastNode));
     BOOST_CHECK(!ft.isSet(QueueOptions::strLastValueQueue));
 
 }
@@ -87,16 +80,6 @@ QPID_AUTO_TEST_CASE(testSetOrdering)
 
 }
 
-QPID_AUTO_TEST_CASE(testClearPersistLastNode)
-{
-    //ensure clear works even if not preceded by the setting on the
-    //option
-    QueueOptions ft;
-    ft.clearPersistLastNode();
-    BOOST_CHECK(!ft.isSet(QueueOptions::strPersistLastNode));
-}
-
-
 QPID_AUTO_TEST_SUITE_END()
 
 }} // namespace qpid::tests