diff options
| -rw-r--r-- | src/mongo/client/dbclient_base.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/client/dbclient_base.h | 10 | ||||
| -rw-r--r-- | src/mongo/db/dbdirectclient.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/db/dbdirectclient.h | 10 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/mongo/client/dbclient_base.cpp b/src/mongo/client/dbclient_base.cpp index b91e5d0f32c..2633a560298 100644 --- a/src/mongo/client/dbclient_base.cpp +++ b/src/mongo/client/dbclient_base.cpp @@ -319,7 +319,7 @@ bool DBClientBase::runPseudoCommand(StringData db, return success; } -unsigned long long DBClientBase::count( +long long DBClientBase::count( const NamespaceStringOrUUID nsOrUuid, const BSONObj& query, int options, int limit, int skip) { auto dbName = (nsOrUuid.uuid() ? nsOrUuid.dbname() : (*nsOrUuid.nss()).db().toString()); BSONObj cmd = _countCmd(nsOrUuid, query, options, limit, skip); diff --git a/src/mongo/client/dbclient_base.h b/src/mongo/client/dbclient_base.h index 194210f8a24..13d0d50cc99 100644 --- a/src/mongo/client/dbclient_base.h +++ b/src/mongo/client/dbclient_base.h @@ -351,11 +351,11 @@ public: /** count number of objects in collection ns that match the query criteria specified throws UserAssertion if database returns an error */ - virtual unsigned long long count(NamespaceStringOrUUID nsOrUuid, - const BSONObj& query = BSONObj(), - int options = 0, - int limit = 0, - int skip = 0); + virtual long long count(NamespaceStringOrUUID nsOrUuid, + const BSONObj& query = BSONObj(), + int options = 0, + int limit = 0, + int skip = 0); static std::string createPasswordDigest(const std::string& username, const std::string& clearTextPassword); diff --git a/src/mongo/db/dbdirectclient.cpp b/src/mongo/db/dbdirectclient.cpp index be41cc3c86a..24e157eb323 100644 --- a/src/mongo/db/dbdirectclient.cpp +++ b/src/mongo/db/dbdirectclient.cpp @@ -172,7 +172,7 @@ unique_ptr<DBClientCursor> DBDirectClient::query(const NamespaceStringOrUUID& ns nsOrUuid, query, nToReturn, nToSkip, fieldsToReturn, queryOptions, batchSize); } -unsigned long long DBDirectClient::count( +long long DBDirectClient::count( const NamespaceStringOrUUID nsOrUuid, const BSONObj& query, int options, int limit, int skip) { DirectClientScope directClientScope(_opCtx); BSONObj cmdObj = _countCmd(nsOrUuid, query, options, limit, skip); diff --git a/src/mongo/db/dbdirectclient.h b/src/mongo/db/dbdirectclient.h index 544d1801bcf..9ff0dc9cd80 100644 --- a/src/mongo/db/dbdirectclient.h +++ b/src/mongo/db/dbdirectclient.h @@ -81,11 +81,11 @@ public: virtual void say(Message& toSend, bool isRetry = false, std::string* actualServer = nullptr); - virtual unsigned long long count(const NamespaceStringOrUUID nsOrUuid, - const BSONObj& query = BSONObj(), - int options = 0, - int limit = 0, - int skip = 0); + virtual long long count(const NamespaceStringOrUUID nsOrUuid, + const BSONObj& query = BSONObj(), + int options = 0, + int limit = 0, + int skip = 0); virtual ConnectionString::ConnectionType type() const; |