SERVER-14633 rename prepareToYield() and recoverFromYield() to saveState() and restoreState()

Also renames PlanExecutor::getStages() to PlanExecutor::getRootStage()

1 files changed, 4 insertions, 4 deletions

diff --git a/src/mongo/db/exec/merge_sort.cpp b/src/mongo/db/exec/merge_sort.cpp
index c9f449caa53..372bb912d47 100644
--- a/src/mongo/db/exec/merge_sort.cpp
+++ b/src/mongo/db/exec/merge_sort.cpp
@@ -182,17 +182,17 @@ namespace mongo {
         return PlanStage::ADVANCED;
     }
 
-    void MergeSortStage::prepareToYield() {
+    void MergeSortStage::saveState() {
         ++_commonStats.yields;
         for (size_t i = 0; i < _children.size(); ++i) {
-            _children[i]->prepareToYield();
+            _children[i]->saveState();
         }
     }
 
-    void MergeSortStage::recoverFromYield(OperationContext* opCtx) {
+    void MergeSortStage::restoreState(OperationContext* opCtx) {
         ++_commonStats.unyields;
         for (size_t i = 0; i < _children.size(); ++i) {
-            _children[i]->recoverFromYield(opCtx);
+            _children[i]->restoreState(opCtx);
         }
     }