summaryrefslogtreecommitdiff
path: root/src/mongo/db/pipeline/document_source_exchange.h
diff options
context:
space:
mode:
authorCharlie Swanson <charlie.swanson@mongodb.com>2018-07-02 18:23:25 -0400
committerCharlie Swanson <charlie.swanson@mongodb.com>2018-08-15 13:30:12 -0400
commitee06e6cbe5a75775f76836449558be2f6a98ddfd (patch)
treed4dbf37110d25f7f4876337a7b1e11abe251fac5 /src/mongo/db/pipeline/document_source_exchange.h
parenta5bde2f3e9afc3f72da01788b76829fb29c2f4e7 (diff)
downloadmongo-ee06e6cbe5a75775f76836449558be2f6a98ddfd.tar.gz
SERVER-33323 Refactor agg cursor merging on mongos
This commit makes it so that aggregations will always use a $mergeCursors as a wrapper around a AsyncResultsMerger, which is new behavior for mongos. As part of this refactor, we can delete the concept of a 'merging presorted' $sort stage (which is now handled by the AsyncResultsMerger) and delete the DocumentSourceRouterAdapter stage which talked to a RouterStageMerge, instead directly using a $mergeCursors stage.
Diffstat (limited to 'src/mongo/db/pipeline/document_source_exchange.h')
-rw-r--r--src/mongo/db/pipeline/document_source_exchange.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/db/pipeline/document_source_exchange.h b/src/mongo/db/pipeline/document_source_exchange.h
index b4231424032..ba4cb56ecdb 100644
--- a/src/mongo/db/pipeline/document_source_exchange.h
+++ b/src/mongo/db/pipeline/document_source_exchange.h
@@ -167,7 +167,7 @@ public:
boost::intrusive_ptr<DocumentSource> getShardSource() final {
return this;
}
- std::list<boost::intrusive_ptr<DocumentSource>> getMergeSources() final {
+ MergingLogic mergingLogic() final {
// TODO SERVER-35974 we have to revisit this when we implement consumers.
return {this};
}