SERVER-17577 query planner now makes use of separate limit and batchSize fields in find command

2 files changed, 6 insertions, 7 deletions

diff --git a/src/mongo/db/commands/find_cmd.cpp b/src/mongo/db/commands/find_cmd.cpp
index 87f349061d7..3afcaaaf88f 100644
--- a/src/mongo/db/commands/find_cmd.cpp
+++ b/src/mongo/db/commands/find_cmd.cpp
@@ -210,7 +210,8 @@ namespace mongo {
             }
 
             // Fill out curop information.
-            beginQueryOp(nss, cmdObj, lpq->getNumToReturn(), lpq->getSkip(), CurOp::get(txn));
+            int ntoreturn = lpq->getBatchSize().value_or(0);
+            beginQueryOp(nss, cmdObj, ntoreturn, lpq->getSkip(), CurOp::get(txn));
 
             // 1b) Finish the parsing step by using the LiteParsedQuery to create a CanonicalQuery.
             std::unique_ptr<CanonicalQuery> cq;
@@ -309,14 +310,11 @@ namespace mongo {
             BSONObj obj;
             PlanExecutor::ExecState state;
             int numResults = 0;
-            while (PlanExecutor::ADVANCED == (state = exec->getNext(&obj, NULL))) {
+            while (!enoughForFirstBatch(pq, numResults, firstBatch.len())
+                    && PlanExecutor::ADVANCED == (state = exec->getNext(&obj, NULL))) {
                 // Add result to output buffer.
                 firstBatch.append(obj);
                 numResults++;
-
-                if (enoughForFirstBatch(pq, numResults, firstBatch.len())) {
-                    break;
-                }
             }
 
             // Throw an assertion if query execution fails for any reason.
diff --git a/src/mongo/db/commands/getmore_cmd.cpp b/src/mongo/db/commands/getmore_cmd.cpp
index 2ae2d54a015..574c7bea6a1 100644
--- a/src/mongo/db/commands/getmore_cmd.cpp
+++ b/src/mongo/db/commands/getmore_cmd.cpp
@@ -346,7 +346,8 @@ namespace mongo {
                     nextBatch->append(obj);
                     (*numResults)++;
 
-                    if (enoughForGetMore(request.batchSize, *numResults, nextBatch->len())) {
+                    if (enoughForGetMore(request.batchSize.value_or(0),
+                                         *numResults, nextBatch->len())) {
                         break;
                     }
                 }