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_group.cpp | |
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_group.cpp')
-rw-r--r-- | src/mongo/db/pipeline/document_source_group.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 { |