SERVER-33065 CommandReplyBuilder and CommandInvocation

Revert "Revert "SERVER-33065 CommandReplyBuilder and CommandInvocation""
This reverts commit 74177edb35b6ce7594e4751051010ceade592484.
Leave out the unintentional repl/ change this time.

1 files changed, 12 insertions, 13 deletions

diff --git a/src/mongo/db/service_entry_point_mongod.cpp b/src/mongo/db/service_entry_point_mongod.cpp
index 84c8534e6fb..eb281981054 100644
--- a/src/mongo/db/service_entry_point_mongod.cpp
+++ b/src/mongo/db/service_entry_point_mongod.cpp
@@ -51,11 +51,10 @@ public:
     }
 
     void waitForReadConcern(OperationContext* opCtx,
-                            const Command* command,
+                            const CommandInvocation* invocation,
                             const OpMsgRequest& request) const override {
-        Status rcStatus = mongo::waitForReadConcern(opCtx,
-                                                    repl::ReadConcernArgs::get(opCtx),
-                                                    command->allowsAfterClusterTime(request.body));
+        Status rcStatus = mongo::waitForReadConcern(
+            opCtx, repl::ReadConcernArgs::get(opCtx), invocation->allowsAfterClusterTime());
 
         if (!rcStatus.isOK()) {
             if (rcStatus == ErrorCodes::ExceededTimeLimit) {
@@ -64,7 +63,7 @@ public:
                 LOG(debugLevel) << "Command on database " << request.getDatabase()
                                 << " timed out waiting for read concern to be satisfied. Command: "
                                 << redact(ServiceEntryPointCommon::getRedactedCopyForLogging(
-                                       command, request.body));
+                                       invocation->definition(), request.body));
             }
 
             uassertStatusOK(rcStatus);
@@ -74,7 +73,7 @@ public:
     void waitForWriteConcern(OperationContext* opCtx,
                              const std::string& commandName,
                              const repl::OpTime& lastOpBeforeRun,
-                             BSONObjBuilder* commandResponseBuilder) const override {
+                             BSONObjBuilder commandResponseBuilder) const override {
         auto lastOpAfterRun = repl::ReplClientInfo::forClient(opCtx->getClient()).getLastOp();
         // Ensures that if we tried to do a write, we wait for write concern, even if that write was
         // a noop.
@@ -88,15 +87,15 @@ public:
         auto waitForWCStatus =
             mongo::waitForWriteConcern(opCtx, lastOpAfterRun, opCtx->getWriteConcern(), &res);
 
-        CommandHelpers::appendCommandWCStatus(*commandResponseBuilder, waitForWCStatus, res);
+        CommandHelpers::appendCommandWCStatus(commandResponseBuilder, waitForWCStatus, res);
 
         // SERVER-22421: This code is to ensure error response backwards compatibility with the
         // user management commands. This can be removed in 3.6.
         if (!waitForWCStatus.isOK() && CommandHelpers::isUserManagementCommand(commandName)) {
-            BSONObj temp = commandResponseBuilder->asTempObj().copy();
-            commandResponseBuilder->resetToEmpty();
-            CommandHelpers::appendCommandStatus(*commandResponseBuilder, waitForWCStatus);
-            commandResponseBuilder->appendElementsUnique(temp);
+            BSONObj temp = commandResponseBuilder.asTempObj().copy();
+            commandResponseBuilder.resetToEmpty();
+            CommandHelpers::appendCommandStatus(commandResponseBuilder, waitForWCStatus);
+            commandResponseBuilder.appendElementsUnique(temp);
         }
     }
 
@@ -115,8 +114,8 @@ public:
         }
     }
 
-    void attachCurOpErrInfo(OperationContext* opCtx, BSONObjBuilder& replyObj) const override {
-        CurOp::get(opCtx)->debug().errInfo = getStatusFromCommandResult(replyObj.asTempObj());
+    void attachCurOpErrInfo(OperationContext* opCtx, const BSONObj& replyObj) const override {
+        CurOp::get(opCtx)->debug().errInfo = getStatusFromCommandResult(replyObj);
     }
 };