diff options
| author | Ridhwaan Anayetullah <ridhwaan.any@gmail.com> | 2021-06-14 16:00:20 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-06-16 23:38:13 +0000 |
| commit | 9075b127ee14471ca784494a7e290ca1fd0df157 (patch) | |
| tree | 62c2227b3519389ad0cbcbc3a503bb1fd325e9d9 | |
| parent | 1d8a34ce5423658a4b37a3f49e9331fcf1d2c73b (diff) | |
| download | mongo-9075b127ee14471ca784494a7e290ca1fd0df157.tar.gz | |
bracket changes
| -rw-r--r-- | src/mongo/db/pipeline/document_source_densify.cpp | 5 | ||||
| -rw-r--r-- | src/mongo/db/pipeline/document_source_densify.h | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/mongo/db/pipeline/document_source_densify.cpp b/src/mongo/db/pipeline/document_source_densify.cpp index c7d8b122c31..a631cad3782 100644 --- a/src/mongo/db/pipeline/document_source_densify.cpp +++ b/src/mongo/db/pipeline/document_source_densify.cpp @@ -142,7 +142,12 @@ 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 5175e416a74..2c6364a087e 100644 --- a/src/mongo/db/pipeline/document_source_densify.h +++ b/src/mongo/db/pipeline/document_source_densify.h @@ -42,7 +42,6 @@ namespace document_source_densify { // TODO SERVER-57334 Translation logic goes here. } -// TODO SERVER-57332 This should inherit from DocumentSource. class DocumentSourceInternalDensify final : public DocumentSource { public: static constexpr StringData kStageName = "$_internalDensify"_sd; @@ -126,6 +125,5 @@ public: DocumentSourceInternalDensify(const boost::intrusive_ptr<ExpressionContext>& pExpCtx); GetNextResult doGetNext() final; - -}; -} // namespace mongo +}; +} // namespace mongo |