diff options
| author | Daniel Moody <daniel.moody@mongodb.com> | 2020-08-27 06:03:22 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-08-27 06:21:15 +0000 |
| commit | ad84ed6435d49b86bd6f97c530131c094cc6122c (patch) | |
| tree | 87d53b749d4d4cac08d424065fd6037bbeee87be /src | |
| parent | ed3073ed0ae632bdb0e40fcdbd1d41dd84ec40aa (diff) | |
| download | mongo-ad84ed6435d49b86bd6f97c530131c094cc6122c.tar.gz | |
SERVER-49703 Added libdep linter alphabetic rule and update all libdeps list to be alphabetical
Diffstat (limited to 'src')
52 files changed, 650 insertions, 596 deletions
diff --git a/src/mongo/SConscript b/src/mongo/SConscript index d73363814b1..b9027f0ded0 100644 --- a/src/mongo/SConscript +++ b/src/mongo/SConscript @@ -260,8 +260,8 @@ baseEnv.Library( '$BUILD_DIR/third_party/shim_intel_decimal128', '$BUILD_DIR/third_party/shim_pcrecpp', '$BUILD_DIR/third_party/shim_unwind' if use_libunwind else [], - 'util/boost_assert_shim', 'stdx/stdx', + 'util/boost_assert_shim', ], AIB_COMPONENT='platform', ) diff --git a/src/mongo/bson/mutable/SConscript b/src/mongo/bson/mutable/SConscript index 37e0557656c..281974899aa 100644 --- a/src/mongo/bson/mutable/SConscript +++ b/src/mongo/bson/mutable/SConscript @@ -11,8 +11,8 @@ env.Library( 'element.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/util/safe_num', '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/util/safe_num', ], ) diff --git a/src/mongo/client/SConscript b/src/mongo/client/SConscript index f6d531a737e..fbf77caa24c 100644 --- a/src/mongo/client/SConscript +++ b/src/mongo/client/SConscript @@ -50,8 +50,8 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/idl/idl_parser', '$BUILD_DIR/mongo/db/server_options_core', # For object_check.h + '$BUILD_DIR/mongo/idl/idl_parser', ], ) @@ -69,9 +69,9 @@ kmsEnv.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/third_party/shim_kms_message', - '$BUILD_DIR/mongo/idl/idl_parser', '$BUILD_DIR/mongo/db/server_options_core', # For object_check.h + '$BUILD_DIR/mongo/idl/idl_parser', + '$BUILD_DIR/third_party/shim_kms_message', 'sasl_aws_common', ], ) @@ -113,7 +113,6 @@ saslClientEnv.Library( target='sasl_client', source=saslClientSource, LIBDEPS=[ - "sasl_aws_client" if get_option('ssl') == 'on' else '', '$BUILD_DIR/mongo/base/secure_allocator', '$BUILD_DIR/mongo/bson/util/bson_extract', '$BUILD_DIR/mongo/executor/remote_command', @@ -123,6 +122,7 @@ saslClientEnv.Library( '$BUILD_DIR/mongo/util/md5', '$BUILD_DIR/mongo/util/net/network', '$BUILD_DIR/mongo/util/options_parser/options_parser', + "sasl_aws_client" if get_option('ssl') == 'on' else '', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/util/net/http_client', @@ -294,8 +294,8 @@ env.Library( 'remote_command_targeter_standalone.cpp', ], LIBDEPS=[ - 'clientdriver_network', '$BUILD_DIR/mongo/db/service_context', + 'clientdriver_network', ], ) @@ -306,8 +306,8 @@ env.Library( 'remote_command_targeter_factory_mock.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/util/net/network', '$BUILD_DIR/mongo/s/coreshard', + '$BUILD_DIR/mongo/util/net/network', ], ) @@ -317,11 +317,11 @@ env.Library( 'fetcher.cpp', ], LIBDEPS=[ - 'remote_command_retry_scheduler', - '$BUILD_DIR/mongo/executor/task_executor_interface', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/namespace_string', + '$BUILD_DIR/mongo/executor/task_executor_interface', '$BUILD_DIR/mongo/rpc/command_status', + 'remote_command_retry_scheduler', ], ) @@ -331,8 +331,8 @@ env.Library( 'remote_command_retry_scheduler.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/executor/task_executor_interface', '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/executor/task_executor_interface', ], ) diff --git a/src/mongo/client/sdam/SConscript b/src/mongo/client/sdam/SConscript index 5411b15c8f3..42c50529b3e 100644 --- a/src/mongo/client/sdam/SConscript +++ b/src/mongo/client/sdam/SConscript @@ -28,12 +28,12 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/client/read_preference', '$BUILD_DIR/mongo/db/repl/optime', - '$BUILD_DIR/mongo/util/clock_sources', - '$BUILD_DIR/mongo/client/read_preference', - '$BUILD_DIR/mongo/executor/task_executor_interface', '$BUILD_DIR/mongo/db/wire_version', + '$BUILD_DIR/mongo/executor/task_executor_interface', '$BUILD_DIR/mongo/rpc/metadata', + '$BUILD_DIR/mongo/util/clock_sources', 'sdam_configuration_parameters', ], ) @@ -45,12 +45,14 @@ sdam_json_test = env.Program( 'sdam_json_test_runner.cpp'], AIB_COMPONENT="sdam-json-test", LIBDEPS=[ - 'sdam', - 'sdam_test', + '$BUILD_DIR/mongo/client/connection_string', + '$BUILD_DIR/mongo/util/clock_source_mock', 'json_test', + 'sdam', 'sdam_configuration_parameters', - '$BUILD_DIR/mongo/util/clock_source_mock', - '$BUILD_DIR/mongo/client/connection_string'], + 'sdam_test', + ], + )[0] server_selection_json_test = env.Program( @@ -59,12 +61,13 @@ server_selection_json_test = env.Program( 'server_selection_json_test_runner.cpp'], AIB_COMPONENT="server-selection-json-test", LIBDEPS=[ - 'sdam', - 'sdam_test', + '$BUILD_DIR/mongo/client/connection_string', + '$BUILD_DIR/mongo/util/clock_source_mock', 'json_test', + 'sdam', 'sdam_configuration_parameters', - '$BUILD_DIR/mongo/util/clock_source_mock', - '$BUILD_DIR/mongo/client/connection_string'], + 'sdam_test', + ], )[0] env.Library( @@ -74,9 +77,9 @@ env.Library( env.Idlc('json_test_runner_cli_options.idl')[0], ], LIBDEPS=[ - 'sdam', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/util/options_parser/options_parser', + 'sdam', ], ) @@ -87,8 +90,8 @@ env.Library( 'topology_listener_mock.cpp', ], LIBDEPS=[ - 'sdam', '$BUILD_DIR/mongo/base', + 'sdam', ], ) diff --git a/src/mongo/crypto/SConscript b/src/mongo/crypto/SConscript index 8d151e993c6..e4af03ead75 100644 --- a/src/mongo/crypto/SConscript +++ b/src/mongo/crypto/SConscript @@ -76,8 +76,8 @@ env.Library( "aead_encryption.cpp", ], LIBDEPS=[ - 'symmetric_crypto', '$BUILD_DIR/mongo/db/matcher/expressions', + 'symmetric_crypto', ], ) diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index 4b7f7cbe674..6374268664b 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -122,9 +122,9 @@ env.Library( 'startup_warnings_mongod.cpp', ], LIBDEPS=[ - 'startup_warnings_common', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', '$BUILD_DIR/mongo/util/processinfo', + 'startup_warnings_common', ] ) @@ -137,16 +137,16 @@ env.Library( '$BUILD_DIR/mongo/bson/mutable/mutable_bson', '$BUILD_DIR/mongo/db/commands', '$BUILD_DIR/mongo/db/concurrency/lock_manager', - '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/query/command_request_response', + '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/stats/timer_stats', '$BUILD_DIR/mongo/rpc/client_metadata', '$BUILD_DIR/mongo/util/diagnostic_info' if get_option('use-diagnostic-latches') == 'on' else [], '$BUILD_DIR/mongo/util/fail_point', '$BUILD_DIR/mongo/util/net/network', '$BUILD_DIR/mongo/util/progress_meter', - 'server_options', 'generic_cursor', + 'server_options', ], LIBDEPS_PRIVATE=[ 'auth/auth', @@ -160,8 +160,8 @@ env.Library( 'curop_failpoint_helpers.cpp', ], LIBDEPS=[ - 'curop', '$BUILD_DIR/mongo/util/fail_point', + 'curop', ], ) @@ -373,9 +373,9 @@ env.Library( 'storage/storage_options', ], LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/util/options_parser/options_parser', 'global_settings', 'server_options_base', - '$BUILD_DIR/mongo/util/options_parser/options_parser', ] ) @@ -522,9 +522,9 @@ env.Library( '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/executor/task_executor_interface', "$BUILD_DIR/mongo/rpc/protocol", + "$BUILD_DIR/mongo/util/net/network", 'client_out_of_line_executor', 'service_context', - "$BUILD_DIR/mongo/util/net/network", ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/bson/util/bson_extract', @@ -533,8 +533,8 @@ env.Library( '$BUILD_DIR/mongo/idl/idl_parser', '$BUILD_DIR/mongo/util/concurrency/thread_pool', 'commands/server_status', - 'repl/replica_set_messages', 'repl/repl_coordinator_interface', + 'repl/replica_set_messages', 'repl/topology_version_observer', ], ) @@ -559,8 +559,8 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/bson/mutable/mutable_bson', - '$BUILD_DIR/mongo/rpc/rpc', '$BUILD_DIR/mongo/rpc/command_status', + '$BUILD_DIR/mongo/rpc/rpc', 'audit', 'auth/auth', 'command_generic_argument', @@ -670,9 +670,9 @@ env.Library( '$BUILD_DIR/mongo/idl/idl_parser', '$BUILD_DIR/mongo/idl/server_parameter', '$BUILD_DIR/mongo/util/concurrency/thread_pool', - 'catalog_raii', - 'catalog/database_holder', 'catalog/collection_catalog', + 'catalog/database_holder', + 'catalog_raii', 'commands/server_status', 'commands/test_commands_enabled', 'curop_failpoint_helpers', @@ -707,9 +707,9 @@ env.Library( 'dbhelpers.cpp', ], LIBDEPS=[ - 'query_exec', 'db_raii', 'index/index_access_method', + 'query_exec', 'write_ops', ], LIBDEPS_PRIVATE=[ @@ -723,10 +723,10 @@ env.Library( 'system_index.cpp', ], LIBDEPS=[ - 'db_raii', 'catalog/index_key_validate', 'catalog/multi_index_block', 'concurrency/write_conflict_exception', + 'db_raii', 'index_builds_coordinator_interface', ], ) @@ -743,9 +743,9 @@ env.Library( '$BUILD_DIR/mongo/db/ops/write_ops_parsers', '$BUILD_DIR/mongo/db/s/sharding_runtime_d', '$BUILD_DIR/mongo/db/storage/storage_engine_common', - '$BUILD_DIR/mongo/db/storage/storage_options', '$BUILD_DIR/mongo/db/storage/storage_engine_lock_file', '$BUILD_DIR/mongo/db/storage/storage_engine_metadata', + '$BUILD_DIR/mongo/db/storage/storage_options', '$BUILD_DIR/mongo/transport/service_entry_point', 'command_can_run_here', 'curop', @@ -790,6 +790,11 @@ env.Library( "op_observer_impl.cpp", ], LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/db/catalog/collection_catalog', + "$BUILD_DIR/mongo/db/repl/tenant_migration_donor", + '$BUILD_DIR/mongo/s/coreshard', + "$BUILD_DIR/mongo/s/grid", 'catalog/collection_options', 'catalog/database_holder', 'op_observer', @@ -798,15 +803,10 @@ env.Library( 'repl/oplog', 's/sharding_api_d', 'views/views_mongod', - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/catalog/collection_catalog', - "$BUILD_DIR/mongo/db/repl/tenant_migration_donor", - '$BUILD_DIR/mongo/s/coreshard', - "$BUILD_DIR/mongo/s/grid", ], LIBDEPS_PRIVATE=[ - 'transaction', "$BUILD_DIR/mongo/db/catalog/commit_quorum_options", + 'transaction', ], ) @@ -839,11 +839,6 @@ env.Library( '$BUILD_DIR/mongo/base', ], LIBDEPS_PRIVATE=[ - 'shared_request_handling', - 'introspect', - 'lasterror', - 'query_exec', - 'transaction', '$BUILD_DIR/mongo/db/audit', '$BUILD_DIR/mongo/db/auth/auth', '$BUILD_DIR/mongo/db/auth/authprivilege', @@ -860,7 +855,12 @@ env.Library( '$BUILD_DIR/mongo/db/storage/storage_engine_lock_file', '$BUILD_DIR/mongo/db/storage/storage_engine_metadata', 'commands/server_status_core', + 'introspect', + 'lasterror', + 'query_exec', 'repl/replica_set_messages', + 'shared_request_handling', + 'transaction', ], ) @@ -884,18 +884,18 @@ env.Library( "index_builds_coordinator_mongod.cpp", ], LIBDEPS=[ - "index_builds_coordinator_interface", "$BUILD_DIR/mongo/util/concurrency/thread_pool", + "index_builds_coordinator_interface", ], LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/db/catalog/collection_catalog', + '$BUILD_DIR/mongo/db/catalog/index_build_entry_idl', + '$BUILD_DIR/mongo/db/storage/two_phase_index_build_knobs_idl', + '$BUILD_DIR/mongo/executor/task_executor_interface', 'curop', 'db_raii', 'index_build_entry_helpers', 'resumable_index_builds_idl', - '$BUILD_DIR/mongo/db/catalog/collection_catalog', - '$BUILD_DIR/mongo/db/catalog/index_build_entry_idl', - "$BUILD_DIR/mongo/executor/task_executor_interface", - "$BUILD_DIR/mongo/db/storage/two_phase_index_build_knobs_idl", ], ) @@ -906,29 +906,30 @@ env.Library( ], LIBDEPS=[ "$BUILD_DIR/mongo/base", - '$BUILD_DIR/mongo/db/catalog_raii', "$BUILD_DIR/mongo/db/catalog/commit_quorum_options", "$BUILD_DIR/mongo/db/catalog/index_builds_manager", + '$BUILD_DIR/mongo/db/catalog_raii', ], LIBDEPS_PRIVATE=[ - 'catalog/database_holder', - 'db_raii', - 'index_build_entry_helpers', - 'server_options_core', - '$BUILD_DIR/mongo/db/catalog/index_build_entry_idl', - '$BUILD_DIR/mongo/db/catalog/index_build_oplog_entry', '$BUILD_DIR/mongo/db/catalog/collection', '$BUILD_DIR/mongo/db/catalog/collection_catalog', + '$BUILD_DIR/mongo/db/catalog/index_build_entry_idl', + '$BUILD_DIR/mongo/db/catalog/index_build_oplog_entry', '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/dbhelpers', + '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', '$BUILD_DIR/mongo/db/repl/timestamp_block', '$BUILD_DIR/mongo/db/s/sharding_api_d', '$BUILD_DIR/mongo/db/storage/encryption_hooks', '$BUILD_DIR/mongo/db/storage/storage_util', '$BUILD_DIR/mongo/db/storage/two_phase_index_build_knobs_idl', - '$BUILD_DIR/mongo/util/fail_point', "$BUILD_DIR/mongo/executor/task_executor_interface", + '$BUILD_DIR/mongo/util/fail_point', + 'catalog/database_holder', + 'db_raii', + 'index_build_entry_helpers', + 'server_options_core', ], ) @@ -938,16 +939,16 @@ env.Library( "index_build_entry_helpers.cpp", ], LIBDEPS_PRIVATE=[ - "catalog_raii", - "dbhelpers", - "db_raii", - "namespace_string", - "service_context", "$BUILD_DIR/mongo/base", "$BUILD_DIR/mongo/db/catalog/commit_quorum_options", "$BUILD_DIR/mongo/db/catalog/index_build_entry_idl", "$BUILD_DIR/mongo/db/storage/write_unit_of_work", + "catalog_raii", + "db_raii", + "dbhelpers", + "namespace_string", "repl/local_oplog_info", + "service_context", ], ) @@ -958,12 +959,12 @@ env.Library( env.Idlc("cloner.idl")[0], ], LIBDEPS=[ - 'dbdirectclient', - 'repl/isself', - 'write_ops', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/catalog/collection_options', '$BUILD_DIR/mongo/db/catalog/multi_index_block', + 'dbdirectclient', + 'repl/isself', + 'write_ops', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/client/authentication', @@ -1015,10 +1016,10 @@ env.Library( "storage/storage_options", ], LIBDEPS_PRIVATE=[ + "$BUILD_DIR/mongo/db/storage/storage_control", "commands/server_status_core", "s/sharding_api_d", "shared_request_handling", - "$BUILD_DIR/mongo/db/storage/storage_control", ], ) @@ -1032,8 +1033,8 @@ env.Library( "$BUILD_DIR/mongo/idl/server_parameter", "$BUILD_DIR/mongo/s/grid", "catalog_raii", - "curop", "concurrency/write_conflict_exception", + "curop", "repl/repl_coordinator_interface", "repl/speculative_majority_read_info", "s/sharding_api_d", @@ -1049,8 +1050,8 @@ env.Library( '$BUILD_DIR/mongo/db/catalog/collection', ], LIBDEPS_PRIVATE=[ - 'index_builds_coordinator_interface', 'catalog/index_key_validate', + 'index_builds_coordinator_interface', ], ) @@ -1065,16 +1066,16 @@ env.Library( 'vector_clock', ], LIBDEPS_PRIVATE=[ - 'index_builds_coordinator_interface', - 'rebuild_indexes', 'catalog/collection_validation', 'catalog/database_holder', 'catalog/document_validation', 'catalog/index_key_validate', 'catalog/multi_index_block', + 'index_builds_coordinator_interface', + 'rebuild_indexes', + 'repl/oplog', 'storage/storage_repair_observer', 'storage/storage_util', - 'repl/oplog', ], ) @@ -1092,8 +1093,8 @@ env.Library( LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/commands/fsync_locked', '$BUILD_DIR/mongo/idl/server_parameter', - 'service_context', 'commands/server_status_core', + 'service_context', 'write_ops', ] ) @@ -1194,12 +1195,12 @@ env.Library( 'catalog/collection', 'catalog/collection_query_info', 'catalog/document_validation', - 'catalog/index_catalog_entry', 'catalog/index_catalog', + 'catalog/index_catalog_entry', 'commands', 'concurrency/write_conflict_exception', - 'curop_failpoint_helpers', 'curop', + 'curop_failpoint_helpers', 'cursor_server_params', 'db_raii', 'dbdirectclient', @@ -1223,9 +1224,9 @@ env.Library( 'shared_request_handling', 'stats/serveronly_stats', 'storage/oplog_hack', + 'storage/remove_saver', 'storage/snapshot_helper', 'storage/storage_options', - 'storage/remove_saver', 'update/update_driver', ], LIBDEPS_PRIVATE=[ @@ -1241,12 +1242,12 @@ env.Library( "startup_recovery.cpp", ], LIBDEPS_PRIVATE=[ - 'rebuild_indexes', 'catalog/catalog_helpers', 'catalog/database_holder', 'commands/mongod_fcv', 'dbdirectclient', 'dbhelpers', + 'rebuild_indexes', 'repair', 'repl/repl_settings', 'storage/storage_repair_observer', @@ -1274,9 +1275,9 @@ env.Library( 'logical_session_id_helpers.cpp', ], LIBDEPS=[ - 'logical_session_id', '$BUILD_DIR/mongo/db/auth/auth', '$BUILD_DIR/mongo/db/auth/authprivilege', + 'logical_session_id', ], ) @@ -1330,10 +1331,10 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/logical_session_id', - '$BUILD_DIR/mongo/util/clock_sources', - '$BUILD_DIR/mongo/util/periodic_runner', '$BUILD_DIR/mongo/s/coreshard', '$BUILD_DIR/mongo/s/query/cluster_cursor_manager', + '$BUILD_DIR/mongo/util/clock_sources', + '$BUILD_DIR/mongo/util/periodic_runner', 'service_context', 'service_liaison', ], @@ -1417,12 +1418,12 @@ env.Library( 'logical_session_cache_impl.cpp', ], LIBDEPS=[ + 'kill_sessions', 'logical_session_cache', 'logical_session_id', 'logical_session_id_helpers', - 'sessions_collection', 'service_liaison', - 'kill_sessions', + 'sessions_collection', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/s/sharding_api_d', @@ -1521,8 +1522,8 @@ env.Library( 'periodic_runner_job_abort_expired_transactions.cpp', ], LIBDEPS_PRIVATE=[ - 'kill_sessions_local', '$BUILD_DIR/mongo/util/periodic_runner', + 'kill_sessions_local', 'transaction', ], ) @@ -1543,8 +1544,8 @@ env.Library( 'signed_logical_time.cpp', ], LIBDEPS=[ - 'logical_time', '$BUILD_DIR/mongo/crypto/sha1_block', + 'logical_time', ], ) @@ -1603,9 +1604,9 @@ env.Library( 'keys_collection_client_sharded.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/s/catalog/sharding_catalog_client', 'keys_collection_document', 'logical_time', - '$BUILD_DIR/mongo/s/catalog/sharding_catalog_client', ], ) @@ -1623,6 +1624,7 @@ env.Library( env.Idlc('vector_clock_document.idl')[0], ], LIBDEPS=[ + '$BUILD_DIR/mongo/transport/transport_layer_common', 'auth/authprivilege', 'global_settings', 'keys_collection_client_sharded', @@ -1632,7 +1634,6 @@ env.Library( 'service_context', 'signed_logical_time', 'time_proof_service', - '$BUILD_DIR/mongo/transport/transport_layer_common', ], LIBDEPS_PRIVATE=[ 'server_options_core', @@ -1683,9 +1684,9 @@ env.Library( 'logical_time_metadata_hook.cpp', ], LIBDEPS= [ + '$BUILD_DIR/mongo/rpc/metadata', 'logical_time', 'vector_clock', - '$BUILD_DIR/mongo/rpc/metadata', ], ) @@ -1720,12 +1721,12 @@ env.Library( 'service_context_test_fixture.cpp', ], LIBDEPS=[ - 'service_context', '$BUILD_DIR/mongo/unittest/unittest', + 'service_context', ], LIBDEPS_PRIVATE=[ - 'op_observer', '$BUILD_DIR/mongo/util/clock_source_mock', + 'op_observer', ], ) @@ -1743,9 +1744,9 @@ env.Library( 'index/index_access_methods', 'index_builds_coordinator_mongod', 'service_context_d', - 'storage/storage_control', 'storage/devnull/storage_devnull', 'storage/ephemeral_for_test/storage_ephemeral_for_test', + 'storage/storage_control', 'storage/storage_options', ], ) @@ -1770,11 +1771,11 @@ env.Library( 'log_process_details.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/util/net/network', 'repl/repl_coordinator_interface', 'repl/replica_set_messages', 'server_options_servers', - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/util/net/network', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/util/processinfo', @@ -1798,9 +1799,9 @@ env.Library( env.Idlc('generic_cursor.idl')[0], ], LIBDEPS=[ - 'service_context', '$BUILD_DIR/mongo/db/repl/optime', '$BUILD_DIR/mongo/idl/idl_parser', + 'service_context', ], ) @@ -1845,8 +1846,8 @@ env.Library( 'concurrency/lock_manager', 'introspect', 'matcher/expressions_mongod_only', - 'query_exec', 'query/command_request_response', + 'query_exec', 'repl/repl_coordinator_interface', 'service_context', 'update/update_driver', @@ -1907,8 +1908,8 @@ env.Library( '$BUILD_DIR/mongo/base', ], LIBDEPS_PRIVATE=[ - 'mongod_options', '$BUILD_DIR/mongo/util/net/ssl_options_server' if get_option('ssl') == 'on' else '', + 'mongod_options', ] ) @@ -2236,8 +2237,8 @@ envWithAsio.CppUnitTest( '$BUILD_DIR/mongo/util/net/network', '$BUILD_DIR/mongo/util/net/ssl_options_server', 'auth/authmocks', - 'catalog_raii', 'catalog/database_holder', + 'catalog_raii', 'collection_index_usage_tracker', 'commands', 'common', @@ -2250,15 +2251,15 @@ envWithAsio.CppUnitTest( 'keys_collection_client_direct', 'keys_collection_document', 'logical_clock_test_fixture', - 'logical_session_cache_impl', 'logical_session_cache', - 'logical_session_id_helpers', + 'logical_session_cache_impl', 'logical_session_id', + 'logical_session_id_helpers', 'logical_time', 'mirror_maestro', 'namespace_string', - 'op_observer_impl', 'op_observer', + 'op_observer_impl', 'query_exec', 'range_arithmetic', 'read_write_concern_defaults_mock', @@ -2272,15 +2273,15 @@ envWithAsio.CppUnitTest( 's/shard_server_test_fixture', 'server_options_core', 'server_options_servers', - 'service_context_d_test_fixture', + 'service_context', 'service_context_d', + 'service_context_d_test_fixture', 'service_context_devnull_test_fixture', 'service_context_test_fixture', - 'service_context', 'service_liaison_mock', 'session_catalog', - 'sessions_collection_mock', 'sessions_collection', + 'sessions_collection_mock', 'signed_logical_time', 'snapshot_window_options', 'startup_warnings_mongod', diff --git a/src/mongo/db/auth/SConscript b/src/mongo/db/auth/SConscript index c33cc3ee5ec..1ecf238f9ca 100644 --- a/src/mongo/db/auth/SConscript +++ b/src/mongo/db/auth/SConscript @@ -40,13 +40,13 @@ env.Library( "auth_op_observer.cpp", ], LIBDEPS_PRIVATE=[ - 'auth', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/catalog/collection_options', '$BUILD_DIR/mongo/db/index/index_descriptor', '$BUILD_DIR/mongo/db/op_observer', '$BUILD_DIR/mongo/db/op_observer_util', '$BUILD_DIR/mongo/db/repl/oplog_entry', + 'auth', ] ) @@ -59,9 +59,9 @@ env.Library( '$BUILD_DIR/mongo/base', ], LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/crypto/sha_block_${MONGO_CRYPTO}', 'authentication_restriction', 'authprivilege', - '$BUILD_DIR/mongo/crypto/sha_block_${MONGO_CRYPTO}', ], ) @@ -82,11 +82,11 @@ env.Library( 'role_graph_builtin_roles.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/bson/mutable/mutable_bson', 'auth', 'auth_options', 'authprivilege', - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/bson/mutable/mutable_bson', ], ) @@ -96,12 +96,12 @@ env.Library( 'user_document_parser.cpp', ], LIBDEPS=[ - 'auth', - 'user', - 'role_graph_update', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/bson/mutable/mutable_bson', '$BUILD_DIR/mongo/bson/util/bson_extract', + 'auth', + 'role_graph_update', + 'user', ], ) @@ -121,10 +121,10 @@ env.Library( 'role_graph_update.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/db/update/update_driver', 'auth', 'auth_options', 'role_graph', - '$BUILD_DIR/mongo/db/update/update_driver', ], ) @@ -139,14 +139,6 @@ env.Library( env.Idlc('authorization_manager_impl_parameters.idl')[0], ], LIBDEPS=[ - 'address_restriction', - 'auth', - 'authorization_manager_global', - 'authprivilege', - 'role_graph', - 'sasl_options', - 'user', - 'user_document_parser', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/base/secure_allocator', '$BUILD_DIR/mongo/bson/mutable/mutable_bson', @@ -157,14 +149,22 @@ env.Library( '$BUILD_DIR/mongo/db/namespace_string', '$BUILD_DIR/mongo/db/pipeline/lite_parsed_document_source', '$BUILD_DIR/mongo/db/update/update_driver', - '$BUILD_DIR/mongo/util/icu', '$BUILD_DIR/mongo/util/concurrency/thread_pool', + '$BUILD_DIR/mongo/util/icu', '$BUILD_DIR/mongo/util/net/ssl_manager', '$BUILD_DIR/mongo/util/net/ssl_types', + 'address_restriction', + 'auth', + 'authorization_manager_global', + 'authprivilege', + 'role_graph', + 'sasl_options', + 'user', + 'user_document_parser', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/util/caching', '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/util/caching', ], ) @@ -180,11 +180,11 @@ env.Library( 'user_management_commands_parser.cpp', ], LIBDEPS=[ - 'auth', - 'address_restriction', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/bson/mutable/mutable_bson', '$BUILD_DIR/mongo/db/common', + 'address_restriction', + 'auth', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/rpc/metadata_impersonated_user', @@ -201,9 +201,9 @@ env.Library( '$BUILD_DIR/mongo/idl/server_parameter', ], LIBDEPS=[ - 'auth', '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/service_context', + 'auth', ], ) @@ -216,14 +216,14 @@ env.Library( '$BUILD_DIR/mongo/base', ], LIBDEPS_PRIVATE=[ - 'sasl_options', - 'security_file', - 'user', '$BUILD_DIR/mongo/base/secure_allocator', '$BUILD_DIR/mongo/client/authentication', '$BUILD_DIR/mongo/crypto/sha_block_${MONGO_CRYPTO}', '$BUILD_DIR/mongo/util/icu', '$BUILD_DIR/mongo/util/md5', + 'sasl_options', + 'security_file', + 'user', ], ) @@ -279,18 +279,18 @@ env.Library( ) env.Library( - target='sasl_options_init', - source=[ - 'sasl_options_init.cpp', - env.Idlc('sasl_options.idl')[0], - ], - LIBDEPS=[ - 'sasl_options' - ], - LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/util/options_parser/options_parser', - '$BUILD_DIR/mongo/util/net/network', - ], + target='sasl_options_init', + source=[ + 'sasl_options_init.cpp', + env.Idlc('sasl_options.idl')[0], + ], + LIBDEPS=[ + 'sasl_options' + ], + LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/util/net/network', + '$BUILD_DIR/mongo/util/options_parser/options_parser', + ], ) env.Library( @@ -301,10 +301,6 @@ env.Library( 'sasl_scram_server_conversation.cpp', ], LIBDEPS=[ - 'auth', - 'authprivilege', - 'sasl_options', - 'user', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/base/secure_allocator', '$BUILD_DIR/mongo/crypto/sha_block_${MONGO_CRYPTO}', @@ -312,6 +308,10 @@ env.Library( '$BUILD_DIR/mongo/util/icu', '$BUILD_DIR/mongo/util/md5', '$BUILD_DIR/mongo/util/net/network', + 'auth', + 'authprivilege', + 'sasl_options', + 'user', ], ) @@ -322,12 +322,12 @@ env.Library( 'authz_session_external_state_d.cpp', ], LIBDEPS=[ - 'authservercommon', - 'auth_impl_internal_local', '$BUILD_DIR/mongo/db/db_raii', '$BUILD_DIR/mongo/db/dbdirectclient', '$BUILD_DIR/mongo/db/dbhelpers', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', + 'auth_impl_internal_local', + 'authservercommon', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/concurrency/lock_manager', @@ -343,9 +343,9 @@ env.Library( env.Idlc('user_cache_invalidator_job_parameters.idl')[0], ], LIBDEPS=[ - 'authservercommon', '$BUILD_DIR/mongo/s/catalog/dist_lock_manager', '$BUILD_DIR/mongo/s/coreshard', + 'authservercommon', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/idl/server_parameter', @@ -375,10 +375,10 @@ env.Library( env.Idlc('address_restriction.idl')[0], ], LIBDEPS_PRIVATE=[ - 'authentication_restriction', '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/util/net/network', '$BUILD_DIR/mongo/idl/idl_parser', + '$BUILD_DIR/mongo/util/net/network', + 'authentication_restriction', ], ) diff --git a/src/mongo/db/catalog/SConscript b/src/mongo/db/catalog/SConscript index 4d8a586789f..da81d6433b7 100644 --- a/src/mongo/db/catalog/SConscript +++ b/src/mongo/db/catalog/SConscript @@ -31,13 +31,13 @@ env.Library( 'catalog_test_fixture.cpp', ], LIBDEPS=[ - 'catalog_helpers', '$BUILD_DIR/mongo/db/auth/authmocks', '$BUILD_DIR/mongo/db/namespace_string', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', '$BUILD_DIR/mongo/db/repl/replmocks', '$BUILD_DIR/mongo/db/repl/storage_interface_impl', '$BUILD_DIR/mongo/db/service_context_d_test_fixture', + 'catalog_helpers', ], ) @@ -67,9 +67,9 @@ env.Library( env.Idlc('commit_quorum.idl')[0], ], LIBDEPS=[ - 'commit_quorum_options', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/idl/idl_parser', + 'commit_quorum_options', ], ) @@ -89,8 +89,8 @@ env.Library( env.Idlc('index_build_entry.idl')[0], ], LIBDEPS=[ - 'commit_quorum_idl', '$BUILD_DIR/mongo/util/net/network', + 'commit_quorum_idl', ], ) @@ -114,8 +114,8 @@ env.Library( 'index_builds_manager.cpp', ], LIBDEPS=[ - 'multi_index_block', '$BUILD_DIR/mongo/base', + 'multi_index_block', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/catalog_raii', @@ -214,9 +214,9 @@ env.Library( 'database_holder.cpp', ], LIBDEPS=[ - 'collection', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/service_context', + 'collection', ], ) @@ -273,8 +273,8 @@ env.Library( 'collection_catalog_helper.cpp', ], LIBDEPS_PRIVATE=[ - 'collection_catalog', '$BUILD_DIR/mongo/db/concurrency/lock_manager', + 'collection_catalog', ] ) @@ -284,12 +284,12 @@ env.Library( "catalog_control.cpp", ], LIBDEPS_PRIVATE=[ - 'collection', - 'collection_catalog', - 'database_holder', '$BUILD_DIR/mongo/db/index_builds_coordinator_interface', '$BUILD_DIR/mongo/db/rebuild_indexes', '$BUILD_DIR/mongo/db/service_context', + 'collection', + 'collection_catalog', + 'database_holder', ], ) @@ -299,13 +299,13 @@ env.Library( "validate_state.cpp" ], LIBDEPS_PRIVATE=[ - "collection_catalog", - "database_holder", - "throttle_cursor", "$BUILD_DIR/mongo/base", "$BUILD_DIR/mongo/db/catalog_raii", "$BUILD_DIR/mongo/db/views/views", "$BUILD_DIR/mongo/util/fail_point", + "collection_catalog", + "database_holder", + "throttle_cursor", ] ) @@ -320,13 +320,6 @@ env.Library( "index_consistency.cpp", ], LIBDEPS=[ - 'collection', - 'collection_options', - 'database_holder', - 'health_log', - 'index_catalog', - 'index_catalog_entry', - 'index_key_validate', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/collection_index_usage_tracker', '$BUILD_DIR/mongo/db/concurrency/lock_manager', @@ -339,22 +332,29 @@ env.Library( '$BUILD_DIR/mongo/db/repl/oplog', '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/service_context', - '$BUILD_DIR/mongo/db/storage/key_string', '$BUILD_DIR/mongo/db/storage/durable_catalog_impl', '$BUILD_DIR/mongo/db/storage/execution_context', + '$BUILD_DIR/mongo/db/storage/key_string', '$BUILD_DIR/mongo/db/storage/storage_engine_impl', '$BUILD_DIR/mongo/db/system_index', '$BUILD_DIR/mongo/db/views/views_mongod', + 'collection', + 'collection_options', + 'database_holder', + 'health_log', + 'index_catalog', + 'index_catalog_entry', + 'index_key_validate', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/catalog/collection_catalog', '$BUILD_DIR/mongo/db/catalog/collection_catalog_helper', '$BUILD_DIR/mongo/db/commands/server_status_core', - '$BUILD_DIR/mongo/db/index/index_build_interceptor', '$BUILD_DIR/mongo/db/index/index_access_methods', + '$BUILD_DIR/mongo/db/index/index_build_interceptor', '$BUILD_DIR/mongo/db/repl/repl_settings', - '$BUILD_DIR/mongo/db/storage/storage_engine_common', '$BUILD_DIR/mongo/db/storage/storage_debug_util', + '$BUILD_DIR/mongo/db/storage/storage_engine_common', '$BUILD_DIR/mongo/db/storage/storage_util', '$BUILD_DIR/mongo/db/transaction', '$BUILD_DIR/mongo/db/vector_clock', @@ -425,8 +425,8 @@ env.Library( '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/views/views', '$BUILD_DIR/mongo/db/write_ops', - 'collection_options', 'collection', + 'collection_options', 'index_catalog', 'index_key_validate', 'multi_index_block', @@ -449,8 +449,8 @@ env.Library( '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/curop', '$BUILD_DIR/mongo/db/query/query_planner', - '$BUILD_DIR/mongo/db/update_index_data', '$BUILD_DIR/mongo/db/service_context', + '$BUILD_DIR/mongo/db/update_index_data', ], ) @@ -485,8 +485,8 @@ env.CppUnitTest( '$BUILD_DIR/mongo/db/index_builds_coordinator_mongod', '$BUILD_DIR/mongo/db/matcher/expressions', '$BUILD_DIR/mongo/db/namespace_string', - '$BUILD_DIR/mongo/db/op_observer_impl', '$BUILD_DIR/mongo/db/op_observer', + '$BUILD_DIR/mongo/db/op_observer_impl', '$BUILD_DIR/mongo/db/query/datetime/date_time_support', '$BUILD_DIR/mongo/db/query/query_test_service_context', '$BUILD_DIR/mongo/db/repl/drop_pending_collection_reaper', @@ -495,9 +495,9 @@ env.CppUnitTest( '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', '$BUILD_DIR/mongo/db/repl/replmocks', '$BUILD_DIR/mongo/db/repl/storage_interface_impl', + '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/service_context_d_test_fixture', '$BUILD_DIR/mongo/db/service_context_test_fixture', - '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/storage/kv/kv_prefix', '$BUILD_DIR/mongo/db/storage/wiredtiger/storage_wiredtiger', '$BUILD_DIR/mongo/unittest/unittest', @@ -506,11 +506,11 @@ env.CppUnitTest( 'catalog_control', 'catalog_helpers', 'catalog_test_fixture', - 'collection_catalog_helper', + 'collection', 'collection_catalog', + 'collection_catalog_helper', 'collection_options', 'collection_validation', - 'collection', 'commit_quorum_options', 'database_holder', 'index_build_block', diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript index e47074dc441..f79d849961e 100644 --- a/src/mongo/db/commands/SConscript +++ b/src/mongo/db/commands/SConscript @@ -41,8 +41,8 @@ env.Library( '$BUILD_DIR/mongo/db/auth/authprivilege', '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/stats/counters', - '$BUILD_DIR/mongo/util/processinfo', '$BUILD_DIR/mongo/util/net/http_client', + '$BUILD_DIR/mongo/util/processinfo', 'server_status_core', ], ) @@ -68,8 +68,8 @@ env.Library( "write_commands/write_commands_common.cpp", ], LIBDEPS=[ - '$BUILD_DIR/mongo/db/auth/auth', '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/db/auth/auth', '$BUILD_DIR/mongo/db/auth/authprivilege', '$BUILD_DIR/mongo/db/commands', '$BUILD_DIR/mongo/db/ops/write_ops_parsers', @@ -121,10 +121,10 @@ env.Library( '$BUILD_DIR/mongo/db/commands', '$BUILD_DIR/mongo/db/common', '$BUILD_DIR/mongo/db/kill_sessions', - '$BUILD_DIR/mongo/db/logical_session_cache_impl', '$BUILD_DIR/mongo/db/logical_session_cache', - '$BUILD_DIR/mongo/db/logical_session_id_helpers', + '$BUILD_DIR/mongo/db/logical_session_cache_impl', '$BUILD_DIR/mongo/db/logical_session_id', + '$BUILD_DIR/mongo/db/logical_session_id_helpers', '$BUILD_DIR/mongo/db/mongohasher', '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/idl/server_parameter', @@ -164,10 +164,10 @@ env.Library( '$BUILD_DIR/mongo/db/commands', '$BUILD_DIR/mongo/db/common', '$BUILD_DIR/mongo/db/log_process_details', - '$BUILD_DIR/mongo/db/logical_session_cache_impl', '$BUILD_DIR/mongo/db/logical_session_cache', - '$BUILD_DIR/mongo/db/logical_session_id_helpers', + '$BUILD_DIR/mongo/db/logical_session_cache_impl', '$BUILD_DIR/mongo/db/logical_session_id', + '$BUILD_DIR/mongo/db/logical_session_id_helpers', '$BUILD_DIR/mongo/db/pipeline/pipeline', '$BUILD_DIR/mongo/db/repl/isself', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', @@ -179,8 +179,8 @@ env.Library( '$BUILD_DIR/mongo/rpc/client_metadata', '$BUILD_DIR/mongo/s/coreshard', '$BUILD_DIR/mongo/scripting/scripting_common', - '$BUILD_DIR/mongo/util/ntservice', '$BUILD_DIR/mongo/util/net/ssl_manager', + '$BUILD_DIR/mongo/util/ntservice', 'authentication_commands', 'core', 'feature_compatibility_parsers', @@ -318,6 +318,7 @@ env.Library( '$BUILD_DIR/mongo/db/stats/counters', '$BUILD_DIR/mongo/db/stats/server_read_concern_write_concern_metrics', '$BUILD_DIR/mongo/db/storage/storage_engine_common', + "$BUILD_DIR/mongo/db/storage/two_phase_index_build_knobs_idl", '$BUILD_DIR/mongo/db/transaction', '$BUILD_DIR/mongo/db/views/views_mongod', '$BUILD_DIR/mongo/util/log_and_backoff', @@ -331,7 +332,6 @@ env.Library( 'rename_collection_idl', 'test_commands_enabled', 'write_commands_common', - "$BUILD_DIR/mongo/db/storage/two_phase_index_build_knobs_idl", ], ) @@ -468,8 +468,8 @@ env.Library( 'profile_common', 'server_status', 'servers', - 'set_index_commit_quorum_idl', 'set_feature_compatibility_version_idl', + 'set_index_commit_quorum_idl', 'shell_protocol', 'shutdown_idl', 'standalone', @@ -487,11 +487,11 @@ env.Library( env.Idlc('kill_operations.idl')[0], ], LIBDEPS=[ - '$BUILD_DIR/mongo/db/auth/authprivilege', '$BUILD_DIR/mongo/db/audit', + '$BUILD_DIR/mongo/db/auth/authorization_manager_global', + '$BUILD_DIR/mongo/db/auth/authprivilege', '$BUILD_DIR/mongo/db/commands', '$BUILD_DIR/mongo/db/operation_killer', - '$BUILD_DIR/mongo/db/auth/authorization_manager_global', '$BUILD_DIR/mongo/db/query/command_request_response', ], ) @@ -547,8 +547,8 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/idl/idl_parser', '$BUILD_DIR/mongo/client/read_preference', + '$BUILD_DIR/mongo/idl/idl_parser', ] ) env.Library( @@ -586,8 +586,8 @@ env.Library( '$BUILD_DIR/mongo/db/index/index_access_methods', '$BUILD_DIR/mongo/db/pipeline/process_interface/mongo_process_interface', '$BUILD_DIR/mongo/db/pipeline/process_interface/mongod_process_interface_factory', - '$BUILD_DIR/mongo/db/query_exec', '$BUILD_DIR/mongo/db/query/map_reduce_output_format', + '$BUILD_DIR/mongo/db/query_exec', '$BUILD_DIR/mongo/idl/idl_parser', 'map_reduce_parser' ] @@ -614,8 +614,8 @@ env.CppUnitTest( ], LIBDEPS=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/auth/authorization_manager_global', '$BUILD_DIR/mongo/db/auth/authmocks', + '$BUILD_DIR/mongo/db/auth/authorization_manager_global', '$BUILD_DIR/mongo/db/commands/standalone', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/unittest/unittest', diff --git a/src/mongo/db/concurrency/SConscript b/src/mongo/db/concurrency/SConscript index ce94b838109..e880c08d1d9 100644 --- a/src/mongo/db/concurrency/SConscript +++ b/src/mongo/db/concurrency/SConscript @@ -91,9 +91,9 @@ env.CppUnitTest( '$BUILD_DIR/mongo/db/auth/authmocks', '$BUILD_DIR/mongo/db/curop', '$BUILD_DIR/mongo/db/service_context_d_test_fixture', - '$BUILD_DIR/mongo/util/progress_meter', '$BUILD_DIR/mongo/transport/transport_layer_common', '$BUILD_DIR/mongo/transport/transport_layer_mock', + '$BUILD_DIR/mongo/util/progress_meter', 'lock_manager', 'write_conflict_exception', ] diff --git a/src/mongo/db/cst/SConscript b/src/mongo/db/cst/SConscript index f39cb553646..b67dcacbbd3 100644 --- a/src/mongo/db/cst/SConscript +++ b/src/mongo/db/cst/SConscript @@ -43,7 +43,7 @@ env.CppUnitTest( 'cst_literals_test.cpp', ], LIBDEPS=[ - 'cst', '$BUILD_DIR/mongo/db/query/query_test_service_context', + 'cst', ] ) diff --git a/src/mongo/db/exec/document_value/SConscript b/src/mongo/db/exec/document_value/SConscript index ddbb7c2f307..41e729f9a4c 100644 --- a/src/mongo/db/exec/document_value/SConscript +++ b/src/mongo/db/exec/document_value/SConscript @@ -12,8 +12,8 @@ env.Library( 'value_comparator.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/db/pipeline/field_path', '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/db/pipeline/field_path', '$BUILD_DIR/mongo/db/query/datetime/date_time_support', '$BUILD_DIR/mongo/util/intrusive_counter', ] diff --git a/src/mongo/db/exec/sbe/SConscript b/src/mongo/db/exec/sbe/SConscript index 514be74881a..a9461dc72a6 100644 --- a/src/mongo/db/exec/sbe/SConscript +++ b/src/mongo/db/exec/sbe/SConscript @@ -97,8 +97,8 @@ env.CppUnitTest( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/concurrency/lock_manager', - '$BUILD_DIR/mongo/unittest/unittest', '$BUILD_DIR/mongo/db/service_context_test_fixture', + '$BUILD_DIR/mongo/unittest/unittest', 'query_sbe_parser', ], ) diff --git a/src/mongo/db/free_mon/SConscript b/src/mongo/db/free_mon/SConscript index 41afebd22e3..ba20544ff6e 100644 --- a/src/mongo/db/free_mon/SConscript +++ b/src/mongo/db/free_mon/SConscript @@ -41,10 +41,10 @@ if free_monitoring == "on": 'free_mon_status.cpp', ], LIBDEPS=[ - 'free_mon', '$BUILD_DIR/mongo/db/commands/server_status', '$BUILD_DIR/mongo/db/ftdc/ftdc_server', '$BUILD_DIR/mongo/util/options_parser/options_parser', + 'free_mon', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/client/clientdriver_network', @@ -60,11 +60,11 @@ else: 'free_mon_stub.cpp', ], LIBDEPS_PRIVATE=[ - 'free_mon', '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/commands', '$BUILD_DIR/mongo/db/auth/auth', '$BUILD_DIR/mongo/db/auth/authprivilege', + '$BUILD_DIR/mongo/db/commands', + 'free_mon', ], ) @@ -80,8 +80,8 @@ fmEnv.CppUnitTest( '$BUILD_DIR/mongo/db/auth/authmocks', '$BUILD_DIR/mongo/db/repl/replmocks', '$BUILD_DIR/mongo/db/repl/storage_interface_impl', - '$BUILD_DIR/mongo/db/service_context_d_test_fixture', '$BUILD_DIR/mongo/db/service_context_d', + '$BUILD_DIR/mongo/db/service_context_d_test_fixture', '$BUILD_DIR/mongo/executor/thread_pool_task_executor_test_fixture', '$BUILD_DIR/mongo/util/clock_source_mock', 'free_mon', diff --git a/src/mongo/db/ftdc/SConscript b/src/mongo/db/ftdc/SConscript index 0e165ac38c1..9e57cdfe767 100644 --- a/src/mongo/db/ftdc/SConscript +++ b/src/mongo/db/ftdc/SConscript @@ -1,4 +1,7 @@ # -*- mode: python -*- + +from site_scons.mongo import insort_wrapper + Import("env") env = env.Clone() @@ -31,15 +34,10 @@ ftdcEnv.Library( ) platform_libs = [] - if env.TargetOSIs('linux'): - platform_libs = [ - '$BUILD_DIR/mongo/util/procparser' - ] + platform_libs.append('$BUILD_DIR/mongo/util/procparser') elif env.TargetOSIs('windows'): - platform_libs = [ - '$BUILD_DIR/mongo/util/perfctr_collect' - ] + platform_libs.append('$BUILD_DIR/mongo/util/perfctr_collect') env.Library( target='ftdc_server', @@ -58,6 +56,9 @@ env.Library( LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/idl/server_parameter', ], + LIBDEPS_TAGS=[ + 'lint-allow-non-alphabetic', + ], ) env.Library( diff --git a/src/mongo/db/fts/SConscript b/src/mongo/db/fts/SConscript index 219871dadf5..2d4910b1c28 100644 --- a/src/mongo/db/fts/SConscript +++ b/src/mongo/db/fts/SConscript @@ -75,9 +75,16 @@ env.Library( ], ) -env.Library('ftsmongod', [ - 'ftsmongod.cpp', - ], LIBDEPS=["base_fts","$BUILD_DIR/mongo/base"]) +env.Library( + target='ftsmongod', + source=[ + 'ftsmongod.cpp', + ], + LIBDEPS=[ + "$BUILD_DIR/mongo/base", + "base_fts", + ] +) env.CppUnitTest( target='db_fts_test', diff --git a/src/mongo/db/geo/SConscript b/src/mongo/db/geo/SConscript index fb13309cbfb..1a32eefac8a 100644 --- a/src/mongo/db/geo/SConscript +++ b/src/mongo/db/geo/SConscript @@ -5,22 +5,36 @@ Import("env") env = env.Clone() # Core geometry shape libraries -env.Library("geometry", [ "hash.cpp", - "shapes.cpp", - "big_polygon.cpp", - "r2_region_coverer.cpp" ], - LIBDEPS = [ "$BUILD_DIR/mongo/base", - "$BUILD_DIR/mongo/db/common", - '$BUILD_DIR/mongo/db/storage/key_string', - "$BUILD_DIR/third_party/s2/s2" ]) +env.Library( + target="geometry", + source=[ + "hash.cpp", + "shapes.cpp", + "big_polygon.cpp", + "r2_region_coverer.cpp" + ], + LIBDEPS=[ + "$BUILD_DIR/mongo/base", + "$BUILD_DIR/mongo/db/common", + "$BUILD_DIR/mongo/db/storage/key_string", + "$BUILD_DIR/third_party/s2/s2" + ] +) # Geometry / BSON parsing and wrapping -env.Library("geoparser", [ "geoparser.cpp", - "geometry_container.cpp" ], - LIBDEPS = [ "geometry", - "$BUILD_DIR/mongo/base", - "$BUILD_DIR/mongo/db/bson/dotted_path_support", - "$BUILD_DIR/third_party/s2/s2" ]) +env.Library( + target="geoparser", + source=[ + "geoparser.cpp", + "geometry_container.cpp" + ], + LIBDEPS=[ + "$BUILD_DIR/mongo/base", + "$BUILD_DIR/mongo/db/bson/dotted_path_support", + "$BUILD_DIR/third_party/s2/s2", + "geometry", + ] +) env.CppUnitTest( target="db_geo_test", @@ -31,8 +45,8 @@ env.CppUnitTest( "r2_region_coverer_test.cpp", ], LIBDEPS=[ + "$BUILD_DIR/mongo/db/common", "geometry", "geoparser", - "$BUILD_DIR/mongo/db/common" ] ) diff --git a/src/mongo/db/index/SConscript b/src/mongo/db/index/SConscript index c4c148b91e4..97f2eeb63c2 100644 --- a/src/mongo/db/index/SConscript +++ b/src/mongo/db/index/SConscript @@ -16,8 +16,8 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/index_names', - '$BUILD_DIR/mongo/db/namespace_string', '$BUILD_DIR/mongo/db/matcher/expressions', + '$BUILD_DIR/mongo/db/namespace_string', '$BUILD_DIR/mongo/db/query/collation/collator_factory_interface', ], ) @@ -126,8 +126,8 @@ serveronlyEnv.Library( LIBDEPS=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/catalog/index_catalog_entry', - '$BUILD_DIR/mongo/db/curop', '$BUILD_DIR/mongo/db/concurrency/write_conflict_exception', + '$BUILD_DIR/mongo/db/curop', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', '$BUILD_DIR/mongo/db/storage/encryption_hooks', '$BUILD_DIR/mongo/db/storage/execution_context', @@ -138,10 +138,10 @@ serveronlyEnv.Library( 'index_descriptor', ], LIBDEPS_PRIVATE=[ - 'skipped_record_tracker', '$BUILD_DIR/mongo/db/sorter/sorter_idl', '$BUILD_DIR/mongo/db/vector_clock', '$BUILD_DIR/mongo/idl/server_parameter', + 'skipped_record_tracker', ], ) diff --git a/src/mongo/db/matcher/SConscript b/src/mongo/db/matcher/SConscript index 10977b44289..641bc8b8a20 100644 --- a/src/mongo/db/matcher/SConscript +++ b/src/mongo/db/matcher/SConscript @@ -67,9 +67,9 @@ env.Library( '$BUILD_DIR/mongo/db/fts/fts_query_noop', '$BUILD_DIR/mongo/db/geo/geometry', '$BUILD_DIR/mongo/db/geo/geoparser', + '$BUILD_DIR/mongo/db/pipeline/expression_context', '$BUILD_DIR/mongo/db/query/collation/collator_interface', '$BUILD_DIR/mongo/db/query/query_knobs', - '$BUILD_DIR/mongo/db/pipeline/expression_context', '$BUILD_DIR/mongo/idl/idl_parser', '$BUILD_DIR/mongo/util/regex_util', '$BUILD_DIR/third_party/shim_pcrecpp', @@ -85,13 +85,13 @@ env.Library( 'expression_where.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/db/catalog/collection', + '$BUILD_DIR/mongo/db/catalog/index_catalog', + '$BUILD_DIR/mongo/db/catalog_raii', '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/fts/base_fts', '$BUILD_DIR/mongo/scripting/scripting_server', 'expressions', - '$BUILD_DIR/mongo/db/catalog/collection', - '$BUILD_DIR/mongo/db/catalog/index_catalog', - '$BUILD_DIR/mongo/db/catalog_raii', ], ) diff --git a/src/mongo/db/ops/SConscript b/src/mongo/db/ops/SConscript index 80956062357..50dab62eaac 100644 --- a/src/mongo/db/ops/SConscript +++ b/src/mongo/db/ops/SConscript @@ -8,11 +8,11 @@ env.Library( target='write_ops_exec', source=[ 'write_ops_exec.cpp', - ], + ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/catalog_raii', '$BUILD_DIR/mongo/db/catalog/collection_options', + '$BUILD_DIR/mongo/db/catalog_raii', '$BUILD_DIR/mongo/db/curop', '$BUILD_DIR/mongo/db/curop_metrics', '$BUILD_DIR/mongo/db/repl/oplog', diff --git a/src/mongo/db/pipeline/SConscript b/src/mongo/db/pipeline/SConscript index 887fb93486b..509369c31ae 100644 --- a/src/mongo/db/pipeline/SConscript +++ b/src/mongo/db/pipeline/SConscript @@ -92,8 +92,8 @@ env.Library( 'variable_validation', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/vector_clock', '$BUILD_DIR/mongo/db/mongohasher', + '$BUILD_DIR/mongo/db/vector_clock', ], ) @@ -165,10 +165,10 @@ env.Library( 'sharded_agg_helpers.cpp', ], LIBDEPS=[ - 'aggregation', '$BUILD_DIR/mongo/s/async_requests_sender', '$BUILD_DIR/mongo/s/commands/shared_cluster_commands', '$BUILD_DIR/mongo/s/query/cluster_query', + 'aggregation', ], ) diff --git a/src/mongo/db/query/SConscript b/src/mongo/db/query/SConscript index 130d0f51230..49d1516f433 100644 --- a/src/mongo/db/query/SConscript +++ b/src/mongo/db/query/SConscript @@ -161,11 +161,11 @@ env.Library( '$BUILD_DIR/mongo/db/common', '$BUILD_DIR/mongo/db/namespace_string', '$BUILD_DIR/mongo/db/ops/write_ops_parsers', + '$BUILD_DIR/mongo/db/query/hint_parser', '$BUILD_DIR/mongo/db/repl/optime', - "$BUILD_DIR/mongo/idl/idl_parser", + '$BUILD_DIR/mongo/idl/idl_parser', '$BUILD_DIR/mongo/rpc/command_status', '$BUILD_DIR/mongo/rpc/rpc', - '$BUILD_DIR/mongo/db/query/hint_parser', 'query_request', ] ) @@ -204,9 +204,9 @@ env.Library( "query_test_service_context.cpp", ], LIBDEPS=[ - "collation/collator_factory_mock", "$BUILD_DIR/mongo/db/logical_session_id", "$BUILD_DIR/mongo/db/service_context", + "collation/collator_factory_mock", ], LIBDEPS_PRIVATE=[ ], @@ -218,8 +218,8 @@ env.Library( "query_planner_test_fixture.cpp", ], LIBDEPS=[ - "query_planner_test_lib", "$BUILD_DIR/mongo/unittest/unittest", + "query_planner_test_lib", ], ) diff --git a/src/mongo/db/query/datetime/SConscript b/src/mongo/db/query/datetime/SConscript index 62c21d259b7..e8a45118d4f 100644 --- a/src/mongo/db/query/datetime/SConscript +++ b/src/mongo/db/query/datetime/SConscript @@ -23,9 +23,9 @@ timeZoneEnv.Library( 'init_timezone_data.cpp' ], LIBDEPS=[ - 'date_time_support', '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/third_party/shim_timelib', + 'date_time_support', ] ) diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript index a9a9e3113fa..a5f1502fcab 100644 --- a/src/mongo/db/repl/SConscript +++ b/src/mongo/db/repl/SConscript @@ -21,11 +21,11 @@ env.Library( 'local_oplog_info.cpp', ], LIBDEPS_PRIVATE=[ - 'optime', - 'repl_coordinator_interface', '$BUILD_DIR/mongo/db/logical_time', '$BUILD_DIR/mongo/db/storage/flow_control', '$BUILD_DIR/mongo/db/vector_clock_mutable', + 'optime', + 'repl_coordinator_interface', ], ) @@ -40,13 +40,6 @@ env.Library( env.Idlc('apply_ops.idl')[0], ], LIBDEPS_PRIVATE=[ - 'dbcheck', - 'local_oplog_info', - 'repl_coordinator_interface', - 'repl_server_parameters', - 'repl_settings', - 'tenant_migration_donor', - 'timestamp_block', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/catalog/catalog_helpers', '$BUILD_DIR/mongo/db/catalog/database_holder', @@ -62,6 +55,13 @@ env.Library( '$BUILD_DIR/mongo/db/transaction', '$BUILD_DIR/mongo/idl/idl_parser', '$BUILD_DIR/mongo/rpc/command_status', + 'dbcheck', + 'local_oplog_info', + 'repl_coordinator_interface', + 'repl_server_parameters', + 'repl_settings', + 'tenant_migration_donor', + 'timestamp_block', ], ) @@ -71,8 +71,8 @@ env.Library( 'replication_auth.cpp', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/auth/authorization_manager_global', '$BUILD_DIR/mongo/client/authentication', + '$BUILD_DIR/mongo/db/auth/authorization_manager_global', ], ) @@ -93,9 +93,6 @@ env.Library( 'rollback_source_impl.cpp', ], LIBDEPS=[ - 'oplog', - 'oplog_interface_remote', - 'repl_coordinator_interface', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/db_raii', @@ -103,6 +100,9 @@ env.Library( '$BUILD_DIR/mongo/db/index/index_descriptor', '$BUILD_DIR/mongo/db/query_exec', '$BUILD_DIR/mongo/util/fail_point', + 'oplog', + 'oplog_interface_remote', + 'repl_coordinator_interface', ], LIBDEPS_PRIVATE=[ 'replication_auth', @@ -115,9 +115,15 @@ env.Library( 'bgsync.cpp', ], LIBDEPS=[ - 'oplog', + '$BUILD_DIR/mongo/client/connection_pool', + '$BUILD_DIR/mongo/client/fetcher', + '$BUILD_DIR/mongo/db/concurrency/write_conflict_exception', + '$BUILD_DIR/mongo/db/index_builds_coordinator_interface', + '$BUILD_DIR/mongo/db/service_context', + '$BUILD_DIR/mongo/util/concurrency/thread_pool', 'abstract_async_component', 'data_replicator_external_state_impl', + 'oplog', 'oplog_fetcher', 'oplog_interface_local', 'oplog_interface_remote', @@ -127,16 +133,10 @@ env.Library( 'rs_rollback', 'storage_interface', 'sync_source_resolver', - '$BUILD_DIR/mongo/client/connection_pool', - '$BUILD_DIR/mongo/client/fetcher', - '$BUILD_DIR/mongo/db/concurrency/write_conflict_exception', - '$BUILD_DIR/mongo/db/index_builds_coordinator_interface', - '$BUILD_DIR/mongo/db/service_context', - '$BUILD_DIR/mongo/util/concurrency/thread_pool', ], LIBDEPS_PRIVATE=[ - 'repl_server_parameters', '$BUILD_DIR/mongo/executor/thread_pool_task_executor', + 'repl_server_parameters', ], ) @@ -172,9 +172,9 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/idl/idl_parser', '$BUILD_DIR/mongo/db/catalog/health_log', '$BUILD_DIR/mongo/db/db_raii', + '$BUILD_DIR/mongo/idl/idl_parser', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/catalog/collection_options', @@ -183,16 +183,15 @@ env.Library( ], ) - env.Library( target='rollback_idl', source=[ env.Idlc('rollback.idl')[0], ], LIBDEPS=[ - 'optime', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/idl/idl_parser', + 'optime', ], ) @@ -202,8 +201,8 @@ env.Library( 'storage_interface.cpp', ], LIBDEPS=[ - 'optime', '$BUILD_DIR/mongo/db/service_context', + 'optime', ], ) @@ -214,21 +213,21 @@ env.Library( 'collection_bulk_loader_impl.cpp', ], LIBDEPS=[ - 'oplog', - 'rollback_idl', - 'storage_interface', '$BUILD_DIR/mongo/db/catalog/catalog_helpers', '$BUILD_DIR/mongo/db/catalog/multi_index_block', '$BUILD_DIR/mongo/db/common', '$BUILD_DIR/mongo/db/dbhelpers', '$BUILD_DIR/mongo/db/query_exec', + 'oplog', + 'rollback_idl', + 'storage_interface', ], LIBDEPS_PRIVATE=[ - 'repl_server_parameters', '$BUILD_DIR/mongo/db/catalog/database_holder', '$BUILD_DIR/mongo/db/storage/oplog_cap_maintainer_thread', '$BUILD_DIR/mongo/db/storage/storage_control', '$BUILD_DIR/mongo/db/vector_clock', + 'repl_server_parameters', ], ) @@ -238,9 +237,9 @@ env.Library( env.Idlc('replication_consistency_markers.idl')[0], ], LIBDEPS=[ - 'optime', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/idl/idl_parser', + 'optime', ], ) @@ -268,11 +267,11 @@ env.Library( LIBDEPS=[ ], LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/db/storage/storage_options', 'oplog', 'oplog_application', 'oplog_interface_local', - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/storage/storage_options', ], ) @@ -283,10 +282,10 @@ env.Library( 'replication_process.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/db/service_context', 'optime', 'rollback_idl', 'storage_interface', - '$BUILD_DIR/mongo/db/service_context', ], ) @@ -296,11 +295,11 @@ env.Library( 'drop_pending_collection_reaper.cpp', ], LIBDEPS=[ - 'optime', - 'storage_interface', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/namespace_string', '$BUILD_DIR/mongo/db/service_context', + 'optime', + 'storage_interface', ], ) @@ -331,11 +330,11 @@ env.Library( 'oplog_buffer_collection.cpp', ], LIBDEPS=[ - 'storage_interface', '$BUILD_DIR/mongo/db/catalog/collection_options', '$BUILD_DIR/mongo/db/db_raii', '$BUILD_DIR/mongo/db/dbdirectclient', '$BUILD_DIR/mongo/db/service_context', + 'storage_interface', ], ) @@ -368,9 +367,9 @@ env.Library( 'oplog_interface_mock.cpp', ], LIBDEPS=[ - 'oplog_entry', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/util/net/network', + 'oplog_entry', ], ) @@ -390,18 +389,18 @@ env.Library( 'rs_rollback.cpp', ], LIBDEPS=[ - 'drop_pending_collection_reaper', - 'oplog', - 'replication_process', - 'roll_back_local_operations', - 'rollback_impl', '$BUILD_DIR/mongo/db/catalog/catalog_helpers', '$BUILD_DIR/mongo/db/catalog/database_holder', + '$BUILD_DIR/mongo/db/dbhelpers', + '$BUILD_DIR/mongo/db/query_exec', '$BUILD_DIR/mongo/db/s/sharding_runtime_d', '$BUILD_DIR/mongo/db/storage/remove_saver', '$BUILD_DIR/mongo/util/fail_point', - '$BUILD_DIR/mongo/db/dbhelpers', - '$BUILD_DIR/mongo/db/query_exec', + 'drop_pending_collection_reaper', + 'oplog', + 'replication_process', + 'roll_back_local_operations', + 'rollback_impl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/catalog/index_build_oplog_entry', @@ -440,6 +439,10 @@ env.Library( 'rollback_test_fixture.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/db/query_exec', + '$BUILD_DIR/mongo/db/read_write_concern_defaults_mock', + '$BUILD_DIR/mongo/db/service_context', + '$BUILD_DIR/mongo/db/service_context_d_test_fixture', 'drop_pending_collection_reaper', 'oplog_interface_mock', 'optime', @@ -448,10 +451,6 @@ env.Library( 'replmocks', 'rs_rollback', 'storage_interface_impl', - '$BUILD_DIR/mongo/db/query_exec', - '$BUILD_DIR/mongo/db/read_write_concern_defaults_mock', - '$BUILD_DIR/mongo/db/service_context', - '$BUILD_DIR/mongo/db/service_context_d_test_fixture', ], ) @@ -473,9 +472,9 @@ env.Library( 'roll_back_local_operations', ], LIBDEPS_PRIVATE=[ - 'drop_pending_collection_reaper', '$BUILD_DIR/mongo/db/index_builds_coordinator_interface', '$BUILD_DIR/mongo/idl/server_parameter', + 'drop_pending_collection_reaper', ], ) @@ -486,13 +485,12 @@ env.Library( env.Idlc('oplog_entry.idl')[0], ], LIBDEPS=[ - 'optime', - 'optime_and_wall_time_base', '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/logical_session_id', '$BUILD_DIR/mongo/db/catalog/collection_options', '$BUILD_DIR/mongo/db/exec/document_value/document_value', '$BUILD_DIR/mongo/idl/idl_parser', + 'optime', + 'optime_and_wall_time_base', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/namespace_string', @@ -555,8 +553,8 @@ env.Library( 'oplog_entry', 'repl_coordinator_interface', 'repl_settings', - 'storage_interface', 'replication_metrics', + 'storage_interface', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/commands/mongod_fsync', @@ -572,12 +570,12 @@ env.Library( 'oplog_entry_test_helpers.cpp', ], LIBDEPS=[ - 'oplog_entry', - 'optime', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/common', '$BUILD_DIR/mongo/db/logical_session_id', '$BUILD_DIR/mongo/db/namespace_string', + 'oplog_entry', + 'optime', ] ) @@ -587,11 +585,11 @@ env.Library( 'idempotency_test_fixture.cpp', ], LIBDEPS=[ - 'oplog_applier_impl_test_fixture', - 'oplog_entry_test_helpers', '$BUILD_DIR/mongo/db/auth/authmocks', '$BUILD_DIR/mongo/db/catalog/collection_validation', '$BUILD_DIR/mongo/db/index_builds_coordinator_interface', + 'oplog_applier_impl_test_fixture', + 'oplog_entry_test_helpers', ], ) @@ -601,13 +599,14 @@ env.Library( 'oplog_applier_impl_test_fixture.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/db/catalog/document_validation', + '$BUILD_DIR/mongo/db/service_context_d_test_fixture', + '$BUILD_DIR/mongo/db/storage/wiredtiger/storage_wiredtiger', 'drop_pending_collection_reaper', 'oplog_application', 'replmocks', 'storage_interface_impl', - '$BUILD_DIR/mongo/db/catalog/document_validation', - '$BUILD_DIR/mongo/db/service_context_d_test_fixture', - '$BUILD_DIR/mongo/db/storage/wiredtiger/storage_wiredtiger', + ], ) @@ -660,14 +659,14 @@ env.Library( '$BUILD_DIR/mongo/util/fail_point', 'isself', 'member_data', - 'replica_set_messages', - 'repl_settings', 'repl_coordinator_interface', + 'repl_settings', + 'replica_set_messages', ], LIBDEPS_PRIVATE=[ - 'repl_server_parameters', '$BUILD_DIR/mongo/db/catalog/commit_quorum_options', '$BUILD_DIR/mongo/idl/server_parameter', + 'repl_server_parameters', ] ) @@ -726,18 +725,17 @@ env.Library( 'replication_coordinator_test_fixture.cpp', ], LIBDEPS=[ - 'repl_coordinator_impl', - 'replmocks', - 'topology_coordinator', - '$BUILD_DIR/mongo/db/auth/authorization_manager_global', '$BUILD_DIR/mongo/db/auth/authmocks', + '$BUILD_DIR/mongo/db/auth/authorization_manager_global', '$BUILD_DIR/mongo/db/service_context_d_test_fixture', - '$BUILD_DIR/mongo/executor/network_interface_mock', '$BUILD_DIR/mongo/executor/network_interface_factory', + '$BUILD_DIR/mongo/executor/network_interface_mock', '$BUILD_DIR/mongo/executor/network_interface_thread_pool', '$BUILD_DIR/mongo/executor/thread_pool_task_executor', '$BUILD_DIR/mongo/unittest/unittest', - + 'repl_coordinator_impl', + 'replmocks', + 'topology_coordinator', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/storage/ephemeral_for_test/storage_ephemeral_for_test', @@ -754,11 +752,11 @@ env.Library( 'replication_coordinator_noop.cpp', ], LIBDEPS=[ - 'optime', - 'replication_process', '$BUILD_DIR/mongo/db/namespace_string', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/util/net/network', + 'optime', + 'replication_process', ], ) @@ -781,15 +779,15 @@ env.Library( 'storage_interface_mock.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/db/concurrency/lock_manager', + '$BUILD_DIR/mongo/db/service_context', + '$BUILD_DIR/mongo/executor/network_interface_mock', 'isself', 'oplog_buffer_blocking_queue', 'repl_coordinator_interface', 'repl_settings', 'replica_set_messages', 'storage_interface', - '$BUILD_DIR/mongo/db/concurrency/lock_manager', - '$BUILD_DIR/mongo/db/service_context', - '$BUILD_DIR/mongo/executor/network_interface_mock', ], ) @@ -814,41 +812,43 @@ env.Library('speculative_majority_read_info', 'optime', ]) -env.Library('replica_set_messages', - [ - 'is_master_response.cpp', - 'member_config.cpp', - 'repl_set_config.cpp', - 'repl_set_config_validators.cpp', - 'repl_set_heartbeat_args_v1.cpp', - 'repl_set_heartbeat_response.cpp', - 'repl_set_request_votes_args.cpp', - 'repl_set_tag.cpp', - 'repl_set_write_concern_mode_definitions.cpp', - 'update_position_args.cpp', - 'last_vote.cpp', - env.Idlc('member_config.idl')[0], - env.Idlc('repl_set_config.idl')[0], - env.Idlc('repl_set_config_params.idl')[0], - ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/bson/util/bson_extract', - '$BUILD_DIR/mongo/client/connection_string', - '$BUILD_DIR/mongo/db/common', - '$BUILD_DIR/mongo/db/server_options_core', - '$BUILD_DIR/mongo/transport/transport_layer_common', - '$BUILD_DIR/mongo/util/net/network', - '$BUILD_DIR/mongo/rpc/command_status', - '$BUILD_DIR/mongo/rpc/metadata', - 'optime', - 'read_concern_args', +env.Library( + target='replica_set_messages', + source=[ + 'is_master_response.cpp', + 'member_config.cpp', + 'repl_set_config.cpp', + 'repl_set_config_validators.cpp', + 'repl_set_heartbeat_args_v1.cpp', + 'repl_set_heartbeat_response.cpp', + 'repl_set_request_votes_args.cpp', + 'repl_set_tag.cpp', + 'repl_set_write_concern_mode_definitions.cpp', + 'update_position_args.cpp', + 'last_vote.cpp', + env.Idlc('member_config.idl')[0], + env.Idlc('repl_set_config.idl')[0], + env.Idlc('repl_set_config_params.idl')[0], ], - LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/server_parameter', - 'repl_server_parameters', - 'split_horizon', - ]) + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/bson/util/bson_extract', + '$BUILD_DIR/mongo/client/connection_string', + '$BUILD_DIR/mongo/db/common', + '$BUILD_DIR/mongo/db/server_options_core', + '$BUILD_DIR/mongo/rpc/command_status', + '$BUILD_DIR/mongo/rpc/metadata', + '$BUILD_DIR/mongo/transport/transport_layer_common', + '$BUILD_DIR/mongo/util/net/network', + 'optime', + 'read_concern_args', + ], + LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/idl/server_parameter', + 'repl_server_parameters', + 'split_horizon', + ] +) env.Library( target='repl_set_status_commands', @@ -906,9 +906,6 @@ env.Library( 'oplog_fetcher.cpp', ], LIBDEPS=[ - 'abstract_async_component', - 'repl_coordinator_interface', - 'replica_set_messages', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/client/clientdriver_network', '$BUILD_DIR/mongo/db/logical_time_metadata_hook', @@ -916,12 +913,15 @@ env.Library( '$BUILD_DIR/mongo/db/stats/counters', '$BUILD_DIR/mongo/db/stats/timer_stats', '$BUILD_DIR/mongo/executor/task_executor_interface', + 'abstract_async_component', + 'repl_coordinator_interface', + 'replica_set_messages', ], LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/db/commands/server_status_core', + '$BUILD_DIR/mongo/db/matcher/expressions', 'repl_server_parameters', 'replication_auth', - '$BUILD_DIR/mongo/db/matcher/expressions', - '$BUILD_DIR/mongo/db/commands/server_status_core', ], ) @@ -931,12 +931,12 @@ env.Library( 'reporter.cpp', ], LIBDEPS=[ - 'replica_set_messages', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/namespace_string', '$BUILD_DIR/mongo/executor/remote_command', '$BUILD_DIR/mongo/executor/task_executor_interface', '$BUILD_DIR/mongo/rpc/command_status', + 'replica_set_messages', ], ) @@ -946,15 +946,15 @@ env.Library( 'sync_source_resolver.cpp', ], LIBDEPS=[ - 'oplog_entry', - 'optime', - 'read_concern_args', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/client/fetcher', '$BUILD_DIR/mongo/db/namespace_string', '$BUILD_DIR/mongo/executor/task_executor_interface', '$BUILD_DIR/mongo/rpc/metadata', '$BUILD_DIR/mongo/util/net/network', + 'oplog_entry', + 'optime', + 'read_concern_args', ], ) @@ -964,10 +964,10 @@ env.Library( 'sync_source_selector_mock.cpp', ], LIBDEPS=[ - 'optime', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/rpc/metadata', '$BUILD_DIR/mongo/util/net/network', + 'optime', ], ) @@ -979,24 +979,24 @@ env.Library( 'database_cloner.cpp', ], LIBDEPS = [ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/client/clientdriver_network', + '$BUILD_DIR/mongo/util/concurrency/thread_pool', + '$BUILD_DIR/mongo/util/net/network', 'base_cloner', 'cloner_utils', - 'repl_sync_shared_data', 'member_data', + 'repl_sync_shared_data', 'replication_consistency_markers_impl', 'task_runner', - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/client/clientdriver_network', - '$BUILD_DIR/mongo/util/concurrency/thread_pool', - '$BUILD_DIR/mongo/util/net/network', ], LIBDEPS_PRIVATE=[ - 'repl_server_parameters', - 'replication_auth', '$BUILD_DIR/mongo/db/commands/list_collections_filter', - '$BUILD_DIR/mongo/db/index_builds_coordinator_interface', '$BUILD_DIR/mongo/db/index_build_entry_helpers', + '$BUILD_DIR/mongo/db/index_builds_coordinator_interface', '$BUILD_DIR/mongo/util/progress_meter', + 'repl_server_parameters', + 'replication_auth', ] ) @@ -1008,17 +1008,17 @@ env.Library( 'tenant_database_cloner.cpp', ], LIBDEPS = [ + '$BUILD_DIR/mongo/base', 'base_cloner', 'cloner_utils', 'repl_sync_shared_data', 'task_runner', - '$BUILD_DIR/mongo/base', ], LIBDEPS_PRIVATE=[ - 'repl_server_parameters', '$BUILD_DIR/mongo/db/commands/list_collections_filter', '$BUILD_DIR/mongo/rpc/metadata', '$BUILD_DIR/mongo/util/progress_meter', + 'repl_server_parameters', ] ) @@ -1033,16 +1033,17 @@ env.Library( ], ) -env.Library(target='optime', - source=[ - 'bson_extract_optime.cpp', - 'optime.cpp', - ], - LIBDEPS=[ - 'optime_and_wall_time_base', - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/bson/util/bson_extract', - ], +env.Library( + target='optime', + source=[ + 'bson_extract_optime.cpp', + 'optime.cpp', + ], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/bson/util/bson_extract', + 'optime_and_wall_time_base', + ], ) env.Library( @@ -1051,9 +1052,9 @@ env.Library( 'multiapplier.cpp', ], LIBDEPS=[ - 'oplog_entry', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/executor/task_executor_interface', + 'oplog_entry', ], ) @@ -1063,6 +1064,7 @@ env.Library( 'data_replicator_external_state_impl.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/base', 'oplog_application', 'oplog_buffer_blocking_queue', 'oplog_buffer_collection', @@ -1070,7 +1072,6 @@ env.Library( 'optime', 'repl_coordinator_interface', 'storage_interface', - '$BUILD_DIR/mongo/base', ], LIBDEPS_PRIVATE=[ 'repl_server_parameters', @@ -1093,12 +1094,12 @@ env.Library( 'data_replicator_external_state_mock.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/util/net/network', 'oplog_application_interface', 'oplog_buffer_blocking_queue', 'oplog_entry', 'optime', 'replica_set_messages', - '$BUILD_DIR/mongo/util/net/network', ], ) @@ -1120,10 +1121,10 @@ env.Library( 'base_cloner.cpp', ], LIBDEPS=[ - 'repl_sync_shared_data', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/client/clientdriver_network', '$BUILD_DIR/mongo/util/fail_point', + 'repl_sync_shared_data', ], LIBDEPS_PRIVATE=[ 'repl_server_parameters', @@ -1155,12 +1156,11 @@ env.Library( 'initial_syncer.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/client/clientdriver_network', '$BUILD_DIR/mongo/client/fetcher', - '$BUILD_DIR/mongo/db/transaction', '$BUILD_DIR/mongo/db/commands/server_status_core', - '$BUILD_DIR/mongo/client/clientdriver_network', + '$BUILD_DIR/mongo/db/transaction', 'initial_sync_cloners', - 'repl_sync_shared_data', 'multiapplier', 'oplog', 'oplog_application_interface', @@ -1168,13 +1168,14 @@ env.Library( 'oplog_entry', 'oplog_fetcher', 'optime', + 'repl_sync_shared_data', 'rollback_checker', 'storage_interface', ], LIBDEPS_PRIVATE=[ - 'repl_server_parameters', '$BUILD_DIR/mongo/db/commands/feature_compatibility_parsers', '$BUILD_DIR/mongo/db/index_builds_coordinator_interface', + 'repl_server_parameters', ] ) @@ -1194,10 +1195,10 @@ env.Library( 'roll_back_local_operations.cpp', ], LIBDEPS=[ - 'oplog_entry', - 'optime', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/util/fail_point', + 'oplog_entry', + 'optime', ], ) @@ -1255,8 +1256,8 @@ env.Library( '$BUILD_DIR/mongo/db/commands/server_status', '$BUILD_DIR/mongo/db/commands/tenant_migration_cmds_request', '$BUILD_DIR/mongo/db/dbhelpers', - '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/rw_concern_d', + '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/executor/network_interface_factory', '$BUILD_DIR/mongo/executor/thread_pool_task_executor', 'local_oplog_info', @@ -1341,13 +1342,13 @@ env.Library( 'mock_repl_coord_server_fixture.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/db/catalog_raii', + '$BUILD_DIR/mongo/db/dbdirectclient', + '$BUILD_DIR/mongo/db/service_context_d_test_fixture', 'drop_pending_collection_reaper', 'oplog', 'oplog_entry', 'replmocks', - '$BUILD_DIR/mongo/db/catalog_raii', - '$BUILD_DIR/mongo/db/dbdirectclient', - '$BUILD_DIR/mongo/db/service_context_d_test_fixture', ] ) @@ -1412,8 +1413,8 @@ env.CppUnitTest( '$BUILD_DIR/mongo/db/commands/mongod_fcv', '$BUILD_DIR/mongo/db/commands/txn_cmd_request', '$BUILD_DIR/mongo/db/dbdirectclient', - '$BUILD_DIR/mongo/db/index_builds_coordinator_mongod', '$BUILD_DIR/mongo/db/index/index_access_methods', + '$BUILD_DIR/mongo/db/index_builds_coordinator_mongod', '$BUILD_DIR/mongo/db/logical_session_id_helpers', '$BUILD_DIR/mongo/db/logical_time', '$BUILD_DIR/mongo/db/op_observer', @@ -1535,10 +1536,10 @@ env.CppUnitTest( '$BUILD_DIR/mongo/db/service_context_d_test_fixture', '$BUILD_DIR/mongo/dbtests/mocklib', '$BUILD_DIR/mongo/util/clock_source_mock', - 'repl_server_parameters', - 'replmocks', 'initial_sync_cloners', + 'repl_server_parameters', 'repl_sync_shared_data', + 'replmocks', 'tenant_migration_cloners' ], ) @@ -1564,11 +1565,11 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/commands/server_status', - 'topology_coordinator', + '$BUILD_DIR/mongo/db/service_context', 'election_reason_counter', 'election_reason_counter_parser', + 'topology_coordinator', ], ) diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript index c6464a5a569..3dd77b842fd 100644 --- a/src/mongo/db/s/SConscript +++ b/src/mongo/db/s/SConscript @@ -100,10 +100,10 @@ env.Library( '$BUILD_DIR/mongo/db/commands/mongod_fcv', '$BUILD_DIR/mongo/db/db_raii', '$BUILD_DIR/mongo/db/dbhelpers', - '$BUILD_DIR/mongo/db/pipeline/expression_context', - '$BUILD_DIR/mongo/db/pipeline/pipeline', '$BUILD_DIR/mongo/db/op_observer_impl', '$BUILD_DIR/mongo/db/ops/write_ops_exec', + '$BUILD_DIR/mongo/db/pipeline/expression_context', + '$BUILD_DIR/mongo/db/pipeline/pipeline', '$BUILD_DIR/mongo/db/repl/oplog', '$BUILD_DIR/mongo/db/repl/wait_for_majority_service', '$BUILD_DIR/mongo/db/rw_concern_d', @@ -157,12 +157,12 @@ env.Library( env.Idlc('transaction_coordinators_stats.idl')[0], ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/transaction', '$BUILD_DIR/mongo/db/commands/server_status', '$BUILD_DIR/mongo/db/commands/txn_cmd_request', '$BUILD_DIR/mongo/db/dbdirectclient', '$BUILD_DIR/mongo/db/repl/wait_for_majority_service', '$BUILD_DIR/mongo/db/rw_concern_d', + '$BUILD_DIR/mongo/db/transaction', '$BUILD_DIR/mongo/db/vector_clock_mongod', '$BUILD_DIR/mongo/executor/task_executor_pool', '$BUILD_DIR/mongo/s/grid', @@ -190,9 +190,9 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/s/write_ops/batch_write_types', '$BUILD_DIR/mongo/bson/util/bson_extract', '$BUILD_DIR/mongo/s/common_s', + '$BUILD_DIR/mongo/s/write_ops/batch_write_types', ], ) @@ -323,8 +323,8 @@ env.Library( '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', '$BUILD_DIR/mongo/db/repl/replica_set_messages', '$BUILD_DIR/mongo/s/commands/shared_cluster_commands', - '$BUILD_DIR/mongo/s/sharding_router_api', '$BUILD_DIR/mongo/s/sharding_initialization', + '$BUILD_DIR/mongo/s/sharding_router_api', 'balancer', 'sharding_runtime_d', ], @@ -351,8 +351,8 @@ env.Library( 'sharding_logging.cpp', ], LIBDEPS=[ - 'sharding_api_d', '$BUILD_DIR/mongo/s/catalog/sharding_catalog_client_impl', + 'sharding_api_d', ], ) diff --git a/src/mongo/db/stats/SConscript b/src/mongo/db/stats/SConscript index 899e42d2697..755414a43bf 100644 --- a/src/mongo/db/stats/SConscript +++ b/src/mongo/db/stats/SConscript @@ -22,8 +22,8 @@ env.Library( 'operation_latency_histogram.cpp' ], LIBDEPS=[ - '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/server_options_core', + '$BUILD_DIR/mongo/db/service_context', ], ) @@ -36,8 +36,8 @@ env.Library( '$BUILD_DIR/mongo/base', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/rpc/client_metadata', '$BUILD_DIR/mongo/db/shared_request_handling', + '$BUILD_DIR/mongo/rpc/client_metadata', ] ) diff --git a/src/mongo/db/storage/SConscript b/src/mongo/db/storage/SConscript index 7c95014a583..88565bb5ca5 100644 --- a/src/mongo/db/storage/SConscript +++ b/src/mongo/db/storage/SConscript @@ -135,15 +135,15 @@ env.Library( 'oplog_cap_maintainer_thread.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/util/background_job', '$BUILD_DIR/mongo/db/namespace_string', + '$BUILD_DIR/mongo/util/background_job', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/catalog_raii', '$BUILD_DIR/mongo/db/catalog/collection', '$BUILD_DIR/mongo/db/catalog/collection_catalog', '$BUILD_DIR/mongo/db/catalog/database_holder', + '$BUILD_DIR/mongo/db/catalog_raii', '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/service_context', ], @@ -158,9 +158,9 @@ env.Library( '$BUILD_DIR/mongo/util/background_job', ], LIBDEPS_PRIVATE=[ - 'storage_options', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/service_context', + 'storage_options', ], ) @@ -234,8 +234,8 @@ env.Library( 'sorted_data_interface_test_unindex.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/db/storage/storage_options', '$BUILD_DIR/mongo/db/service_context', + '$BUILD_DIR/mongo/db/storage/storage_options', '$BUILD_DIR/mongo/unittest/unittest', 'index_entry_comparison', 'key_string', @@ -311,13 +311,13 @@ env.Library( LIBDEPS=[ ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/concurrency/lock_manager', + '$BUILD_DIR/mongo/db/service_context', 'storage_control', 'storage_engine_lock_file', - 'storage_repair_observer', 'storage_engine_metadata', 'storage_options', + 'storage_repair_observer', ], ) @@ -356,8 +356,8 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/bson/dotted_path_support', + '$BUILD_DIR/mongo/db/server_options_core', ], ) @@ -379,18 +379,20 @@ env.Library( LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/dbhelpers', - '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/repl/replica_set_messages', + '$BUILD_DIR/mongo/db/service_context', 'storage_file_util', ], ) env.Benchmark( target='storage_key_string_bm', - source='key_string_bm.cpp', + source=[ + 'key_string_bm.cpp' + ], LIBDEPS=[ - 'key_string', '$BUILD_DIR/mongo/base', + 'key_string', ], ) @@ -400,9 +402,9 @@ env.Library( 'remove_saver.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/base', 'encryption_hooks', 'storage_options', - '$BUILD_DIR/mongo/base', ] ) @@ -483,13 +485,13 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/bson/util/bson_extract', + '$BUILD_DIR/mongo/db/catalog/collection_catalog', '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/index/index_descriptor', '$BUILD_DIR/mongo/db/index_names', '$BUILD_DIR/mongo/db/namespace_string', '$BUILD_DIR/mongo/db/storage/bson_collection_catalog_entry', '$BUILD_DIR/mongo/db/storage/kv/kv_prefix', - '$BUILD_DIR/mongo/db/catalog/collection_catalog', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/concurrency/write_conflict_exception', @@ -523,7 +525,7 @@ env.Library( target='storage_engine_impl', source=[ 'storage_engine_impl.cpp', - 'kv/temporary_kv_record_store.cpp', # TODO: SERVER-41892 Avoid source under kv sub-directory + 'kv/temporary_kv_record_store.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -534,9 +536,9 @@ env.Library( '$BUILD_DIR/mongo/db/storage/storage_options', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/storage/storage_repair_observer', '$BUILD_DIR/mongo/db/catalog/collection_catalog_helper', '$BUILD_DIR/mongo/db/resumable_index_builds_idl', + '$BUILD_DIR/mongo/db/storage/storage_repair_observer', '$BUILD_DIR/mongo/db/vector_clock', 'storage_util', 'two_phase_index_build_knobs_idl', diff --git a/src/mongo/db/storage/devnull/SConscript b/src/mongo/db/storage/devnull/SConscript index 25de82caf40..ad03475e219 100644 --- a/src/mongo/db/storage/devnull/SConscript +++ b/src/mongo/db/storage/devnull/SConscript @@ -23,9 +23,9 @@ env.Library( 'devnull_init.cpp', ], LIBDEPS=[ - 'storage_devnull_core', '$BUILD_DIR/mongo/db/storage/durable_catalog_impl', '$BUILD_DIR/mongo/db/storage/storage_engine_impl', + 'storage_devnull_core', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/storage/storage_engine_common', diff --git a/src/mongo/db/storage/ephemeral_for_test/SConscript b/src/mongo/db/storage/ephemeral_for_test/SConscript index 80234e42ef2..ac18c30fdfa 100644 --- a/src/mongo/db/storage/ephemeral_for_test/SConscript +++ b/src/mongo/db/storage/ephemeral_for_test/SConscript @@ -21,10 +21,10 @@ env.Library( '$BUILD_DIR/mongo/db/storage/recovery_unit_base', ], LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/db/commands/server_status', '$BUILD_DIR/mongo/db/storage/key_string', '$BUILD_DIR/mongo/db/storage/oplog_hack', '$BUILD_DIR/mongo/db/storage/write_unit_of_work', - '$BUILD_DIR/mongo/db/commands/server_status', ], ) @@ -40,9 +40,9 @@ env.Library( 'storage_ephemeral_for_test_core', ], LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/db/commands/server_status', '$BUILD_DIR/mongo/db/storage/storage_engine_common', '$BUILD_DIR/mongo/db/storage/storage_engine_lock_file', - '$BUILD_DIR/mongo/db/commands/server_status', ], ) @@ -58,16 +58,16 @@ env.CppUnitTest( 'ephemeral_for_test_sorted_impl_test.cpp', ], LIBDEPS=[ - 'storage_ephemeral_for_test_core', '$BUILD_DIR/mongo/db/auth/authmocks', '$BUILD_DIR/mongo/db/common', '$BUILD_DIR/mongo/db/index/index_descriptor', - '$BUILD_DIR/mongo/db/repl/replmocks', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', + '$BUILD_DIR/mongo/db/repl/replmocks', '$BUILD_DIR/mongo/db/storage/key_string', '$BUILD_DIR/mongo/db/storage/kv/kv_engine_test_harness', '$BUILD_DIR/mongo/db/storage/record_store_test_harness', '$BUILD_DIR/mongo/db/storage/recovery_unit_test_harness', '$BUILD_DIR/mongo/db/storage/sorted_data_interface_test_harness', + 'storage_ephemeral_for_test_core', ], ) diff --git a/src/mongo/db/storage/wiredtiger/SConscript b/src/mongo/db/storage/wiredtiger/SConscript index 6fe5b51795c..0cf7d92ce08 100644 --- a/src/mongo/db/storage/wiredtiger/SConscript +++ b/src/mongo/db/storage/wiredtiger/SConscript @@ -63,8 +63,8 @@ if wiredtiger: '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/concurrency/write_conflict_exception', '$BUILD_DIR/mongo/db/curop', - '$BUILD_DIR/mongo/db/index/index_descriptor', '$BUILD_DIR/mongo/db/global_settings', + '$BUILD_DIR/mongo/db/index/index_descriptor', '$BUILD_DIR/mongo/db/namespace_string', '$BUILD_DIR/mongo/db/prepare_conflict_tracker', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', @@ -87,13 +87,13 @@ if wiredtiger: 'storage_wiredtiger_customization_hooks', ], LIBDEPS_PRIVATE= [ - 'oplog_stone_parameters', - '$BUILD_DIR/mongo/db/db_raii', '$BUILD_DIR/mongo/db/catalog/database_holder', '$BUILD_DIR/mongo/db/commands/server_status', + '$BUILD_DIR/mongo/db/db_raii', '$BUILD_DIR/mongo/db/snapshot_window_options', '$BUILD_DIR/mongo/db/storage/storage_repair_observer', '$BUILD_DIR/mongo/util/options_parser/options_parser', + 'oplog_stone_parameters', ], ) @@ -106,12 +106,12 @@ if wiredtiger: env.Idlc('wiredtiger_global_options.idl')[0], ], LIBDEPS=[ - 'storage_wiredtiger_core', - 'storage_wiredtiger_customization_hooks', '$BUILD_DIR/mongo/db/db_raii', '$BUILD_DIR/mongo/db/storage/storage_engine_impl', '$BUILD_DIR/mongo/db/storage/storage_engine_lock_file', '$BUILD_DIR/mongo/db/storage/storage_engine_metadata', + 'storage_wiredtiger_core', + 'storage_wiredtiger_customization_hooks', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/catalog/database_holder', @@ -134,8 +134,8 @@ if wiredtiger: LIBDEPS=[ '$BUILD_DIR/mongo/db/auth/authmocks', '$BUILD_DIR/mongo/db/index/index_access_methods', - '$BUILD_DIR/mongo/db/repl/replmocks', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', + '$BUILD_DIR/mongo/db/repl/replmocks', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/service_context_d', '$BUILD_DIR/mongo/db/service_context_test_fixture', @@ -196,12 +196,12 @@ if wiredtiger: 'wiredtiger_standard_record_store_test.cpp', ], LIBDEPS=[ - 'additional_wiredtiger_index_tests', - 'additional_wiredtiger_record_store_tests', '$BUILD_DIR/mongo/db/auth/authmocks', - '$BUILD_DIR/mongo/db/repl/replmocks', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', + '$BUILD_DIR/mongo/db/repl/replmocks', '$BUILD_DIR/mongo/db/service_context_test_fixture', + 'additional_wiredtiger_index_tests', + 'additional_wiredtiger_record_store_tests', ], ) @@ -212,12 +212,12 @@ if wiredtiger: 'wiredtiger_prefixed_record_store_test.cpp', ], LIBDEPS=[ - 'additional_wiredtiger_index_tests', - 'additional_wiredtiger_record_store_tests', '$BUILD_DIR/mongo/db/auth/authmocks', - '$BUILD_DIR/mongo/db/repl/replmocks', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', + '$BUILD_DIR/mongo/db/repl/replmocks', '$BUILD_DIR/mongo/db/service_context_test_fixture', + 'additional_wiredtiger_index_tests', + 'additional_wiredtiger_record_store_tests', ], ) diff --git a/src/mongo/db/update/SConscript b/src/mongo/db/update/SConscript index e3aad047e1c..b390689f796 100644 --- a/src/mongo/db/update/SConscript +++ b/src/mongo/db/update/SConscript @@ -61,8 +61,8 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/pipeline/pipeline', - 'update_nodes', 'update_document_diff', + 'update_nodes', ], ) diff --git a/src/mongo/db/views/SConscript b/src/mongo/db/views/SConscript index 00aba3711cb..4de94ee1afb 100644 --- a/src/mongo/db/views/SConscript +++ b/src/mongo/db/views/SConscript @@ -26,11 +26,11 @@ env.Library( 'view_graph.cpp', ], LIBDEPS=[ - 'resolved_view', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/pipeline/aggregation', - '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', '$BUILD_DIR/mongo/db/query/collation/collator_factory_interface', + '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', + 'resolved_view', ] ) @@ -53,8 +53,6 @@ env.CppUnitTest( 'view_graph_test.cpp', ], LIBDEPS=[ - 'views', - 'views_mongod', '$BUILD_DIR/mongo/db/auth/authmocks', '$BUILD_DIR/mongo/db/catalog/catalog_test_fixture', '$BUILD_DIR/mongo/db/query/collation/collator_interface_mock', @@ -62,5 +60,7 @@ env.CppUnitTest( '$BUILD_DIR/mongo/db/repl/replmocks', '$BUILD_DIR/mongo/s/is_mongos', '$BUILD_DIR/mongo/unittest/unittest', + 'views', + 'views_mongod', ], ) diff --git a/src/mongo/dbtests/SConscript b/src/mongo/dbtests/SConscript index 96254643237..8358a63c54e 100644 --- a/src/mongo/dbtests/SConscript +++ b/src/mongo/dbtests/SConscript @@ -18,8 +18,8 @@ env.Library( '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/storage/flow_control_parameters', '$BUILD_DIR/mongo/db/storage/storage_options', - '$BUILD_DIR/mongo/util/options_parser/options_parser_init', '$BUILD_DIR/mongo/unittest/unittest', + '$BUILD_DIR/mongo/util/options_parser/options_parser_init', ], ) @@ -35,8 +35,8 @@ env.Library( '$BUILD_DIR/mongo/db/index/index_access_methods', '$BUILD_DIR/mongo/db/index_builds_coordinator_mongod', '$BUILD_DIR/mongo/db/op_observer', - '$BUILD_DIR/mongo/db/service_context_d', '$BUILD_DIR/mongo/db/s/sharding_runtime_d', + '$BUILD_DIR/mongo/db/service_context_d', '$BUILD_DIR/mongo/db/storage/storage_control', '$BUILD_DIR/mongo/scripting/scripting_common', '$BUILD_DIR/mongo/unittest/unittest', diff --git a/src/mongo/embedded/SConscript b/src/mongo/embedded/SConscript index 913e61d06fe..f64288444e7 100644 --- a/src/mongo/embedded/SConscript +++ b/src/mongo/embedded/SConscript @@ -105,15 +105,15 @@ env.Library( '$BUILD_DIR/mongo/db/service_liaison_mongod', '$BUILD_DIR/mongo/db/sessions_collection_standalone', '$BUILD_DIR/mongo/db/startup_recovery', - '$BUILD_DIR/mongo/db/storage/wiredtiger/storage_wiredtiger' if wiredtiger else [], '$BUILD_DIR/mongo/db/storage/storage_control', '$BUILD_DIR/mongo/db/storage/storage_engine_common', '$BUILD_DIR/mongo/db/storage/storage_engine_lock_file', '$BUILD_DIR/mongo/db/storage/storage_engine_metadata', '$BUILD_DIR/mongo/db/storage/storage_init_d', '$BUILD_DIR/mongo/db/storage/storage_options', - '$BUILD_DIR/mongo/db/wire_version', + '$BUILD_DIR/mongo/db/storage/wiredtiger/storage_wiredtiger' if wiredtiger else [], '$BUILD_DIR/mongo/db/vector_clock_trivial', + '$BUILD_DIR/mongo/db/wire_version', '$BUILD_DIR/mongo/rpc/client_metadata', '$BUILD_DIR/mongo/util/latch_analyzer' if get_option('use-diagnostic-latches') == 'on' else [], '$BUILD_DIR/mongo/util/options_parser/options_parser', diff --git a/src/mongo/embedded/mongo_embedded/SConscript b/src/mongo/embedded/mongo_embedded/SConscript index 28c8b80066f..d34ab07094f 100644 --- a/src/mongo/embedded/mongo_embedded/SConscript +++ b/src/mongo/embedded/mongo_embedded/SConscript @@ -65,9 +65,9 @@ mongoEmbeddedTargets = mongoEmbeddedEnv.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/service_context', + '$BUILD_DIR/mongo/embedded/embedded', '$BUILD_DIR/mongo/rpc/protocol', '$BUILD_DIR/mongo/transport/transport_layer_mock', - '$BUILD_DIR/mongo/embedded/embedded', ], AIB_COMPONENT='embedded', ) diff --git a/src/mongo/executor/SConscript b/src/mongo/executor/SConscript index da4acd722ab..76956c8818e 100644 --- a/src/mongo/executor/SConscript +++ b/src/mongo/executor/SConscript @@ -12,73 +12,90 @@ env.Library( LIBDEPS=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/util/net/network', - ]) + ] +) -env.Library(target='async_timer_mock', - source=['async_timer_mock.cpp'], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/base/system_error', - ]) +env.Library( + target='async_timer_mock', + source=['async_timer_mock.cpp'], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/base/system_error', + ] +) -env.Library(target='remote_command', - source=[ - 'remote_command_request.cpp', - 'remote_command_response.cpp', - ], - LIBDEPS=[ - '$BUILD_DIR/mongo/rpc/metadata', - '$BUILD_DIR/mongo/util/net/network', - ]) +env.Library( + target='remote_command', + source=[ + 'remote_command_request.cpp', + 'remote_command_response.cpp', + ], + LIBDEPS=[ + '$BUILD_DIR/mongo/rpc/metadata', + '$BUILD_DIR/mongo/util/net/network', + ] +) -env.Library(target='async_multicaster', - source=[ - 'async_multicaster.cpp', - ], - LIBDEPS=[ - 'remote_command', - 'task_executor_interface', - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/util/net/network', - ]) +env.Library( + target='async_multicaster', + source=[ + 'async_multicaster.cpp', + ], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/util/net/network', + 'remote_command', + 'task_executor_interface', + ] +) -env.Library(target='task_executor_interface', - source=[ - 'task_executor.cpp', - ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - 'remote_command', - ]) +env.Library( + target='task_executor_interface', + source=[ + 'task_executor.cpp', + ], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + 'remote_command', + ] +) -env.Library(target='scoped_task_executor', - source=[ - 'scoped_task_executor.cpp', - ], - LIBDEPS=[ - 'task_executor_interface', - '$BUILD_DIR/mongo/util/fail_point', - ]) +env.Library( + target='scoped_task_executor', + source=[ + 'scoped_task_executor.cpp', + ], + LIBDEPS=[ + '$BUILD_DIR/mongo/util/fail_point', + 'task_executor_interface', + ] +) -env.Library(target='network_interface', - source=['network_interface.cpp',], - LIBDEPS=[ - 'task_executor_interface', - ]) +env.Library( + target='network_interface', + source=[ + 'network_interface.cpp', + ], + LIBDEPS=[ + 'task_executor_interface', + ] +) -env.Library('network_interface_mock', - [ - 'network_interface_mock.cpp', - 'thread_pool_mock.cpp', - ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/rpc/metadata', - '$BUILD_DIR/mongo/util/clock_source_mock', - '$BUILD_DIR/mongo/util/net/network', - 'network_interface', - 'task_executor_interface', - ]) +env.Library( + target='network_interface_mock', + source=[ + 'network_interface_mock.cpp', + 'thread_pool_mock.cpp', + ], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/rpc/metadata', + '$BUILD_DIR/mongo/util/clock_source_mock', + '$BUILD_DIR/mongo/util/net/network', + 'network_interface', + 'task_executor_interface', + ] +) env.Library( target='connection_pool_executor', @@ -96,22 +113,28 @@ env.Library( ], ) -env.Library(target='network_test_env', - source=['network_test_env.cpp',], - LIBDEPS=[ - '$BUILD_DIR/mongo/db/commands', - '$BUILD_DIR/mongo/db/query/command_request_response', - 'network_interface_mock', - 'task_executor_interface', - ]) +env.Library( + target='network_test_env', + source=[ + 'network_test_env.cpp', + ], + LIBDEPS=[ + '$BUILD_DIR/mongo/db/commands', + '$BUILD_DIR/mongo/db/query/command_request_response', + 'network_interface_mock', + 'task_executor_interface', + ] +) -env.Library(target='egress_tag_closer_manager', - source=[ - 'egress_tag_closer_manager.cpp', - ], - LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/service_context', - ]) +env.Library( + target='egress_tag_closer_manager', + source=[ + 'egress_tag_closer_manager.cpp', + ], + LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/db/service_context', + ] +) env.Library( target='hedging_metrics', @@ -148,11 +171,11 @@ env.Library( 'network_interface_integration_fixture.cpp' ], LIBDEPS=[ - '$BUILD_DIR/mongo/unittest/integration_test_main', - '$BUILD_DIR/mongo/executor/thread_pool_task_executor', - '$BUILD_DIR/mongo/executor/network_interface_thread_pool', '$BUILD_DIR/mongo/executor/network_interface_factory', + '$BUILD_DIR/mongo/executor/network_interface_thread_pool', + '$BUILD_DIR/mongo/executor/thread_pool_task_executor', '$BUILD_DIR/mongo/rpc/command_status', + '$BUILD_DIR/mongo/unittest/integration_test_main', '$BUILD_DIR/mongo/util/concurrency/thread_pool', '$BUILD_DIR/mongo/util/version_impl', ] @@ -167,9 +190,9 @@ env.Library( 'connection_pool_executor', ], LIBDEPS_PRIVATE=[ + 'egress_tag_closer_manager', 'network_interface', 'network_interface_tl', - 'egress_tag_closer_manager', ]) env.Library( @@ -179,8 +202,8 @@ env.Library( 'task_executor_test_fixture.cpp' ], LIBDEPS=[ - '$BUILD_DIR/mongo/util/clock_source_mock', '$BUILD_DIR/mongo/unittest/unittest', + '$BUILD_DIR/mongo/util/clock_source_mock', 'network_interface_mock', 'task_executor_interface', ] @@ -192,9 +215,9 @@ env.Library( 'thread_pool_task_executor.cpp', ], LIBDEPS=[ - 'task_executor_interface', - '$BUILD_DIR/mongo/util/fail_point', '$BUILD_DIR/mongo/db/service_context', + '$BUILD_DIR/mongo/util/fail_point', + 'task_executor_interface', ], LIBDEPS_PRIVATE=[ 'network_interface', @@ -241,8 +264,8 @@ env.Library( 'task_executor_cursor.cpp', ], LIBDEPS=[ - 'task_executor_interface', '$BUILD_DIR/mongo/db/query/command_request_response', + 'task_executor_interface', ], ) diff --git a/src/mongo/rpc/SConscript b/src/mongo/rpc/SConscript index 88d1f637bf6..2d1ad70e6ba 100644 --- a/src/mongo/rpc/SConscript +++ b/src/mongo/rpc/SConscript @@ -47,9 +47,7 @@ protoEnv.Library( ) env.Library( - target=[ - 'rpc', - ], + target='rpc', source=[ 'factory.cpp', 'object_check.cpp', @@ -61,13 +59,13 @@ env.Library( env.Idlc('object_check.idl')[0], ], LIBDEPS=[ - 'metadata', - 'protocol', - '$BUILD_DIR/mongo/util/net/network', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/dbmessage', '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/s/common_s', + '$BUILD_DIR/mongo/util/net/network', + 'metadata', + 'protocol', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/idl/server_parameter', @@ -88,9 +86,7 @@ env.CppLibfuzzerTest( ) env.Library( - target=[ - 'metadata', - ], + target='metadata', source=[ 'metadata.cpp', 'metadata/config_server_metadata.cpp', @@ -102,13 +98,13 @@ env.Library( env.Idlc('topology_version.idl')[0], ], LIBDEPS=[ - 'client_metadata', - 'metadata_impersonated_user', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/bson/util/bson_extract', '$BUILD_DIR/mongo/client/read_preference', '$BUILD_DIR/mongo/db/repl/optime', '$BUILD_DIR/mongo/db/signed_logical_time', + 'client_metadata', + 'metadata_impersonated_user', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/vector_clock', @@ -184,9 +180,9 @@ env.CppIntegrationTest( 'op_msg_integration_test.cpp', ], LIBDEPS=[ - 'protocol', '$BUILD_DIR/mongo/client/clientdriver_network', '$BUILD_DIR/mongo/transport/transport_layer_egress_init', '$BUILD_DIR/mongo/util/version_impl', + 'protocol', ], ) 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', diff --git a/src/mongo/scripting/SConscript b/src/mongo/scripting/SConscript index 9c938d7e1ab..a21b49ae298 100644 --- a/src/mongo/scripting/SConscript +++ b/src/mongo/scripting/SConscript @@ -114,15 +114,15 @@ if usemozjs: env.Idlc('mozjs/scripting_util.idl')[0], ], LIBDEPS=[ + '$BUILD_DIR/mongo/db/service_context', + '$BUILD_DIR/mongo/shell/mongojs', 'bson_template_evaluator', 'scripting_common', - '$BUILD_DIR/mongo/shell/mongojs', - '$BUILD_DIR/mongo/db/service_context', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/client/clientdriver_network', - '$BUILD_DIR/third_party/shim_mozjs', '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/third_party/shim_mozjs', ], ) else: diff --git a/src/mongo/shell/SConscript b/src/mongo/shell/SConscript index 3927f74694e..3e77b125139 100644 --- a/src/mongo/shell/SConscript +++ b/src/mongo/shell/SConscript @@ -109,8 +109,8 @@ env.Library( env.Idlc('shell_options.idl')[0], ], LIBDEPS=[ - 'shell_options_storage', '$BUILD_DIR/mongo/base', + 'shell_options_storage', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/util/options_parser/options_parser', @@ -127,7 +127,6 @@ env.Library( 'shell_utils_launcher.cpp', ], LIBDEPS=[ - 'benchrun', '$BUILD_DIR/mongo/base/environment_buffer', '$BUILD_DIR/mongo/client/clientdriver_network', '$BUILD_DIR/mongo/db/mongohasher', @@ -135,6 +134,7 @@ env.Library( '$BUILD_DIR/mongo/scripting/scripting', '$BUILD_DIR/mongo/transport/message_compressor', '$BUILD_DIR/mongo/util/password', + 'benchrun', 'shell_options_storage', ] ) @@ -186,9 +186,9 @@ scriptingEnv.Library( scriptingEnv.Idlc("fle_shell_options.idl")[0], ], LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/client/clientdriver_minimal', '$BUILD_DIR/mongo/crypto/aead_encryption', '$BUILD_DIR/mongo/crypto/symmetric_crypto', - '$BUILD_DIR/mongo/client/clientdriver_minimal', '$BUILD_DIR/mongo/scripting/scripting', '$BUILD_DIR/mongo/shell/shell_options_register', '$BUILD_DIR/third_party/shim_mozjs', diff --git a/src/mongo/transport/SConscript b/src/mongo/transport/SConscript index 5e5b33cf388..9ac3bf2c329 100644 --- a/src/mongo/transport/SConscript +++ b/src/mongo/transport/SConscript @@ -44,8 +44,8 @@ tlEnv.Library( 'transport_layer', ], LIBDEPS_PRIVATE=[ - 'service_executor', '$BUILD_DIR/third_party/shim_asio', + 'service_executor', ], ) @@ -56,12 +56,12 @@ tlEnv.Library( env.Idlc('transport_options.idl')[0], ], LIBDEPS=[ - 'transport_layer_common', '$BUILD_DIR/mongo/base/system_error', '$BUILD_DIR/mongo/db/auth/authentication_restriction', '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/stats/counters', + 'transport_layer_common', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/idl/server_parameter', @@ -96,8 +96,8 @@ tlEnv.Library( '$BUILD_DIR/mongo/db/service_context', ], LIBDEPS_PRIVATE=[ - "$BUILD_DIR/mongo/idl/server_parameter", "$BUILD_DIR/mongo/db/server_options_core", + "$BUILD_DIR/mongo/idl/server_parameter", "$BUILD_DIR/mongo/util/concurrency/thread_pool", "$BUILD_DIR/mongo/util/processinfo", '$BUILD_DIR/third_party/shim_asio', @@ -208,12 +208,12 @@ tlEnv.CppIntegrationTest( 'transport_layer_asio_integration_test.cpp', ], LIBDEPS=[ - 'transport_layer_egress_init', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/client/async_client', '$BUILD_DIR/mongo/executor/task_executor_interface', '$BUILD_DIR/mongo/util/net/network', '$BUILD_DIR/mongo/util/version_impl', '$BUILD_DIR/third_party/shim_asio', + 'transport_layer_egress_init', ], ) diff --git a/src/mongo/unittest/SConscript b/src/mongo/unittest/SConscript index 88e18f8d4b4..93192746231 100644 --- a/src/mongo/unittest/SConscript +++ b/src/mongo/unittest/SConscript @@ -48,15 +48,15 @@ env.Library( env.Idlc('integration_test_main.idl')[0], ], LIBDEPS=[ - 'unittest', '$BUILD_DIR/mongo/base', + 'unittest', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/client/connection_string', '$BUILD_DIR/mongo/db/commands/test_commands_enabled', - '$BUILD_DIR/mongo/db/serverinit', '$BUILD_DIR/mongo/db/server_options', '$BUILD_DIR/mongo/db/server_options_base', + '$BUILD_DIR/mongo/db/serverinit', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/wire_version', '$BUILD_DIR/mongo/util/options_parser/options_parser', diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript index 194e494982d..a2df539fb88 100644 --- a/src/mongo/util/SConscript +++ b/src/mongo/util/SConscript @@ -1,5 +1,7 @@ # -*- mode: python -*- +from site_scons.mongo import insort_wrapper + Import([ "endian", "env", @@ -177,8 +179,8 @@ env.Library( 'alarm_runner_background_thread.cpp', ], LIBDEPS=[ - 'clock_sources', '$BUILD_DIR/mongo/base', + 'clock_sources', ], ) @@ -347,8 +349,8 @@ env.Library( 'ntservice.cpp', ], LIBDEPS=[ - 'signal_handlers', '$BUILD_DIR/mongo/util/options_parser/options_parser', + 'signal_handlers', ], ) @@ -451,8 +453,8 @@ env.Library( LIBDEPS=[ "$BUILD_DIR/mongo/base", "$BUILD_DIR/mongo/db/log_process_details", - "$BUILD_DIR/mongo/db/service_context", "$BUILD_DIR/mongo/db/server_options_core", + "$BUILD_DIR/mongo/db/service_context", ], ) @@ -589,9 +591,9 @@ icuEnv.Library( 'icu.cpp', ], LIBDEPS_PRIVATE=[ - 'icu_init', '$BUILD_DIR/mongo/base', '$BUILD_DIR/third_party/shim_icu', + 'icu_init', ], ) @@ -737,12 +739,15 @@ if use_libunwind: # overwrite it. ) +stacktrace_test_LIBDEPS = stacktraceEnv.get('LIBDEPS', []).copy() +insort_wrapper(stacktrace_test_LIBDEPS, '$BUILD_DIR/third_party/shim_pcrecpp') + stacktraceEnv.CppUnitTest( target='stacktrace_test', - source='stacktrace_test.cpp', - LIBDEPS=(stacktraceEnv.get('LIBDEPS', []) + [ - '$BUILD_DIR/third_party/shim_pcrecpp' - ]), + source=[ + 'stacktrace_test.cpp', + ], + LIBDEPS=stacktrace_test_LIBDEPS, ) stacktraceEnv.Benchmark( diff --git a/src/mongo/util/net/SConscript b/src/mongo/util/net/SConscript index 60d4465fa52..968d6f3e90e 100644 --- a/src/mongo/util/net/SConscript +++ b/src/mongo/util/net/SConscript @@ -114,8 +114,8 @@ if not get_option('ssl') == 'off': ], LIBDEPS=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/auth/auth', '$BUILD_DIR/mongo/client/internal_auth', + '$BUILD_DIR/mongo/db/auth/auth', '$BUILD_DIR/mongo/util/caching', '$BUILD_DIR/mongo/util/concurrency/thread_pool', '$BUILD_DIR/third_party/shim_asio', @@ -144,10 +144,10 @@ if not get_option('ssl') == 'off': env.Idlc('ssl_parameters_auth.idl')[0], ], LIBDEPS_PRIVATE=[ - 'ssl_options', '$BUILD_DIR/mongo/client/authentication', '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/idl/server_parameter', + 'ssl_options', ], ) else: @@ -230,11 +230,11 @@ if get_option('ssl') == 'on': 'sock_test.cpp', ], LIBDEPS=[ - 'network', - 'ssl_manager', - 'ssl_options_server', '$BUILD_DIR/mongo/db/server_options_servers', '$BUILD_DIR/mongo/util/cmdline_utils/cmdline_utils', '$BUILD_DIR/mongo/util/fail_point', + 'network', + 'ssl_manager', + 'ssl_options_server', ], ) diff --git a/src/mongo/util/options_parser/SConscript b/src/mongo/util/options_parser/SConscript index 22507bd4f0e..f8c7c2c0046 100644 --- a/src/mongo/util/options_parser/SConscript +++ b/src/mongo/util/options_parser/SConscript @@ -45,7 +45,7 @@ env.CppUnitTest( 'options_parser_test.cpp', ], LIBDEPS=[ - 'options_parser', '$BUILD_DIR/mongo/unittest/unittest', + 'options_parser', ], ) diff --git a/src/third_party/SConscript b/src/third_party/SConscript index daadaace0d8..47b2d126f1a 100644 --- a/src/third_party/SConscript +++ b/src/third_party/SConscript @@ -2,6 +2,7 @@ import SCons +from site_scons.mongo import insort_wrapper import libdeps import json @@ -237,7 +238,7 @@ for builder_name in ('Program', 'SharedLibrary', 'LoadableModule', 'StaticLibrar lds = env.get('LIBDEPS', []) shim_allocator = '$BUILD_DIR/third_party/shim_allocator' if shim_allocator not in lds: - lds.append(shim_allocator) + insort_wrapper(lds, shim_allocator) env['LIBDEPS'] = lds return target, source @@ -364,11 +365,11 @@ else: boostEnv.SConscript(boostDirectory + '/SConscript', exports={ 'env' : boostEnv }) boostEnv = boostEnv.Clone( LIBDEPS_INTERFACE=[ - boostDirectory + '/boost_program_options', boostDirectory + '/boost_filesystem', - boostDirectory + '/boost_system', boostDirectory + '/boost_iostreams', boostDirectory + '/boost_log', + boostDirectory + '/boost_program_options', + boostDirectory + '/boost_system', ]) boostEnv.Library( diff --git a/src/third_party/wiredtiger/SConscript b/src/third_party/wiredtiger/SConscript index a01833cac09..b7f50e9ff62 100644 --- a/src/third_party/wiredtiger/SConscript +++ b/src/third_party/wiredtiger/SConscript @@ -200,10 +200,10 @@ wtlib = env.Library( target="wiredtiger", source=wtsources, LIBDEPS_PRIVATE=[ - 'wiredtiger_checksum', '$BUILD_DIR/third_party/shim_snappy', '$BUILD_DIR/third_party/shim_zlib', '$BUILD_DIR/third_party/shim_zstd', + 'wiredtiger_checksum', ], LIBDEPS_TAGS=[ 'init-no-global-side-effects', |