generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-17 20:06:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #818 from fbraem/develop

Browse Source 
Fix #817 - Use std::list instead of std::set for storing elements in Document
This commit is contained in:
Aleksandar Fabijanic 2015-05-14 15:42:12 -05:00
commit 95a61b9844
6 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MongoDB/include/Poco/MongoDB/Document.h
View File

@ -185,7 +185,7 @@ protected:
inline Document& Document::addElement(Element::Ptr element)
{
_elements.insert(element);
_elements.push_back(element);
return *this;
}

14
MongoDB/include/Poco/MongoDB/Element.h
View File

@ -33,7 +33,7 @@
#include <string>
#include <sstream>
#include <iomanip>
#include <set>
#include <list>
namespace Poco {
@ -76,17 +76,7 @@ inline std::string Element::name() const
}
class ElementComparator
{
public:
bool operator()(const Element::Ptr& s1, const Element::Ptr& s2)
{
return s1->name() < s2->name();
}
};
typedef std::set<Element::Ptr, ElementComparator> ElementSet;
typedef std::list<Element::Ptr> ElementSet;
template<typename T>

4
MongoDB/samples/SQLToMongo/src/SQLToMongo.cpp
View File

@ -234,7 +234,7 @@ void sample5(Poco::MongoDB::Connection& connection)
// When orderby is needed, use 2 separate documents in the query selector
cursor.query().selector().addNewDocument("$query").add("birthyear", 1987);
cursor.query().selector().addNewDocument("$orderby").add("lastname", 0);
cursor.query().selector().addNewDocument("$orderby").add("lastname", -1);
Poco::MongoDB::ResponseMessage& response = cursor.next(connection);
while(1)
@ -410,7 +410,7 @@ void sample11(Poco::MongoDB::Connection& connection)
if ( response.hasDocuments() )
{
std::cout << "Count: " << response.documents()[0]->get<double>("n") << std::endl;
std::cout << "Count: " << response.documents()[0]->get<int>("n") << std::endl;
}
}

2
MongoDB/src/Document.cpp
View File

@ -120,7 +120,7 @@ void Document::read(BinaryReader& reader)
}
element->read(reader);
_elements.insert(element);
_elements.push_back(element);
reader >> type;
}

24
MongoDB/testsuite/src/MongoDBTest.cpp
View File

@ -410,6 +410,29 @@ void MongoDBTest::testObjectID()
}
void MongoDBTest::testCommand() {
Poco::MongoDB::Database db("team");
Poco::SharedPtr<Poco::MongoDB::QueryRequest> command = db.createCommand();
command->selector().add("create", "fixCol")
.add("capped", true)
.add("max", 1024*1024)
.add("size", 1024);
Poco::MongoDB::ResponseMessage response;
_mongo.sendRequest(*command, response);
if ( response.documents().size() > 0 )
{
Poco::MongoDB::Document::Ptr doc = response.documents()[0];
std::cout << doc->toString(2);
}
else
{
Poco::MongoDB::Document::Ptr lastError = db.getLastErrorDoc(_mongo);
std::cout << "LastError: " << lastError->toString(2) << std::endl;
fail("Didn't get a response from the command");
}
}
CppUnit::Test* MongoDBTest::suite()
{
CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("MongoDBTest");
@ -425,6 +448,7 @@ CppUnit::Test* MongoDBTest::suite()
CppUnit_addTest(pSuite, MongoDBTest, testBuildInfo);
CppUnit_addTest(pSuite, MongoDBTest, testCursorRequest);
CppUnit_addTest(pSuite, MongoDBTest, testObjectID);
CppUnit_addTest(pSuite, MongoDBTest, testCommand);
return pSuite;
}

1
MongoDB/testsuite/src/MongoDBTest.h
View File

@ -41,6 +41,7 @@ public:
void testConnectionPool();
void testCursorRequest();
void testObjectID();
void testCommand();
void setUp();
void tearDown();