SERVER-44021 Make type of "count" command in DBClient_Base match server.

Author: mtrussotto

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);

src/mongo/client/dbclient_base.h

@@ -351,11 +351,11 @@ class DBClientBase : public DBClientQueryInterface {
     /** 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);

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);

src/mongo/db/dbdirectclient.h

@@ -81,11 +81,11 @@ class DBDirectClient : public DBClientBase {
 
     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;