summaryrefslogtreecommitdiff
path: root/src/mongo/s
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/s')
-rw-r--r--src/mongo/s/SConscript14
-rw-r--r--src/mongo/s/catalog/SConscript2
-rw-r--r--src/mongo/s/client/SConscript2
-rw-r--r--src/mongo/s/commands/SConscript20
-rw-r--r--src/mongo/s/query/SConscript6
-rw-r--r--src/mongo/s/write_ops/SConscript2
6 files changed, 23 insertions, 23 deletions
diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript
index ef829350aeb..4d1aa91d63c 100644
--- a/src/mongo/s/SConscript
+++ b/src/mongo/s/SConscript
@@ -102,9 +102,9 @@ env.Library(
'common_s',
],
LIBDEPS_PRIVATE=[
- "$BUILD_DIR/mongo/idl/server_parameter",
- '$BUILD_DIR/mongo/executor/thread_pool_task_executor',
'$BUILD_DIR/mongo/executor/connection_pool_executor',
+ '$BUILD_DIR/mongo/executor/thread_pool_task_executor',
+ "$BUILD_DIR/mongo/idl/server_parameter",
'coreshard',
'sharding_task_executor',
],
@@ -117,13 +117,13 @@ env.Library(
'hedge_options_util.cpp',
],
LIBDEPS=[
- 'mongos_server_parameters',
'$BUILD_DIR/mongo/db/query/command_request_response',
'$BUILD_DIR/mongo/executor/scoped_task_executor',
'$BUILD_DIR/mongo/executor/task_executor_interface',
+ '$BUILD_DIR/mongo/s/client/shard_interface',
'$BUILD_DIR/mongo/s/client/sharding_client',
'$BUILD_DIR/mongo/s/coreshard',
- '$BUILD_DIR/mongo/s/client/shard_interface',
+ 'mongos_server_parameters',
],
)
@@ -258,9 +258,9 @@ env.Library(
LIBDEPS=[
'$BUILD_DIR/mongo/client/clientdriver_network',
'$BUILD_DIR/mongo/db/logical_time_metadata_hook',
- '$BUILD_DIR/mongo/util/concurrency/thread_pool',
'$BUILD_DIR/mongo/executor/task_executor_pool',
'$BUILD_DIR/mongo/util/caching',
+ '$BUILD_DIR/mongo/util/concurrency/thread_pool',
'client/shard_interface',
'query/cluster_cursor_manager',
'sharding_routing_table',
@@ -291,8 +291,8 @@ env.Benchmark(
'chunk_manager_refresh_bm.cpp',
],
LIBDEPS=[
- 'sharding_routing_table',
'$BUILD_DIR/mongo/db/s/sharding_api_d',
+ 'sharding_routing_table',
],
)
@@ -369,9 +369,9 @@ env.Library(
],
LIBDEPS=[
'$BUILD_DIR/mongo/db/common',
+ '$BUILD_DIR/mongo/rpc/metadata',
'$BUILD_DIR/mongo/transport/transport_layer_common',
'$BUILD_DIR/mongo/util/fail_point',
- '$BUILD_DIR/mongo/rpc/metadata',
'mongos_is_master_response',
],
)
diff --git a/src/mongo/s/catalog/SConscript b/src/mongo/s/catalog/SConscript
index 9cbe083901a..8a65757d960 100644
--- a/src/mongo/s/catalog/SConscript
+++ b/src/mongo/s/catalog/SConscript
@@ -10,8 +10,8 @@ env.Library(
'sharding_catalog_client.cpp',
],
LIBDEPS=[
- '$BUILD_DIR/mongo/db/write_concern_options',
'$BUILD_DIR/mongo/db/keys_collection_document',
+ '$BUILD_DIR/mongo/db/write_concern_options',
],
)
diff --git a/src/mongo/s/client/SConscript b/src/mongo/s/client/SConscript
index 8e338108840..765dedcc15c 100644
--- a/src/mongo/s/client/SConscript
+++ b/src/mongo/s/client/SConscript
@@ -15,8 +15,8 @@ env.Library(
'$BUILD_DIR/mongo/client/fetcher',
'$BUILD_DIR/mongo/db/commands',
'$BUILD_DIR/mongo/db/lasterror',
- '$BUILD_DIR/mongo/executor/task_executor_pool',
'$BUILD_DIR/mongo/executor/hedging_metrics',
+ '$BUILD_DIR/mongo/executor/task_executor_pool',
'$BUILD_DIR/mongo/s/grid',
'shard_interface',
],
diff --git a/src/mongo/s/commands/SConscript b/src/mongo/s/commands/SConscript
index ea9a258fd13..499325b5241 100644
--- a/src/mongo/s/commands/SConscript
+++ b/src/mongo/s/commands/SConscript
@@ -116,21 +116,21 @@ env.Library(
'$BUILD_DIR/mongo/db/commands/list_databases_command',
'$BUILD_DIR/mongo/db/commands/map_reduce_parser',
'$BUILD_DIR/mongo/db/commands/profile_common',
- '$BUILD_DIR/mongo/db/commands/set_index_commit_quorum_idl',
- '$BUILD_DIR/mongo/db/commands/test_commands_enabled',
- '$BUILD_DIR/mongo/db/commands/write_commands_common',
+ '$BUILD_DIR/mongo/db/commands/rename_collection_idl',
'$BUILD_DIR/mongo/db/commands/server_status',
'$BUILD_DIR/mongo/db/commands/set_feature_compatibility_version_idl',
+ '$BUILD_DIR/mongo/db/commands/set_index_commit_quorum_idl',
'$BUILD_DIR/mongo/db/commands/shutdown_idl',
- '$BUILD_DIR/mongo/db/commands/rename_collection_idl',
+ '$BUILD_DIR/mongo/db/commands/test_commands_enabled',
+ '$BUILD_DIR/mongo/db/commands/write_commands_common',
'$BUILD_DIR/mongo/db/ftdc/ftdc_server',
- '$BUILD_DIR/mongo/db/shared_request_handling',
'$BUILD_DIR/mongo/db/logical_session_cache_impl',
- '$BUILD_DIR/mongo/db/read_write_concern_defaults',
- '$BUILD_DIR/mongo/db/repl/speculative_authenticate',
'$BUILD_DIR/mongo/db/pipeline/aggregation',
'$BUILD_DIR/mongo/db/query/command_request_response',
'$BUILD_DIR/mongo/db/query/map_reduce_output_format',
+ '$BUILD_DIR/mongo/db/read_write_concern_defaults',
+ '$BUILD_DIR/mongo/db/repl/speculative_authenticate',
+ '$BUILD_DIR/mongo/db/shared_request_handling',
'$BUILD_DIR/mongo/db/stats/api_version_metrics',
'$BUILD_DIR/mongo/db/stats/counters',
'$BUILD_DIR/mongo/db/views/views',
@@ -156,8 +156,8 @@ env.Library(
'cluster_command_test_fixture.cpp',
],
LIBDEPS=[
- 'cluster_commands',
'$BUILD_DIR/mongo/s/sharding_router_test_fixture',
+ 'cluster_commands',
]
)
@@ -173,10 +173,10 @@ env.CppUnitTest(
"document_shard_key_update_test.cpp",
],
LIBDEPS=[
- 'cluster_commands',
- 'cluster_command_test_fixture',
'$BUILD_DIR/mongo/db/auth/authmocks',
'$BUILD_DIR/mongo/db/auth/saslauth',
'$BUILD_DIR/mongo/db/pipeline/process_interface/mongos_process_interface_factory',
+ 'cluster_command_test_fixture',
+ 'cluster_commands',
],
)
diff --git a/src/mongo/s/query/SConscript b/src/mongo/s/query/SConscript
index 05daa81d443..c036a7a45c0 100644
--- a/src/mongo/s/query/SConscript
+++ b/src/mongo/s/query/SConscript
@@ -33,10 +33,10 @@ env.Library(
],
LIBDEPS=[
'$BUILD_DIR/mongo/db/pipeline/pipeline',
- '$BUILD_DIR/mongo/s/query/cluster_client_cursor',
'$BUILD_DIR/mongo/db/pipeline/process_interface/mongos_process_interface',
'$BUILD_DIR/mongo/db/pipeline/sharded_agg_helpers',
'$BUILD_DIR/mongo/db/views/views',
+ '$BUILD_DIR/mongo/s/query/cluster_client_cursor',
'cluster_query',
]
)
@@ -81,8 +81,8 @@ env.Library(
"$BUILD_DIR/mongo/db/query/command_request_response",
"$BUILD_DIR/mongo/db/query/query_common",
"$BUILD_DIR/mongo/executor/task_executor_interface",
- "$BUILD_DIR/mongo/s/client/sharding_client",
'$BUILD_DIR/mongo/s/catalog/sharding_catalog_client_impl',
+ "$BUILD_DIR/mongo/s/client/sharding_client",
"$BUILD_DIR/mongo/s/sharding_router_api",
],
)
@@ -169,8 +169,8 @@ env.CppUnitTest(
"$BUILD_DIR/mongo/util/clock_source_mock",
"async_results_merger",
"cluster_aggregate",
- "cluster_client_cursor_mock",
"cluster_client_cursor",
+ "cluster_client_cursor_mock",
"cluster_cursor_manager",
"router_exec_stage",
"store_possible_cursor",
diff --git a/src/mongo/s/write_ops/SConscript b/src/mongo/s/write_ops/SConscript
index 65eb38704c4..a38386bb15d 100644
--- a/src/mongo/s/write_ops/SConscript
+++ b/src/mongo/s/write_ops/SConscript
@@ -14,11 +14,11 @@ env.Library(
],
LIBDEPS=[
'$BUILD_DIR/mongo/base',
+ '$BUILD_DIR/mongo/db/commands',
'$BUILD_DIR/mongo/db/common',
'$BUILD_DIR/mongo/db/error_labels',
'$BUILD_DIR/mongo/db/ops/write_ops_parsers',
'$BUILD_DIR/mongo/db/repl/optime',
- '$BUILD_DIR/mongo/db/commands',
'$BUILD_DIR/mongo/db/vector_clock',
'$BUILD_DIR/mongo/rpc/command_status',
'$BUILD_DIR/mongo/s/common_s',