From 76dc7ca3e92919d83932e66906425067652e76f5 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Mon, 13 Oct 2008 21:24:40 +0000 Subject: Field Table API: changed the getInt() & getString() operations which are inconsistent with all the other getXXX() functions to getAsString()/getAsInt() to better indicate their real function. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@704255 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/Message.cpp | 4 ++-- cpp/src/qpid/broker/Queue.cpp | 10 +++++----- cpp/src/qpid/broker/XmlExchange.cpp | 2 +- cpp/src/qpid/framing/FieldTable.cpp | 12 ++++++------ cpp/src/qpid/framing/FieldTable.h | 9 +++++---- cpp/src/qpid/management/ManagementBroker.cpp | 2 +- 6 files changed, 20 insertions(+), 19 deletions(-) (limited to 'cpp/src/qpid') diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/src/qpid/broker/Message.cpp index 0e37dabe8a..0302bc1dbd 100644 --- a/cpp/src/qpid/broker/Message.cpp +++ b/cpp/src/qpid/broker/Message.cpp @@ -273,7 +273,7 @@ bool Message::isExcluded(const std::vector& excludes) const { const FieldTable* headers = getApplicationHeaders(); if (headers) { - std::string traceStr = headers->getString(X_QPID_TRACE); + std::string traceStr = headers->getAsString(X_QPID_TRACE); if (traceStr.size()) { std::vector trace = split(traceStr, ", "); @@ -294,7 +294,7 @@ void Message::addTraceId(const std::string& id) sys::Mutex::ScopedLock l(lock); if (isA()) { FieldTable& headers = getProperties()->getApplicationHeaders(); - std::string trace = headers.getString(X_QPID_TRACE); + std::string trace = headers.getAsString(X_QPID_TRACE); if (trace.empty()) { headers.setString(X_QPID_TRACE, id); } else if (trace.find(id) == std::string::npos) { diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp index e608ef270b..355f822b57 100644 --- a/cpp/src/qpid/broker/Queue.cpp +++ b/cpp/src/qpid/broker/Queue.cpp @@ -206,7 +206,7 @@ bool Queue::acquire(const QueuedMessage& msg) { || (lastValueQueue && i->position == msg.position && i->payload.get() == msg.payload.get())) { if (lastValueQueue){ const framing::FieldTable* ft = msg.payload->getApplicationHeaders(); - string key = ft->getString(qpidVQMatchProperty); + string key = ft->getAsString(qpidVQMatchProperty); lvq.erase(key); } messages.erase(i); @@ -461,7 +461,7 @@ void Queue::popMsg(QueuedMessage& qmsg) { if (lastValueQueue){ const framing::FieldTable* ft = qmsg.payload->getApplicationHeaders(); - string key = ft->getString(qpidVQMatchProperty); + string key = ft->getAsString(qpidVQMatchProperty); lvq.erase(key); } messages.pop_front(); @@ -478,7 +478,7 @@ void Queue::push(boost::intrusive_ptr& msg){ LVQ::iterator i; if (lastValueQueue){ const framing::FieldTable* ft = msg->getApplicationHeaders(); - string key = ft->getString(qpidVQMatchProperty); + string key = ft->getAsString(qpidVQMatchProperty); i = lvq.find(key); if (i == lvq.end()){ @@ -625,8 +625,8 @@ void Queue::configure(const FieldTable& _settings) persistLastNode= _settings.get(qpidPersistLastNode); if (persistLastNode) QPID_LOG(debug, "Configured queue to Persist data if cluster fails to one node"); - traceId = _settings.getString(qpidTraceIdentity); - std::string excludeList = _settings.getString(qpidTraceExclude); + traceId = _settings.getAsString(qpidTraceIdentity); + std::string excludeList = _settings.getAsString(qpidTraceExclude); if (excludeList.size()) { split(traceExclude, excludeList, ", "); } diff --git a/cpp/src/qpid/broker/XmlExchange.cpp b/cpp/src/qpid/broker/XmlExchange.cpp index 5095e4a564..0ff5b2fdbf 100644 --- a/cpp/src/qpid/broker/XmlExchange.cpp +++ b/cpp/src/qpid/broker/XmlExchange.cpp @@ -78,7 +78,7 @@ XmlExchange::XmlExchange(const std::string& _name, bool _durable, bool XmlExchange::bind(Queue::shared_ptr queue, const string& routingKey, const FieldTable* bindingArguments) { - string queryText = bindingArguments->getString("xquery"); + string queryText = bindingArguments->getAsString("xquery"); try { RWlock::ScopedWlock l(lock); diff --git a/cpp/src/qpid/framing/FieldTable.cpp b/cpp/src/qpid/framing/FieldTable.cpp index 013bcd1797..cf0e03180c 100644 --- a/cpp/src/qpid/framing/FieldTable.cpp +++ b/cpp/src/qpid/framing/FieldTable.cpp @@ -127,18 +127,14 @@ T getValue(const FieldTable::ValuePtr value) return value->get(); } -std::string FieldTable::getString(const std::string& name) const { +std::string FieldTable::getAsString(const std::string& name) const { return getValue(get(name)); } -int FieldTable::getInt(const std::string& name) const { +int FieldTable::getAsInt(const std::string& name) const { return getValue(get(name)); } -//uint64_t FieldTable::getTimestamp(const std::string& name) const { -// return getValue(name); -//} - uint64_t FieldTable::getAsUInt64(const std::string& name) const { return static_cast( getValue(get(name))); } @@ -176,6 +172,10 @@ bool FieldTable::getDouble(const std::string& name, double& value) const { return getRawFixedWidthValue(get(name), value); } +//uint64_t FieldTable::getTimestamp(const std::string& name) const { +// return getValue(name); +//} + void FieldTable::encode(Buffer& buffer) const{ buffer.putLong(encodedSize() - 4); buffer.putLong(values.size()); diff --git a/cpp/src/qpid/framing/FieldTable.h b/cpp/src/qpid/framing/FieldTable.h index f4f130743b..66103448a7 100644 --- a/cpp/src/qpid/framing/FieldTable.h +++ b/cpp/src/qpid/framing/FieldTable.h @@ -72,16 +72,17 @@ class FieldTable void setDouble(const std::string& name, double value); //void setDecimal(string& name, xxx& value); - std::string getString(const std::string& name) const; - int getInt(const std::string& name) const; -// uint64_t getTimestamp(const std::string& name) const; + int getAsInt(const std::string& name) const; uint64_t getAsUInt64(const std::string& name) const; int64_t getAsInt64(const std::string& name) const; + std::string getAsString(const std::string& name) const; + bool getTable(const std::string& name, FieldTable& value) const; bool getArray(const std::string& name, Array& value) const; bool getFloat(const std::string& name, float& value) const; bool getDouble(const std::string& name, double& value) const; -// void getDecimal(string& name, xxx& value); + //bool getTimestamp(const std::string& name, uint64_t& value) const; + //bool getDecimal(string& name, xxx& value); void erase(const std::string& name); diff --git a/cpp/src/qpid/management/ManagementBroker.cpp b/cpp/src/qpid/management/ManagementBroker.cpp index 03a9dee94a..4a9882d827 100644 --- a/cpp/src/qpid/management/ManagementBroker.cpp +++ b/cpp/src/qpid/management/ManagementBroker.cpp @@ -1083,7 +1083,7 @@ size_t ManagementBroker::validateTableSchema(Buffer& inBuffer) ft.decode(inBuffer); if (!ft.isSet("argCount")) return 0; - int argCount = ft.getInt("argCount"); + int argCount = ft.getAsInt("argCount"); for (int mIdx = 0; mIdx < argCount; mIdx++) { FieldTable aft; aft.decode(inBuffer); -- cgit v1.2.1