SERVER-37297 Move aggregation pipeline stages that require sharding out of the pipeline lib.

17 files changed, 26 insertions, 23 deletions

diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index dc86b4e0ac2..708fc4514c5 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -640,6 +640,8 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/stats/fill_locker_info',
         '$BUILD_DIR/mongo/idl/idl_parser',
+        '$BUILD_DIR/mongo/s/async_requests_sender',
+        '$BUILD_DIR/mongo/s/grid',
         'catalog/collection',
         'catalog/database',
         'catalog/database_holder',
diff --git a/src/mongo/db/pipeline/SConscript b/src/mongo/db/pipeline/SConscript
index 8da8342dbbe..59b9b19db39 100644
--- a/src/mongo/db/pipeline/SConscript
+++ b/src/mongo/db/pipeline/SConscript
@@ -232,6 +232,7 @@ env.CppUnitTest(
         '$BUILD_DIR/mongo/db/repl/replmocks',
         '$BUILD_DIR/mongo/db/service_context',
         '$BUILD_DIR/mongo/executor/thread_pool_task_executor_test_fixture',
+        '$BUILD_DIR/mongo/s/query/router_exec_stage',
         '$BUILD_DIR/mongo/s/sharding_router_test_fixture',
         '$BUILD_DIR/mongo/util/clock_source_mock',
         'document_source_mock',
@@ -366,8 +367,6 @@ pipelineeEnv.Library(
         'document_source_lookup.cpp',
         'document_source_lookup_change_post_image.cpp',
         'document_source_match.cpp',
-        'document_source_merge_cursors.cpp',
-        'document_source_update_on_add_shard.cpp',
         'document_source_out.cpp',
         'document_source_out_replace_coll.cpp',
         'document_source_plan_cache_stats.cpp',
@@ -409,7 +408,6 @@ pipelineeEnv.Library(
         '$BUILD_DIR/mongo/db/storage/encryption_hooks',
         '$BUILD_DIR/mongo/db/storage/storage_options',
         '$BUILD_DIR/mongo/s/is_mongos',
-        '$BUILD_DIR/mongo/s/query/async_results_merger',
         '$BUILD_DIR/third_party/shim_snappy',
         'accumulator',
         'dependencies',
diff --git a/src/mongo/db/pipeline/document_source_merge_cursors_test.cpp b/src/mongo/db/pipeline/document_source_merge_cursors_test.cpp
index f0c1c521314..8032480ae49 100644
--- a/src/mongo/db/pipeline/document_source_merge_cursors_test.cpp
+++ b/src/mongo/db/pipeline/document_source_merge_cursors_test.cpp
@@ -28,7 +28,7 @@
 
 #include "mongo/platform/basic.h"
 
-#include "mongo/db/pipeline/document_source_merge_cursors.h"
+#include "mongo/s/query/document_source_merge_cursors.h"
 
 #include "mongo/client/remote_command_targeter_factory_mock.h"
 #include "mongo/client/remote_command_targeter_mock.h"
diff --git a/src/mongo/db/pipeline/document_source_sort.cpp b/src/mongo/db/pipeline/document_source_sort.cpp
index ca092927f56..faacf60b33f 100644
--- a/src/mongo/db/pipeline/document_source_sort.cpp
+++ b/src/mongo/db/pipeline/document_source_sort.cpp
@@ -33,13 +33,13 @@
 #include "mongo/db/jsobj.h"
 #include "mongo/db/pipeline/document.h"
 #include "mongo/db/pipeline/document_path_support.h"
-#include "mongo/db/pipeline/document_source_merge_cursors.h"
 #include "mongo/db/pipeline/document_source_skip.h"
 #include "mongo/db/pipeline/expression.h"
 #include "mongo/db/pipeline/expression_context.h"
 #include "mongo/db/pipeline/lite_parsed_document_source.h"
 #include "mongo/db/pipeline/value.h"
 #include "mongo/db/query/collation/collation_index_key.h"
+#include "mongo/s/query/document_source_merge_cursors.h"
 
 namespace mongo {
 
diff --git a/src/mongo/db/pipeline/pipeline.cpp b/src/mongo/db/pipeline/pipeline.cpp
index eec6cc72ba6..7a6200cfd3f 100644
--- a/src/mongo/db/pipeline/pipeline.cpp
+++ b/src/mongo/db/pipeline/pipeline.cpp
@@ -42,7 +42,6 @@
 #include "mongo/db/pipeline/document_source.h"
 #include "mongo/db/pipeline/document_source_geo_near.h"
 #include "mongo/db/pipeline/document_source_match.h"
-#include "mongo/db/pipeline/document_source_merge_cursors.h"
 #include "mongo/db/pipeline/document_source_out.h"
 #include "mongo/db/pipeline/document_source_project.h"
 #include "mongo/db/pipeline/document_source_sort.h"
diff --git a/src/mongo/db/pipeline/pipeline_d.cpp b/src/mongo/db/pipeline/pipeline_d.cpp
index 48729855dd0..085f161ebaa 100644
--- a/src/mongo/db/pipeline/pipeline_d.cpp
+++ b/src/mongo/db/pipeline/pipeline_d.cpp
@@ -56,7 +56,6 @@
 #include "mongo/db/pipeline/document_source_geo_near_cursor.h"
 #include "mongo/db/pipeline/document_source_group.h"
 #include "mongo/db/pipeline/document_source_match.h"
-#include "mongo/db/pipeline/document_source_merge_cursors.h"
 #include "mongo/db/pipeline/document_source_sample.h"
 #include "mongo/db/pipeline/document_source_sample_from_random_cursor.h"
 #include "mongo/db/pipeline/document_source_single_document_transformation.h"
@@ -78,6 +77,7 @@
 #include "mongo/s/chunk_manager.h"
 #include "mongo/s/chunk_version.h"
 #include "mongo/s/grid.h"
+#include "mongo/s/query/document_source_merge_cursors.h"
 #include "mongo/s/write_ops/cluster_write.h"
 #include "mongo/stdx/memory.h"
 #include "mongo/util/log.h"
diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript
index a8ce73042ab..f99ed28e113 100644
--- a/src/mongo/db/s/SConscript
+++ b/src/mongo/db/s/SConscript
@@ -237,6 +237,7 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/commands/mongod_fcv',
+        '$BUILD_DIR/mongo/s/catalog/sharding_catalog_client_impl',
     ],
 )
 
diff --git a/src/mongo/s/query/SConscript b/src/mongo/s/query/SConscript
index e156eafc303..015ea1c66d1 100644
--- a/src/mongo/s/query/SConscript
+++ b/src/mongo/s/query/SConscript
@@ -64,15 +64,17 @@ env.Library(
 env.Library(
     target="router_exec_stage",
     source=[
-        "router_stage_limit.cpp",
-        "router_stage_mock.cpp",
-        "router_stage_pipeline.cpp",
-        "router_stage_remove_metadata_fields.cpp",
-        "router_stage_skip.cpp",
+        'document_source_merge_cursors.cpp',
+        'document_source_update_on_add_shard.cpp',
+        'router_stage_limit.cpp',
+        'router_stage_mock.cpp',
+        'router_stage_pipeline.cpp',
+        'router_stage_remove_metadata_fields.cpp',
+        'router_stage_skip.cpp',
     ],
     LIBDEPS=[
-        "async_results_merger",
-        "$BUILD_DIR/mongo/db/pipeline/pipeline",
+        '$BUILD_DIR/mongo/db/pipeline/pipeline',
+        'async_results_merger',
     ],
 )
 
diff --git a/src/mongo/s/query/cluster_aggregate.cpp b/src/mongo/s/query/cluster_aggregate.cpp
index c145908ec5e..14e3059ed73 100644
--- a/src/mongo/s/query/cluster_aggregate.cpp
+++ b/src/mongo/s/query/cluster_aggregate.cpp
@@ -43,7 +43,6 @@
 #include "mongo/db/logical_clock.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/pipeline/document_source_change_stream.h"
-#include "mongo/db/pipeline/document_source_merge_cursors.h"
 #include "mongo/db/pipeline/document_source_out.h"
 #include "mongo/db/pipeline/expression_context.h"
 #include "mongo/db/pipeline/lite_parsed_pipeline.h"
@@ -65,6 +64,7 @@
 #include "mongo/s/query/cluster_client_cursor_params.h"
 #include "mongo/s/query/cluster_cursor_manager.h"
 #include "mongo/s/query/cluster_query_knobs.h"
+#include "mongo/s/query/document_source_merge_cursors.h"
 #include "mongo/s/query/establish_cursors.h"
 #include "mongo/s/query/router_stage_pipeline.h"
 #include "mongo/s/query/store_possible_cursor.h"
diff --git a/src/mongo/s/query/cluster_aggregate.h b/src/mongo/s/query/cluster_aggregate.h
index 9f45297819c..99adf22b418 100644
--- a/src/mongo/s/query/cluster_aggregate.h
+++ b/src/mongo/s/query/cluster_aggregate.h
@@ -36,10 +36,10 @@
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/pipeline/aggregation_request.h"
 #include "mongo/db/pipeline/document_source.h"
-#include "mongo/db/pipeline/document_source_merge_cursors.h"
 #include "mongo/s/async_requests_sender.h"
 #include "mongo/s/commands/strategy.h"
 #include "mongo/s/query/cluster_client_cursor_params.h"
+#include "mongo/s/query/document_source_merge_cursors.h"
 
 namespace mongo {
 
diff --git a/src/mongo/s/query/cluster_aggregation_planner.cpp b/src/mongo/s/query/cluster_aggregation_planner.cpp
index a19b832cb30..3cf21281b11 100644
--- a/src/mongo/s/query/cluster_aggregation_planner.cpp
+++ b/src/mongo/s/query/cluster_aggregation_planner.cpp
@@ -33,17 +33,17 @@
 #include "mongo/db/pipeline/document_source_group.h"
 #include "mongo/db/pipeline/document_source_limit.h"
 #include "mongo/db/pipeline/document_source_match.h"
-#include "mongo/db/pipeline/document_source_merge_cursors.h"
 #include "mongo/db/pipeline/document_source_out.h"
 #include "mongo/db/pipeline/document_source_project.h"
 #include "mongo/db/pipeline/document_source_skip.h"
 #include "mongo/db/pipeline/document_source_sort.h"
 #include "mongo/db/pipeline/document_source_unwind.h"
-#include "mongo/db/pipeline/document_source_update_on_add_shard.h"
 #include "mongo/executor/task_executor_pool.h"
 #include "mongo/s/catalog_cache.h"
 #include "mongo/s/grid.h"
 #include "mongo/s/query/cluster_query_knobs.h"
+#include "mongo/s/query/document_source_merge_cursors.h"
+#include "mongo/s/query/document_source_update_on_add_shard.h"
 #include "mongo/s/query/router_stage_limit.h"
 #include "mongo/s/query/router_stage_pipeline.h"
 #include "mongo/s/query/router_stage_remove_metadata_fields.h"
diff --git a/src/mongo/db/pipeline/document_source_merge_cursors.cpp b/src/mongo/s/query/document_source_merge_cursors.cpp
index 795755893de..5ee49e8d54b 100644
--- a/src/mongo/db/pipeline/document_source_merge_cursors.cpp
+++ b/src/mongo/s/query/document_source_merge_cursors.cpp
@@ -28,7 +28,8 @@
 
 #include "mongo/platform/basic.h"
 
-#include "mongo/db/pipeline/document_source_merge_cursors.h"
+#include "mongo/s/query/document_source_merge_cursors.h"
+
 #include "mongo/db/pipeline/document_source_sort.h"
 #include "mongo/db/query/find_common.h"
 #include "mongo/executor/task_executor_pool.h"
diff --git a/src/mongo/db/pipeline/document_source_merge_cursors.h b/src/mongo/s/query/document_source_merge_cursors.h
index 8a2db705ab0..8a2db705ab0 100644
--- a/src/mongo/db/pipeline/document_source_merge_cursors.h
+++ b/src/mongo/s/query/document_source_merge_cursors.h
diff --git a/src/mongo/db/pipeline/document_source_update_on_add_shard.cpp b/src/mongo/s/query/document_source_update_on_add_shard.cpp
index 7177d705c67..40da845353a 100644
--- a/src/mongo/db/pipeline/document_source_update_on_add_shard.cpp
+++ b/src/mongo/s/query/document_source_update_on_add_shard.cpp
@@ -26,7 +26,7 @@
  * then also delete it in the license file.
  */
 
-#include "mongo/db/pipeline/document_source_update_on_add_shard.h"
+#include "mongo/s/query/document_source_update_on_add_shard.h"
 
 #include <algorithm>
 
diff --git a/src/mongo/db/pipeline/document_source_update_on_add_shard.h b/src/mongo/s/query/document_source_update_on_add_shard.h
index 4c6e0473528..279729807df 100644
--- a/src/mongo/db/pipeline/document_source_update_on_add_shard.h
+++ b/src/mongo/s/query/document_source_update_on_add_shard.h
@@ -29,8 +29,8 @@
 #pragma once
 
 #include "mongo/db/pipeline/document_source.h"
-#include "mongo/db/pipeline/document_source_merge_cursors.h"
 #include "mongo/executor/task_executor.h"
+#include "mongo/s/query/document_source_merge_cursors.h"
 #include "mongo/s/shard_id.h"
 
 namespace mongo {
diff --git a/src/mongo/s/query/router_stage_pipeline.cpp b/src/mongo/s/query/router_stage_pipeline.cpp
index a5a97bdbdbc..e90131c027e 100644
--- a/src/mongo/s/query/router_stage_pipeline.cpp
+++ b/src/mongo/s/query/router_stage_pipeline.cpp
@@ -33,8 +33,8 @@
 #include "mongo/db/pipeline/document_source.h"
 #include "mongo/db/pipeline/document_source_change_stream.h"
 #include "mongo/db/pipeline/document_source_list_local_sessions.h"
-#include "mongo/db/pipeline/document_source_merge_cursors.h"
 #include "mongo/db/pipeline/expression_context.h"
+#include "mongo/s/query/document_source_merge_cursors.h"
 
 namespace mongo {
 
diff --git a/src/mongo/s/query/router_stage_pipeline.h b/src/mongo/s/query/router_stage_pipeline.h
index 43706b42cd9..ef7e1b39ad1 100644
--- a/src/mongo/s/query/router_stage_pipeline.h
+++ b/src/mongo/s/query/router_stage_pipeline.h
@@ -31,8 +31,8 @@
 #include "mongo/s/query/router_exec_stage.h"
 
 #include "mongo/db/pipeline/document_source.h"
-#include "mongo/db/pipeline/document_source_merge_cursors.h"
 #include "mongo/db/pipeline/pipeline.h"
+#include "mongo/s/query/document_source_merge_cursors.h"
 
 namespace mongo {