diff options
author | Arun Banala <arun.banala@mongodb.com> | 2019-05-23 11:12:19 +0100 |
---|---|---|
committer | Arun Banala <arun.banala@mongodb.com> | 2019-05-24 14:24:51 +0100 |
commit | 7536959e9afa7e5dd0ef7bc807630630e48d5706 (patch) | |
tree | 202f6bf9dd8264f1c8de61737e48a86e1ff2ab6a /src/mongo/db/pipeline/document_source_check_resume_token.h | |
parent | 4f034e89cc7978317d4a6ef34bc718a83ab55ecb (diff) | |
download | mongo-7536959e9afa7e5dd0ef7bc807630630e48d5706.tar.gz |
SERVER-41180 Rename 'MergingLogic' to 'DistributedPlanLogic' to avoid confusion with $merge
Diffstat (limited to 'src/mongo/db/pipeline/document_source_check_resume_token.h')
-rw-r--r-- | src/mongo/db/pipeline/document_source_check_resume_token.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/pipeline/document_source_check_resume_token.h b/src/mongo/db/pipeline/document_source_check_resume_token.h index d449595faf7..c4cd53bb2cf 100644 --- a/src/mongo/db/pipeline/document_source_check_resume_token.h +++ b/src/mongo/db/pipeline/document_source_check_resume_token.h @@ -73,7 +73,7 @@ public: ChangeStreamRequirement::kChangeStreamStage}; } - boost::optional<MergingLogic> mergingLogic() final { + boost::optional<DistributedPlanLogic> distributedPlanLogic() final { return boost::none; } @@ -129,8 +129,8 @@ public: ChangeStreamRequirement::kChangeStreamStage}; } - boost::optional<MergingLogic> mergingLogic() final { - MergingLogic logic; + boost::optional<DistributedPlanLogic> distributedPlanLogic() final { + DistributedPlanLogic logic; // This stage must run on mongos to ensure it sees the resume token, which could have come // from any shard. We also must include a mergingPresorted $sort stage to communicate to // the AsyncResultsMerger that we need to merge the streams in a particular order. |