diff options
| author | Ridhwaan Anayetullah <ridhwaan.any@gmail.com> | 2021-06-14 18:59:56 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-06-16 23:38:13 +0000 |
| commit | eb0922bf4d9b2f50248144c02f235c9a55049671 (patch) | |
| tree | 48e8ec93f2254f26655d823606893f07fc9ffd59 | |
| parent | 9075b127ee14471ca784494a7e290ca1fd0df157 (diff) | |
| download | mongo-eb0922bf4d9b2f50248144c02f235c9a55049671.tar.gz | |
remove comment, fix method
| -rw-r--r-- | src/mongo/db/pipeline/document_source_densify.cpp | 5 | ||||
| -rw-r--r-- | src/mongo/db/pipeline/document_source_densify.h | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/mongo/db/pipeline/document_source_densify.cpp b/src/mongo/db/pipeline/document_source_densify.cpp index a631cad3782..c7d8b122c31 100644 --- a/src/mongo/db/pipeline/document_source_densify.cpp +++ b/src/mongo/db/pipeline/document_source_densify.cpp @@ -142,12 +142,7 @@ bool DocumentSourceInternalDensify::DocGenerator::done() const { } DocumentSource::GetNextResult DocumentSourceInternalDensify::doGetNext() { -<<<<<<< HEAD return pSource->getNext(); -======= - auto nextInput = pSource->getNext(); - return nextInput; ->>>>>>> 5d323a58c9... bracket changes } } // namespace mongo diff --git a/src/mongo/db/pipeline/document_source_densify.h b/src/mongo/db/pipeline/document_source_densify.h index 2c6364a087e..b9f843fc69f 100644 --- a/src/mongo/db/pipeline/document_source_densify.h +++ b/src/mongo/db/pipeline/document_source_densify.h @@ -117,9 +117,6 @@ public: } boost::optional<DistributedPlanLogic> distributedPlanLogic() final { - // Running this stage on the shards is an optimization, but is not strictly necessary in - // order to produce correct pipeline output. - // {shardsStage, mergingStage, sortPattern} return DistributedPlanLogic{nullptr, this, boost::none}; } |