SERVER-35044 Remove maxScan query option

1 files changed, 0 insertions, 27 deletions

diff --git a/src/mongo/db/query/query_request.cpp b/src/mongo/db/query/query_request.cpp
index 56ffe5dbb42..5a6225acacb 100644
--- a/src/mongo/db/query/query_request.cpp
+++ b/src/mongo/db/query/query_request.cpp
@@ -89,7 +89,6 @@ const char kBatchSizeField[] = "batchSize";
 const char kNToReturnField[] = "ntoreturn";
 const char kSingleBatchField[] = "singleBatch";
 const char kCommentField[] = "comment";
-const char kMaxScanField[] = "maxScan";
 const char kMaxField[] = "max";
 const char kMinField[] = "min";
 const char kReturnKeyField[] = "returnKey";
@@ -265,15 +264,6 @@ StatusWith<unique_ptr<QueryRequest>> QueryRequest::parseFromFindCommand(unique_p
             }
 
             qr->_comment = el.str();
-        } else if (fieldName == kMaxScanField) {
-            if (!el.isNumber()) {
-                str::stream ss;
-                ss << "Failed to parse: " << cmdObj.toString() << ". "
-                   << "'maxScan' field must be numeric.";
-                return Status(ErrorCodes::FailedToParse, ss);
-            }
-
-            qr->_maxScan = el.numberInt();
         } else if (fieldName == cmdOptionMaxTimeMS) {
             StatusWith<int> maxTimeMS = parseMaxTimeMS(el);
             if (!maxTimeMS.isOK()) {
@@ -470,10 +460,6 @@ void QueryRequest::asFindCommand(BSONObjBuilder* cmdBuilder) const {
         cmdBuilder->append(kCommentField, _comment);
     }
 
-    if (_maxScan > 0) {
-        cmdBuilder->append(kMaxScanField, _maxScan);
-    }
-
     if (_maxTimeMS > 0) {
         cmdBuilder->append(cmdOptionMaxTimeMS, _maxTimeMS);
     }
@@ -611,12 +597,6 @@ Status QueryRequest::validate() const {
                                     << *_ntoreturn);
     }
 
-    if (_maxScan < 0) {
-        return Status(ErrorCodes::BadValue,
-                      str::stream() << "MaxScan value must be non-negative, but received: "
-                                    << _maxScan);
-    }
-
     if (_maxTimeMS < 0) {
         return Status(ErrorCodes::BadValue,
                       str::stream() << "MaxTimeMS value must be non-negative, but received: "
@@ -879,9 +859,6 @@ Status QueryRequest::initFullQuery(const BSONObj& top) {
                     _returnKey = true;
                     addReturnKeyMetaProj();
                 }
-            } else if (str::equals("maxScan", name)) {
-                // Won't throw.
-                _maxScan = e.numberInt();
             } else if (str::equals("showDiskLoc", name)) {
                 // Won't throw.
                 if (e.trueValue()) {
@@ -973,10 +950,6 @@ StatusWith<BSONObj> QueryRequest::asAggregationCommand() const {
         return {ErrorCodes::InvalidPipelineOperator,
                 str::stream() << "Option " << kMaxField << " not supported in aggregation."};
     }
-    if (_maxScan != 0) {
-        return {ErrorCodes::InvalidPipelineOperator,
-                str::stream() << "Option " << kMaxScanField << " not supported in aggregation."};
-    }
     if (_returnKey) {
         return {ErrorCodes::InvalidPipelineOperator,
                 str::stream() << "Option " << kReturnKeyField << " not supported in aggregation."};