generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-28 11:31:53 +01:00
Code Issues Projects Releases Wiki Activity

Rename query() method to selector()

Browse Source
This commit is contained in:
fbraem
2013-02-20 22:20:55 +01:00
parent e04dca0e13
commit e79f75d9fe
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
MongoDB/include/Poco/MongoDB/QueryRequest.h
View File

@@ -105,12 +105,12 @@ public:
/// Sets the number to return (limit)
Document& query();
/// Returns the query document
Document& selector();
/// Returns the selector document
Document& returnFieldSelector();
/// Returns the selector document
/// Returns the field selector document
protected:
@@ -128,7 +128,7 @@ private:
Int32 _numberToReturn;
Document _query;
Document _selector;
Document _returnFieldSelector;
};
@@ -152,9 +152,9 @@ inline std::string QueryRequest::fullCollectionName() const
}
inline Document& QueryRequest::query()
inline Document& QueryRequest::selector()
{
return _query;
return _selector;
}

4
MongoDB/src/Database.cpp
View File

@@ -75,7 +75,7 @@ Document::Ptr Database::getLastErrorDoc(Connection& connection) const
Poco::SharedPtr<Poco::MongoDB::QueryRequest> request = createQueryRequest("$cmd");
request->setNumberToReturn(1);
request->query().add("getLastError", 1);
request->selector().add("getLastError", 1);
Poco::MongoDB::ResponseMessage response;
connection.sendRequest(*request, response);
@@ -110,7 +110,7 @@ Poco::SharedPtr<Poco::MongoDB::QueryRequest> Database::createCountRequest(const
{
Poco::SharedPtr<Poco::MongoDB::QueryRequest> request = createQueryRequest("$cmd");
request->setNumberToReturn(1);
request->query().add("count", collectionName);
request->selector().add("count", collectionName);
return request;
}

4
MongoDB/src/QueryRequest.cpp
View File

@@ -49,7 +49,7 @@ QueryRequest::QueryRequest(const std::string& collectionName, QueryRequest::Flag
_fullCollectionName(collectionName),
_numberToSkip(0),
_numberToReturn(100),
_query(),
_selector(),
_returnFieldSelector()
{
}
@@ -65,7 +65,7 @@ void QueryRequest::buildRequest(BinaryWriter& writer)
BSONWriter(writer).writeCString(_fullCollectionName);
writer << _numberToSkip;
writer << _numberToReturn;
_query.write(writer);
_selector.write(writer);
if ( ! _returnFieldSelector.empty() )
{

2
MongoDB/src/ReplicaSet.cpp
View File

@@ -78,7 +78,7 @@ Connection::Ptr ReplicaSet::isMaster(const Net::SocketAddress& address)
QueryRequest request("admin.$cmd");
request.setNumberToReturn(1);
request.query().add("isMaster", 1);
request.selector().add("isMaster", 1);
ResponseMessage response;
conn->sendRequest(request, response);

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

@@ -124,7 +124,7 @@ void MongoDBTest::testQueryRequest()
}
Poco::MongoDB::QueryRequest request("team.players");
request.query().add("lastname" , std::string("Braem"));
request.selector().add("lastname" , std::string("Braem"));
request.setNumberToReturn(1);
Poco::MongoDB::ResponseMessage response;
@@ -173,7 +173,7 @@ void MongoDBTest::testDBQueryRequest()
Database db("team");
Poco::SharedPtr<Poco::MongoDB::QueryRequest> request = db.createQueryRequest("players");
request->query().add("lastname" , std::string("Braem"));
request->selector().add("lastname" , std::string("Braem"));
Poco::MongoDB::ResponseMessage response;
_mongo.sendRequest(*request, response);
@@ -219,7 +219,7 @@ void MongoDBTest::testCountCommand()
Poco::MongoDB::QueryRequest request("team.$cmd");
request.setNumberToReturn(1);
request.query().add("count", std::string("players"));
request.selector().add("count", std::string("players"));
Poco::MongoDB::ResponseMessage response;
@@ -331,7 +331,7 @@ void MongoDBTest::testCursorRequest()
Poco::MongoDB::QueryRequest drop("team.$cmd");
drop.setNumberToReturn(1);
drop.query().add("drop", std::string("numbers"));
drop.selector().add("drop", std::string("numbers"));
Poco::MongoDB::ResponseMessage responseDrop;
_mongo.sendRequest(drop, responseDrop);
@@ -353,7 +353,7 @@ void MongoDBTest::testBuildInfo()
Poco::MongoDB::QueryRequest request("team.$cmd");
request.setNumberToReturn(1);
request.query().add("buildInfo", 1);
request.selector().add("buildInfo", 1);
Poco::MongoDB::ResponseMessage response;
@@ -388,7 +388,7 @@ void MongoDBTest::testConnectionPool()
Poco::MongoDB::QueryRequest request("team.$cmd");
request.setNumberToReturn(1);
request.query().add("count", std::string("players"));
request.selector().add("count", std::string("players"));
Poco::MongoDB::ResponseMessage response;
((Connection::Ptr) pooledConnection)->sendRequest(request, response);