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 2008/11/17 18:03:43 UTC
svn commit: r718277 - in /incubator/qpid/trunk/qpid/cpp/src:
qpid/broker/Queue.h qpid/client/QueueOptions.cpp qpid/client/QueueOptions.h
qpid/sys/ssl/check.cpp tests/QueueOptionsTest.cpp tests/QueueTest.cpp
Author: aconway
Date: Mon Nov 17 09:03:43 2008
New Revision: 718277
URL: http://svn.apache.org/viewvc?rev=718277&view=rev
Log:
Remove optimistic consume options. Better default message for SSL errors.
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ssl/check.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/QueueOptionsTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h?rev=718277&r1=718276&r2=718277&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h Mon Nov 17 09:03:43 2008
@@ -76,7 +76,6 @@
OwnershipToken* exclusive;
bool noLocal;
bool lastValueQueue;
- bool optimisticConsume;
bool persistLastNode;
bool inLastNodeFailure;
std::string traceId;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.cpp?rev=718277&r1=718276&r2=718277&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.cpp Mon Nov 17 09:03:43 2008
@@ -36,7 +36,6 @@
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::strOptimisticConsume("qpid.optimistic_consume");
const std::string QueueOptions::strPersistLastNode("qpid.persist_last_node");
const std::string QueueOptions::strLVQMatchProperty("qpid.LVQ_key");
@@ -71,11 +70,6 @@
}
-void QueueOptions::setOptimisticConsume()
-{
- setInt(strOptimisticConsume, 1);
-}
-
void QueueOptions::setPersistLastNode()
{
setInt(strPersistLastNode, 1);
@@ -102,11 +96,6 @@
erase(strTypeKey);
}
-void QueueOptions::clearOptimisticConsume()
-{
- erase(strOptimisticConsume);
-}
-
void QueueOptions::clearPersistLastNode()
{
erase(strPersistLastNode);
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.h?rev=718277&r1=718276&r2=718277&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.h Mon Nov 17 09:03:43 2008
@@ -54,12 +54,6 @@
void setSizePolicy(QueueSizePolicy sp, uint64_t maxSize, uint32_t maxCount );
/**
- * Enables optimistic consume allowing the consumer to dequeue the message before the
- * broker has safe stored it.
- */
- void setOptimisticConsume();
-
- /**
* 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.
*/
@@ -76,11 +70,6 @@
void clearSizePolicy();
/**
- * Clear Optimistic Consume Policy
- */
- void clearOptimisticConsume();
-
- /**
* Clear Persist Last Node Policy
*/
void clearPersistLastNode();
@@ -103,7 +92,6 @@
static const std::string strRING;
static const std::string strRING_STRICT;
static const std::string strLastValueQueue;
- static const std::string strOptimisticConsume;
static const std::string strPersistLastNode;
static const std::string strLVQMatchProperty;
};
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ssl/check.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ssl/check.cpp?rev=718277&r1=718276&r2=718277&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ssl/check.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ssl/check.cpp Mon Nov 17 09:03:43 2008
@@ -35,6 +35,7 @@
const std::string SSL_ERROR_BAD_CERT_ALERT_STR = "SSL peer cannot verify your certificate.";
const std::string SEC_ERROR_BAD_DATABASE_STR = "Security library: bad database.";
const std::string SSL_ERROR_NO_CERTIFICATE_STR = "Unable to find the certificate or key necessary for authentication.";
+const std::string SSL_ERROR_UNKNOWN = "Unknown NSS error code.";
ErrorString::ErrorString() : code(PR_GetError()), buffer(new char[PR_GetErrorTextLength()]), used(PR_GetErrorText(buffer)) {}
@@ -55,6 +56,7 @@
case SSL_ERROR_BAD_CERT_ALERT: msg = SSL_ERROR_BAD_CERT_ALERT_STR; break;
case SEC_ERROR_BAD_DATABASE: msg = SEC_ERROR_BAD_DATABASE_STR; break;
case SSL_ERROR_NO_CERTIFICATE: msg = SSL_ERROR_NO_CERTIFICATE_STR; break;
+ default: msg = SSL_ERROR_UNKNOWN; break;
}
}
return str(format("%1% [%2%]") % msg % code);
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/QueueOptionsTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/QueueOptionsTest.cpp?rev=718277&r1=718276&r2=718277&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/QueueOptionsTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/QueueOptionsTest.cpp Mon Nov 17 09:03:43 2008
@@ -34,48 +34,44 @@
{
QueueOptions ft;
- ft.setSizePolicy(REJECT,1,2);
+ ft.setSizePolicy(REJECT,1,2);
BOOST_CHECK(QueueOptions::strREJECT == ft.getAsString(QueueOptions::strTypeKey));
BOOST_CHECK(1 == ft.getAsInt(QueueOptions::strMaxSizeKey));
BOOST_CHECK(2 == ft.getAsInt(QueueOptions::strMaxCountKey));
- ft.setSizePolicy(FLOW_TO_DISK,0,2);
+ ft.setSizePolicy(FLOW_TO_DISK,0,2);
BOOST_CHECK(QueueOptions::strFLOW_TO_DISK == ft.getAsString(QueueOptions::strTypeKey));
BOOST_CHECK(1 == ft.getAsInt(QueueOptions::strMaxSizeKey));
BOOST_CHECK(2 == ft.getAsInt(QueueOptions::strMaxCountKey));
- ft.setSizePolicy(RING,1,0);
+ ft.setSizePolicy(RING,1,0);
BOOST_CHECK(QueueOptions::strRING == ft.getAsString(QueueOptions::strTypeKey));
- ft.setSizePolicy(RING_STRICT,1,0);
+ ft.setSizePolicy(RING_STRICT,1,0);
BOOST_CHECK(QueueOptions::strRING_STRICT == ft.getAsString(QueueOptions::strTypeKey));
- ft.clearSizePolicy();
- BOOST_CHECK(!ft.isSet(QueueOptions::strTypeKey));
- BOOST_CHECK(!ft.isSet(QueueOptions::strMaxSizeKey));
- BOOST_CHECK(!ft.isSet(QueueOptions::strMaxCountKey));
+ ft.clearSizePolicy();
+ BOOST_CHECK(!ft.isSet(QueueOptions::strTypeKey));
+ BOOST_CHECK(!ft.isSet(QueueOptions::strMaxSizeKey));
+ BOOST_CHECK(!ft.isSet(QueueOptions::strMaxCountKey));
}
QPID_AUTO_TEST_CASE(testFlags)
{
QueueOptions ft;
- ft.setOptimisticConsume();
- ft.setPersistLastNode();
+ ft.setPersistLastNode();
ft.setOrdering(LVQ);
- BOOST_CHECK(1 == ft.getAsInt(QueueOptions::strOptimisticConsume));
BOOST_CHECK(1 == ft.getAsInt(QueueOptions::strPersistLastNode));
BOOST_CHECK(1 == ft.getAsInt(QueueOptions::strLastValueQueue));
- ft.clearOptimisticConsume();
- ft.clearPersistLastNode();
+ ft.clearPersistLastNode();
ft.setOrdering(FIFO);
- BOOST_CHECK(!ft.isSet(QueueOptions::strOptimisticConsume));
- BOOST_CHECK(!ft.isSet(QueueOptions::strPersistLastNode));
- BOOST_CHECK(!ft.isSet(QueueOptions::strLastValueQueue));
+ BOOST_CHECK(!ft.isSet(QueueOptions::strPersistLastNode));
+ BOOST_CHECK(!ft.isSet(QueueOptions::strLastValueQueue));
}
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp?rev=718277&r1=718276&r2=718277&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp Mon Nov 17 09:03:43 2008
@@ -289,38 +289,6 @@
};
-QPID_AUTO_TEST_CASE(testOptimisticConsume){
-
- client::QueueOptions args;
- args.setPersistLastNode();
-
- // set queue mode
-
- TestMessageStoreOC store;
- Queue::shared_ptr queue(new Queue("my-queue", true, &store));
- queue->setLastNodeFailure();
-
- intrusive_ptr<Message> msg1 = create_message("e", "A");
- msg1->forcePersistent();
-
- //change mode
- args.setOptimisticConsume();
- queue->configure(args);
-
- //enqueue 1 message
- queue->deliver(msg1);
-
- TestConsumer::shared_ptr consumer(new TestConsumer());
- queue->consume(consumer);
- queue->dispatch(consumer);
- if (!consumer->received)
- sleep(2);
-
- BOOST_CHECK_EQUAL(msg1.get(), consumer->last.get());
- BOOST_CHECK_EQUAL(uint32_t(0), queue->getMessageCount());
-
-}
-
QPID_AUTO_TEST_CASE(testLVQOrdering){
client::QueueOptions args;