diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2023-02-06 12:47:05 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-02-06 13:25:00 +0000 |
| commit | b85aa7ea04fd867fee017953bb831c2217423eb7 (patch) | |
| tree | 9c27ef01bf56e13ffbbfb18dc3879a29d9180dfd | |
| parent | 44d44fc65f6cea228ddf6be48575d690457fac93 (diff) | |
| download | mongo-b85aa7ea04fd867fee017953bb831c2217423eb7.tar.gz | |
SERVER-73634 Merge the `server_options_core` library into `server_base`
28 files changed, 64 insertions, 107 deletions
diff --git a/src/mongo/client/SConscript b/src/mongo/client/SConscript index ead270f65a5..044f612e57f 100644 --- a/src/mongo/client/SConscript +++ b/src/mongo/client/SConscript @@ -179,7 +179,6 @@ clientDriverEnv.Library( 'index_spec.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/dbmessage', '$BUILD_DIR/mongo/db/pipeline/aggregation_request_helper', '$BUILD_DIR/mongo/db/query/command_request_response', @@ -192,7 +191,7 @@ clientDriverEnv.Library( 'read_preference', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/idl_parser', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/util/net/ssl_manager', ], ) @@ -269,6 +268,7 @@ env.Library( LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/commands/test_commands_enabled', '$BUILD_DIR/mongo/db/server_feature_flags', + '$BUILD_DIR/mongo/db/stats/counters', '$BUILD_DIR/mongo/executor/egress_tag_closer_manager', '$BUILD_DIR/mongo/transport/message_compressor', ], @@ -304,6 +304,7 @@ env.Library( 'remote_command_targeter_factory_mock.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/util/net/network', ], ) diff --git a/src/mongo/crypto/SConscript b/src/mongo/crypto/SConscript index c8ac00f10e3..f11e3d834d4 100644 --- a/src/mongo/crypto/SConscript +++ b/src/mongo/crypto/SConscript @@ -106,14 +106,13 @@ fleCryptoEnv.Library( LIBDEPS=[ '$BUILD_DIR/mongo/base/secure_allocator', '$BUILD_DIR/mongo/db/common', - '$BUILD_DIR/mongo/idl/idl_parser', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/bson/util/bson_extract', '$BUILD_DIR/mongo/db/commands/server_status_core', '$BUILD_DIR/mongo/db/exec/document_value/document_value', '$BUILD_DIR/mongo/db/query/query_knobs', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/shell/kms_idl', '$BUILD_DIR/mongo/util/testing_options', '$BUILD_DIR/third_party/shim_libmongocrypt', diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index a6da531de31..4bc93760ab4 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -61,20 +61,21 @@ env.Library( target='server_base', source=[ 'basic_types.idl', - 'database_name.cpp', 'catalog_shard_feature_flag.idl', 'cluster_role.cpp', - 'feature_compatibility_version_parser.cpp', + 'database_name.cpp', 'feature_compatibility_version_document.idl', + 'feature_compatibility_version_parser.cpp', 'feature_flag.cpp', 'index_names.cpp', 'keypattern.cpp', 'logical_time.cpp', 'multitenancy.idl', 'namespace_string.cpp', - 'server_parameter_with_storage.cpp', + 'server_options.cpp', 'server_parameter.cpp', 'server_parameter.idl', + 'server_parameter_with_storage.cpp', 'shard_id.cpp', 'shutdown_in_progress_quiesce_info.cpp', 'tenant_id.cpp', @@ -82,7 +83,6 @@ env.Library( LIBDEPS=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/idl/idl_parser', - 'server_options_core', ], ) @@ -266,16 +266,6 @@ env.Library( ) env.Library( - target='server_options_core', - source=[ - 'server_options.cpp', - ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - ], -) - -env.Library( target='server_options', source=[ 'server_options_helpers.cpp', @@ -450,10 +440,10 @@ env.Library( 'change_stream_options_parameter.idl', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', 'change_stream_options', 'change_stream_serverless_helpers', - 'server_options_core', + 'repl/repl_coordinator_interface', + 'server_base', 'service_context', ], ) @@ -1911,7 +1901,7 @@ env.Library( 'dbdirectclient', 'repl/replica_set_aware_service', 'rw_concern_d', - 'server_options_core', + 'server_base', ], ) diff --git a/src/mongo/db/catalog/SConscript b/src/mongo/db/catalog/SConscript index 0d66453c412..f24e8f10b90 100644 --- a/src/mongo/db/catalog/SConscript +++ b/src/mongo/db/catalog/SConscript @@ -41,7 +41,6 @@ env.Library( '$BUILD_DIR/mongo/db/query/collation/collator_interface', '$BUILD_DIR/mongo/db/query/query_knobs', '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/timeseries/timeseries_options', 'clustered_collection_options', ], @@ -308,7 +307,6 @@ env.Library( '$BUILD_DIR/mongo/db/query/collation/collator_factory_interface', '$BUILD_DIR/mongo/db/query/op_metrics', '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/storage/bson_collection_catalog_entry', '$BUILD_DIR/mongo/db/storage/capped_snapshots', @@ -358,10 +356,9 @@ env.Library( 'validate_state.cpp', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/multitenancy', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', - '$BUILD_DIR/mongo/db/server_options_core', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/shard_role', '$BUILD_DIR/mongo/db/storage/storage_options', '$BUILD_DIR/mongo/db/views/views', @@ -402,7 +399,7 @@ env.Library( '$BUILD_DIR/mongo/db/repl/oplog', '$BUILD_DIR/mongo/db/repl/repl_server_parameters', '$BUILD_DIR/mongo/db/repl/repl_settings', - '$BUILD_DIR/mongo/db/server_options_core', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/shard_role', '$BUILD_DIR/mongo/db/storage/capped_snapshots', @@ -557,8 +554,8 @@ env.Library( '$BUILD_DIR/mongo/db/ops/write_ops', '$BUILD_DIR/mongo/db/query_exec', '$BUILD_DIR/mongo/db/repl/drop_pending_collection_reaper', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/server_feature_flags', - '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/shard_role', '$BUILD_DIR/mongo/db/stats/top', '$BUILD_DIR/mongo/db/storage/index_entry_comparison', diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript index 9a1c5b83865..8d5c82fbb12 100644 --- a/src/mongo/db/commands/SConscript +++ b/src/mongo/db/commands/SConscript @@ -80,7 +80,6 @@ env.Library( '$BUILD_DIR/mongo/db/mongohasher', '$BUILD_DIR/mongo/db/ops/write_ops_parsers', '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/session/kill_sessions', '$BUILD_DIR/mongo/db/session/logical_session_cache', '$BUILD_DIR/mongo/db/session/logical_session_cache_impl', @@ -132,8 +131,6 @@ env.Library( '$BUILD_DIR/mongo/db/repl/isself', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/db/server_options_core', - '$BUILD_DIR/mongo/db/session/logical_session_cache', '$BUILD_DIR/mongo/db/session/logical_session_cache_impl', '$BUILD_DIR/mongo/db/session/logical_session_id', '$BUILD_DIR/mongo/db/session/logical_session_id_helpers', @@ -281,7 +278,6 @@ env.Library( '$BUILD_DIR/mongo/db/commands', '$BUILD_DIR/mongo/db/ops/write_ops_parsers', '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/util/namespace_string_database_name_util', ], @@ -305,7 +301,6 @@ env.Library( '$BUILD_DIR/mongo/db/query_exec', '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/server_feature_flags', - '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/session/logical_session_id_helpers', '$BUILD_DIR/mongo/logv2/logv2_options', @@ -612,7 +607,6 @@ env.Library( '$BUILD_DIR/mongo/db/s/transaction_coordinator', '$BUILD_DIR/mongo/db/s/user_writes_recoverable_critical_section', '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/serverless/shard_split_donor_service', '$BUILD_DIR/mongo/db/set_change_stream_state_coordinator', '$BUILD_DIR/mongo/db/timeseries/timeseries_conversion_util', @@ -704,7 +698,7 @@ env.Library( '$BUILD_DIR/mongo/db/catalog/collection_catalog', '$BUILD_DIR/mongo/db/query/op_metrics', '$BUILD_DIR/mongo/db/query_expressions', - '$BUILD_DIR/mongo/db/server_options_core', + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -732,7 +726,6 @@ env.Library( '$BUILD_DIR/mongo/db/repl/repl_server_parameters', '$BUILD_DIR/mongo/db/repl/tenant_migration_state_machine_idl', '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/serverless/serverless_types_idl', '$BUILD_DIR/mongo/idl/idl_parser', '$BUILD_DIR/mongo/util/namespace_string_database_name_util', @@ -747,7 +740,6 @@ env.Library( LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/auth/authprivilege', '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/idl/idl_parser', '$BUILD_DIR/mongo/util/namespace_string_database_name_util', ], ) @@ -761,7 +753,6 @@ env.Library( LIBDEPS=[ '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/write_concern_options', - '$BUILD_DIR/mongo/idl/idl_parser', '$BUILD_DIR/mongo/util/namespace_string_database_name_util', ], ) diff --git a/src/mongo/db/free_mon/SConscript b/src/mongo/db/free_mon/SConscript index b29a73f3cc4..7b18f082cb4 100644 --- a/src/mongo/db/free_mon/SConscript +++ b/src/mongo/db/free_mon/SConscript @@ -20,11 +20,10 @@ fmEnv.Library( 'free_mon_storage.idl', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/dbhelpers', '$BUILD_DIR/mongo/db/ftdc/ftdc', - '$BUILD_DIR/mongo/idl/idl_parser', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/third_party/shim_snappy', ], ) diff --git a/src/mongo/db/ftdc/SConscript b/src/mongo/db/ftdc/SConscript index 4f5f0cbce9a..bf58e691ea6 100644 --- a/src/mongo/db/ftdc/SConscript +++ b/src/mongo/db/ftdc/SConscript @@ -24,10 +24,9 @@ ftdcEnv.Library( 'varint.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/bson/bson_validate', '$BUILD_DIR/mongo/bson/util/bson_extract', - '$BUILD_DIR/mongo/db/server_options_core', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/third_party/s2/s2', # For VarInt '$BUILD_DIR/third_party/shim_zlib', diff --git a/src/mongo/db/pipeline/SConscript b/src/mongo/db/pipeline/SConscript index 0876ae311e8..9203a19806c 100644 --- a/src/mongo/db/pipeline/SConscript +++ b/src/mongo/db/pipeline/SConscript @@ -76,7 +76,6 @@ env.Library( '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/storage/storage_options', '$BUILD_DIR/mongo/db/write_concern_options', - '$BUILD_DIR/mongo/idl/idl_parser', 'document_sources_idl', ], ) diff --git a/src/mongo/db/query/SConscript b/src/mongo/db/query/SConscript index eb4ea3be54f..bb1b4efda4c 100644 --- a/src/mongo/db/query/SConscript +++ b/src/mongo/db/query/SConscript @@ -360,19 +360,34 @@ env.Library( env.Library( target='op_metrics', - source=['telemetry.cpp', '$BUILD_DIR/mongo/db/curop.cpp'], + source=[ + 'telemetry.cpp', + '$BUILD_DIR/mongo/db/curop.cpp', + ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/bson/mutable/mutable_bson', - '$BUILD_DIR/mongo/db/commands', '$BUILD_DIR/mongo/db/concurrency/lock_manager', - '$BUILD_DIR/mongo/db/generic_cursor', '$BUILD_DIR/mongo/db/profile_filter', - '$BUILD_DIR/mongo/db/server_options', '$BUILD_DIR/mongo/db/service_context', + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/bson/mutable/mutable_bson', + '$BUILD_DIR/mongo/db/commands', + '$BUILD_DIR/mongo/db/concurrency/lock_manager', + '$BUILD_DIR/mongo/db/generic_cursor', + '$BUILD_DIR/mongo/db/profile_filter', + '$BUILD_DIR/mongo/db/server_options', + '$BUILD_DIR/mongo/db/service_context', + '$BUILD_DIR/mongo/db/stats/counters', '$BUILD_DIR/mongo/db/stats/timer_stats', '$BUILD_DIR/mongo/db/storage/storage_engine_parameters', - '$BUILD_DIR/mongo/rpc/client_metadata', '$BUILD_DIR/mongo/transport/service_executor', - '$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/processinfo', '$BUILD_DIR/mongo/util/progress_meter', - 'command_request_response', 'memory_util', 'query_knobs', 'rate_limiting' + '$BUILD_DIR/mongo/rpc/client_metadata', + '$BUILD_DIR/mongo/transport/service_executor', + '$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/processinfo', + '$BUILD_DIR/mongo/util/progress_meter', + 'command_request_response', + 'memory_util', + 'query_knobs', + 'rate_limiting', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/auth/auth', diff --git a/src/mongo/db/query/datetime/SConscript b/src/mongo/db/query/datetime/SConscript index 6bfd4e3ed63..bca4240b9ac 100644 --- a/src/mongo/db/query/datetime/SConscript +++ b/src/mongo/db/query/datetime/SConscript @@ -17,9 +17,11 @@ timeZoneEnv.Library( timeZoneEnv.Library( target='init_timezone_data', - source=['init_timezone_data.cpp'], + source=[ + 'init_timezone_data.cpp', + ], LIBDEPS=[ - '$BUILD_DIR/mongo/db/server_options_core', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/third_party/shim_timelib', 'date_time_support', ], diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript index e2638555b59..ebeb2d99411 100644 --- a/src/mongo/db/repl/SConscript +++ b/src/mongo/db/repl/SConscript @@ -93,7 +93,6 @@ env.Library( '$BUILD_DIR/mongo/db/stats/counters', '$BUILD_DIR/mongo/db/stats/server_read_concern_write_concern_metrics', '$BUILD_DIR/mongo/db/transaction/transaction', - '$BUILD_DIR/mongo/idl/idl_parser', '$BUILD_DIR/mongo/rpc/command_status', '$BUILD_DIR/mongo/s/common_s', '$BUILD_DIR/mongo/util/namespace_string_database_name_util', @@ -215,7 +214,6 @@ env.Library( LIBDEPS=[ '$BUILD_DIR/mongo/db/catalog/health_log_interface', '$BUILD_DIR/mongo/db/shard_role', - '$BUILD_DIR/mongo/idl/idl_parser', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/catalog/collection_options', @@ -568,7 +566,6 @@ env.Library( LIBDEPS=[ '$BUILD_DIR/mongo/db/catalog/collection_options', '$BUILD_DIR/mongo/db/exec/document_value/document_value', - '$BUILD_DIR/mongo/idl/idl_parser', 'optime', 'optime_base', ], @@ -720,6 +717,7 @@ env.Library( LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/catalog/commit_quorum_options', '$BUILD_DIR/mongo/db/server_base', + '$BUILD_DIR/mongo/db/stats/counters', 'repl_server_parameters', ], ) @@ -742,7 +740,6 @@ env.Library( '$BUILD_DIR/mongo/db/index/index_access_method', '$BUILD_DIR/mongo/db/mongod_options', '$BUILD_DIR/mongo/db/prepare_conflict_tracker', - '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/session/kill_sessions_local', '$BUILD_DIR/mongo/executor/task_executor_interface', @@ -897,11 +894,9 @@ env.Library( 'repl_set_config_params.idl', ], 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', @@ -1224,7 +1219,6 @@ env.Library( '$BUILD_DIR/mongo/db/multitenancy', '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/server_feature_flags', - '$BUILD_DIR/mongo/idl/idl_parser', 'read_concern_args', ], ) @@ -1296,7 +1290,6 @@ env.Library( '$BUILD_DIR/mongo/db/auth/auth', '$BUILD_DIR/mongo/db/auth/authprivilege', '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/idl/idl_parser', '$BUILD_DIR/mongo/rpc/metadata', '$BUILD_DIR/mongo/util/namespace_string_database_name_util', 'optime', diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript index 5930f1907ce..080165690e3 100644 --- a/src/mongo/db/s/SConscript +++ b/src/mongo/db/s/SConscript @@ -69,7 +69,6 @@ env.Library( '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/shard_role', - '$BUILD_DIR/mongo/idl/idl_parser', '$BUILD_DIR/mongo/s/analyze_shard_key_idl', '$BUILD_DIR/mongo/s/analyze_shard_key_util', ], @@ -243,7 +242,6 @@ env.Library( '$BUILD_DIR/mongo/db/repl/wait_for_majority_service', '$BUILD_DIR/mongo/db/rs_local_client', '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/session/session_catalog', '$BUILD_DIR/mongo/db/session/session_catalog_mongod', '$BUILD_DIR/mongo/db/storage/remove_saver', diff --git a/src/mongo/db/stats/SConscript b/src/mongo/db/stats/SConscript index f3eafa07a07..4046c1ca2a9 100644 --- a/src/mongo/db/stats/SConscript +++ b/src/mongo/db/stats/SConscript @@ -21,7 +21,7 @@ env.Library( 'operation_latency_histogram.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/db/server_options_core', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/util/namespace_string_database_name_util', ], diff --git a/src/mongo/db/storage/SConscript b/src/mongo/db/storage/SConscript index ba4af679c22..6a8c535cece 100644 --- a/src/mongo/db/storage/SConscript +++ b/src/mongo/db/storage/SConscript @@ -417,10 +417,9 @@ env.Library( 'storage_engine_metadata.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/bson/bson_validate', '$BUILD_DIR/mongo/db/bson/dotted_path_support', - '$BUILD_DIR/mongo/db/server_options_core', + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -499,11 +498,10 @@ env.Library( 'flow_control.cpp', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/commands/server_status_core', '$BUILD_DIR/mongo/db/concurrency/flow_control_ticketholder', '$BUILD_DIR/mongo/db/concurrency/lock_manager', - '$BUILD_DIR/mongo/db/server_options_core', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/util/background_job', '$BUILD_DIR/mongo/util/fail_point', @@ -637,9 +635,7 @@ env.Library( 'storage_engine_impl.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/catalog/catalog_control', - '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/shard_role', '$BUILD_DIR/mongo/db/storage/durable_catalog_impl', '$BUILD_DIR/mongo/db/storage/kv/kv_drop_pending_ident_reaper', @@ -652,6 +648,7 @@ env.Library( '$BUILD_DIR/mongo/db/catalog/index_catalog', '$BUILD_DIR/mongo/db/multitenancy', '$BUILD_DIR/mongo/db/resumable_index_builds_idl', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/server_feature_flags', '$BUILD_DIR/mongo/db/storage/storage_repair_observer', '$BUILD_DIR/mongo/db/vector_clock', diff --git a/src/mongo/db/storage/wiredtiger/SConscript b/src/mongo/db/storage/wiredtiger/SConscript index 1c7534ab0d4..236b6dd566b 100644 --- a/src/mongo/db/storage/wiredtiger/SConscript +++ b/src/mongo/db/storage/wiredtiger/SConscript @@ -59,7 +59,6 @@ wtEnv.Library( '$BUILD_DIR/mongo/db/query/op_metrics', '$BUILD_DIR/mongo/db/record_id_helpers', '$BUILD_DIR/mongo/db/repl/repl_settings', - '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/server_options_servers', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/storage/index_entry_comparison', diff --git a/src/mongo/db/timeseries/SConscript b/src/mongo/db/timeseries/SConscript index b6d7137da8b..b6fafcaaef4 100644 --- a/src/mongo/db/timeseries/SConscript +++ b/src/mongo/db/timeseries/SConscript @@ -22,7 +22,6 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/storage/storage_options', '$BUILD_DIR/mongo/util/processinfo', ], @@ -36,7 +35,6 @@ env.Library( LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/bson/util/bson_column', '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/storage/storage_options', '$BUILD_DIR/mongo/util/fail_point', ], diff --git a/src/mongo/db/timeseries/bucket_catalog/SConscript b/src/mongo/db/timeseries/bucket_catalog/SConscript index 7a207a58ba7..5934016e368 100644 --- a/src/mongo/db/timeseries/bucket_catalog/SConscript +++ b/src/mongo/db/timeseries/bucket_catalog/SConscript @@ -27,7 +27,6 @@ env.Library( '$BUILD_DIR/mongo/db/dbdirectclient', '$BUILD_DIR/mongo/db/record_id_helpers', '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/storage/storage_options', '$BUILD_DIR/mongo/db/timeseries/bucket_compression', '$BUILD_DIR/mongo/db/timeseries/timeseries_options', diff --git a/src/mongo/db/update/SConscript b/src/mongo/db/update/SConscript index a571468bc3f..3c1b1db5b29 100644 --- a/src/mongo/db/update/SConscript +++ b/src/mongo/db/update/SConscript @@ -92,12 +92,11 @@ env.Library( 'update_driver.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/common', '$BUILD_DIR/mongo/db/ops/write_ops_parsers', '$BUILD_DIR/mongo/db/query/canonical_query', '$BUILD_DIR/mongo/db/query_expressions', - '$BUILD_DIR/mongo/db/server_options_core', + '$BUILD_DIR/mongo/db/server_base', 'update', ], ) diff --git a/src/mongo/dbtests/SConscript b/src/mongo/dbtests/SConscript index 6a5eb29d44e..ad74ed90113 100644 --- a/src/mongo/dbtests/SConscript +++ b/src/mongo/dbtests/SConscript @@ -23,7 +23,6 @@ env.Library( '$BUILD_DIR/mongo/db/index_builds_coordinator_mongod', '$BUILD_DIR/mongo/db/op_observer/op_observer', '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/service_context_d', '$BUILD_DIR/mongo/db/storage/flow_control_parameters', '$BUILD_DIR/mongo/db/storage/storage_control', @@ -159,7 +158,7 @@ env.Program( "$BUILD_DIR/mongo/db/repl/replmocks", "$BUILD_DIR/mongo/db/repl/serveronly_repl", "$BUILD_DIR/mongo/db/repl/storage_interface_impl", - "$BUILD_DIR/mongo/db/server_options_core", + "$BUILD_DIR/mongo/db/server_base", "$BUILD_DIR/mongo/db/session/sessions_collection_standalone", "$BUILD_DIR/mongo/db/shard_role", "$BUILD_DIR/mongo/db/storage/durable_catalog_impl", diff --git a/src/mongo/embedded/mongoc_embedded/SConscript b/src/mongo/embedded/mongoc_embedded/SConscript index 57cead4cc65..1ae5b692ea0 100644 --- a/src/mongo/embedded/mongoc_embedded/SConscript +++ b/src/mongo/embedded/mongoc_embedded/SConscript @@ -82,8 +82,7 @@ if get_option('link-model') != 'dynamic-sdk': 'mongoc_embedded_test.idl', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/server_options_core', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/unittest/unittest', '$BUILD_DIR/mongo/util/options_parser/options_parser', 'mongoc_embedded', diff --git a/src/mongo/idl/SConscript b/src/mongo/idl/SConscript index 3181216eba6..c0fb2123cca 100644 --- a/src/mongo/idl/SConscript +++ b/src/mongo/idl/SConscript @@ -148,7 +148,6 @@ env.CppUnitTest( '$BUILD_DIR/mongo/db/auth/authprivilege', '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/server_feature_flags', - '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/rpc/message', '$BUILD_DIR/mongo/util/cmdline_utils/cmdline_utils', diff --git a/src/mongo/rpc/SConscript b/src/mongo/rpc/SConscript index 72e3bce9fd9..5f1acff99a6 100644 --- a/src/mongo/rpc/SConscript +++ b/src/mongo/rpc/SConscript @@ -63,8 +63,6 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/dbmessage', - '$BUILD_DIR/mongo/db/server_options_core', - '$BUILD_DIR/mongo/db/stats/counters', '$BUILD_DIR/mongo/s/common_s', '$BUILD_DIR/mongo/util/net/network', 'message', @@ -73,6 +71,7 @@ env.Library( LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/commands/test_commands_enabled', '$BUILD_DIR/mongo/db/server_base', + '$BUILD_DIR/mongo/db/stats/counters', 'rewrite_state_change_errors', ], ) diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript index 4c2f2f8c593..97744139c45 100644 --- a/src/mongo/s/SConscript +++ b/src/mongo/s/SConscript @@ -157,7 +157,7 @@ env.Library( 'load_balancer_support.cpp', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/server_options_core', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/service_context', 'mongos_server_parameters', ], @@ -351,7 +351,6 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/db/server_options_core', ], ) diff --git a/src/mongo/shell/SConscript b/src/mongo/shell/SConscript index d053c0f01d9..e43690d06db 100644 --- a/src/mongo/shell/SConscript +++ b/src/mongo/shell/SConscript @@ -162,13 +162,12 @@ env.Library( ) env.Library( - target="kms_idl", + target='kms_idl', source=[ - "kms.idl", + 'kms.idl', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/idl/idl_parser', + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -274,7 +273,7 @@ if not has_option('noshell') and jsEngine: "$BUILD_DIR/mongo/db/pipeline/change_stream_error_extra_info", "$BUILD_DIR/mongo/db/query/command_request_response", "$BUILD_DIR/mongo/db/query/query_request", - "$BUILD_DIR/mongo/db/server_options_core", + "$BUILD_DIR/mongo/db/server_base", "$BUILD_DIR/mongo/db/session/logical_session_id_helpers", "$BUILD_DIR/mongo/db/storage/duplicate_key_error_info", "$BUILD_DIR/mongo/db/traffic_reader", diff --git a/src/mongo/transport/SConscript b/src/mongo/transport/SConscript index 81a6f2807f2..1f7d42e7491 100644 --- a/src/mongo/transport/SConscript +++ b/src/mongo/transport/SConscript @@ -79,7 +79,6 @@ tlEnv.Library( LIBDEPS=[ '$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/util/executor_stats', 'transport_layer_common', @@ -122,7 +121,6 @@ tlEnv.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/util/concurrency/thread_pool', '$BUILD_DIR/mongo/util/processinfo', '$BUILD_DIR/third_party/shim_asio', @@ -143,7 +141,6 @@ env.Library( '$BUILD_DIR/mongo/db/query/command_request_response', '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/server_feature_flags', - '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/stats/counters', '$BUILD_DIR/mongo/rpc/message', diff --git a/src/mongo/unittest/SConscript b/src/mongo/unittest/SConscript index 737c3443b6b..9e3366630c2 100644 --- a/src/mongo/unittest/SConscript +++ b/src/mongo/unittest/SConscript @@ -32,11 +32,10 @@ utEnv.Library( 'unittest.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', 'golden_test_base', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/server_options_core', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/util/options_parser/options_parser', '$BUILD_DIR/mongo/util/pcre_util', '$BUILD_DIR/mongo/util/pcre_wrapper', diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript index 1cec160602e..ee4810a0e0b 100644 --- a/src/mongo/util/SConscript +++ b/src/mongo/util/SConscript @@ -240,7 +240,6 @@ env.Library( '$BUILD_DIR/mongo/db/multitenancy', '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/server_feature_flags', - '$BUILD_DIR/mongo/db/server_options_core', ], ) @@ -506,9 +505,8 @@ env.Library( "signal_win32.cpp", ], LIBDEPS=[ - "$BUILD_DIR/mongo/base", "$BUILD_DIR/mongo/db/log_process_details", - "$BUILD_DIR/mongo/db/server_options_core", + "$BUILD_DIR/mongo/db/server_base", "$BUILD_DIR/mongo/db/service_context", ], ) diff --git a/src/mongo/util/net/SConscript b/src/mongo/util/net/SConscript index 678f421c5a8..7f1473f0a66 100644 --- a/src/mongo/util/net/SConscript +++ b/src/mongo/util/net/SConscript @@ -18,11 +18,8 @@ env.Library( "socket_utils.cpp", 'hostandport.idl', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/server_options_core', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/util/concurrency/spin_lock', '$BUILD_DIR/mongo/util/winutil', ], @@ -33,11 +30,8 @@ env.Library( source=[ 'ssl_options.cpp', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/server_options_core', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/util/options_parser/options_parser', ], ) |