SERVER-53149 Finish converting getMore to IDL

1 files changed, 27 insertions, 41 deletions

diff --git a/src/mongo/db/query/getmore_request.cpp b/src/mongo/db/query/getmore_request.cpp
index 30d8c59337b..669c9587213 100644
--- a/src/mongo/db/query/getmore_request.cpp
+++ b/src/mongo/db/query/getmore_request.cpp
@@ -38,7 +38,6 @@
 #include "mongo/db/api_parameters_gen.h"
 #include "mongo/db/commands.h"
 #include "mongo/db/namespace_string.h"
-#include "mongo/db/query/getmore_command_gen.h"
 #include "mongo/db/repl/bson_extract_optime.h"
 #include "mongo/idl/command_generic_argument.h"
 #include "mongo/util/assert_util.h"
@@ -46,6 +45,18 @@
 
 namespace mongo {
 
+namespace {
+
+const char kCollectionField[] = "collection";
+const char kBatchSizeField[] = "batchSize";
+const char kAwaitDataTimeoutField[] = "maxTimeMS";
+const char kTermField[] = "term";
+const char kLastKnownCommittedOpTimeField[] = "lastKnownCommittedOpTime";
+
+}  // namespace
+
+const char GetMoreRequest::kGetMoreCommandName[] = "getMore";
+
 GetMoreRequest::GetMoreRequest() : cursorid(0), batchSize(0) {}
 
 GetMoreRequest::GetMoreRequest(NamespaceString namespaceString,
@@ -80,54 +91,29 @@ Status GetMoreRequest::isValid() const {
     return Status::OK();
 }
 
-// static
-StatusWith<GetMoreRequest> GetMoreRequest::parseFromBSON(const std::string& dbname,
-                                                         const BSONObj& cmdObj) try {
-    for (const auto& fieldName :
-         std::vector<StringData>{APIParametersFromClient::kApiVersionFieldName,
-                                 APIParametersFromClient::kApiStrictFieldName,
-                                 APIParametersFromClient::kApiDeprecationErrorsFieldName}) {
-        uassert(4937600,
-                str::stream() << "Cannot pass in API parameter field " << fieldName,
-                !cmdObj.hasField(fieldName));
-    }
+BSONObj GetMoreRequest::toBSON() const {
+    BSONObjBuilder builder;
+
+    builder.append(kGetMoreCommandName, cursorid);
+    builder.append(kCollectionField, nss.coll());
 
-    auto parsed = GetMoreCommand::parse({"getMore"}, cmdObj);
-    auto maxTimeMS = parsed.getMaxTimeMS();
-
-    GetMoreRequest request(
-        NamespaceString(dbname, parsed.getCollection()),
-        parsed.getCommandParameter(),
-        parsed.getBatchSize(),
-        // Treat maxTimeMS=0 the same as none.
-        (maxTimeMS && *maxTimeMS) ? boost::optional<Milliseconds>(*maxTimeMS) : boost::none,
-        parsed.getTerm() ? boost::optional<long long>(*parsed.getTerm()) : boost::none,
-        parsed.getLastKnownCommittedOpTime());
-
-    Status validStatus = request.isValid();
-    if (!validStatus.isOK()) {
-        return validStatus;
+    if (batchSize) {
+        builder.append(kBatchSizeField, *batchSize);
     }
 
-    return request;
-} catch (const DBException& exc) {
-    return exc.toStatus();
-}
+    if (awaitDataTimeout) {
+        builder.append(kAwaitDataTimeoutField, durationCount<Milliseconds>(*awaitDataTimeout));
+    }
 
-BSONObj GetMoreRequest::toBSON() const {
-    auto cmd = GetMoreCommand(cursorid);
-    cmd.setDbName(nss.db());
-    cmd.setCollection(nss.coll());
-    cmd.setBatchSize(batchSize);
-    cmd.setLastKnownCommittedOpTime(lastKnownCommittedOpTime);
     if (term) {
-        cmd.setTerm(static_cast<int64_t>(*term));
+        builder.append(kTermField, *term);
     }
-    if (awaitDataTimeout) {
-        cmd.setMaxTimeMS(durationCount<Milliseconds>(*awaitDataTimeout));
+
+    if (lastKnownCommittedOpTime) {
+        lastKnownCommittedOpTime->append(&builder, kLastKnownCommittedOpTimeField);
     }
 
-    return cmd.toBSON({});
+    return builder.obj();
 }
 
 }  // namespace mongo