diff options
| author | Charlie Swanson <charlie.swanson@mongodb.com> | 2019-01-16 20:15:37 -0500 |
|---|---|---|
| committer | Charlie Swanson <charlie.swanson@mongodb.com> | 2019-01-16 20:15:37 -0500 |
| commit | 97821dfa13cccb5acad6faef0f536e3d5d77d678 (patch) | |
| tree | 80c13b3e04fbe9a759d48d4252bda1f70fd7197a /src/mongo/db/pipeline/document_source_geo_near.cpp | |
| parent | 781be1ad38c79b755d28414c842527ff049c9d5d (diff) | |
| download | mongo-97821dfa13cccb5acad6faef0f536e3d5d77d678.tar.gz | |
Revert " SERVER-38311 Adjust $out merging strategy"
This reverts commit 0cb2195939494660334db8e9d0a52509caeb621c.
Diffstat (limited to 'src/mongo/db/pipeline/document_source_geo_near.cpp')
| -rw-r--r-- | src/mongo/db/pipeline/document_source_geo_near.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mongo/db/pipeline/document_source_geo_near.cpp b/src/mongo/db/pipeline/document_source_geo_near.cpp index e80feb995bd..4a9cee80e3f 100644 --- a/src/mongo/db/pipeline/document_source_geo_near.cpp +++ b/src/mongo/db/pipeline/document_source_geo_near.cpp @@ -237,9 +237,8 @@ DepsTracker::State DocumentSourceGeoNear::getDependencies(DepsTracker* deps) con DocumentSourceGeoNear::DocumentSourceGeoNear(const intrusive_ptr<ExpressionContext>& pExpCtx) : DocumentSource(pExpCtx), coordsIsArray(false), spherical(false) {} -boost::optional<DocumentSource::MergingLogic> DocumentSourceGeoNear::mergingLogic() { - // {shardsStage, mergingStage, sortPattern} - return MergingLogic{this, nullptr, BSON(distanceField->fullPath() << 1)}; +NeedsMergerDocumentSource::MergingLogic DocumentSourceGeoNear::mergingLogic() { + return {nullptr, BSON(distanceField->fullPath() << 1)}; } } // namespace mongo |