diff options
59 files changed, 293 insertions, 476 deletions
diff --git a/buildscripts/idl/idl/generator.py b/buildscripts/idl/idl/generator.py index 9062eea8b6a..0832c3c928a 100644 --- a/buildscripts/idl/idl/generator.py +++ b/buildscripts/idl/idl/generator.py @@ -1017,8 +1017,8 @@ class _CppHeaderFileWriter(_CppFileWriterBase): if spec.server_parameters: if [param for param in spec.server_parameters if param.feature_flag]: header_list.append('mongo/idl/feature_flag.h') - header_list.append('mongo/idl/server_parameter.h') - header_list.append('mongo/idl/server_parameter_with_storage.h') + header_list.append('mongo/db/server_parameter.h') + header_list.append('mongo/db/server_parameter_with_storage.h') # Include this for TypedCommand only if a base class will be generated for a command in this # file. @@ -2668,8 +2668,8 @@ class _CppSourceFileWriter(_CppFileWriterBase): ] if spec.server_parameters: - header_list.append('mongo/idl/server_parameter.h') - header_list.append('mongo/idl/server_parameter_with_storage.h') + header_list.append('mongo/db/server_parameter.h') + header_list.append('mongo/db/server_parameter_with_storage.h') if spec.configs: header_list.append('mongo/util/options_parser/option_section.h') diff --git a/src/mongo/bson/bsonobjbuilder.cpp b/src/mongo/bson/bsonobjbuilder.cpp index 859b5c8b5a7..bde3526c543 100644 --- a/src/mongo/bson/bsonobjbuilder.cpp +++ b/src/mongo/bson/bsonobjbuilder.cpp @@ -27,19 +27,14 @@ * it in the license file. */ - -#include "mongo/db/jsobj.h" - +#include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/timestamp.h" #include "mongo/logv2/log.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kDefault - namespace mongo { -using std::string; - template <class Derived, class B> Derived& BSONObjBuilderBase<Derived, B>::appendMinForType(StringData fieldName, int t) { switch (t) { diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index 3c7b374f8b2..20daaf2e050 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -63,29 +63,21 @@ env.Library( 'database_name.cpp', 'index_names.cpp', 'keypattern.cpp', + 'logical_time.cpp', 'multitenancy.idl', 'namespace_string.cpp', + 'server_parameter_with_storage.cpp', + 'server_parameter.cpp', + 'server_parameter.idl', 'shard_id.cpp', 'shutdown_in_progress_quiesce_info.cpp', 'tenant_id.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/idl/idl_parser', - '$BUILD_DIR/mongo/idl/server_parameter', - 'logical_time', + '$BUILD_DIR/mongo/util/options_parser/options_parser', ]) -env.Library( - target='logical_time', - source=[ - 'logical_time.cpp', - ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/idl/idl_parser', - ], -) - # # The db/'common' lib has the abstractions that are shared by components of the # server. Ideally, many of the object in 'coredb' should be moved here when their dependencies @@ -104,10 +96,10 @@ env.Library( '$BUILD_DIR/mongo/db/catalog/cannot_convert_index_to_unique_info', '$BUILD_DIR/mongo/db/repl/tenant_migration_errors', '$BUILD_DIR/mongo/db/write_concern_options', - 'server_base', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/catalog/collection_uuid_mismatch_info', + 'server_base', ], ) @@ -126,9 +118,9 @@ env.Library( ) env.Library( - target="dbmessage", + target='dbmessage', source=[ - "dbmessage.cpp", + 'dbmessage.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/server_options_core', @@ -259,15 +251,13 @@ env.Library( ) env.Library( - target="server_feature_flags", + target='server_feature_flags', source=[ 'server_feature_flags.idl', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/idl/feature_flag', + 'server_base', ], ) @@ -298,7 +288,6 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/util/fail_point', - '$BUILD_DIR/mongo/util/options_parser/options_parser', 'server_base', ], ) @@ -324,13 +313,10 @@ env.Library( 'server_options_general.idl', 'server_options_nongeneral.idl', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/auth/cluster_auth_mode', - '$BUILD_DIR/mongo/idl/server_parameter', '$BUILD_DIR/mongo/util/options_parser/options_parser', + 'server_base', 'server_options_core', ], ) @@ -689,10 +675,9 @@ env.Library( 'mirroring_sampler.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/executor/task_executor_interface', - "$BUILD_DIR/mongo/rpc/message", - "$BUILD_DIR/mongo/util/net/network", + '$BUILD_DIR/mongo/rpc/message', + '$BUILD_DIR/mongo/util/net/network', 'client_out_of_line_executor', 'service_context', ], @@ -700,12 +685,13 @@ env.Library( '$BUILD_DIR/mongo/bson/util/bson_extract', '$BUILD_DIR/mongo/executor/network_interface_factory', '$BUILD_DIR/mongo/executor/thread_pool_task_executor', - '$BUILD_DIR/mongo/idl/idl_parser', '$BUILD_DIR/mongo/util/concurrency/thread_pool', - 'commands/server_status', + 'commands', + 'commands/server_status_core', 'repl/repl_coordinator_interface', 'repl/replica_set_messages', 'repl/topology_version_observer', + 'server_base', ], ) @@ -746,13 +732,13 @@ env.Library( ) env.Library( - target="commands", + target='commands', source=[ 'coll_mod_reply_validation.cpp', 'commands.cpp', 'drop.idl', 'drop_database.idl', - "explain.idl", + 'explain.idl', 'list_collections.idl', 'list_indexes.idl', ], @@ -803,14 +789,14 @@ env.Library( ], LIBDEPS=[ 'catalog_raii', - 'curop', 's/sharding_api_d', 'stats/top', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/server_parameter', 'catalog/database_holder', + 'curop', 'multitenancy', + 'server_base', 'storage/snapshot_helper', ], ) @@ -820,9 +806,9 @@ env.Library( source=[ 'internal_transactions_feature_flag.idl', ], - LIBDEPS=[ + LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/idl/feature_flag', - '$BUILD_DIR/mongo/idl/server_parameter', + 'server_base', 'server_options_core', ], ) @@ -889,7 +875,7 @@ env.Library( '$BUILD_DIR/mongo/executor/network_interface_factory', '$BUILD_DIR/mongo/executor/task_executor_pool', '$BUILD_DIR/mongo/executor/thread_pool_task_executor', - "$BUILD_DIR/mongo/util/concurrency/thread_pool", + '$BUILD_DIR/mongo/util/concurrency/thread_pool', 'fle_crud', ], ) @@ -1202,53 +1188,53 @@ env.Library( ) env.Library( - target="rw_concern_d", + target='rw_concern_d', source=[ - "read_concern.cpp", - "write_concern.cpp", + 'read_concern.cpp', + 'write_concern.cpp', ], LIBDEPS=[ - "concurrency/lock_manager", - "curop", + 'curop', 'read_write_concern_defaults', - "repl/read_concern_args", - "repl/repl_coordinator_interface", - "repl/speculative_majority_read_info", - "stats/timer_stats", - "storage/storage_options", + 'repl/read_concern_args', + 'repl/speculative_majority_read_info', + 'stats/timer_stats', + 'storage/storage_options', ], LIBDEPS_PRIVATE=[ - "$BUILD_DIR/mongo/db/storage/storage_control", - "commands/server_status_core", + 'commands/server_status_core', + 'concurrency/lock_manager', + 'repl/repl_coordinator_interface', 'repl/repl_server_parameters', - "s/sharding_api_d", - "shared_request_handling", + 's/sharding_api_d', + 'shared_request_handling', + 'storage/storage_control', ], ) env.Library( - target="read_concern_d_impl", + target='read_concern_d_impl', source=[ - "read_concern_mongod.cpp", + 'read_concern_mongod.cpp', 'read_concern_mongod.idl', ], LIBDEPS_PRIVATE=[ - "$BUILD_DIR/mongo/db/concurrency/exception_util", - "$BUILD_DIR/mongo/db/repl/tenant_migration_access_blocker", - "$BUILD_DIR/mongo/idl/server_parameter", - "$BUILD_DIR/mongo/s/grid", - "catalog_raii", - "curop", - "repl/repl_coordinator_interface", - "repl/speculative_majority_read_info", - "s/sharding_api_d", + '$BUILD_DIR/mongo/s/grid', + 'catalog_raii', + 'concurrency/exception_util', + 'curop', + 'repl/repl_coordinator_interface', + 'repl/speculative_majority_read_info', + 'repl/tenant_migration_access_blocker', + 's/sharding_api_d', + 'server_base', ], ) env.Library( - target="rebuild_indexes", + target='rebuild_indexes', source=[ - "rebuild_indexes.cpp", + 'rebuild_indexes.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/catalog/collection', @@ -1260,9 +1246,9 @@ env.Library( ) env.Library( - target="repair", + target='repair', source=[ - "repair.cpp", + 'repair.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/catalog/collection', @@ -1285,10 +1271,10 @@ env.Library( ) env.Library( - target="ttl_d", + target='ttl_d', source=[ - "ttl.cpp", - "ttl.idl", + 'ttl.cpp', + 'ttl.idl', ], LIBDEPS=[ 'db_raii', @@ -1296,15 +1282,15 @@ env.Library( 'ttl_collection_cache', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/commands/fsync_locked', - '$BUILD_DIR/mongo/db/ops/write_ops', - '$BUILD_DIR/mongo/db/record_id_helpers', - '$BUILD_DIR/mongo/db/repl/replica_set_aware_service', - '$BUILD_DIR/mongo/db/repl/tenant_migration_access_blocker', - '$BUILD_DIR/mongo/db/s/sharding_runtime_d', - '$BUILD_DIR/mongo/idl/server_parameter', 'catalog/database_holder', + 'commands/fsync_locked', 'commands/server_status_core', + 'ops/write_ops', + 'record_id_helpers', + 'repl/replica_set_aware_service', + 'repl/tenant_migration_access_blocker', + 's/sharding_runtime_d', + 'server_base', 'service_context', ], ) @@ -1587,7 +1573,7 @@ env.Library( ) env.Library( - target="startup_recovery", + target='startup_recovery', source=[ 'startup_recovery.cpp', ], @@ -1717,8 +1703,7 @@ env.Library( 'api_parameters.idl', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/idl_parser', - '$BUILD_DIR/mongo/idl/server_parameter', + 'server_base', ], ) @@ -1778,7 +1763,7 @@ env.Library( 'snapshot_window_options.idl', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/server_parameter', + 'server_base', ], ) @@ -2045,7 +2030,7 @@ env.Library( 'cursor_server_params.idl', ], LIBDEPS_PRIVATE=[ - "$BUILD_DIR/mongo/idl/server_parameter", + 'server_base', ], ) @@ -2096,28 +2081,23 @@ env.Library( 'traffic_recorder_validators.cpp', 'traffic_recorder.idl', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - ], LIBDEPS_PRIVATE=[ - "$BUILD_DIR/mongo/db/commands/server_status", + '$BUILD_DIR/mongo/db/commands/server_status_core', '$BUILD_DIR/mongo/db/service_context', - '$BUILD_DIR/mongo/idl/server_parameter', - "$BUILD_DIR/mongo/rpc/rpc", + '$BUILD_DIR/mongo/rpc/rpc', + 'server_base', ], ) env.Library( target='traffic_reader', source=[ - "traffic_reader.cpp", - ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', + 'traffic_reader.cpp', ], LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/rpc/message', - "$BUILD_DIR/mongo/rpc/rpc", + '$BUILD_DIR/mongo/rpc/rpc', ], ) @@ -2269,7 +2249,7 @@ env.Library( ) env.Library( - target="mongod_main", + target='mongod_main', source=[ 'mongod_main.cpp', 'logical_session_cache_factory_mongod.cpp', diff --git a/src/mongo/db/auth/SConscript b/src/mongo/db/auth/SConscript index ab481424ac6..6735121f2be 100644 --- a/src/mongo/db/auth/SConscript +++ b/src/mongo/db/auth/SConscript @@ -72,7 +72,7 @@ env.Library( env.Library( target='auth_op_observer', source=[ - "auth_op_observer.cpp", + 'auth_op_observer.cpp', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/db/auth/sasl_options.cpp b/src/mongo/db/auth/sasl_options.cpp index 63414acc3a1..03dd0d86245 100644 --- a/src/mongo/db/auth/sasl_options.cpp +++ b/src/mongo/db/auth/sasl_options.cpp @@ -30,7 +30,6 @@ #include "mongo/db/auth/sasl_options.h" #include "mongo/db/auth/sasl_options_gen.h" #include "mongo/db/stats/counters.h" - #include "mongo/util/text.h" namespace mongo { diff --git a/src/mongo/db/catalog/SConscript b/src/mongo/db/catalog/SConscript index 59a0e26a4d5..be099e1767e 100644 --- a/src/mongo/db/catalog/SConscript +++ b/src/mongo/db/catalog/SConscript @@ -51,10 +51,10 @@ env.Library( env.Library( target='document_validation', source=[ - "document_validation.cpp", + 'document_validation.cpp', ], LIBDEPS_PRIVATE=[ - "$BUILD_DIR/mongo/db/service_context", + '$BUILD_DIR/mongo/db/service_context', ], ) @@ -65,9 +65,8 @@ env.Library( 'commit_quorum_options.cpp', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/bson/util/bson_extract', - '$BUILD_DIR/mongo/idl/idl_parser', + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -77,7 +76,7 @@ env.Library( 'validate.idl', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -87,7 +86,7 @@ env.Library( 'index_build_entry.idl', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/idl_parser', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/util/net/network', 'commit_quorum_options', ], @@ -103,7 +102,6 @@ env.Library( '$BUILD_DIR/mongo/db/concurrency/deferred_writer', '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/service_context', - '$BUILD_DIR/mongo/idl/idl_parser', 'collection_options', ], ) @@ -270,11 +268,11 @@ env.Library( '$BUILD_DIR/mongo/db/index/index_access_method', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', '$BUILD_DIR/mongo/db/resumable_index_builds_idl', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/storage/storage_options', '$BUILD_DIR/mongo/db/storage/write_unit_of_work', '$BUILD_DIR/mongo/db/timeseries/timeseries_conversion_util', - '$BUILD_DIR/mongo/idl/server_parameter', '$BUILD_DIR/mongo/util/fail_point', '$BUILD_DIR/mongo/util/log_and_backoff', '$BUILD_DIR/mongo/util/progress_meter', @@ -306,7 +304,6 @@ env.Library( '$BUILD_DIR/mongo/db/storage/snapshot_helper', '$BUILD_DIR/mongo/db/storage/storage_options', '$BUILD_DIR/mongo/db/views/views', - '$BUILD_DIR/mongo/idl/server_parameter', 'collection', ], ) @@ -436,7 +433,7 @@ env.Library( 'catalog_stats.cpp', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/commands/server_status', + '$BUILD_DIR/mongo/db/commands/server_status_core', '$BUILD_DIR/mongo/db/db_raii', '$BUILD_DIR/mongo/db/multitenancy', '$BUILD_DIR/mongo/db/views/views', @@ -588,7 +585,6 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/idl/idl_parser', ], ) diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript index 60d5609dd93..314821fc5b8 100644 --- a/src/mongo/db/commands/SConscript +++ b/src/mongo/db/commands/SConscript @@ -7,14 +7,13 @@ Import("get_option") env = env.Clone() env.Library( - target="test_commands_enabled", + target='test_commands_enabled', source=[ - "test_commands_enabled.cpp", + 'test_commands_enabled.cpp', 'test_commands_enabled.idl', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/server_parameter', - "server_status_core", + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -24,27 +23,8 @@ env.Library( 'server_status.cpp', 'server_status_metric.cpp', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - ], -) - -env.Library( - target='server_status', - source=[ - 'server_status_command.cpp', - ], - LIBDEPS=[ - '$BUILD_DIR/mongo/db/commands', - ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/auth/auth', - '$BUILD_DIR/mongo/db/auth/authprivilege', - '$BUILD_DIR/mongo/db/server_options_core', - '$BUILD_DIR/mongo/db/stats/counters', - '$BUILD_DIR/mongo/util/net/http_client', - '$BUILD_DIR/mongo/util/processinfo', - 'server_status_core', + '$BUILD_DIR/mongo/base', ], ) @@ -58,7 +38,6 @@ env.Library( '$BUILD_DIR/mongo/transport/message_compressor', '$BUILD_DIR/mongo/transport/service_executor', '$BUILD_DIR/mongo/util/net/ssl_manager', - 'server_status', 'server_status_core', ], ) @@ -71,7 +50,6 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/idl/idl_parser', ], ) @@ -95,6 +73,7 @@ env.Library( 'refresh_logical_session_cache_now.cpp', 'refresh_sessions_command.cpp', 'rename_collection_common.cpp', + 'server_status_command.cpp', 'sessions_commands.idl', 'start_session_command.cpp', 'update_metrics.cpp', @@ -118,9 +97,9 @@ env.Library( '$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', - '$BUILD_DIR/mongo/idl/server_parameter', '$BUILD_DIR/mongo/logv2/logv2_options', '$BUILD_DIR/mongo/rpc/message', + '$BUILD_DIR/mongo/util/net/http_client', 'test_commands_enabled', ], ) @@ -134,7 +113,7 @@ env.Library( 'connection_status.cpp', 'connection_status.idl', 'drop_connections_command.cpp', - 'rotate_certificates_command.cpp', + 'drop_connections.idl', 'generic_servers.cpp', 'generic_servers.idl', 'internal_transactions_test_command.idl', @@ -142,17 +121,14 @@ env.Library( 'logical_session_server_status_section.cpp', 'mr_common.cpp', 'reap_logical_session_cache_now.cpp', + 'rotate_certificates_command.cpp', + 'rotate_certificates.idl', 'test_api_version_2_commands.cpp', 'test_deprecation_command.cpp', 'traffic_recording_cmds.cpp', 'user_management_commands_common.cpp', - 'drop_connections.idl', - 'rotate_certificates.idl', 'user_management_commands.idl', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/db/read_write_concern_defaults', - ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/client/clientdriver_minimal', '$BUILD_DIR/mongo/db/auth/address_restriction', @@ -163,9 +139,11 @@ env.Library( '$BUILD_DIR/mongo/db/pipeline/change_stream_pipeline', '$BUILD_DIR/mongo/db/pipeline/document_source_internal_apply_oplog_update', '$BUILD_DIR/mongo/db/pipeline/pipeline', + '$BUILD_DIR/mongo/db/read_write_concern_defaults', '$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', @@ -183,7 +161,6 @@ env.Library( 'authentication_commands', 'core', 'feature_compatibility_parsers', - 'server_status', 'test_commands_enabled', ], ) @@ -200,7 +177,7 @@ env.Library( ) env.Library( - target="authentication_commands", + target='authentication_commands', source=[ 'authentication_commands.cpp', 'authentication_commands.idl', @@ -220,9 +197,9 @@ env.Library( ) env.Library( - target="mongod_fsync", + target='mongod_fsync', source=[ - "fsync.cpp", + 'fsync.cpp', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/auth/auth', @@ -236,9 +213,9 @@ env.Library( ) env.Library( - target="mongod_fcv", + target='mongod_fcv', source=[ - "feature_compatibility_version.cpp", + 'feature_compatibility_version.cpp', 'feature_compatibility_version.idl', ], LIBDEPS=[ @@ -251,7 +228,7 @@ env.Library( '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', '$BUILD_DIR/mongo/db/repl/repl_server_parameters', '$BUILD_DIR/mongo/db/repl/repl_settings', - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -271,7 +248,6 @@ env.Library( LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/auth/authprivilege', '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/idl/idl_parser', ], ) @@ -283,7 +259,6 @@ env.Library( LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/auth/authprivilege', '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/idl/idl_parser', ], ) @@ -477,7 +452,6 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/idl/idl_parser', ], ) @@ -488,7 +462,6 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/idl/idl_parser', ], ) @@ -606,7 +579,6 @@ env.Library( '$BUILD_DIR/mongo/db/set_change_stream_state_coordinator', '$BUILD_DIR/mongo/db/timeseries/timeseries_conversion_util', '$BUILD_DIR/mongo/db/transaction/transaction_api', - '$BUILD_DIR/mongo/idl/idl_parser', '$BUILD_DIR/mongo/util/net/ssl_manager', 'cluster_server_parameter_commands_invocation', 'core', @@ -617,7 +589,6 @@ env.Library( 'mongod_fsync', 'profile_common', 'rwc_defaults_commands', - 'server_status', 'servers', 'set_feature_compatibility_version_idl', 'set_index_commit_quorum_idl', @@ -786,7 +757,7 @@ env.CppUnitTest( ) env.CppUnitTest( - target="command_mirroring_test", + target='command_mirroring_test', source=[ 'command_mirroring_test.cpp', ], diff --git a/src/mongo/db/commands/get_cluster_parameter_invocation.h b/src/mongo/db/commands/get_cluster_parameter_invocation.h index 66b63737c27..a122cd6be94 100644 --- a/src/mongo/db/commands/get_cluster_parameter_invocation.h +++ b/src/mongo/db/commands/get_cluster_parameter_invocation.h @@ -30,7 +30,7 @@ #pragma once #include "mongo/db/commands/cluster_server_parameter_cmds_gen.h" -#include "mongo/idl/server_parameter.h" +#include "mongo/db/server_parameter.h" namespace mongo { diff --git a/src/mongo/db/commands/parameters.cpp b/src/mongo/db/commands/parameters.cpp index c498273f107..834002ff9b6 100644 --- a/src/mongo/db/commands/parameters.cpp +++ b/src/mongo/db/commands/parameters.cpp @@ -27,9 +27,6 @@ * it in the license file. */ - -#include "mongo/platform/basic.h" - #include <set> #include "mongo/bson/bsontypes.h" @@ -41,22 +38,18 @@ #include "mongo/db/commands.h" #include "mongo/db/commands/parameters_gen.h" #include "mongo/db/commands/parse_log_component_settings.h" +#include "mongo/db/server_parameter_gen.h" #include "mongo/db/storage/kv/kv_engine.h" #include "mongo/db/storage/storage_options.h" #include "mongo/idl/command_generic_argument.h" -#include "mongo/idl/server_parameter_gen.h" #include "mongo/logv2/log.h" #include "mongo/util/str.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kCommand - -using std::string; -using std::stringstream; - namespace mongo { - namespace { + using logv2::LogComponent; using logv2::LogSeverity; @@ -93,7 +86,7 @@ static mutablebson::Element getParentForLogComponent(mutablebson::Document& doc, * The "default" log component is an implementation detail. Don't expose this to users. */ void getLogComponentVerbosity(BSONObj* output) { - static const string defaultLogComponentName = + static const std::string defaultLogComponentName = LogComponent(LogComponent::kDefault).getShortName(); mutablebson::Document doc; @@ -190,7 +183,6 @@ Status setLogComponentVerbosity(const BSONObj& bsonSettings) { return Status::OK(); } - GetParameterOptions parseGetParameterOptions(BSONElement elem) { if (elem.type() == BSONType::Object) { return GetParameterOptions::parse(IDLParserContext{"getParameter"}, elem.Obj()); diff --git a/src/mongo/db/commands/server_status.cpp b/src/mongo/db/commands/server_status.cpp index 584726a56e0..1fab501c0a5 100644 --- a/src/mongo/db/commands/server_status.cpp +++ b/src/mongo/db/commands/server_status.cpp @@ -27,8 +27,6 @@ * it in the license file. */ -#include "mongo/platform/basic.h" - #include "mongo/db/commands/server_status.h" #include "mongo/db/service_context.h" diff --git a/src/mongo/db/commands/server_status.h b/src/mongo/db/commands/server_status.h index d4b8b59e025..d5f08eef962 100644 --- a/src/mongo/db/commands/server_status.h +++ b/src/mongo/db/commands/server_status.h @@ -145,4 +145,5 @@ public: private: const OpCounters* _counters; }; + } // namespace mongo diff --git a/src/mongo/db/commands/server_status_command.cpp b/src/mongo/db/commands/server_status_command.cpp index b98e6fc4cd2..cd5ed9cad25 100644 --- a/src/mongo/db/commands/server_status_command.cpp +++ b/src/mongo/db/commands/server_status_command.cpp @@ -184,15 +184,6 @@ MONGO_INITIALIZER(CreateCmdServerStatus)(InitializerContext* context) { } // namespace -OpCounterServerStatusSection::OpCounterServerStatusSection(const std::string& sectionName, - OpCounters* counters) - : ServerStatusSection(sectionName), _counters(counters) {} - -BSONObj OpCounterServerStatusSection::generateSection(OperationContext* opCtx, - const BSONElement& configElement) const { - return _counters->getObj(); -} - OpCounterServerStatusSection globalOpCounterServerStatusSection("opcounters", &globalOpCounters); namespace { diff --git a/src/mongo/db/commands/server_status_servers.cpp b/src/mongo/db/commands/server_status_servers.cpp index 80cdd8ec25d..6e6a265c9e0 100644 --- a/src/mongo/db/commands/server_status_servers.cpp +++ b/src/mongo/db/commands/server_status_servers.cpp @@ -27,8 +27,6 @@ * it in the license file. */ -#include "mongo/platform/basic.h" - #include "mongo/config.h" #include "mongo/db/commands/server_status.h" #include "mongo/transport/message_compressor_registry.h" @@ -41,12 +39,6 @@ #include "mongo/util/net/ssl_manager.h" namespace mongo { - -using std::endl; -using std::map; -using std::string; -using std::stringstream; - namespace { // some universal sections @@ -187,6 +179,6 @@ public: } } } advisoryHostFQDNs; -} // namespace +} // namespace } // namespace mongo diff --git a/src/mongo/db/concurrency/SConscript b/src/mongo/db/concurrency/SConscript index 4aa43a9acfd..3b1f8e04de7 100644 --- a/src/mongo/db/concurrency/SConscript +++ b/src/mongo/db/concurrency/SConscript @@ -29,6 +29,7 @@ env.Library( 'exception_util.idl', ], LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/db/commands/server_status_core', '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/server_options_servers', '$BUILD_DIR/mongo/db/storage/recovery_unit_base', diff --git a/src/mongo/db/concurrency/exception_util.cpp b/src/mongo/db/concurrency/exception_util.cpp index 3f9dec3441e..ebece0e57e7 100644 --- a/src/mongo/db/concurrency/exception_util.cpp +++ b/src/mongo/db/concurrency/exception_util.cpp @@ -27,7 +27,6 @@ * it in the license file. */ - #include "mongo/db/concurrency/exception_util.h" #include "mongo/db/commands/server_status_metric.h" @@ -39,7 +38,6 @@ #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kControl - namespace mongo { MONGO_FAIL_POINT_DEFINE(skipWriteConflictRetries); diff --git a/src/mongo/db/exec/SConscript b/src/mongo/db/exec/SConscript index 46418b1847b..7efd7ab3441 100644 --- a/src/mongo/db/exec/SConscript +++ b/src/mongo/db/exec/SConscript @@ -41,15 +41,15 @@ env.Library( ) env.Library( - target="js_function", + target='js_function', source=[ - "js_function.cpp", + 'js_function.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/auth/auth', '$BUILD_DIR/mongo/db/query/query_knobs', '$BUILD_DIR/mongo/db/service_context', - '$BUILD_DIR/mongo/scripting/scripting_server', + '$BUILD_DIR/mongo/scripting/scripting_common', ], ) diff --git a/src/mongo/db/free_mon/SConscript b/src/mongo/db/free_mon/SConscript index 949e1cc31ae..b29a73f3cc4 100644 --- a/src/mongo/db/free_mon/SConscript +++ b/src/mongo/db/free_mon/SConscript @@ -41,15 +41,15 @@ if free_monitoring == "on": 'free_mon_status.cpp', ], LIBDEPS=[ - '$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', + '$BUILD_DIR/mongo/db/commands/server_status_core', + '$BUILD_DIR/mongo/db/ftdc/ftdc_server', '$BUILD_DIR/mongo/util/concurrency/thread_pool', '$BUILD_DIR/mongo/util/net/http_client', + '$BUILD_DIR/mongo/util/options_parser/options_parser', ], ) else: diff --git a/src/mongo/db/ftdc/SConscript b/src/mongo/db/ftdc/SConscript index 98e530daa44..5ffe0b7d1b6 100644 --- a/src/mongo/db/ftdc/SConscript +++ b/src/mongo/db/ftdc/SConscript @@ -48,13 +48,12 @@ env.Library( 'ftdc_system_stats_${TARGET_OS}.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/commands', '$BUILD_DIR/mongo/util/processinfo', 'ftdc', ] + platform_libs, LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/rpc/command_status', ], LIBDEPS_TAGS=[ @@ -75,8 +74,8 @@ env.Library( LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/auth/auth', '$BUILD_DIR/mongo/db/auth/authprivilege', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/storage/storage_options', - '$BUILD_DIR/mongo/idl/server_parameter', 'ftdc_server', ], ) @@ -88,8 +87,8 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/client/clientdriver_minimal', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/executor/task_executor_pool', - '$BUILD_DIR/mongo/idl/server_parameter', '$BUILD_DIR/mongo/s/grid', 'ftdc_server', ], diff --git a/src/mongo/db/logical_time.cpp b/src/mongo/db/logical_time.cpp index bdc8d9f040f..86dea210692 100644 --- a/src/mongo/db/logical_time.cpp +++ b/src/mongo/db/logical_time.cpp @@ -27,8 +27,6 @@ * it in the license file. */ -#include "mongo/platform/basic.h" - #include "mongo/db/logical_time.h" #include "mongo/base/data_type_endian.h" diff --git a/src/mongo/db/query/SConscript b/src/mongo/db/query/SConscript index 5285ca44564..890bf8e1615 100644 --- a/src/mongo/db/query/SConscript +++ b/src/mongo/db/query/SConscript @@ -6,9 +6,9 @@ env = env.Clone() env.SConscript( dirs=[ - "ce", - "collation", - "datetime", + 'ce', + 'collation', + 'datetime', 'optimizer', ], exports=[ @@ -19,20 +19,20 @@ env.SConscript( env.Library( target='canonical_query', source=[ - "canonical_query.cpp", - "canonical_query_encoder.cpp", + 'canonical_query.cpp', + 'canonical_query_encoder.cpp', ], LIBDEPS=[ - "$BUILD_DIR/mongo/crypto/encrypted_field_config", - "$BUILD_DIR/mongo/db/cst/cst", - "$BUILD_DIR/mongo/db/query_expressions", - "collation/collator_factory_interface", - "collation/collator_interface", - "projection_ast", - "sort_pattern", + '$BUILD_DIR/mongo/crypto/encrypted_field_config', + '$BUILD_DIR/mongo/db/cst/cst', + '$BUILD_DIR/mongo/db/query_expressions', + 'collation/collator_factory_interface', + 'collation/collator_interface', + 'projection_ast', + 'sort_pattern', ], LIBDEPS_PRIVATE=[ - "common_query_enums_and_helpers", + 'common_query_enums_and_helpers', ], ) @@ -59,7 +59,7 @@ env.Library( '$BUILD_DIR/mongo/db/catalog/clustered_collection_options', '$BUILD_DIR/mongo/db/exec/sbe/query_sbe_plan_stats', '$BUILD_DIR/mongo/db/index/expression_params', - "$BUILD_DIR/mongo/db/query_expressions", + '$BUILD_DIR/mongo/db/query_expressions', 'canonical_query', 'query_index_bounds', 'query_knobs', @@ -70,7 +70,6 @@ env.Library( '$BUILD_DIR/mongo/db/index/key_generator', '$BUILD_DIR/mongo/db/record_id_helpers', '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/idl/server_parameter', 'query_plan_cache', ], ) @@ -107,29 +106,29 @@ env.Library( env.Library( target='sbe_stage_builder_helpers', source=[ - "sbe_stage_builder_helpers.cpp", + 'sbe_stage_builder_helpers.cpp', ], LIBDEPS=[ - "$BUILD_DIR/mongo/base", + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/exec/sbe/query_sbe', '$BUILD_DIR/mongo/db/exec/sbe/query_sbe_stages', '$BUILD_DIR/mongo/db/exec/sbe/query_sbe_storage', - "$BUILD_DIR/mongo/db/index/index_access_method", - "$BUILD_DIR/mongo/db/query_expressions", - "$BUILD_DIR/mongo/db/storage/execution_context", + '$BUILD_DIR/mongo/db/index/index_access_method', + '$BUILD_DIR/mongo/db/query_expressions', + '$BUILD_DIR/mongo/db/storage/execution_context', ], ) env.Library( target='projection_ast', source=[ - "projection.cpp", - "projection_ast_util.cpp", - "projection_parser.cpp", + 'projection.cpp', + 'projection_ast_util.cpp', + 'projection_parser.cpp', ], LIBDEPS=[ - "$BUILD_DIR/mongo/base", - "$BUILD_DIR/mongo/db/query_expressions", + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/db/query_expressions', ], ) @@ -213,7 +212,6 @@ env.Library( '$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/rpc/command_status', '$BUILD_DIR/mongo/rpc/rpc', 'query_request', @@ -236,7 +234,6 @@ env.Library( 'tailable_mode.idl', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/crypto/fle_fields', '$BUILD_DIR/mongo/db/api_parameters', '$BUILD_DIR/mongo/db/auth/authprivilege', @@ -253,7 +250,7 @@ env.Library( ) env.Library( - target="query_knobs", + target='query_knobs', source=[ 'ce_mode_parameter.cpp', 'framework_control.cpp', @@ -263,9 +260,9 @@ env.Library( 'sbe_plan_cache_on_parameter_change.cpp', ], LIBDEPS_PRIVATE=[ - "$BUILD_DIR/mongo/db/service_context", + '$BUILD_DIR/mongo/db/server_base', + '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/idl/feature_flag', - '$BUILD_DIR/mongo/idl/server_parameter', '$BUILD_DIR/mongo/util/pcre_wrapper', ], ) @@ -307,9 +304,9 @@ env.Library( ) env.Library( - target="hint_parser", + target='hint_parser', source=[ - "hint_parser.cpp", + 'hint_parser.cpp', 'hint.idl', ], LIBDEPS=[ @@ -318,9 +315,9 @@ env.Library( ) env.Library( - target="sort_pattern", + target='sort_pattern', source=[ - "sort_pattern.cpp", + 'sort_pattern.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -330,9 +327,9 @@ env.Library( ) env.Library( - target="plan_yield_policy", + target='plan_yield_policy', source=[ - "plan_yield_policy.cpp", + 'plan_yield_policy.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript index 953111df679..cfb4a9af3be 100644 --- a/src/mongo/db/repl/SConscript +++ b/src/mongo/db/repl/SConscript @@ -12,8 +12,8 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/client/read_preference', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/idl/feature_flag', - '$BUILD_DIR/mongo/idl/server_parameter', ], ) @@ -185,11 +185,8 @@ env.Library( source=[ 'repl_settings.cpp', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/idl/server_parameter', - ], LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/db/server_base', 'repl_server_parameters', ], ) @@ -546,9 +543,9 @@ env.Library( '$BUILD_DIR/mongo/db/ops/write_ops', '$BUILD_DIR/mongo/db/repl/tenant_migration_access_blocker', '$BUILD_DIR/mongo/db/s/sharding_runtime_d', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/session/kill_sessions_local', '$BUILD_DIR/mongo/db/storage/historical_ident_tracker', - '$BUILD_DIR/mongo/idl/server_parameter', 'drop_pending_collection_reaper', ], ) @@ -709,7 +706,7 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/catalog/commit_quorum_options', - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/server_base', 'repl_server_parameters', ], ) @@ -757,9 +754,9 @@ env.Library( '$BUILD_DIR/mongo/db/catalog/local_oplog_info', '$BUILD_DIR/mongo/db/commands/test_commands_enabled', '$BUILD_DIR/mongo/db/index_builds_coordinator_interface', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/session/session_catalog', '$BUILD_DIR/mongo/db/storage/journal_flusher', - '$BUILD_DIR/mongo/idl/server_parameter', 'delayable_timeout_callback', 'repl_server_parameters', 'replica_set_aware_service', @@ -890,7 +887,6 @@ env.Library( '$BUILD_DIR/mongo/client/connection_string', '$BUILD_DIR/mongo/db/common', '$BUILD_DIR/mongo/db/server_options_core', - '$BUILD_DIR/mongo/idl/feature_flag', '$BUILD_DIR/mongo/rpc/command_status', '$BUILD_DIR/mongo/rpc/metadata', '$BUILD_DIR/mongo/transport/transport_layer_common', @@ -899,7 +895,8 @@ env.Library( 'read_concern_args', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/server_base', + '$BUILD_DIR/mongo/idl/feature_flag', 'repl_server_parameters', 'split_horizon', ], @@ -987,6 +984,7 @@ env.Library( 'reporter.cpp', ], LIBDEPS=[ + '$BUILD_DIR/mongo/db/commands/server_status_core', '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/executor/remote_command', '$BUILD_DIR/mongo/executor/task_executor_interface', @@ -1284,9 +1282,9 @@ env.Library( ) env.Library( - target="replication_info", + target='replication_info', source=[ - "replication_info.cpp", + 'replication_info.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -1296,14 +1294,13 @@ env.Library( '$BUILD_DIR/mongo/db/commands/test_commands_enabled', '$BUILD_DIR/mongo/db/dbhelpers', '$BUILD_DIR/mongo/db/query_exec', - "$BUILD_DIR/mongo/util/fail_point", + '$BUILD_DIR/mongo/util/fail_point', 'oplog', 'repl_coordinator_interface', 'repl_settings', 'replica_set_messages', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/commands/server_status', '$BUILD_DIR/mongo/db/read_write_concern_defaults', '$BUILD_DIR/mongo/db/s/sharding_api_d', '$BUILD_DIR/mongo/db/stats/counters', @@ -1440,7 +1437,7 @@ env.Library( '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/client/remote_command_targeter', '$BUILD_DIR/mongo/db/catalog_raii', - '$BUILD_DIR/mongo/db/commands/server_status', + '$BUILD_DIR/mongo/db/commands/server_status_core', '$BUILD_DIR/mongo/db/commands/tenant_migration_cmds_request', '$BUILD_DIR/mongo/db/dbhelpers', '$BUILD_DIR/mongo/db/rw_concern_d', @@ -1564,14 +1561,14 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/service_context_d_test_fixture', + 'primary_only_service', + 'wait_for_majority_service', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/op_observer/op_observer_impl', '$BUILD_DIR/mongo/db/op_observer/oplog_writer_impl', - 'primary_only_service', 'repl_coordinator_interface', 'replmocks', - 'wait_for_majority_service', ], ) @@ -1755,7 +1752,6 @@ if wiredtiger: 'oplog_interface_mock', 'oplog_interface_remote', 'optime', - 'primary_only_service', 'primary_only_service_test_fixture', 'repl_coordinator_impl', 'repl_server_parameters', @@ -1783,7 +1779,6 @@ if wiredtiger: 'tenant_migration_utils', 'tenant_oplog_processing', 'timestamp_block', - 'wait_for_majority_service', ], ) @@ -1885,7 +1880,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/commands/server_status', + '$BUILD_DIR/mongo/db/commands/server_status_core', '$BUILD_DIR/mongo/db/service_context', 'election_reason_counter', 'election_reason_counter_parser', diff --git a/src/mongo/db/repl/oplog_applier_impl.cpp b/src/mongo/db/repl/oplog_applier_impl.cpp index e12c57e0384..353d1965f8f 100644 --- a/src/mongo/db/repl/oplog_applier_impl.cpp +++ b/src/mongo/db/repl/oplog_applier_impl.cpp @@ -37,6 +37,7 @@ #include "mongo/db/catalog_raii.h" #include "mongo/db/change_stream_change_collection_manager.h" #include "mongo/db/client.h" +#include "mongo/db/commands/fsync.h" #include "mongo/db/db_raii.h" #include "mongo/db/repl/apply_ops.h" #include "mongo/db/repl/oplog_applier_utils.h" diff --git a/src/mongo/db/repl/oplog_applier_impl.h b/src/mongo/db/repl/oplog_applier_impl.h index b93756d9456..9e8ac05083d 100644 --- a/src/mongo/db/repl/oplog_applier_impl.h +++ b/src/mongo/db/repl/oplog_applier_impl.h @@ -30,7 +30,6 @@ #pragma once -#include "mongo/db/commands/fsync.h" #include "mongo/db/commands/server_status_metric.h" #include "mongo/db/concurrency/replication_state_transition_lock_guard.h" #include "mongo/db/repl/initial_syncer.h" diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript index 6caad30199b..f34ec635559 100644 --- a/src/mongo/db/s/SConscript +++ b/src/mongo/db/s/SConscript @@ -166,11 +166,7 @@ env.Library( '$BUILD_DIR/mongo/db/repl/abstract_async_component', '$BUILD_DIR/mongo/db/repl/change_stream_oplog_notification', '$BUILD_DIR/mongo/db/repl/oplog', - '$BUILD_DIR/mongo/db/repl/primary_only_service', - '$BUILD_DIR/mongo/db/repl/wait_for_majority_service', '$BUILD_DIR/mongo/db/rw_concern_d', - '$BUILD_DIR/mongo/db/server_options_core', - '$BUILD_DIR/mongo/db/storage/remove_saver', '$BUILD_DIR/mongo/db/transaction/transaction', '$BUILD_DIR/mongo/db/vector_clock_mongod', '$BUILD_DIR/mongo/s/query/cluster_aggregate', @@ -190,10 +186,14 @@ env.Library( '$BUILD_DIR/mongo/db/index_builds_coordinator_interface', '$BUILD_DIR/mongo/db/ops/write_ops', '$BUILD_DIR/mongo/db/repl/image_collection_entry', + '$BUILD_DIR/mongo/db/repl/primary_only_service', + '$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/storage/remove_saver', '$BUILD_DIR/mongo/db/timeseries/bucket_catalog', - '$BUILD_DIR/mongo/idl/server_parameter', '$BUILD_DIR/mongo/util/future_util', 'sharding_logging', ], @@ -233,7 +233,7 @@ env.Library( 'transaction_coordinators_stats.idl', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/commands/server_status', + '$BUILD_DIR/mongo/db/commands/server_status_core', '$BUILD_DIR/mongo/db/commands/txn_cmd_request', '$BUILD_DIR/mongo/db/dbdirectclient', '$BUILD_DIR/mongo/db/internal_transactions_feature_flag', @@ -347,10 +347,8 @@ env.Library( 'configure_query_analyzer_cmd.idl', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/common', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/idl/feature_flag', - '$BUILD_DIR/mongo/idl/idl_parser', ], ) @@ -494,7 +492,7 @@ env.Library( '$BUILD_DIR/mongo/db/commands/create_command', '$BUILD_DIR/mongo/db/commands/mongod_fcv', '$BUILD_DIR/mongo/db/commands/rename_collection_idl', - '$BUILD_DIR/mongo/db/commands/server_status', + '$BUILD_DIR/mongo/db/commands/server_status_core', '$BUILD_DIR/mongo/db/commands/test_commands_enabled', '$BUILD_DIR/mongo/db/commands/txn_cmd_request', '$BUILD_DIR/mongo/db/fle_crud', @@ -505,6 +503,7 @@ env.Library( '$BUILD_DIR/mongo/db/repl/primary_only_service', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', '$BUILD_DIR/mongo/db/repl/replica_set_messages', + '$BUILD_DIR/mongo/db/repl/wait_for_majority_service', '$BUILD_DIR/mongo/db/server_feature_flags', '$BUILD_DIR/mongo/db/timeseries/catalog_helper', '$BUILD_DIR/mongo/db/timeseries/timeseries_collmod', @@ -672,7 +671,6 @@ env.CppUnitTest( '$BUILD_DIR/mongo/db/catalog/catalog_helpers', '$BUILD_DIR/mongo/db/catalog/catalog_test_fixture', '$BUILD_DIR/mongo/db/catalog/database_holder', - '$BUILD_DIR/mongo/db/commands/server_status', '$BUILD_DIR/mongo/db/exec/document_value/document_value_test_util', '$BUILD_DIR/mongo/db/keys_collection_client_direct', '$BUILD_DIR/mongo/db/op_observer/op_observer', @@ -691,7 +689,6 @@ env.CppUnitTest( '$BUILD_DIR/mongo/db/repl/primary_only_service_test_fixture', '$BUILD_DIR/mongo/db/repl/replmocks', '$BUILD_DIR/mongo/db/repl/storage_interface_impl', - '$BUILD_DIR/mongo/db/repl/wait_for_majority_service', '$BUILD_DIR/mongo/db/session/logical_session_cache_impl', '$BUILD_DIR/mongo/db/timeseries/timeseries_options', '$BUILD_DIR/mongo/executor/thread_pool_task_executor_test_fixture', @@ -748,7 +745,9 @@ env.CppUnitTest( '$BUILD_DIR/mongo/db/multitenancy', '$BUILD_DIR/mongo/db/pipeline/document_source_mock', '$BUILD_DIR/mongo/db/read_write_concern_defaults_mock', + '$BUILD_DIR/mongo/db/repl/primary_only_service', '$BUILD_DIR/mongo/db/repl/replication_info', + '$BUILD_DIR/mongo/db/repl/wait_for_majority_service', '$BUILD_DIR/mongo/db/timeseries/timeseries_options', '$BUILD_DIR/mongo/db/transaction/transaction', '$BUILD_DIR/mongo/db/transaction/transaction_api', diff --git a/src/mongo/db/server_options_helpers.cpp b/src/mongo/db/server_options_helpers.cpp index a7f583b4a28..677e279c9e7 100644 --- a/src/mongo/db/server_options_helpers.cpp +++ b/src/mongo/db/server_options_helpers.cpp @@ -46,7 +46,6 @@ #include "mongo/bson/util/builder.h" #include "mongo/config.h" #include "mongo/db/server_options.h" -#include "mongo/idl/server_parameter.h" #include "mongo/logv2/log.h" #include "mongo/logv2/log_component.h" #include "mongo/logv2/log_component_settings.h" diff --git a/src/mongo/db/server_options_helpers.h b/src/mongo/db/server_options_helpers.h index 994d089ec74..bbb362587cd 100644 --- a/src/mongo/db/server_options_helpers.h +++ b/src/mongo/db/server_options_helpers.h @@ -33,7 +33,7 @@ #include <string> #include "mongo/base/status.h" -#include "mongo/idl/server_parameter.h" +#include "mongo/db/server_parameter.h" #include "mongo/util/options_parser/environment.h" #include "mongo/util/options_parser/option_section.h" diff --git a/src/mongo/db/server_options_test.cpp b/src/mongo/db/server_options_test.cpp index dbcc1c94143..f3d5c11c7a3 100644 --- a/src/mongo/db/server_options_test.cpp +++ b/src/mongo/db/server_options_test.cpp @@ -27,9 +27,6 @@ * it in the license file. */ - -#include "mongo/platform/basic.h" - #include "mongo/config.h" #if defined(MONGO_CONFIG_HAVE_HEADER_UNISTD_H) @@ -54,7 +51,6 @@ #include "mongo/db/server_options_helpers.h" #include "mongo/db/server_options_nongeneral_gen.h" #include "mongo/db/server_options_server_helpers.h" -#include "mongo/idl/server_parameter.h" #include "mongo/unittest/log_test.h" #include "mongo/unittest/unittest.h" #include "mongo/util/errno_util.h" @@ -65,7 +61,6 @@ #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kTest - namespace mongo { namespace { diff --git a/src/mongo/idl/server_parameter.cpp b/src/mongo/db/server_parameter.cpp index 874753135c0..553eb6d199f 100644 --- a/src/mongo/idl/server_parameter.cpp +++ b/src/mongo/db/server_parameter.cpp @@ -27,8 +27,7 @@ * it in the license file. */ - -#include "mongo/idl/server_parameter.h" +#include "mongo/db/server_parameter.h" #include <fmt/format.h> @@ -37,8 +36,8 @@ #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kControl - namespace mongo { + using namespace fmt::literals; using SPT = ServerParameterType; diff --git a/src/mongo/idl/server_parameter.h b/src/mongo/db/server_parameter.h index 71960aa91a6..71960aa91a6 100644 --- a/src/mongo/idl/server_parameter.h +++ b/src/mongo/db/server_parameter.h diff --git a/src/mongo/idl/server_parameter.idl b/src/mongo/db/server_parameter.idl index 999da3747ab..999da3747ab 100644 --- a/src/mongo/idl/server_parameter.idl +++ b/src/mongo/db/server_parameter.idl diff --git a/src/mongo/idl/server_parameter_with_storage.cpp b/src/mongo/db/server_parameter_with_storage.cpp index 5eff6dc485b..1c2d33553d1 100644 --- a/src/mongo/idl/server_parameter_with_storage.cpp +++ b/src/mongo/db/server_parameter_with_storage.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/idl/server_parameter_with_storage.h" +#include "mongo/db/server_parameter_with_storage.h" namespace mongo { namespace idl_server_parameter_detail { diff --git a/src/mongo/idl/server_parameter_with_storage.h b/src/mongo/db/server_parameter_with_storage.h index 787eb49b135..b0ad2fb7f08 100644 --- a/src/mongo/idl/server_parameter_with_storage.h +++ b/src/mongo/db/server_parameter_with_storage.h @@ -43,8 +43,8 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsonobjbuilder.h" +#include "mongo/db/server_parameter.h" #include "mongo/idl/idl_parser.h" -#include "mongo/idl/server_parameter.h" #include "mongo/platform/atomic_proxy.h" #include "mongo/platform/atomic_word.h" #include "mongo/util/str.h" @@ -61,11 +61,11 @@ using HasClusterServerParameter = decltype(std::declval<T>().getClusterServerPar template <typename T> constexpr bool hasClusterServerParameter = stdx::is_detected_v<HasClusterServerParameter, T>; +namespace idl_server_parameter_detail { + template <typename U> using TenantIdMap = std::map<boost::optional<TenantId>, U>; -namespace idl_server_parameter_detail { - // Predicate rules for bounds conditions struct GT { @@ -212,7 +212,6 @@ private: U _defaultValue; }; - template <typename U> struct storage_wrapper<TenantIdMap<U>> { static constexpr bool isTenantAware = true; diff --git a/src/mongo/db/serverless/SConscript b/src/mongo/db/serverless/SConscript index 9155a721bf6..b60edcd2064 100644 --- a/src/mongo/db/serverless/SConscript +++ b/src/mongo/db/serverless/SConscript @@ -93,7 +93,6 @@ env.CppUnitTest( '$BUILD_DIR/mongo/db/auth/authmocks', '$BUILD_DIR/mongo/db/catalog/catalog_helpers', '$BUILD_DIR/mongo/db/commands/create_command', - '$BUILD_DIR/mongo/db/repl/primary_only_service', '$BUILD_DIR/mongo/db/repl/primary_only_service_test_fixture', '$BUILD_DIR/mongo/db/repl/replmocks', '$BUILD_DIR/mongo/db/repl/tenant_migration_access_blocker', diff --git a/src/mongo/db/session/SConscript b/src/mongo/db/session/SConscript index 4e79131041f..52cbcd59988 100644 --- a/src/mongo/db/session/SConscript +++ b/src/mongo/db/session/SConscript @@ -26,11 +26,9 @@ env.Library( 'logical_session_id.idl', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/crypto/sha256_block', '$BUILD_DIR/mongo/crypto/sha_block_${MONGO_CRYPTO}', - '$BUILD_DIR/mongo/idl/idl_parser', - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -114,11 +112,11 @@ env.Library( 'logical_session_cache.idl', ], LIBDEPS=[ - '$BUILD_DIR/mongo/db/service_context', 'logical_session_id', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/server_base', + '$BUILD_DIR/mongo/db/service_context', ], ) diff --git a/src/mongo/db/sorter/SConscript b/src/mongo/db/sorter/SConscript index 7e9be557984..a52da1d0c7a 100644 --- a/src/mongo/db/sorter/SConscript +++ b/src/mongo/db/sorter/SConscript @@ -23,11 +23,13 @@ sorterEnv.CppUnitTest( ], ) -sorterEnv.Library(target='sorter_stats', source=[ - 'sorter_stats.cpp', -], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/commands/server_status_core', -]) +sorterEnv.Library( + target='sorter_stats', source=[ + 'sorter_stats.cpp', + ], LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/db/commands/server_status_core', + ]) env.Library( target='sorter_idl', @@ -35,8 +37,8 @@ env.Library( 'sorter.idl', ], LIBDEPS=[ - "$BUILD_DIR/mongo/base", - '$BUILD_DIR/mongo/db/sorter/sorter_stats', + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/idl/idl_parser', + 'sorter_stats', ], ) diff --git a/src/mongo/db/stats/SConscript b/src/mongo/db/stats/SConscript index 7d07cadb4b4..668c60eed5b 100644 --- a/src/mongo/db/stats/SConscript +++ b/src/mongo/db/stats/SConscript @@ -9,9 +9,8 @@ env.Library( source=[ 'timer_stats.cpp', ], - LIBDEPS=[ + LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/util/concurrency/spin_lock', ], ) @@ -32,10 +31,8 @@ env.Library( source=[ 'api_version_metrics.cpp', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - ], LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/shared_request_handling', '$BUILD_DIR/mongo/rpc/client_metadata', ], @@ -47,8 +44,10 @@ env.Library( 'counters.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/commands/server_status_core', + ], + LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/util/concurrency/spin_lock', ], ) @@ -62,14 +61,12 @@ env.Library( 'server_write_concern_metrics.idl', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/commands/server_status', '$BUILD_DIR/mongo/db/repl/read_concern_args', '$BUILD_DIR/mongo/db/write_concern_options', - '$BUILD_DIR/mongo/idl/idl_parser', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/commands/server_status_core', + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -79,26 +76,22 @@ env.Library( 'resource_consumption_metrics.cpp', 'operation_resource_consumption.idl', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/idl/idl_parser', - ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/commands/server_status', + '$BUILD_DIR/mongo/db/commands/server_status_core', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/idl/feature_flag', - '$BUILD_DIR/mongo/idl/server_parameter', ], ) env.Library( - target="transaction_stats", + target='transaction_stats', source=[ - "single_transaction_stats.cpp", + 'single_transaction_stats.cpp', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', + LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/repl/read_concern_args', + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -124,7 +117,7 @@ env.Library( '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/catalog/database_holder', '$BUILD_DIR/mongo/db/catalog/index_catalog', - '$BUILD_DIR/mongo/db/commands/server_status', + '$BUILD_DIR/mongo/db/commands/server_status_core', '$BUILD_DIR/mongo/db/db_raii', '$BUILD_DIR/mongo/db/index/index_access_method', '$BUILD_DIR/mongo/db/pipeline/document_sources_idl', diff --git a/src/mongo/db/stats/counters.cpp b/src/mongo/db/stats/counters.cpp index 44328202169..3cc52b663aa 100644 --- a/src/mongo/db/stats/counters.cpp +++ b/src/mongo/db/stats/counters.cpp @@ -27,25 +27,20 @@ * it in the license file. */ - -#include "mongo/platform/basic.h" - #include "mongo/db/stats/counters.h" #include <fmt/format.h> #include "mongo/client/authenticate.h" +#include "mongo/db/commands/server_status.h" #include "mongo/db/jsobj.h" #include "mongo/logv2/log.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kDefault - namespace mongo { -namespace { using namespace fmt::literals; -} void OpCounters::_checkWrap(CacheExclusive<AtomicWord<long long>> OpCounters::*counter, int n) { static constexpr auto maxCount = 1LL << 60; @@ -312,6 +307,15 @@ void AuthCounter::append(BSONObjBuilder* b) { mechsBuilder.done(); } +OpCounterServerStatusSection::OpCounterServerStatusSection(const std::string& sectionName, + OpCounters* counters) + : ServerStatusSection(sectionName), _counters(counters) {} + +BSONObj OpCounterServerStatusSection::generateSection(OperationContext* opCtx, + const BSONElement& configElement) const { + return _counters->getObj(); +} + OpCounters globalOpCounters; OpCounters replOpCounters; NetworkCounter networkCounter; diff --git a/src/mongo/db/stats/counters.h b/src/mongo/db/stats/counters.h index e4f12ce7d46..9fe9e7f2126 100644 --- a/src/mongo/db/stats/counters.h +++ b/src/mongo/db/stats/counters.h @@ -31,7 +31,6 @@ #include <map> -#include "mongo/db/commands/server_status_metric.h" #include "mongo/db/curop.h" #include "mongo/db/jsobj.h" #include "mongo/platform/atomic_word.h" diff --git a/src/mongo/db/storage/SConscript b/src/mongo/db/storage/SConscript index 86c58de6253..110ff27c058 100644 --- a/src/mongo/db/storage/SConscript +++ b/src/mongo/db/storage/SConscript @@ -183,12 +183,9 @@ env.Library( 'storage_options.cpp', 'storage_parameters.idl', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/idl/feature_flag', - ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/server_base', + '$BUILD_DIR/mongo/idl/feature_flag', ], ) @@ -200,10 +197,9 @@ env.Library( 'storage_engine_parameters.idl', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/idl/feature_flag', - '$BUILD_DIR/mongo/idl/server_parameter', '$BUILD_DIR/mongo/util/concurrency/ticketholder', ], ) @@ -346,16 +342,14 @@ env.Library( ) env.Library( - target="storage_init_d", + target='storage_init_d', source=[ - "storage_init.cpp", - ], - LIBDEPS=[ - "storage_options", + 'storage_init.cpp', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/commands/server_status', + '$BUILD_DIR/mongo/db/commands/server_status_core', 'backup_cursor_hooks', + 'storage_options', ], ) @@ -458,8 +452,8 @@ env.Library( source=[ 'flow_control_parameters.idl', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/idl/server_parameter', + LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -468,11 +462,9 @@ env.Library( source=[ 'flow_control.cpp', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/db/commands/server_status', - ], 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', @@ -586,7 +578,7 @@ env.Library( 'two_phase_index_build_knobs.idl', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/server_base', ], ) diff --git a/src/mongo/db/storage/wiredtiger/SConscript b/src/mongo/db/storage/wiredtiger/SConscript index bf20bf0112b..9aa5c224d48 100644 --- a/src/mongo/db/storage/wiredtiger/SConscript +++ b/src/mongo/db/storage/wiredtiger/SConscript @@ -78,7 +78,7 @@ wtEnv.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/catalog/database_holder', - '$BUILD_DIR/mongo/db/commands/server_status', + '$BUILD_DIR/mongo/db/commands/server_status_core', '$BUILD_DIR/mongo/db/concurrency/exception_util', '$BUILD_DIR/mongo/db/db_raii', '$BUILD_DIR/mongo/db/mongod_options', @@ -112,7 +112,7 @@ wtEnv.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/catalog/database_holder', - '$BUILD_DIR/mongo/db/commands/server_status', + '$BUILD_DIR/mongo/db/commands/server_status_core', '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/storage/storage_engine_common', '$BUILD_DIR/mongo/util/options_parser/options_parser', diff --git a/src/mongo/db/timeseries/SConscript b/src/mongo/db/timeseries/SConscript index 5f25fe11ae1..414f0841a70 100644 --- a/src/mongo/db/timeseries/SConscript +++ b/src/mongo/db/timeseries/SConscript @@ -12,11 +12,10 @@ env.Library( 'timeseries_options.cpp', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/storage/storage_options', - '$BUILD_DIR/mongo/idl/idl_parser', - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/idl/feature_flag', '$BUILD_DIR/mongo/util/processinfo', ], ) @@ -31,7 +30,7 @@ env.Library( LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/bson/util/bson_column', '$BUILD_DIR/mongo/db/catalog/database_holder', - '$BUILD_DIR/mongo/db/commands/server_status', + '$BUILD_DIR/mongo/db/commands/server_status_core', '$BUILD_DIR/mongo/db/dbdirectclient', '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/server_options_core', @@ -48,13 +47,12 @@ env.Library( source=[ 'bucket_compression.cpp', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - ], 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/idl/feature_flag', '$BUILD_DIR/mongo/util/fail_point', ], ) diff --git a/src/mongo/db/transaction/SConscript b/src/mongo/db/transaction/SConscript index 12515912ade..53fc0e73981 100644 --- a/src/mongo/db/transaction/SConscript +++ b/src/mongo/db/transaction/SConscript @@ -27,7 +27,7 @@ env.Library( '$BUILD_DIR/mongo/db/catalog/database_holder', '$BUILD_DIR/mongo/db/catalog/local_oplog_info', '$BUILD_DIR/mongo/db/catalog_raii', - '$BUILD_DIR/mongo/db/commands/server_status', + '$BUILD_DIR/mongo/db/commands/server_status_core', '$BUILD_DIR/mongo/db/commands/test_commands_enabled', '$BUILD_DIR/mongo/db/commands/txn_cmd_request', '$BUILD_DIR/mongo/db/concurrency/exception_util', diff --git a/src/mongo/dbtests/SConscript b/src/mongo/dbtests/SConscript index a304a872bcb..1e768ab3622 100644 --- a/src/mongo/dbtests/SConscript +++ b/src/mongo/dbtests/SConscript @@ -8,25 +8,12 @@ Import("wiredtiger") env = env.Clone() env.Library( - target="framework_options", - source=[ - "framework_options.cpp", - "framework_options.idl", - ], - LIBDEPS=[ - '$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/unittest/unittest', - '$BUILD_DIR/mongo/util/options_parser/options_parser_init', - ], -) - -env.Library( target='testframework', source=[ - 'framework.cpp', 'framework_options_init.cpp', + 'framework_options.cpp', + 'framework_options.idl', + 'framework.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/catalog/catalog_impl', @@ -36,14 +23,18 @@ env.Library( '$BUILD_DIR/mongo/db/index/index_access_methods', '$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', + '$BUILD_DIR/mongo/db/storage/storage_options', '$BUILD_DIR/mongo/scripting/scripting_common', '$BUILD_DIR/mongo/unittest/unittest', - 'framework_options', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/s/sharding_runtime_d', + '$BUILD_DIR/mongo/util/options_parser/options_parser_init', ], ) diff --git a/src/mongo/idl/SConscript b/src/mongo/idl/SConscript index 31fd80eea00..262afe7f42e 100644 --- a/src/mongo/idl/SConscript +++ b/src/mongo/idl/SConscript @@ -12,22 +12,6 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/commands/server_status_core', - ], -) - -env.Library( - target='server_parameter', - source=[ - 'server_parameter.cpp', - 'server_parameter.idl', - ], - LIBDEPS=[ - '$BUILD_DIR/mongo/db/logical_time', - ], - LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/util/options_parser/options_parser', ], ) @@ -35,7 +19,6 @@ env.Library( target='cluster_server_parameter', source=[ 'cluster_server_parameter.idl', - 'server_parameter_with_storage.cpp', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/server_base', @@ -48,13 +31,11 @@ env.Library( source=[ 'cluster_server_parameter_initializer.cpp', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/audit', '$BUILD_DIR/mongo/db/dbdirectclient', '$BUILD_DIR/mongo/db/repl/replica_set_aware_service', + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -63,12 +44,10 @@ env.Library( source=[ 'cluster_server_parameter_op_observer.cpp', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/dbdirectclient', '$BUILD_DIR/mongo/db/op_observer/op_observer', + '$BUILD_DIR/mongo/db/server_base', 'cluster_server_parameter_initializer', ], ) @@ -79,11 +58,9 @@ env.Library( 'cluster_server_parameter_refresher.cpp', 'cluster_server_parameter_refresher.idl', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/audit', - ], LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/db/audit', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/s/grid', 'cluster_server_parameter', ], @@ -138,13 +115,9 @@ env.Library( 'feature_flag.cpp', 'feature_flag_test.idl', ], - LIBDEPS=[ - 'server_parameter', - ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/commands/feature_compatibility_parsers', - '$BUILD_DIR/mongo/util/options_parser/options_parser', + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -174,6 +147,5 @@ env.CppUnitTest( '$BUILD_DIR/mongo/util/options_parser/options_parser', 'cluster_server_parameter', 'feature_flag', - 'server_parameter', ], ) diff --git a/src/mongo/idl/cluster_server_parameter_initializer_test.cpp b/src/mongo/idl/cluster_server_parameter_initializer_test.cpp index dbaa34e9071..b2ba65c7739 100644 --- a/src/mongo/idl/cluster_server_parameter_initializer_test.cpp +++ b/src/mongo/idl/cluster_server_parameter_initializer_test.cpp @@ -31,10 +31,10 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/repl/storage_interface_mock.h" +#include "mongo/db/server_parameter.h" #include "mongo/db/service_context_d_test_fixture.h" #include "mongo/idl/cluster_server_parameter_initializer.h" #include "mongo/idl/cluster_server_parameter_test_util.h" -#include "mongo/idl/server_parameter.h" #include "mongo/logv2/log.h" #include "mongo/s/write_ops/batched_command_response.h" diff --git a/src/mongo/idl/feature_flag.cpp b/src/mongo/idl/feature_flag.cpp index 9bd50864e9e..93e60479c17 100644 --- a/src/mongo/idl/feature_flag.cpp +++ b/src/mongo/idl/feature_flag.cpp @@ -29,7 +29,6 @@ #include "mongo/idl/feature_flag.h" -#include "mongo/idl/server_parameter.h" #include "mongo/util/debug_util.h" #include "mongo/util/version/releases.h" diff --git a/src/mongo/idl/feature_flag.h b/src/mongo/idl/feature_flag.h index 4c71407ad62..9f98112eed8 100644 --- a/src/mongo/idl/feature_flag.h +++ b/src/mongo/idl/feature_flag.h @@ -33,7 +33,7 @@ #include "mongo/db/commands/feature_compatibility_version_parser.h" #include "mongo/db/server_options.h" -#include "mongo/idl/server_parameter.h" +#include "mongo/db/server_parameter.h" #include "mongo/util/version/releases.h" namespace mongo { diff --git a/src/mongo/idl/server_parameter_test_util.h b/src/mongo/idl/server_parameter_test_util.h index 566489dd1a9..46c4060f028 100644 --- a/src/mongo/idl/server_parameter_test_util.h +++ b/src/mongo/idl/server_parameter_test_util.h @@ -31,7 +31,7 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/idl/server_parameter.h" +#include "mongo/db/server_parameter.h" namespace mongo { diff --git a/src/mongo/idl/server_parameter_with_storage_test.cpp b/src/mongo/idl/server_parameter_with_storage_test.cpp index ed71093eb67..669d6e9b907 100644 --- a/src/mongo/idl/server_parameter_with_storage_test.cpp +++ b/src/mongo/idl/server_parameter_with_storage_test.cpp @@ -27,8 +27,8 @@ * it in the license file. */ +#include "mongo/db/server_parameter_with_storage.h" #include "mongo/idl/server_parameter_test_util.h" -#include "mongo/idl/server_parameter_with_storage.h" #include "mongo/idl/server_parameter_with_storage_test_gen.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/idl/server_parameter_with_storage_test.h b/src/mongo/idl/server_parameter_with_storage_test.h index f5decbaaa4c..fe6730b8da7 100644 --- a/src/mongo/idl/server_parameter_with_storage_test.h +++ b/src/mongo/idl/server_parameter_with_storage_test.h @@ -31,7 +31,7 @@ #include "mongo/platform/basic.h" -#include "mongo/idl/server_parameter.h" +#include "mongo/db/server_parameter.h" #include "mongo/idl/server_parameter_with_storage_test_structs_gen.h" namespace mongo { diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript index 764c42e65f6..b6b67f59c8a 100644 --- a/src/mongo/s/SConscript +++ b/src/mongo/s/SConscript @@ -92,10 +92,10 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/executor/async_multicaster', '$BUILD_DIR/mongo/executor/connection_pool_executor', '$BUILD_DIR/mongo/executor/thread_pool_task_executor', - '$BUILD_DIR/mongo/idl/server_parameter', 'catalog/sharding_catalog_client_impl', 'coreshard', 'sharding_task_executor', @@ -120,7 +120,7 @@ env.Library( ) env.Library( - target="load_balancer_support", + target='load_balancer_support', source=[ 'load_balancer_support.cpp', ], @@ -368,7 +368,7 @@ env.Library( 'mongos_server_parameters.idl', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -425,7 +425,6 @@ env.Library( # please add that library here, as a private library dependency. '$BUILD_DIR/mongo/db/audit', '$BUILD_DIR/mongo/db/auth/authmongos', - '$BUILD_DIR/mongo/db/commands/server_status', '$BUILD_DIR/mongo/db/commands/server_status_core', '$BUILD_DIR/mongo/db/commands/server_status_servers', '$BUILD_DIR/mongo/db/curop', diff --git a/src/mongo/s/commands/SConscript b/src/mongo/s/commands/SConscript index ebd0074f4d4..0d60bad7378 100644 --- a/src/mongo/s/commands/SConscript +++ b/src/mongo/s/commands/SConscript @@ -117,7 +117,6 @@ env.Library( '$BUILD_DIR/mongo/db/commands/profile_common', '$BUILD_DIR/mongo/db/commands/rename_collection_idl', '$BUILD_DIR/mongo/db/commands/rwc_defaults_commands', - '$BUILD_DIR/mongo/db/commands/server_status', '$BUILD_DIR/mongo/db/commands/servers', '$BUILD_DIR/mongo/db/commands/set_feature_compatibility_version_idl', '$BUILD_DIR/mongo/db/commands/set_index_commit_quorum_idl', @@ -138,6 +137,7 @@ env.Library( '$BUILD_DIR/mongo/db/repl/hello_auth', '$BUILD_DIR/mongo/db/repl/hello_command', '$BUILD_DIR/mongo/db/repl/repl_server_parameters', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/shared_request_handling', '$BUILD_DIR/mongo/db/stats/api_version_metrics', '$BUILD_DIR/mongo/db/stats/counters', @@ -148,7 +148,6 @@ env.Library( '$BUILD_DIR/mongo/executor/async_multicaster', '$BUILD_DIR/mongo/executor/async_request_executor', '$BUILD_DIR/mongo/idl/cluster_server_parameter_refresher', - '$BUILD_DIR/mongo/idl/server_parameter', '$BUILD_DIR/mongo/rpc/rewrite_state_change_errors', '$BUILD_DIR/mongo/s/load_balancer_support', '$BUILD_DIR/mongo/s/mongos_topology_coordinator', @@ -225,7 +224,7 @@ env.Library( '$BUILD_DIR/mongo/db/auth/saslauth', '$BUILD_DIR/mongo/db/commands', '$BUILD_DIR/mongo/db/commands/servers', - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/rpc/client_metadata', '$BUILD_DIR/mongo/rpc/rewrite_state_change_errors', '$BUILD_DIR/mongo/s/mongos_topology_coordinator', diff --git a/src/mongo/scripting/SConscript b/src/mongo/scripting/SConscript index d062b2b667e..92578718aef 100644 --- a/src/mongo/scripting/SConscript +++ b/src/mongo/scripting/SConscript @@ -18,20 +18,18 @@ env.Library( 'utils.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/client/clientdriver_minimal', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/shell/mongojs', '$BUILD_DIR/mongo/util/md5', - ], - LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/server_parameter', + 'bson_template_evaluator', ], ) env.Library( target='bson_template_evaluator', source=[ - "bson_template_evaluator.cpp", + 'bson_template_evaluator.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -46,9 +44,6 @@ env.Library( LIBDEPS=[ 'scripting_common', ], - LBDEPS_PRIVATE=[ - 'bson_template_evaluator', - ], ) if jsEngine: @@ -120,14 +115,11 @@ if jsEngine: 'mozjs/scripting_util.idl', ], LIBDEPS=[ - '$BUILD_DIR/mongo/db/service_context', - '$BUILD_DIR/mongo/shell/mongojs', - 'bson_template_evaluator', 'scripting_common', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/client/clientdriver_network', - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/third_party/mozjs/mozjs', ], ) @@ -138,6 +130,9 @@ else: 'scripting_none.cpp', ], LIBDEPS=[ + 'scripting_common', + ], + LIBDEPS_PRIVATE=[ 'scripting_none', ], ) @@ -159,7 +154,6 @@ env.CppUnitTest( 'deadline_monitor_test.cpp', ], LIBDEPS=[ - 'bson_template_evaluator', 'scripting_common', ], ) diff --git a/src/mongo/scripting/engine_none.cpp b/src/mongo/scripting/engine_none.cpp index a0726d76015..8a44a523739 100644 --- a/src/mongo/scripting/engine_none.cpp +++ b/src/mongo/scripting/engine_none.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "engine.h" +#include "mongo/scripting/engine.h" namespace mongo { void ScriptEngine::setup(bool disableLoadStored) { diff --git a/src/mongo/shell/bench.cpp b/src/mongo/shell/bench.cpp index 2ca618d4e5f..ff9bb11327b 100644 --- a/src/mongo/shell/bench.cpp +++ b/src/mongo/shell/bench.cpp @@ -27,9 +27,6 @@ * it in the license file. */ - -#include "mongo/platform/basic.h" - #include "mongo/shell/bench.h" #include <string> @@ -52,7 +49,6 @@ #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kDefault - namespace mongo { namespace { diff --git a/src/mongo/transport/SConscript b/src/mongo/transport/SConscript index 72b40feff6e..457ea23fabc 100644 --- a/src/mongo/transport/SConscript +++ b/src/mongo/transport/SConscript @@ -64,14 +64,15 @@ tlEnv.Library( '$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', '$BUILD_DIR/mongo/util/executor_stats', 'transport_layer_common', ], LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/db/commands/server_status_core', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/server_feature_flags', + '$BUILD_DIR/mongo/db/stats/counters', '$BUILD_DIR/mongo/idl/feature_flag', - '$BUILD_DIR/mongo/idl/server_parameter', '$BUILD_DIR/mongo/util/net/ssl_manager', '$BUILD_DIR/mongo/util/options_parser/options_parser', '$BUILD_DIR/third_party/shim_asio', @@ -104,10 +105,10 @@ tlEnv.Library( '$BUILD_DIR/mongo/db/service_context', ], LIBDEPS_PRIVATE=[ - "$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/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', 'transport_layer_common', ], diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript index 55a2d9b2a74..fc59a929ee0 100644 --- a/src/mongo/util/SConscript +++ b/src/mongo/util/SConscript @@ -195,15 +195,14 @@ env.Library( ) env.Library( - target="fail_point", + target='fail_point', source=[ - "fail_point.cpp", + 'fail_point.cpp', 'fail_point_server_parameter.idl', ], LIBDEPS=[ - "$BUILD_DIR/mongo/base", - "$BUILD_DIR/mongo/bson/util/bson_extract", - "$BUILD_DIR/mongo/idl/server_parameter", + '$BUILD_DIR/mongo/bson/util/bson_extract', + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -223,9 +222,8 @@ env.Library( "testing_options.cpp", 'testing_options.idl', ], - LIBDEPS=[ - "$BUILD_DIR/mongo/base", - "$BUILD_DIR/mongo/idl/server_parameter", + LIBDEPS_PRIVATE=[ + "$BUILD_DIR/mongo/db/server_base", ], ) @@ -343,10 +341,9 @@ if env['MONGO_ALLOCATOR'] in ['tcmalloc', 'tcmalloc-experimental']: 'tcmalloc_parameters.idl', 'heap_profiler.cpp', ], - LIBDEPS=[], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/commands/server_status', - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/commands/server_status_core', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/transport/service_executor', 'processinfo', ], @@ -406,13 +403,11 @@ if get_option('use-diagnostic-latches') == 'on': source=[ 'latch_analyzer.cpp', ], - LIBDEPS=[ + LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/db/commands/server_status_core', '$BUILD_DIR/mongo/db/service_context', ], - LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/commands/server_status', - ], ) env.Benchmark( @@ -497,11 +492,8 @@ env.Library( 'password.cpp', 'password_params.idl', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/server_base', ], ) diff --git a/src/mongo/util/latch_analyzer.cpp b/src/mongo/util/latch_analyzer.cpp index 509d3aa7d8d..aea8e3eba1d 100644 --- a/src/mongo/util/latch_analyzer.cpp +++ b/src/mongo/util/latch_analyzer.cpp @@ -27,9 +27,6 @@ * it in the license file. */ - -#include "mongo/platform/basic.h" - #include "mongo/util/latch_analyzer.h" #include <boost/iterator/transform_iterator.hpp> @@ -37,20 +34,18 @@ #include <fmt/format.h> -#include "mongo/util/hierarchical_acquisition.h" - #include "mongo/base/init.h" #include "mongo/db/client.h" #include "mongo/db/service_context.h" #include "mongo/logv2/log.h" #include "mongo/platform/mutex.h" #include "mongo/util/fail_point.h" +#include "mongo/util/hierarchical_acquisition.h" #include "mongo/util/latch_analyzer.h" #include "mongo/util/testing_proctor.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kDefault - namespace mongo { using namespace fmt::literals; diff --git a/src/mongo/watchdog/SConscript b/src/mongo/watchdog/SConscript index 6704969f115..c20df770a02 100644 --- a/src/mongo/watchdog/SConscript +++ b/src/mongo/watchdog/SConscript @@ -28,7 +28,7 @@ env.Library( 'watchdog_mongod.idl', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/commands/server_status', + '$BUILD_DIR/mongo/db/commands/server_status_core', '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/server_options_core', 'watchdog', |