From 7536959e9afa7e5dd0ef7bc807630630e48d5706 Mon Sep 17 00:00:00 2001
From: Arun Banala <arun.banala@mongodb.com>
Date: Thu, 23 May 2019 11:12:19 +0100
Subject: SERVER-41180 Rename 'MergingLogic' to 'DistributedPlanLogic' to avoid
 confusion with $merge

---
 src/mongo/db/pipeline/document_source_group.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mongo/db/pipeline/document_source_group.cpp')

diff --git a/src/mongo/db/pipeline/document_source_group.cpp b/src/mongo/db/pipeline/document_source_group.cpp
index 9625bc65d97..c2d2c0d7509 100644
--- a/src/mongo/db/pipeline/document_source_group.cpp
+++ b/src/mongo/db/pipeline/document_source_group.cpp
@@ -666,7 +666,7 @@ Document DocumentSourceGroup::makeDocument(const Value& id,
     return out.freeze();
 }
 
-boost::optional<DocumentSource::MergingLogic> DocumentSourceGroup::mergingLogic() {
+boost::optional<DocumentSource::DistributedPlanLogic> DocumentSourceGroup::distributedPlanLogic() {
     intrusive_ptr<DocumentSourceGroup> mergingGroup(new DocumentSourceGroup(pExpCtx));
     mergingGroup->setDoingMerge(true);
 
@@ -686,7 +686,7 @@ boost::optional<DocumentSource::MergingLogic> DocumentSourceGroup::mergingLogic(
     }
 
     // {shardsStage, mergingStage, sortPattern}
-    return MergingLogic{this, mergingGroup, boost::none};
+    return DistributedPlanLogic{this, mergingGroup, boost::none};
 }
 
 bool DocumentSourceGroup::pathIncludedInGroupKeys(const std::string& dottedPath) const {
-- 
cgit v1.2.1