Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 4 insertions, 4 deletions

diff --git a/src/mongo/db/exec/skip.cpp b/src/mongo/db/exec/skip.cpp
index 755e9278fe0..d3d0fc48afd 100644
--- a/src/mongo/db/exec/skip.cpp
+++ b/src/mongo/db/exec/skip.cpp
@@ -47,7 +47,7 @@ SkipStage::SkipStage(ExpressionContext* expCtx,
                      long long toSkip,
                      WorkingSet* ws,
                      std::unique_ptr<PlanStage> child)
-    : PlanStage(kStageType, expCtx), _ws(ws), _leftToSkip(toSkip), _skipAmount(toSkip) {
+    : PlanStage(kStageType, expCtx), _ws(ws), _toSkip(toSkip) {
     _children.emplace_back(std::move(child));
 }
 
@@ -63,9 +63,9 @@ PlanStage::StageState SkipStage::doWork(WorkingSetID* out) {
 
     if (PlanStage::ADVANCED == status) {
         // If we're still skipping results...
-        if (_leftToSkip > 0) {
+        if (_toSkip > 0) {
             // ...drop the result.
-            --_leftToSkip;
+            --_toSkip;
             _ws->free(id);
             return PlanStage::NEED_TIME;
         }
@@ -82,7 +82,7 @@ PlanStage::StageState SkipStage::doWork(WorkingSetID* out) {
 
 unique_ptr<PlanStageStats> SkipStage::getStats() {
     _commonStats.isEOF = isEOF();
-    _specificStats.skip = _skipAmount;
+    _specificStats.skip = _toSkip;
     unique_ptr<PlanStageStats> ret = std::make_unique<PlanStageStats>(_commonStats, STAGE_SKIP);
     ret->specific = std::make_unique<SkipStats>(_specificStats);
     ret->children.emplace_back(child()->getStats());