From 73f6113a0343b3b0a044897a504e5d70614cb354 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Thu, 1 May 2008 22:20:24 +0000 Subject: Boost's string split function causes problems on older versions of the library. Replaced with homegrown equivalent. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@652689 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/Makefile.am | 2 + qpid/cpp/src/qpid/StringUtils.cpp | 50 +++++++++++++++++++++++ qpid/cpp/src/qpid/StringUtils.h | 43 ++++++++++++++++++++ qpid/cpp/src/qpid/broker/Message.cpp | 6 +-- qpid/cpp/src/qpid/broker/Queue.cpp | 7 ++-- qpid/cpp/src/tests/Makefile.am | 1 + qpid/cpp/src/tests/StringUtils.cpp | 77 ++++++++++++++++++++++++++++++++++++ 7 files changed, 178 insertions(+), 8 deletions(-) create mode 100644 qpid/cpp/src/qpid/StringUtils.cpp create mode 100644 qpid/cpp/src/qpid/StringUtils.h create mode 100644 qpid/cpp/src/tests/StringUtils.cpp diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am index 1a66b6051b..f1585b1c5e 100644 --- a/qpid/cpp/src/Makefile.am +++ b/qpid/cpp/src/Makefile.am @@ -203,6 +203,7 @@ libqpidcommon_la_SOURCES = \ qpid/assert.cpp qpid/assert.h \ qpid/Exception.cpp \ qpid/Plugin.cpp \ + qpid/StringUtils.cpp \ qpid/Url.cpp \ qpid/sys/AggregateOutput.cpp \ qpid/sys/AsynchIOHandler.cpp \ @@ -326,6 +327,7 @@ nobase_include_HEADERS = \ qpid/RangeSet.h \ qpid/RefCounted.h \ qpid/SharedObject.h \ + qpid/StringUtils.h \ qpid/Url.h \ qpid/InlineVector.h \ qpid/InlineAllocator.h \ diff --git a/qpid/cpp/src/qpid/StringUtils.cpp b/qpid/cpp/src/qpid/StringUtils.cpp new file mode 100644 index 0000000000..17eb141e12 --- /dev/null +++ b/qpid/cpp/src/qpid/StringUtils.cpp @@ -0,0 +1,50 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +#include "StringUtils.h" + +namespace qpid { + +using std::string; +using std::vector; + +void split(vector& out, const string& in, const string& delims) +{ + string::size_type start = in.find_first_not_of(delims); + if (start == string::npos) return; + + string::size_type end = in.find_first_of(delims, start); + while (end != string::npos) { + out.push_back(in.substr(start, end - start)); + start = in.find_first_not_of(delims, end); + if (start == string::npos) return; + end = in.find_first_of(delims, start); + } + out.push_back(in.substr(start)); +} + +vector split(const string& in, const string& delims) +{ + vector out; + split(out, in, delims); + return out; +} + +} // namespace qpid diff --git a/qpid/cpp/src/qpid/StringUtils.h b/qpid/cpp/src/qpid/StringUtils.h new file mode 100644 index 0000000000..3120e43334 --- /dev/null +++ b/qpid/cpp/src/qpid/StringUtils.h @@ -0,0 +1,43 @@ +#ifndef QPID_STRINGUTILS_H +#define QPID_STRINGUTILS_H + +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +#include +#include + +namespace qpid { + +/** + * Split 'in' into words using delimiters in 'delims' and put + * resulting strings into 'out' vector. + */ +void split(std::vector& out, const std::string& in, const std::string& delims); +/** + * Split 'in' into words using delimiters in 'delims' and return the + * resulting strings in a vector. + */ +std::vector split(const std::string& in, const std::string& delims); + +} // namespace qpid + +#endif /*!QPID_STRINGUTILS_H*/ diff --git a/qpid/cpp/src/qpid/broker/Message.cpp b/qpid/cpp/src/qpid/broker/Message.cpp index 27076ccad8..1b1cec9f85 100644 --- a/qpid/cpp/src/qpid/broker/Message.cpp +++ b/qpid/cpp/src/qpid/broker/Message.cpp @@ -21,6 +21,7 @@ #include "Message.h" #include "ExchangeRegistry.h" +#include "qpid/StringUtils.h" #include "qpid/framing/frame_functors.h" #include "qpid/framing/FieldTable.h" #include "qpid/framing/MessageTransferBody.h" @@ -28,8 +29,6 @@ #include "qpid/framing/SequenceNumber.h" #include "qpid/framing/TypeFilter.h" #include "qpid/log/Statement.h" -#include -#include using boost::intrusive_ptr; using namespace qpid::broker; @@ -259,8 +258,7 @@ bool Message::isExcluded(const std::vector& excludes) const if (headers) { std::string traceStr = headers->getString(X_QPID_TRACE); if (traceStr.size()) { - std::vector trace; - boost::split(trace, traceStr, boost::is_any_of(", ") ); + std::vector trace = split(traceStr, ", "); for (std::vector::const_iterator i = excludes.begin(); i != excludes.end(); i++) { for (std::vector::const_iterator j = trace.begin(); j != trace.end(); j++) { diff --git a/qpid/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp index 06009a208d..4ac061ac25 100644 --- a/qpid/cpp/src/qpid/broker/Queue.cpp +++ b/qpid/cpp/src/qpid/broker/Queue.cpp @@ -26,6 +26,7 @@ #include "MessageStore.h" #include "QueueRegistry.h" +#include "qpid/StringUtils.h" #include "qpid/log/Statement.h" #include "qpid/framing/reply_exceptions.h" #include "qpid/sys/Monitor.h" @@ -37,8 +38,6 @@ #include #include -#include -#include using namespace qpid::broker; using namespace qpid::sys; @@ -517,9 +516,9 @@ void Queue::configure(const FieldTable& _settings) traceId = _settings.getString(qpidTraceIdentity); std::string excludeList = _settings.getString(qpidTraceExclude); if (excludeList.size()) { - boost::split(traceExclude, excludeList, boost::is_any_of(", ") ); + split(traceExclude, excludeList, ", "); } - QPID_LOG(info, "Configured queue " << getName() << " with qpid.trace.id='" << traceId + QPID_LOG(debug, "Configured queue " << getName() << " with qpid.trace.id='" << traceId << "' and qpid.trace.exclude='"<< excludeList << "' i.e. " << traceExclude.size() << " elements"); if (mgmtObject.get() != 0) diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am index bd020e4f77..f215c9f0b4 100644 --- a/qpid/cpp/src/tests/Makefile.am +++ b/qpid/cpp/src/tests/Makefile.am @@ -41,6 +41,7 @@ unit_test_SOURCES= unit_test.cpp unit_test.h \ ISList.cpp IList.cpp \ ClientSessionTest.cpp \ SequenceSet.cpp \ + StringUtils.cpp \ IncompleteMessageList.cpp \ RangeSet.cpp diff --git a/qpid/cpp/src/tests/StringUtils.cpp b/qpid/cpp/src/tests/StringUtils.cpp new file mode 100644 index 0000000000..6a19119288 --- /dev/null +++ b/qpid/cpp/src/tests/StringUtils.cpp @@ -0,0 +1,77 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +#include +#include "qpid/StringUtils.h" + +#include "unit_test.h" + +QPID_AUTO_TEST_SUITE(StringUtilsTestSuite) + +using namespace qpid; +using std::string; + +QPID_AUTO_TEST_CASE(testSplit_general) +{ + std::vector results = split("a bbbb, car,d123,,,e", ", "); + BOOST_CHECK_EQUAL(5u, results.size()); + BOOST_CHECK_EQUAL(string("a"), results[0]); + BOOST_CHECK_EQUAL(string("bbbb"), results[1]); + BOOST_CHECK_EQUAL(string("car"), results[2]); + BOOST_CHECK_EQUAL(string("d123"), results[3]); + BOOST_CHECK_EQUAL(string("e"), results[4]); +} + +QPID_AUTO_TEST_CASE(testSplit_noDelims) +{ + std::vector results = split("abc", ", "); + BOOST_CHECK_EQUAL(1u, results.size()); + BOOST_CHECK_EQUAL(string("abc"), results[0]); +} + +QPID_AUTO_TEST_CASE(testSplit_delimAtEnd) +{ + std::vector results = split("abc def,,", ", "); + BOOST_CHECK_EQUAL(2u, results.size()); + BOOST_CHECK_EQUAL(string("abc"), results[0]); + BOOST_CHECK_EQUAL(string("def"), results[1]); +} + +QPID_AUTO_TEST_CASE(testSplit_delimAtStart) +{ + std::vector results = split(",,abc def", ", "); + BOOST_CHECK_EQUAL(2u, results.size()); + BOOST_CHECK_EQUAL(string("abc"), results[0]); + BOOST_CHECK_EQUAL(string("def"), results[1]); +} + +QPID_AUTO_TEST_CASE(testSplit_onlyDelims) +{ + std::vector results = split(",, , ", ", "); + BOOST_CHECK_EQUAL(0u, results.size()); +} + +QPID_AUTO_TEST_CASE(testSplit_empty) +{ + std::vector results = split("", ", "); + BOOST_CHECK_EQUAL(0u, results.size()); +} + +QPID_AUTO_TEST_SUITE_END() -- cgit v1.2.1