SERVER-29731 Unify logic around directly invoking a command

1 files changed, 5 insertions, 16 deletions

diff --git a/src/mongo/db/dbdirectclient.cpp b/src/mongo/db/dbdirectclient.cpp
index b85be86dd0d..6609d69a642 100644
--- a/src/mongo/db/dbdirectclient.cpp
+++ b/src/mongo/db/dbdirectclient.cpp
@@ -164,23 +164,12 @@ unsigned long long DBDirectClient::count(
     BSONObj cmdObj = _countCmd(ns, query, options, limit, skip);
 
     NamespaceString nsString(ns);
-    std::string dbname = nsString.db().toString();
-
-    Command* countCmd = Command::findCommand("count");
-    invariant(countCmd);
-
-    std::string errmsg;
-    BSONObjBuilder result;
-    bool runRetval = countCmd->run(_opCtx, dbname, cmdObj, errmsg, result);
-    if (!runRetval) {
-        Command::appendCommandStatus(result, runRetval, errmsg);
-        Status commandStatus = getStatusFromCommandResult(result.obj());
-        invariant(!commandStatus.isOK());
-        uassertStatusOK(commandStatus);
-    }
 
-    BSONObj resultObj = result.obj();
-    return static_cast<unsigned long long>(resultObj["n"].numberLong());
+    auto result = Command::runCommandDirectly(
+        _opCtx, OpMsgRequest::fromDBAndBody(nsString.db(), std::move(cmdObj)));
+
+    uassertStatusOK(getStatusFromCommandResult(result));
+    return static_cast<unsigned long long>(result["n"].numberLong());
 }
 
 }  // namespace mongo