diff options
Diffstat (limited to 'src')
309 files changed, 337 insertions, 433 deletions
diff --git a/src/mongo/client/SConscript b/src/mongo/client/SConscript index 25df63559cc..619594b97e5 100644 --- a/src/mongo/client/SConscript +++ b/src/mongo/client/SConscript @@ -247,7 +247,7 @@ env.Library( 'replica_set_monitor_server_parameters.idl', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/server_base', ], ) diff --git a/src/mongo/client/client_api_version_parameters.idl b/src/mongo/client/client_api_version_parameters.idl index 491ef52fab1..1686949e576 100644 --- a/src/mongo/client/client_api_version_parameters.idl +++ b/src/mongo/client/client_api_version_parameters.idl @@ -29,7 +29,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: diff --git a/src/mongo/client/global_conn_pool.idl b/src/mongo/client/global_conn_pool.idl index a0415314159..4ba2b419c73 100644 --- a/src/mongo/client/global_conn_pool.idl +++ b/src/mongo/client/global_conn_pool.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" server_parameters: connPoolMaxConnsPerHost: diff --git a/src/mongo/client/hedging_mode.idl b/src/mongo/client/hedging_mode.idl index 80cd9314c65..999cb03a68c 100644 --- a/src/mongo/client/hedging_mode.idl +++ b/src/mongo/client/hedging_mode.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: HedgingMode: diff --git a/src/mongo/client/read_preference.idl b/src/mongo/client/read_preference.idl index d98376baef8..d3e5580c692 100644 --- a/src/mongo/client/read_preference.idl +++ b/src/mongo/client/read_preference.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" enums: ReadPreference: diff --git a/src/mongo/client/read_preference_setting.idl b/src/mongo/client/read_preference_setting.idl index 03b7db69215..454f79d74a2 100644 --- a/src/mongo/client/read_preference_setting.idl +++ b/src/mongo/client/read_preference_setting.idl @@ -32,7 +32,7 @@ global: - "mongo/client/read_preference.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/client/read_preference.idl" types: diff --git a/src/mongo/client/sasl_aws_client_protocol.idl b/src/mongo/client/sasl_aws_client_protocol.idl index 32e0e6ec4c9..996f1d97268 100644 --- a/src/mongo/client/sasl_aws_client_protocol.idl +++ b/src/mongo/client/sasl_aws_client_protocol.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: Ec2SecurityCredentials: diff --git a/src/mongo/client/sasl_aws_protocol_common.idl b/src/mongo/client/sasl_aws_protocol_common.idl index dc9e352a6b9..29882d99400 100644 --- a/src/mongo/client/sasl_aws_protocol_common.idl +++ b/src/mongo/client/sasl_aws_protocol_common.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo::awsIam" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: awsClientFirst: diff --git a/src/mongo/client/sdam/SConscript b/src/mongo/client/sdam/SConscript index 4563eba4f2a..01b4e8dd622 100644 --- a/src/mongo/client/sdam/SConscript +++ b/src/mongo/client/sdam/SConscript @@ -10,8 +10,8 @@ env.Library( 'sdam_configuration_parameters.idl', ], LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/server_options_core', - '$BUILD_DIR/mongo/idl/server_parameter', ], ) diff --git a/src/mongo/crypto/encryption_fields.idl b/src/mongo/crypto/encryption_fields.idl index 4e6f0e28579..5b989d09f54 100644 --- a/src/mongo/crypto/encryption_fields.idl +++ b/src/mongo/crypto/encryption_fields.idl @@ -31,7 +31,7 @@ global: - "mongo/db/exec/document_value/value.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" types: encrypted_numeric: diff --git a/src/mongo/crypto/fle_crypto.cpp b/src/mongo/crypto/fle_crypto.cpp index 8b259431e81..7c508dfd459 100644 --- a/src/mongo/crypto/fle_crypto.cpp +++ b/src/mongo/crypto/fle_crypto.cpp @@ -67,8 +67,8 @@ #include "mongo/crypto/fle_fields_util.h" #include "mongo/crypto/sha256_block.h" #include "mongo/crypto/symmetric_key.h" +#include "mongo/db/basic_types_gen.h" #include "mongo/db/exec/document_value/value.h" -#include "mongo/idl/basic_types.h" #include "mongo/idl/idl_parser.h" #include "mongo/platform/random.h" #include "mongo/stdx/unordered_map.h" diff --git a/src/mongo/crypto/fle_field_schema.idl b/src/mongo/crypto/fle_field_schema.idl index 322e9dc53eb..7fa23bbcd23 100644 --- a/src/mongo/crypto/fle_field_schema.idl +++ b/src/mongo/crypto/fle_field_schema.idl @@ -31,7 +31,7 @@ global: - "mongo/crypto/fle_fields_util.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/crypto/encryption_fields.idl" enums: diff --git a/src/mongo/crypto/fle_fields_util.cpp b/src/mongo/crypto/fle_fields_util.cpp index 6a8366db747..4905d42176b 100644 --- a/src/mongo/crypto/fle_fields_util.cpp +++ b/src/mongo/crypto/fle_fields_util.cpp @@ -32,7 +32,7 @@ #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsontypes.h" #include "mongo/crypto/fle_field_schema_gen.h" -#include "mongo/idl/basic_types.h" +#include "mongo/db/basic_types_gen.h" namespace mongo { void validateIDLFLE2EncryptionPlaceholder(const FLE2EncryptionPlaceholder* placeholder) { diff --git a/src/mongo/crypto/sha1_block.idl b/src/mongo/crypto/sha1_block.idl index 59ddbbeca61..0929d613931 100644 --- a/src/mongo/crypto/sha1_block.idl +++ b/src/mongo/crypto/sha1_block.idl @@ -34,7 +34,7 @@ global: - "mongo/crypto/sha1_block.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" types: sha1Block: diff --git a/src/mongo/crypto/sha256_block.idl b/src/mongo/crypto/sha256_block.idl index a5b4a1cef41..a864b88da07 100644 --- a/src/mongo/crypto/sha256_block.idl +++ b/src/mongo/crypto/sha256_block.idl @@ -34,7 +34,7 @@ global: - "mongo/crypto/sha256_block.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" types: sha256Block: diff --git a/src/mongo/crypto/sha512_block.idl b/src/mongo/crypto/sha512_block.idl index e7d3ec8925a..ab8b7b04b9c 100644 --- a/src/mongo/crypto/sha512_block.idl +++ b/src/mongo/crypto/sha512_block.idl @@ -34,7 +34,7 @@ global: - "mongo/crypto/sha512_block.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" types: sha512Block: diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index cb991cfc85c..3c7b374f8b2 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -59,6 +59,7 @@ env.SConscript( # the server codebase. env.Library( target='server_base', source=[ + 'basic_types.idl', 'database_name.cpp', 'index_names.cpp', 'keypattern.cpp', @@ -286,20 +287,19 @@ env.Library( ) env.Library( - target="server_options", + target='server_options', source=[ - "server_options_helpers.cpp", + 'server_options_helpers.cpp', 'server_options_helpers.idl', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/util/cmdline_utils/cmdline_utils', 'server_options_core', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/server_parameter', '$BUILD_DIR/mongo/util/fail_point', '$BUILD_DIR/mongo/util/options_parser/options_parser', + 'server_base', ], ) @@ -404,17 +404,13 @@ env.Library( ) env.Library( - target="read_write_concern_provenance", + target='read_write_concern_provenance', source=[ - "read_write_concern_provenance.cpp", + 'read_write_concern_provenance.cpp', 'read_write_concern_provenance_base.idl', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/idl/basic_types', - '$BUILD_DIR/mongo/idl/idl_parser', - ], LIBDEPS_PRIVATE=[ + 'server_base', 'server_options_core', ], ) @@ -426,11 +422,12 @@ env.Library( 'write_concern_options.idl', ], LIBDEPS=[ - '$BUILD_DIR/mongo/bson/util/bson_extract', 'read_write_concern_provenance', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/server_options_core', # For serverGlobalParams + '$BUILD_DIR/mongo/bson/util/bson_extract', + 'server_base', + 'server_options_core', ], ) @@ -445,10 +442,11 @@ env.Library( 'write_concern_options', ], LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/db/repl/repl_server_parameters', '$BUILD_DIR/mongo/idl/feature_flag', '$BUILD_DIR/mongo/util/caching', '$BUILD_DIR/mongo/util/concurrency/thread_pool', - 'repl/repl_server_parameters', + 'server_base', 'server_options_core', 'vector_clock', ], diff --git a/src/mongo/db/api_parameters.idl b/src/mongo/db/api_parameters.idl index ef2ea3224b8..68b823caa05 100644 --- a/src/mongo/db/api_parameters.idl +++ b/src/mongo/db/api_parameters.idl @@ -33,7 +33,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: diff --git a/src/mongo/db/auth/SConscript b/src/mongo/db/auth/SConscript index 32fc6a3df7f..ab481424ac6 100644 --- a/src/mongo/db/auth/SConscript +++ b/src/mongo/db/auth/SConscript @@ -183,10 +183,10 @@ env.Library( env.Library( target='auth_options', source=[ - "auth_options.idl", + 'auth_options.idl', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -310,19 +310,19 @@ env.Library( 'authorization_manager_global.cpp', 'authorization_manager_global_parameters.idl', ], - LIBDEPS_PRIVATE=[ - "$BUILD_DIR/mongo/client/authentication", - '$BUILD_DIR/mongo/idl/server_parameter', - "$BUILD_DIR/mongo/util/net/ssl_manager", - "$BUILD_DIR/mongo/util/net/ssl_parameters_auth", - 'cluster_auth_mode', - 'security_key', - ], LIBDEPS=[ '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/service_context', 'auth', ], + LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/client/authentication', + '$BUILD_DIR/mongo/db/server_base', + '$BUILD_DIR/mongo/util/net/ssl_manager', + '$BUILD_DIR/mongo/util/net/ssl_parameters_auth', + 'cluster_auth_mode', + 'security_key', + ], ) env.Library( @@ -406,9 +406,8 @@ env.Library( 'sasl_options.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/stats/counters', - '$BUILD_DIR/mongo/idl/server_parameter', ], ) @@ -480,12 +479,9 @@ env.Library( 'user_cache_invalidator_job.cpp', 'user_cache_invalidator_job_parameters.idl', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/multitenancy', - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/s/coreshard', 'authservercommon', ], diff --git a/src/mongo/db/auth/action_type.idl b/src/mongo/db/auth/action_type.idl index 1a85e758508..dbc5fe12efb 100644 --- a/src/mongo/db/auth/action_type.idl +++ b/src/mongo/db/auth/action_type.idl @@ -36,7 +36,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" enums: ActionType: diff --git a/src/mongo/db/auth/address_restriction.idl b/src/mongo/db/auth/address_restriction.idl index 28ba12dd5f9..ff8aa07b486 100644 --- a/src/mongo/db/auth/address_restriction.idl +++ b/src/mongo/db/auth/address_restriction.idl @@ -36,7 +36,7 @@ global: - "mongo/db/auth/address_restriction.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: diff --git a/src/mongo/db/auth/auth_options.idl b/src/mongo/db/auth/auth_options.idl index a0d5139938a..d1af197ff08 100644 --- a/src/mongo/db/auth/auth_options.idl +++ b/src/mongo/db/auth/auth_options.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" server_parameters: roleGraphInvalidationIsFatal: diff --git a/src/mongo/db/auth/auth_types.idl b/src/mongo/db/auth/auth_types.idl index 3b55541a4da..032ec847055 100644 --- a/src/mongo/db/auth/auth_types.idl +++ b/src/mongo/db/auth/auth_types.idl @@ -35,7 +35,7 @@ global: - "mongo/db/auth/role_name_or_string.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" types: UserName: diff --git a/src/mongo/db/auth/authorization_manager_impl_parameters.idl b/src/mongo/db/auth/authorization_manager_impl_parameters.idl index 795c83f219d..353ea0cd0d0 100644 --- a/src/mongo/db/auth/authorization_manager_impl_parameters.idl +++ b/src/mongo/db/auth/authorization_manager_impl_parameters.idl @@ -31,7 +31,7 @@ global: - mongo/db/auth/authorization_manager_impl.h imports: - - mongo/idl/basic_types.idl + - mongo/db/basic_types.idl server_parameters: authorizationManagerCacheSize: diff --git a/src/mongo/db/auth/sasl_commands.idl b/src/mongo/db/auth/sasl_commands.idl index cf3ec89c23f..ede7543ac58 100644 --- a/src/mongo/db/auth/sasl_commands.idl +++ b/src/mongo/db/auth/sasl_commands.idl @@ -31,7 +31,7 @@ global: - "mongo/db/auth/sasl_payload.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" types: SaslPayload: diff --git a/src/mongo/db/auth/security_token.idl b/src/mongo/db/auth/security_token.idl index 62076ac8b31..133d67eb913 100644 --- a/src/mongo/db/auth/security_token.idl +++ b/src/mongo/db/auth/security_token.idl @@ -32,7 +32,7 @@ global: imports: - "mongo/db/auth/auth_types.idl" - "mongo/crypto/sha256_block.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: SecurityToken: diff --git a/src/mongo/db/auth/user_cache_invalidator_job_parameters.idl b/src/mongo/db/auth/user_cache_invalidator_job_parameters.idl index 19a37d19d5f..89bcca29822 100644 --- a/src/mongo/db/auth/user_cache_invalidator_job_parameters.idl +++ b/src/mongo/db/auth/user_cache_invalidator_job_parameters.idl @@ -31,7 +31,7 @@ global: - "mongo/db/auth/user_cache_invalidator_job.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" server_parameters: userCacheInvalidationIntervalSecs: diff --git a/src/mongo/db/auth/user_management_commands_parser.idl b/src/mongo/db/auth/user_management_commands_parser.idl index 10ffb919d29..508700daa6d 100644 --- a/src/mongo/db/auth/user_management_commands_parser.idl +++ b/src/mongo/db/auth/user_management_commands_parser.idl @@ -32,7 +32,7 @@ global: - "mongo/db/auth/umc_info_command_arg.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/auth/auth_types.idl" types: diff --git a/src/mongo/idl/basic_types.h b/src/mongo/db/basic_types.h index 5d835e64707..5d835e64707 100644 --- a/src/mongo/idl/basic_types.h +++ b/src/mongo/db/basic_types.h diff --git a/src/mongo/idl/basic_types.idl b/src/mongo/db/basic_types.idl index 063e9b422ef..07ff31d6526 100644 --- a/src/mongo/idl/basic_types.idl +++ b/src/mongo/db/basic_types.idl @@ -30,10 +30,10 @@ global: cpp_namespace: "mongo" cpp_includes: + - "mongo/db/basic_types.h" - "mongo/db/logical_time.h" - "mongo/db/namespace_string.h" - "mongo/db/tenant_id.h" - - "mongo/idl/basic_types.h" - "mongo/util/uuid.h" types: diff --git a/src/mongo/db/catalog/SConscript b/src/mongo/db/catalog/SConscript index 5c78a61f615..59a0e26a4d5 100644 --- a/src/mongo/db/catalog/SConscript +++ b/src/mongo/db/catalog/SConscript @@ -22,9 +22,6 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/idl/basic_types', - '$BUILD_DIR/mongo/idl/idl_parser', - '$BUILD_DIR/mongo/idl/server_parameter', ], ) @@ -40,15 +37,13 @@ env.Library( '$BUILD_DIR/mongo/db/pipeline/change_stream_pre_and_post_images_options', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/common', '$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', - '$BUILD_DIR/mongo/idl/basic_types', '$BUILD_DIR/mongo/idl/feature_flag', - '$BUILD_DIR/mongo/idl/idl_parser', 'clustered_collection_options', ], ) @@ -471,7 +466,6 @@ env.Library( '$BUILD_DIR/mongo/db/storage/record_store_base', '$BUILD_DIR/mongo/db/timeseries/bucket_catalog', '$BUILD_DIR/mongo/db/timeseries/timeseries_options', - '$BUILD_DIR/mongo/idl/basic_types', 'catalog_impl', 'collection_options', 'index_catalog', diff --git a/src/mongo/db/catalog/clustered_collection_options.idl b/src/mongo/db/catalog/clustered_collection_options.idl index d156f76f476..909bdeb7253 100644 --- a/src/mongo/db/catalog/clustered_collection_options.idl +++ b/src/mongo/db/catalog/clustered_collection_options.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" server_parameters: supportArbitraryClusterKeyIndex: diff --git a/src/mongo/db/catalog/collection_options.idl b/src/mongo/db/catalog/collection_options.idl index ffe1ebf63b9..762e664f57d 100644 --- a/src/mongo/db/catalog/collection_options.idl +++ b/src/mongo/db/catalog/collection_options.idl @@ -32,7 +32,7 @@ global: - "mongo/db/catalog/collection_options_validation.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" enums: ValidationLevel: diff --git a/src/mongo/db/catalog/database_impl.cpp b/src/mongo/db/catalog/database_impl.cpp index b1f5a791678..dfa0d846762 100644 --- a/src/mongo/db/catalog/database_impl.cpp +++ b/src/mongo/db/catalog/database_impl.cpp @@ -44,7 +44,6 @@ #include "mongo/db/catalog/index_catalog.h" #include "mongo/db/catalog/uncommitted_catalog_updates.h" #include "mongo/db/clientcursor.h" -#include "mongo/db/commands/feature_compatibility_version_parser.h" #include "mongo/db/concurrency/d_concurrency.h" #include "mongo/db/concurrency/exception_util.h" #include "mongo/db/curop.h" diff --git a/src/mongo/db/catalog/health_log.idl b/src/mongo/db/catalog/health_log.idl index 5ce048473f1..470062a0ecc 100644 --- a/src/mongo/db/catalog/health_log.idl +++ b/src/mongo/db/catalog/health_log.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" types: _id_key: diff --git a/src/mongo/db/catalog/import_collection_oplog_entry.idl b/src/mongo/db/catalog/import_collection_oplog_entry.idl index 8b0ef190800..1818fd39fa9 100644 --- a/src/mongo/db/catalog/import_collection_oplog_entry.idl +++ b/src/mongo/db/catalog/import_collection_oplog_entry.idl @@ -32,7 +32,7 @@ global: - "mongo/util/uuid.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: ImportCollectionOplogEntry: diff --git a/src/mongo/db/catalog/index_build_entry.idl b/src/mongo/db/catalog/index_build_entry.idl index 00b5b0ed9b6..14e73074269 100644 --- a/src/mongo/db/catalog/index_build_entry.idl +++ b/src/mongo/db/catalog/index_build_entry.idl @@ -33,7 +33,7 @@ global: imports: - "mongo/db/catalog/commit_quorum.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/util/net/hostandport.idl" structs: diff --git a/src/mongo/db/catalog/index_catalog_impl.cpp b/src/mongo/db/catalog/index_catalog_impl.cpp index 402b7c82969..4801fafb0af 100644 --- a/src/mongo/db/catalog/index_catalog_impl.cpp +++ b/src/mongo/db/catalog/index_catalog_impl.cpp @@ -27,8 +27,6 @@ * it in the license file. */ -#include "mongo/platform/basic.h" - #include "mongo/db/catalog/index_catalog_impl.h" #include <vector> @@ -59,7 +57,6 @@ #include "mongo/db/multi_key_path_tracker.h" #include "mongo/db/operation_context.h" #include "mongo/db/ops/delete.h" -#include "mongo/db/query/collation/collation_spec.h" #include "mongo/db/query/collation/collator_factory_interface.h" #include "mongo/db/query/collection_index_usage_tracker_decoration.h" #include "mongo/db/query/collection_query_info.h" diff --git a/src/mongo/db/catalog/multi_index_block.idl b/src/mongo/db/catalog/multi_index_block.idl index b07c2a9a352..25ba1199f64 100644 --- a/src/mongo/db/catalog/multi_index_block.idl +++ b/src/mongo/db/catalog/multi_index_block.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" server_parameters: useReadOnceCursorsForIndexBuilds: diff --git a/src/mongo/db/change_stream_options.idl b/src/mongo/db/change_stream_options.idl index 8c2f41d6604..7c65d05f9ce 100644 --- a/src/mongo/db/change_stream_options.idl +++ b/src/mongo/db/change_stream_options.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/idl/cluster_server_parameter.idl" structs: diff --git a/src/mongo/db/change_stream_state.idl b/src/mongo/db/change_stream_state.idl index cec05b86bc1..8972167a058 100644 --- a/src/mongo/db/change_stream_state.idl +++ b/src/mongo/db/change_stream_state.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: ChangeStreamStateParameters: diff --git a/src/mongo/db/change_streams_cluster_parameter.idl b/src/mongo/db/change_streams_cluster_parameter.idl index fa97168380d..466e1c0345a 100644 --- a/src/mongo/db/change_streams_cluster_parameter.idl +++ b/src/mongo/db/change_streams_cluster_parameter.idl @@ -32,7 +32,7 @@ global: - "mongo/db/change_streams_cluster_parameter.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/idl/cluster_server_parameter.idl" structs: diff --git a/src/mongo/db/coll_mod.idl b/src/mongo/db/coll_mod.idl index 68ad7fe76a5..5e6fa56af42 100644 --- a/src/mongo/db/coll_mod.idl +++ b/src/mongo/db/coll_mod.idl @@ -33,7 +33,7 @@ global: imports: - "mongo/db/auth/action_type.idl" - "mongo/db/auth/access_checks.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/catalog/collection_options.idl" - "mongo/db/timeseries/timeseries.idl" - "mongo/db/pipeline/change_stream_pre_and_post_images_options.idl" diff --git a/src/mongo/db/commands.cpp b/src/mongo/db/commands.cpp index 7061cfb07bc..e83e572ba3d 100644 --- a/src/mongo/db/commands.cpp +++ b/src/mongo/db/commands.cpp @@ -27,7 +27,6 @@ * it in the license file. */ - #include "mongo/db/commands.h" #include <string> @@ -50,7 +49,6 @@ #include "mongo/db/jsobj.h" #include "mongo/db/namespace_string.h" #include "mongo/db/read_write_concern_defaults.h" -#include "mongo/idl/basic_types_gen.h" #include "mongo/idl/command_generic_argument.h" #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" @@ -66,7 +64,6 @@ #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kCommand - using namespace fmt::literals; namespace mongo { diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript index e83f7356c54..60d5609dd93 100644 --- a/src/mongo/db/commands/SConscript +++ b/src/mongo/db/commands/SConscript @@ -118,8 +118,6 @@ 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/basic_types', - '$BUILD_DIR/mongo/idl/idl_parser', '$BUILD_DIR/mongo/idl/server_parameter', '$BUILD_DIR/mongo/logv2/logv2_options', '$BUILD_DIR/mongo/rpc/message', @@ -304,9 +302,7 @@ env.Library( '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/server_options', '$BUILD_DIR/mongo/db/timeseries/timeseries_options', - '$BUILD_DIR/mongo/idl/basic_types', '$BUILD_DIR/mongo/idl/feature_flag', - '$BUILD_DIR/mongo/idl/idl_parser', ], ) @@ -317,7 +313,6 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/idl/idl_parser', ], ) diff --git a/src/mongo/db/commands/authentication_commands.idl b/src/mongo/db/commands/authentication_commands.idl index 2477674e6aa..fab2530b33c 100644 --- a/src/mongo/db/commands/authentication_commands.idl +++ b/src/mongo/db/commands/authentication_commands.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: AuthenticateReply: diff --git a/src/mongo/db/commands/cluster_server_parameter_cmds.idl b/src/mongo/db/commands/cluster_server_parameter_cmds.idl index c4f95560b51..982aa130dde 100644 --- a/src/mongo/db/commands/cluster_server_parameter_cmds.idl +++ b/src/mongo/db/commands/cluster_server_parameter_cmds.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: GetClusterParameterReply: diff --git a/src/mongo/db/commands/connection_status.idl b/src/mongo/db/commands/connection_status.idl index 5c40ef712a0..38c0ca03d57 100644 --- a/src/mongo/db/commands/connection_status.idl +++ b/src/mongo/db/commands/connection_status.idl @@ -30,7 +30,7 @@ global: imports: - "mongo/db/auth/auth_types.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: ConnectionStatusReplyAuthInfo: diff --git a/src/mongo/db/commands/drop_connections.idl b/src/mongo/db/commands/drop_connections.idl index e84a2e460c8..182bb3be34c 100644 --- a/src/mongo/db/commands/drop_connections.idl +++ b/src/mongo/db/commands/drop_connections.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/util/net/hostandport.idl" commands: diff --git a/src/mongo/db/commands/feature_compatibility_version_document.idl b/src/mongo/db/commands/feature_compatibility_version_document.idl index 90322ed5043..b2e0491ccf4 100644 --- a/src/mongo/db/commands/feature_compatibility_version_document.idl +++ b/src/mongo/db/commands/feature_compatibility_version_document.idl @@ -32,7 +32,7 @@ global: imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: featureCompatibilityVersionDocument: diff --git a/src/mongo/db/commands/fle2_compact.idl b/src/mongo/db/commands/fle2_compact.idl index 2649701e302..1ece006c512 100644 --- a/src/mongo/db/commands/fle2_compact.idl +++ b/src/mongo/db/commands/fle2_compact.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: ECOCStats: diff --git a/src/mongo/db/commands/generic.idl b/src/mongo/db/commands/generic.idl index 736d3059893..72967b9c36a 100644 --- a/src/mongo/db/commands/generic.idl +++ b/src/mongo/db/commands/generic.idl @@ -29,7 +29,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" enums: MessageSeverity: diff --git a/src/mongo/db/commands/generic_servers.idl b/src/mongo/db/commands/generic_servers.idl index 2927a57d670..4e6f08ab71f 100644 --- a/src/mongo/db/commands/generic_servers.idl +++ b/src/mongo/db/commands/generic_servers.idl @@ -29,7 +29,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: featuresReplyJS: diff --git a/src/mongo/db/commands/http_client.idl b/src/mongo/db/commands/http_client.idl index 9fd17262d7c..d4566cb76c0 100644 --- a/src/mongo/db/commands/http_client.idl +++ b/src/mongo/db/commands/http_client.idl @@ -30,7 +30,7 @@ global: imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: httpClientReply: diff --git a/src/mongo/db/commands/internal_rename_if_options_and_indexes_match.idl b/src/mongo/db/commands/internal_rename_if_options_and_indexes_match.idl index d64d32d3967..4ac60f3cd8a 100644 --- a/src/mongo/db/commands/internal_rename_if_options_and_indexes_match.idl +++ b/src/mongo/db/commands/internal_rename_if_options_and_indexes_match.idl @@ -29,7 +29,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: internalRenameIfOptionsAndIndexesMatch: diff --git a/src/mongo/db/commands/internal_transactions_test_command.idl b/src/mongo/db/commands/internal_transactions_test_command.idl index 7ca275eb493..fd15ebf8839 100644 --- a/src/mongo/db/commands/internal_transactions_test_command.idl +++ b/src/mongo/db/commands/internal_transactions_test_command.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: TestInternalTransactionsCommandReply: diff --git a/src/mongo/db/commands/kill_operations.idl b/src/mongo/db/commands/kill_operations.idl index d3e2a9cd5dc..306bc8a2fab 100644 --- a/src/mongo/db/commands/kill_operations.idl +++ b/src/mongo/db/commands/kill_operations.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: _killOperations: diff --git a/src/mongo/db/commands/list_databases.idl b/src/mongo/db/commands/list_databases.idl index 6c359492ca5..09de65cb8c4 100644 --- a/src/mongo/db/commands/list_databases.idl +++ b/src/mongo/db/commands/list_databases.idl @@ -32,7 +32,7 @@ global: imports: - "mongo/db/auth/access_checks.idl" - "mongo/db/auth/action_type.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: ListDatabasesReplyItem: diff --git a/src/mongo/db/commands/list_databases_for_all_tenants.idl b/src/mongo/db/commands/list_databases_for_all_tenants.idl index a5be6fb29b2..bab74dcd6d1 100644 --- a/src/mongo/db/commands/list_databases_for_all_tenants.idl +++ b/src/mongo/db/commands/list_databases_for_all_tenants.idl @@ -32,7 +32,7 @@ global: imports: - "mongo/db/auth/access_checks.idl" - "mongo/db/auth/action_type.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: ListDatabasesForAllTenantsReplyItem: diff --git a/src/mongo/db/commands/map_reduce.idl b/src/mongo/db/commands/map_reduce.idl index cf74f858a39..fbc714655ac 100644 --- a/src/mongo/db/commands/map_reduce.idl +++ b/src/mongo/db/commands/map_reduce.idl @@ -35,7 +35,7 @@ global: - "mongo/db/write_concern_options.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" types: mapReduceOutOptionsType: diff --git a/src/mongo/db/commands/profile.idl b/src/mongo/db/commands/profile.idl index 9233b4bd2ee..c9930bba124 100644 --- a/src/mongo/db/commands/profile.idl +++ b/src/mongo/db/commands/profile.idl @@ -31,7 +31,7 @@ global: cpp_includes: "mongo/db/commands/profile_common.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" types: ObjectOrUnset: diff --git a/src/mongo/db/commands/rename_collection.idl b/src/mongo/db/commands/rename_collection.idl index c793b3ffe10..10f9ce5ccfd 100644 --- a/src/mongo/db/commands/rename_collection.idl +++ b/src/mongo/db/commands/rename_collection.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: renameCollection: diff --git a/src/mongo/db/commands/resize_oplog.idl b/src/mongo/db/commands/resize_oplog.idl index b57c6e18a74..6850f346e9e 100644 --- a/src/mongo/db/commands/resize_oplog.idl +++ b/src/mongo/db/commands/resize_oplog.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: replSetResizeOplog: diff --git a/src/mongo/db/commands/rotate_certificates.idl b/src/mongo/db/commands/rotate_certificates.idl index 1e1e5cbf0d2..71be5b4861f 100644 --- a/src/mongo/db/commands/rotate_certificates.idl +++ b/src/mongo/db/commands/rotate_certificates.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: rotateCertificates: diff --git a/src/mongo/db/commands/rwc_defaults_commands.idl b/src/mongo/db/commands/rwc_defaults_commands.idl index 87ef62adc4b..9a1ff3c68a9 100644 --- a/src/mongo/db/commands/rwc_defaults_commands.idl +++ b/src/mongo/db/commands/rwc_defaults_commands.idl @@ -30,7 +30,7 @@ global: imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/repl/read_concern_args.idl" - "mongo/db/read_write_concern_defaults.idl" - "mongo/db/write_concern_options.idl" diff --git a/src/mongo/db/commands/sessions_commands.idl b/src/mongo/db/commands/sessions_commands.idl index ad7e75f0c5a..c25a489e2b1 100644 --- a/src/mongo/db/commands/sessions_commands.idl +++ b/src/mongo/db/commands/sessions_commands.idl @@ -32,7 +32,7 @@ global: imports: - "mongo/db/auth/access_checks.idl" - "mongo/db/session/logical_session_id.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: endSessionsFromClient: diff --git a/src/mongo/db/commands/set_feature_compatibility_version.idl b/src/mongo/db/commands/set_feature_compatibility_version.idl index 87a36367e76..416b5d8ee03 100644 --- a/src/mongo/db/commands/set_feature_compatibility_version.idl +++ b/src/mongo/db/commands/set_feature_compatibility_version.idl @@ -32,7 +32,7 @@ global: - "mongo/db/commands/feature_compatibility_version_parser.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" enums: SetFCVPhase: diff --git a/src/mongo/db/commands/set_index_commit_quorum.idl b/src/mongo/db/commands/set_index_commit_quorum.idl index 4773dafcf9b..8c9905123ae 100644 --- a/src/mongo/db/commands/set_index_commit_quorum.idl +++ b/src/mongo/db/commands/set_index_commit_quorum.idl @@ -35,7 +35,7 @@ global: imports: - "mongo/db/catalog/commit_quorum.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: setIndexCommitQuorum: diff --git a/src/mongo/db/commands/set_user_write_block_mode.idl b/src/mongo/db/commands/set_user_write_block_mode.idl index 7cacdf142e9..cc59843a69f 100644 --- a/src/mongo/db/commands/set_user_write_block_mode.idl +++ b/src/mongo/db/commands/set_user_write_block_mode.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: SetUserWriteBlockModeRequest: diff --git a/src/mongo/db/commands/shutdown.idl b/src/mongo/db/commands/shutdown.idl index 2685401de96..271cf1ba229 100644 --- a/src/mongo/db/commands/shutdown.idl +++ b/src/mongo/db/commands/shutdown.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: shutdown: diff --git a/src/mongo/db/commands/tenant_migration_donor_cmds.idl b/src/mongo/db/commands/tenant_migration_donor_cmds.idl index 2e2624e5b28..b065440cd50 100644 --- a/src/mongo/db/commands/tenant_migration_donor_cmds.idl +++ b/src/mongo/db/commands/tenant_migration_donor_cmds.idl @@ -36,7 +36,7 @@ imports: - "mongo/client/read_preference_setting.idl" - "mongo/db/repl/tenant_migration_state_machine.idl" - "mongo/db/serverless/serverless_types.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/sharding_types.idl" structs: diff --git a/src/mongo/db/commands/tenant_migration_recipient_cmds.idl b/src/mongo/db/commands/tenant_migration_recipient_cmds.idl index 5160ab5ff05..96bfcd775cd 100644 --- a/src/mongo/db/commands/tenant_migration_recipient_cmds.idl +++ b/src/mongo/db/commands/tenant_migration_recipient_cmds.idl @@ -37,7 +37,7 @@ imports: - "mongo/client/read_preference_setting.idl" - "mongo/db/repl/tenant_migration_pem_payload.idl" - "mongo/db/serverless/serverless_types.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/sharding_types.idl" - "mongo/db/repl/replication_types.idl" - "mongo/util/net/hostandport.idl" diff --git a/src/mongo/db/commands/txn_cmds.idl b/src/mongo/db/commands/txn_cmds.idl index 07a6289aeff..3363e88e690 100644 --- a/src/mongo/db/commands/txn_cmds.idl +++ b/src/mongo/db/commands/txn_cmds.idl @@ -29,7 +29,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/sharding_types.idl" structs: diff --git a/src/mongo/db/commands/txn_two_phase_commit_cmds.idl b/src/mongo/db/commands/txn_two_phase_commit_cmds.idl index de695d3b979..69ed3648c49 100644 --- a/src/mongo/db/commands/txn_two_phase_commit_cmds.idl +++ b/src/mongo/db/commands/txn_two_phase_commit_cmds.idl @@ -29,7 +29,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/sharding_types.idl" structs: diff --git a/src/mongo/db/commands/user_management_commands.idl b/src/mongo/db/commands/user_management_commands.idl index 957a788292f..06fd9ef3af7 100644 --- a/src/mongo/db/commands/user_management_commands.idl +++ b/src/mongo/db/commands/user_management_commands.idl @@ -29,7 +29,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/auth/auth_types.idl" - "mongo/db/auth/address_restriction.idl" - "mongo/db/auth/user_management_commands_parser.idl" diff --git a/src/mongo/db/commands/validate_db_metadata.idl b/src/mongo/db/commands/validate_db_metadata.idl index 620d144f916..2f8fdd7a27e 100644 --- a/src/mongo/db/commands/validate_db_metadata.idl +++ b/src/mongo/db/commands/validate_db_metadata.idl @@ -32,7 +32,7 @@ global: - "mongo/util/uuid.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: ErrorReplyElement: diff --git a/src/mongo/db/commands/vote_commit_index_build.idl b/src/mongo/db/commands/vote_commit_index_build.idl index 5ef28968573..717a7be96e8 100644 --- a/src/mongo/db/commands/vote_commit_index_build.idl +++ b/src/mongo/db/commands/vote_commit_index_build.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/util/net/hostandport.idl" commands: diff --git a/src/mongo/db/commands_test_example.idl b/src/mongo/db/commands_test_example.idl index 5a121826bf7..646e943c134 100644 --- a/src/mongo/db/commands_test_example.idl +++ b/src/mongo/db/commands_test_example.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo::commands_test_example" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: exampleIncrement: diff --git a/src/mongo/db/concurrency/SConscript b/src/mongo/db/concurrency/SConscript index d3a57d2feed..4aa43a9acfd 100644 --- a/src/mongo/db/concurrency/SConscript +++ b/src/mongo/db/concurrency/SConscript @@ -28,13 +28,10 @@ env.Library( 'exception_util.cpp', 'exception_util.idl', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - ], LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/server_options_servers', '$BUILD_DIR/mongo/db/storage/recovery_unit_base', - '$BUILD_DIR/mongo/idl/server_parameter', '$BUILD_DIR/mongo/util/fail_point', '$BUILD_DIR/mongo/util/log_and_backoff', ], diff --git a/src/mongo/db/create_indexes.idl b/src/mongo/db/create_indexes.idl index d21ed195365..4abbcf9fa24 100644 --- a/src/mongo/db/create_indexes.idl +++ b/src/mongo/db/create_indexes.idl @@ -32,7 +32,7 @@ global: imports: - "mongo/db/auth/action_type.idl" - "mongo/db/catalog/commit_quorum.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: CreateIndexesReply: diff --git a/src/mongo/db/dbcommands.idl b/src/mongo/db/dbcommands.idl index 428edbce64d..51df0e963fe 100644 --- a/src/mongo/db/dbcommands.idl +++ b/src/mongo/db/dbcommands.idl @@ -31,7 +31,7 @@ global: imports: - "mongo/db/catalog/collection_options.idl" - "mongo/db/pipeline/storage_stats_spec.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: DataSizeReply: diff --git a/src/mongo/db/drop.idl b/src/mongo/db/drop.idl index d054e1976e9..adfa486534f 100644 --- a/src/mongo/db/drop.idl +++ b/src/mongo/db/drop.idl @@ -33,7 +33,7 @@ global: imports: - "mongo/db/auth/action_type.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: DropReply: diff --git a/src/mongo/db/drop_database.idl b/src/mongo/db/drop_database.idl index 2ae5e27d412..3bd9c19f5a8 100644 --- a/src/mongo/db/drop_database.idl +++ b/src/mongo/db/drop_database.idl @@ -31,7 +31,7 @@ global: imports: - "mongo/db/auth/action_type.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: dropDatabase: diff --git a/src/mongo/db/drop_indexes.idl b/src/mongo/db/drop_indexes.idl index 41af43ba1a7..bb8be11c6a5 100644 --- a/src/mongo/db/drop_indexes.idl +++ b/src/mongo/db/drop_indexes.idl @@ -31,7 +31,7 @@ global: imports: - "mongo/db/auth/action_type.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: DropIndexesReply: diff --git a/src/mongo/db/exec/batched_delete_stage.idl b/src/mongo/db/exec/batched_delete_stage.idl index d4f7dc6a6be..5449c0e2562 100644 --- a/src/mongo/db/exec/batched_delete_stage.idl +++ b/src/mongo/db/exec/batched_delete_stage.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" server_parameters: batchedDeletesTargetStagedDocBytes: diff --git a/src/mongo/db/explain.idl b/src/mongo/db/explain.idl index a7b35045226..af75c558fe3 100644 --- a/src/mongo/db/explain.idl +++ b/src/mongo/db/explain.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/query/explain_verbosity.idl" commands: diff --git a/src/mongo/db/free_mon/free_mon_commands.idl b/src/mongo/db/free_mon/free_mon_commands.idl index 2fddd12a2c3..ff2d83378b5 100644 --- a/src/mongo/db/free_mon/free_mon_commands.idl +++ b/src/mongo/db/free_mon/free_mon_commands.idl @@ -30,7 +30,7 @@ global: imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" enums: diff --git a/src/mongo/db/free_mon/free_mon_mongod.idl b/src/mongo/db/free_mon/free_mon_mongod.idl index b3b34dafb29..cf944a6cc1b 100644 --- a/src/mongo/db/free_mon/free_mon_mongod.idl +++ b/src/mongo/db/free_mon/free_mon_mongod.idl @@ -32,7 +32,7 @@ global: - "mongo/db/free_mon/free_mon_mongod.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" server_parameters: diff --git a/src/mongo/db/free_mon/free_mon_options.idl b/src/mongo/db/free_mon/free_mon_options.idl index ba7f472b467..906f6b20a0f 100644 --- a/src/mongo/db/free_mon/free_mon_options.idl +++ b/src/mongo/db/free_mon/free_mon_options.idl @@ -33,7 +33,7 @@ global: source: [ yaml, cli] imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" configs: # Command Line: --enableFreeMonitoring=<on|runtime|off> diff --git a/src/mongo/db/free_mon/free_mon_protocol.idl b/src/mongo/db/free_mon/free_mon_protocol.idl index 8e2e7899ed7..7f24df4b085 100644 --- a/src/mongo/db/free_mon/free_mon_protocol.idl +++ b/src/mongo/db/free_mon/free_mon_protocol.idl @@ -29,7 +29,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" enums: diff --git a/src/mongo/db/free_mon/free_mon_storage.idl b/src/mongo/db/free_mon/free_mon_storage.idl index 5c82bbeee2c..59876b5aae4 100644 --- a/src/mongo/db/free_mon/free_mon_storage.idl +++ b/src/mongo/db/free_mon/free_mon_storage.idl @@ -29,7 +29,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" enums: StorageState: diff --git a/src/mongo/db/ftdc/ftdc_mongod.idl b/src/mongo/db/ftdc/ftdc_mongod.idl index 59490c180ac..8c3b32d90e8 100644 --- a/src/mongo/db/ftdc/ftdc_mongod.idl +++ b/src/mongo/db/ftdc/ftdc_mongod.idl @@ -32,7 +32,7 @@ global: - "mongo/db/ftdc/ftdc_mongod.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" server_parameters: diff --git a/src/mongo/db/ftdc/ftdc_server.idl b/src/mongo/db/ftdc/ftdc_server.idl index 0b36d4becaf..32f0cfe6581 100644 --- a/src/mongo/db/ftdc/ftdc_server.idl +++ b/src/mongo/db/ftdc/ftdc_server.idl @@ -32,7 +32,7 @@ global: - "mongo/db/ftdc/ftdc_server.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" server_parameters: diff --git a/src/mongo/db/generic_cursor.idl b/src/mongo/db/generic_cursor.idl index ecb1ded9a10..fc3255fabe1 100644 --- a/src/mongo/db/generic_cursor.idl +++ b/src/mongo/db/generic_cursor.idl @@ -36,7 +36,7 @@ global: imports: - "mongo/db/session/logical_session_id.idl" - "mongo/db/repl/replication_types.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: GenericCursor: diff --git a/src/mongo/db/index/SConscript b/src/mongo/db/index/SConscript index 10fc5254d10..13286acfd41 100644 --- a/src/mongo/db/index/SConscript +++ b/src/mongo/db/index/SConscript @@ -92,13 +92,13 @@ iamEnv.Library( 'skipped_record_tracker.cpp', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/catalog/index_catalog_entry', '$BUILD_DIR/mongo/db/concurrency/exception_util', '$BUILD_DIR/mongo/db/curop', '$BUILD_DIR/mongo/db/multi_key_path_tracker', '$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/sorter/sorter_idl', '$BUILD_DIR/mongo/db/sorter/sorter_stats', @@ -109,7 +109,6 @@ iamEnv.Library( '$BUILD_DIR/mongo/db/storage/record_store_base', '$BUILD_DIR/mongo/db/storage/storage_options', '$BUILD_DIR/mongo/db/vector_clock', - '$BUILD_DIR/mongo/idl/server_parameter', '$BUILD_DIR/mongo/util/progress_meter', '$BUILD_DIR/third_party/shim_snappy', 'index_descriptor', diff --git a/src/mongo/db/index/index_build_interceptor.idl b/src/mongo/db/index/index_build_interceptor.idl index c526632ca25..f14596d4e23 100644 --- a/src/mongo/db/index/index_build_interceptor.idl +++ b/src/mongo/db/index/index_build_interceptor.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" server_parameters: maxIndexBuildDrainBatchSize: diff --git a/src/mongo/db/internal_transactions_feature_flag.idl b/src/mongo/db/internal_transactions_feature_flag.idl index 331f777a313..6740092ed83 100644 --- a/src/mongo/db/internal_transactions_feature_flag.idl +++ b/src/mongo/db/internal_transactions_feature_flag.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo::feature_flags" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" feature_flags: featureFlagAlwaysCreateConfigTransactionsPartialIndexOnStepUp: diff --git a/src/mongo/db/keys_collection_document.idl b/src/mongo/db/keys_collection_document.idl index c4ac2c0bcab..5dc937dc81e 100644 --- a/src/mongo/db/keys_collection_document.idl +++ b/src/mongo/db/keys_collection_document.idl @@ -30,7 +30,7 @@ global: imports: - "mongo/crypto/sha1_block.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: keysCollectionDocumentBase: diff --git a/src/mongo/db/list_collections.idl b/src/mongo/db/list_collections.idl index c700cea6915..68087badf2f 100644 --- a/src/mongo/db/list_collections.idl +++ b/src/mongo/db/list_collections.idl @@ -34,7 +34,7 @@ global: imports: - "mongo/db/auth/access_checks.idl" - "mongo/db/auth/action_type.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: ListCollectionsReplyInfo: diff --git a/src/mongo/db/list_indexes.idl b/src/mongo/db/list_indexes.idl index e25e9263bf7..164c7fab53c 100644 --- a/src/mongo/db/list_indexes.idl +++ b/src/mongo/db/list_indexes.idl @@ -34,7 +34,7 @@ global: imports: - "mongo/db/auth/access_checks.idl" - "mongo/db/auth/action_type.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/create_indexes.idl" structs: diff --git a/src/mongo/db/matcher/schema/encrypt_schema.idl b/src/mongo/db/matcher/schema/encrypt_schema.idl index ca9b1fb64d7..e68c92b93fb 100644 --- a/src/mongo/db/matcher/schema/encrypt_schema.idl +++ b/src/mongo/db/matcher/schema/encrypt_schema.idl @@ -33,7 +33,7 @@ global: - "mongo/db/matcher/schema/encrypt_schema_types.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/crypto/encryption_fields.idl" types: diff --git a/src/mongo/db/mirror_maestro.idl b/src/mongo/db/mirror_maestro.idl index b15b60dcb5f..76ed5567e2e 100644 --- a/src/mongo/db/mirror_maestro.idl +++ b/src/mongo/db/mirror_maestro.idl @@ -31,7 +31,7 @@ global: - "mongo/db/mirror_maestro.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: MirroredReadsParameters: diff --git a/src/mongo/db/ops/delete_request.idl b/src/mongo/db/ops/delete_request.idl index 498d52943ab..9b7fafff747 100644 --- a/src/mongo/db/ops/delete_request.idl +++ b/src/mongo/db/ops/delete_request.idl @@ -35,7 +35,7 @@ global: imports: - "mongo/db/session/logical_session_id.idl" - "mongo/db/pipeline/legacy_runtime_constants.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/query/hint.idl" server_parameters: diff --git a/src/mongo/db/ops/insert.cpp b/src/mongo/db/ops/insert.cpp index b1c3626af3e..e3fbdaf617b 100644 --- a/src/mongo/db/ops/insert.cpp +++ b/src/mongo/db/ops/insert.cpp @@ -26,7 +26,6 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -#include "mongo/platform/basic.h" #include "mongo/db/ops/insert.h" @@ -34,7 +33,6 @@ #include "mongo/bson/bson_depth.h" #include "mongo/db/catalog/document_validation.h" -#include "mongo/db/commands/feature_compatibility_version_parser.h" #include "mongo/db/query/dbref.h" #include "mongo/db/query/query_feature_flags_gen.h" #include "mongo/db/repl/replication_coordinator.h" @@ -45,9 +43,6 @@ #include "mongo/util/str.h" namespace mongo { - -using std::string; - namespace { /** diff --git a/src/mongo/db/ops/single_write_result.idl b/src/mongo/db/ops/single_write_result.idl index 5e54de01219..c677043c8f7 100644 --- a/src/mongo/db/ops/single_write_result.idl +++ b/src/mongo/db/ops/single_write_result.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: singleWriteResult: diff --git a/src/mongo/db/ops/write_ops.idl b/src/mongo/db/ops/write_ops.idl index 4ad32c0e151..a0567a957f8 100644 --- a/src/mongo/db/ops/write_ops.idl +++ b/src/mongo/db/ops/write_ops.idl @@ -38,7 +38,7 @@ imports: - "mongo/db/session/logical_session_id.idl" - "mongo/db/pipeline/legacy_runtime_constants.idl" - "mongo/db/query/hint.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" types: multi_delete_bool: diff --git a/src/mongo/db/pipeline/SConscript b/src/mongo/db/pipeline/SConscript index cf92ade7e0a..e264e1d9425 100644 --- a/src/mongo/db/pipeline/SConscript +++ b/src/mongo/db/pipeline/SConscript @@ -26,14 +26,12 @@ env.Library( ) env.Library( - target="change_stream_preimage", + target='change_stream_preimage', source=[ - "change_stream_preimage.idl", + 'change_stream_preimage.idl', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/idl/idl_parser', - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -85,7 +83,7 @@ env.Library( env.Library( target='variable_validation', source=[ - "variable_validation.cpp", + 'variable_validation.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/db/pipeline/aggregate_command.idl b/src/mongo/db/pipeline/aggregate_command.idl index 3381bf366a0..7cc4840f273 100644 --- a/src/mongo/db/pipeline/aggregate_command.idl +++ b/src/mongo/db/pipeline/aggregate_command.idl @@ -37,7 +37,7 @@ imports: - "mongo/crypto/fle_field_schema.idl" - "mongo/db/auth/action_type.idl" - "mongo/db/auth/access_checks.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/pipeline/exchange_spec.idl" - "mongo/db/pipeline/legacy_runtime_constants.idl" - "mongo/db/query/hint.idl" diff --git a/src/mongo/db/pipeline/aggregation_request_helper.h b/src/mongo/db/pipeline/aggregation_request_helper.h index c052c043941..7c7c7c2453c 100644 --- a/src/mongo/db/pipeline/aggregation_request_helper.h +++ b/src/mongo/db/pipeline/aggregation_request_helper.h @@ -41,7 +41,6 @@ #include "mongo/db/pipeline/plan_executor_pipeline.h" #include "mongo/db/query/explain_options.h" #include "mongo/db/write_concern_options.h" -#include "mongo/idl/basic_types_gen.h" namespace mongo { diff --git a/src/mongo/db/pipeline/change_stream_pre_and_post_images_options.idl b/src/mongo/db/pipeline/change_stream_pre_and_post_images_options.idl index 1c0a9f9299a..f0bad7b596c 100644 --- a/src/mongo/db/pipeline/change_stream_pre_and_post_images_options.idl +++ b/src/mongo/db/pipeline/change_stream_pre_and_post_images_options.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: ChangeStreamPreAndPostImagesOptions: diff --git a/src/mongo/db/pipeline/change_stream_preimage.idl b/src/mongo/db/pipeline/change_stream_preimage.idl index 4d3fa3e3b73..90d8175f976 100644 --- a/src/mongo/db/pipeline/change_stream_preimage.idl +++ b/src/mongo/db/pipeline/change_stream_preimage.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" server_parameters: expiredChangeStreamPreImageRemovalJobSleepSecs: diff --git a/src/mongo/db/pipeline/document_source_change_stream.idl b/src/mongo/db/pipeline/document_source_change_stream.idl index e1b8227a0fc..1ed1f0c0dfa 100644 --- a/src/mongo/db/pipeline/document_source_change_stream.idl +++ b/src/mongo/db/pipeline/document_source_change_stream.idl @@ -34,7 +34,7 @@ global: - "mongo/db/pipeline/resume_token.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" types: # A resume token is an opaque document we return to the user that contains all the information diff --git a/src/mongo/db/pipeline/document_source_coll_stats.idl b/src/mongo/db/pipeline/document_source_coll_stats.idl index 060c20d835a..e0babb11ef6 100644 --- a/src/mongo/db/pipeline/document_source_coll_stats.idl +++ b/src/mongo/db/pipeline/document_source_coll_stats.idl @@ -32,7 +32,7 @@ global: - "mongo/db/pipeline/document_source_parsing_validators.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/pipeline/storage_stats_spec.idl" structs: diff --git a/src/mongo/db/pipeline/document_source_densify.idl b/src/mongo/db/pipeline/document_source_densify.idl index a531d261d1a..5af16633205 100644 --- a/src/mongo/db/pipeline/document_source_densify.idl +++ b/src/mongo/db/pipeline/document_source_densify.idl @@ -28,7 +28,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/pipeline/value.idl" structs: RangeSpec: diff --git a/src/mongo/db/pipeline/document_source_fill.idl b/src/mongo/db/pipeline/document_source_fill.idl index 6d4f45c3a0e..8e993b557de 100644 --- a/src/mongo/db/pipeline/document_source_fill.idl +++ b/src/mongo/db/pipeline/document_source_fill.idl @@ -28,7 +28,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/pipeline/value.idl" structs: FillOutputSpec: diff --git a/src/mongo/db/pipeline/document_source_internal_apply_oplog_update.idl b/src/mongo/db/pipeline/document_source_internal_apply_oplog_update.idl index f6b81d4b6fb..5f37203d603 100644 --- a/src/mongo/db/pipeline/document_source_internal_apply_oplog_update.idl +++ b/src/mongo/db/pipeline/document_source_internal_apply_oplog_update.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: InternalApplyOplogUpdateSpec: diff --git a/src/mongo/db/pipeline/document_source_list_sessions.idl b/src/mongo/db/pipeline/document_source_list_sessions.idl index f6a9d3d84fd..e919fbda2bd 100644 --- a/src/mongo/db/pipeline/document_source_list_sessions.idl +++ b/src/mongo/db/pipeline/document_source_list_sessions.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: diff --git a/src/mongo/db/pipeline/document_source_merge.idl b/src/mongo/db/pipeline/document_source_merge.idl index 5b4d268f75b..582a3ab26d5 100644 --- a/src/mongo/db/pipeline/document_source_merge.idl +++ b/src/mongo/db/pipeline/document_source_merge.idl @@ -37,7 +37,7 @@ global: imports: - "mongo/db/pipeline/document_source_merge_modes.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/sharding_types.idl" types: MergeTargetNss: diff --git a/src/mongo/db/pipeline/document_source_merge_modes.idl b/src/mongo/db/pipeline/document_source_merge_modes.idl index 03369e55111..e87fd1cc9c8 100644 --- a/src/mongo/db/pipeline/document_source_merge_modes.idl +++ b/src/mongo/db/pipeline/document_source_merge_modes.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" enums: MergeWhenMatchedMode: diff --git a/src/mongo/db/pipeline/document_source_set_variable_from_subpipeline.idl b/src/mongo/db/pipeline/document_source_set_variable_from_subpipeline.idl index 8bd754c1e64..d9f530545bd 100644 --- a/src/mongo/db/pipeline/document_source_set_variable_from_subpipeline.idl +++ b/src/mongo/db/pipeline/document_source_set_variable_from_subpipeline.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/pipeline/aggregate_command.idl" structs: diff --git a/src/mongo/db/pipeline/document_source_set_window_fields.idl b/src/mongo/db/pipeline/document_source_set_window_fields.idl index dfd04071f11..28f2ed9ca08 100644 --- a/src/mongo/db/pipeline/document_source_set_window_fields.idl +++ b/src/mongo/db/pipeline/document_source_set_window_fields.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: SetWindowFieldsSpec: diff --git a/src/mongo/db/pipeline/document_source_union_with.idl b/src/mongo/db/pipeline/document_source_union_with.idl index 77b3ea64a82..e9df9018c4b 100644 --- a/src/mongo/db/pipeline/document_source_union_with.idl +++ b/src/mongo/db/pipeline/document_source_union_with.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: UnionWithSpec: diff --git a/src/mongo/db/pipeline/exchange_spec.idl b/src/mongo/db/pipeline/exchange_spec.idl index f862b9065f5..fd411056767 100644 --- a/src/mongo/db/pipeline/exchange_spec.idl +++ b/src/mongo/db/pipeline/exchange_spec.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" enums: ExchangePolicy: diff --git a/src/mongo/db/pipeline/expression_context.cpp b/src/mongo/db/pipeline/expression_context.cpp index c79434f4bcb..b3b433a8c45 100644 --- a/src/mongo/db/pipeline/expression_context.cpp +++ b/src/mongo/db/pipeline/expression_context.cpp @@ -27,22 +27,17 @@ * it in the license file. */ -#include "mongo/platform/basic.h" - #include <utility> #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/process_interface/stub_mongo_process_interface.h" -#include "mongo/db/query/collation/collation_spec.h" #include "mongo/db/query/collation/collator_factory_interface.h" #include "mongo/db/stats/counters.h" #include "mongo/util/intrusive_counter.h" namespace mongo { -using boost::intrusive_ptr; - ExpressionContext::ResolvedNamespace::ResolvedNamespace(NamespaceString ns, std::vector<BSONObj> pipeline, boost::optional<UUID> collUUID) @@ -182,7 +177,7 @@ std::unique_ptr<ExpressionContext::CollatorStash> ExpressionContext::temporarily return std::unique_ptr<CollatorStash>(new CollatorStash(this, std::move(newCollator))); } -intrusive_ptr<ExpressionContext> ExpressionContext::copyWith( +boost::intrusive_ptr<ExpressionContext> ExpressionContext::copyWith( NamespaceString ns, boost::optional<UUID> uuid, boost::optional<std::unique_ptr<CollatorInterface>> updatedCollator) const { diff --git a/src/mongo/db/pipeline/expression_parser.idl b/src/mongo/db/pipeline/expression_parser.idl index fc400bf04a3..2a7b5ff54a2 100644 --- a/src/mongo/db/pipeline/expression_parser.idl +++ b/src/mongo/db/pipeline/expression_parser.idl @@ -29,7 +29,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: diff --git a/src/mongo/db/pipeline/legacy_runtime_constants.idl b/src/mongo/db/pipeline/legacy_runtime_constants.idl index 6479d8662a7..6d853ccb881 100644 --- a/src/mongo/db/pipeline/legacy_runtime_constants.idl +++ b/src/mongo/db/pipeline/legacy_runtime_constants.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: LegacyRuntimeConstants: diff --git a/src/mongo/db/pipeline/process_interface/mongos_process_interface.cpp b/src/mongo/db/pipeline/process_interface/mongos_process_interface.cpp index 1e46ea9117c..daa61791673 100644 --- a/src/mongo/db/pipeline/process_interface/mongos_process_interface.cpp +++ b/src/mongo/db/pipeline/process_interface/mongos_process_interface.cpp @@ -27,9 +27,6 @@ * it in the license file. */ - -#include "mongo/platform/basic.h" - #include "mongo/db/pipeline/process_interface/mongos_process_interface.h" #include "mongo/db/auth/authorization_session.h" @@ -39,7 +36,6 @@ #include "mongo/db/pipeline/document_source.h" #include "mongo/db/pipeline/document_source_merge.h" #include "mongo/db/pipeline/sharded_agg_helpers.h" -#include "mongo/db/query/collation/collation_spec.h" #include "mongo/db/query/collation/collator_factory_interface.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/executor/task_executor_pool.h" @@ -57,7 +53,6 @@ #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kQuery - namespace mongo { namespace { diff --git a/src/mongo/db/pipeline/storage_stats_spec.idl b/src/mongo/db/pipeline/storage_stats_spec.idl index 8052f09de51..a241dfb2b84 100644 --- a/src/mongo/db/pipeline/storage_stats_spec.idl +++ b/src/mongo/db/pipeline/storage_stats_spec.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: StorageStatsSpec: diff --git a/src/mongo/db/process_health/health_monitoring.idl b/src/mongo/db/process_health/health_monitoring.idl index 9e00fe252f2..88837981d8c 100644 --- a/src/mongo/db/process_health/health_monitoring.idl +++ b/src/mongo/db/process_health/health_monitoring.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo::feature_flags" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" feature_flags: featureFlagHealthMonitoring: diff --git a/src/mongo/db/process_health/health_monitoring_server_parameters.idl b/src/mongo/db/process_health/health_monitoring_server_parameters.idl index 89889445dfc..036d1f797c1 100644 --- a/src/mongo/db/process_health/health_monitoring_server_parameters.idl +++ b/src/mongo/db/process_health/health_monitoring_server_parameters.idl @@ -31,7 +31,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" enums: HealthObserverIntensity: diff --git a/src/mongo/db/query/SConscript b/src/mongo/db/query/SConscript index 5ab1d02020b..5285ca44564 100644 --- a/src/mongo/db/query/SConscript +++ b/src/mongo/db/query/SConscript @@ -192,8 +192,6 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/idl/basic_types', - '$BUILD_DIR/mongo/idl/idl_parser', ], ) diff --git a/src/mongo/db/query/analyze_command.idl b/src/mongo/db/query/analyze_command.idl index 124a6acbead..5ce0f270f4a 100644 --- a/src/mongo/db/query/analyze_command.idl +++ b/src/mongo/db/query/analyze_command.idl @@ -32,7 +32,7 @@ global: imports: - "mongo/db/auth/access_checks.idl" - "mongo/db/auth/action_type.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: analyze: diff --git a/src/mongo/db/query/collation/SConscript b/src/mongo/db/query/collation/SConscript index 79578fe98b8..98acc2f2a57 100644 --- a/src/mongo/db/query/collation/SConscript +++ b/src/mongo/db/query/collation/SConscript @@ -12,8 +12,7 @@ env.Library( "collator_interface.cpp", ], LIBDEPS=[ - "$BUILD_DIR/mongo/base", - "$BUILD_DIR/mongo/idl/basic_types", + "$BUILD_DIR/mongo/db/server_base", ], ) diff --git a/src/mongo/db/query/collation/collation_spec.h b/src/mongo/db/query/collation/collation_spec.h index f8369c2bd23..4b2cd29c813 100644 --- a/src/mongo/db/query/collation/collation_spec.h +++ b/src/mongo/db/query/collation/collation_spec.h @@ -32,7 +32,7 @@ #include <string> #include "mongo/bson/bsonobj.h" -#include "mongo/idl/basic_types_gen.h" +#include "mongo/db/basic_types_gen.h" namespace mongo::CollationSpec { diff --git a/src/mongo/db/query/collation/collator_factory_interface.h b/src/mongo/db/query/collation/collator_factory_interface.h index 193e350ed0e..c13b8c8fbe5 100644 --- a/src/mongo/db/query/collation/collator_factory_interface.h +++ b/src/mongo/db/query/collation/collator_factory_interface.h @@ -29,8 +29,6 @@ #pragma once -#include <memory> - #include "mongo/db/query/collation/collator_interface.h" namespace mongo { diff --git a/src/mongo/db/query/collation/collator_interface.h b/src/mongo/db/query/collation/collator_interface.h index 9825f5267a8..f5aae85e147 100644 --- a/src/mongo/db/query/collation/collator_interface.h +++ b/src/mongo/db/query/collation/collator_interface.h @@ -29,7 +29,6 @@ #pragma once -#include <memory> #include <string> #include "mongo/base/string_data.h" diff --git a/src/mongo/db/query/count_command.idl b/src/mongo/db/query/count_command.idl index 10c7a871b5a..d511cd879fb 100644 --- a/src/mongo/db/query/count_command.idl +++ b/src/mongo/db/query/count_command.idl @@ -34,7 +34,7 @@ global: - "mongo/db/query/max_time_ms_parser.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/crypto/fle_field_schema.idl" - "mongo/db/auth/action_type.idl" - "mongo/db/auth/access_checks.idl" diff --git a/src/mongo/db/query/cursor_request.cpp b/src/mongo/db/query/cursor_request.cpp index 785ac850b35..aaa7c76e950 100644 --- a/src/mongo/db/query/cursor_request.cpp +++ b/src/mongo/db/query/cursor_request.cpp @@ -27,13 +27,11 @@ * it in the license file. */ -#include "mongo/platform/basic.h" - #include "mongo/db/query/cursor_request.h" #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsonobj.h" -#include "mongo/idl/basic_types_gen.h" +#include "mongo/db/basic_types_gen.h" namespace mongo { diff --git a/src/mongo/db/query/cursor_response.idl b/src/mongo/db/query/cursor_response.idl index 0975452f329..af264710874 100644 --- a/src/mongo/db/query/cursor_response.idl +++ b/src/mongo/db/query/cursor_response.idl @@ -32,11 +32,10 @@ global: cpp_namespace: "mongo" cpp_includes: - "mongo/db/namespace_string.h" - - "mongo/idl/basic_types.h" - "mongo/db/query/cursor_idl_validator.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" enums: CursorType: diff --git a/src/mongo/db/query/distinct_command.idl b/src/mongo/db/query/distinct_command.idl index 8bfde758758..a632ef06ffa 100644 --- a/src/mongo/db/query/distinct_command.idl +++ b/src/mongo/db/query/distinct_command.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: distinct: diff --git a/src/mongo/db/query/find_command.idl b/src/mongo/db/query/find_command.idl index 448d52dc1ca..44e7b02ceb9 100644 --- a/src/mongo/db/query/find_command.idl +++ b/src/mongo/db/query/find_command.idl @@ -41,7 +41,7 @@ imports: - "mongo/db/auth/access_checks.idl" - "mongo/db/session/logical_session_id.idl" - "mongo/db/pipeline/legacy_runtime_constants.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/query/cursor_response.idl" - "mongo/db/query/hint.idl" diff --git a/src/mongo/db/query/getmore_command.idl b/src/mongo/db/query/getmore_command.idl index 658d2099002..3024313b616 100644 --- a/src/mongo/db/query/getmore_command.idl +++ b/src/mongo/db/query/getmore_command.idl @@ -32,7 +32,7 @@ global: - "mongo/db/query/query_request_helper.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/query/cursor_response.idl" - "mongo/db/repl/replication_types.idl" diff --git a/src/mongo/db/query/kill_cursors.idl b/src/mongo/db/query/kill_cursors.idl index 690589e9848..b507d9530fc 100644 --- a/src/mongo/db/query/kill_cursors.idl +++ b/src/mongo/db/query/kill_cursors.idl @@ -34,7 +34,7 @@ global: imports: - "mongo/db/auth/access_checks.idl" - "mongo/db/auth/action_type.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" types: cursorId: diff --git a/src/mongo/db/read_write_concern_defaults.idl b/src/mongo/db/read_write_concern_defaults.idl index ceb864d272a..2e7494e328e 100644 --- a/src/mongo/db/read_write_concern_defaults.idl +++ b/src/mongo/db/read_write_concern_defaults.idl @@ -29,7 +29,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/repl/read_concern_args.idl" - "mongo/db/write_concern_options.idl" diff --git a/src/mongo/db/read_write_concern_provenance.h b/src/mongo/db/read_write_concern_provenance.h index 72341b9895c..dc8fc0e57da 100644 --- a/src/mongo/db/read_write_concern_provenance.h +++ b/src/mongo/db/read_write_concern_provenance.h @@ -34,7 +34,6 @@ #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/read_write_concern_provenance_base_gen.h" -#include "mongo/idl/basic_types_gen.h" namespace mongo { diff --git a/src/mongo/db/read_write_concern_provenance_base.idl b/src/mongo/db/read_write_concern_provenance_base.idl index 017b89a6984..49433328748 100644 --- a/src/mongo/db/read_write_concern_provenance_base.idl +++ b/src/mongo/db/read_write_concern_provenance_base.idl @@ -30,7 +30,7 @@ global: imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" enums: ReadWriteConcernProvenanceSource: diff --git a/src/mongo/db/repl/apply_ops.cpp b/src/mongo/db/repl/apply_ops.cpp index 2c3ae5cad2d..c89a830b459 100644 --- a/src/mongo/db/repl/apply_ops.cpp +++ b/src/mongo/db/repl/apply_ops.cpp @@ -27,7 +27,6 @@ * it in the license file. */ - #include "mongo/db/repl/apply_ops.h" #include "mongo/bson/util/bson_extract.h" @@ -48,7 +47,6 @@ #include "mongo/db/matcher/matcher.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" -#include "mongo/db/query/collation/collation_spec.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/service_context.h" #include "mongo/db/session/session_catalog_mongod.h" @@ -59,7 +57,6 @@ #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kCommand - namespace mongo { namespace repl { diff --git a/src/mongo/db/repl/apply_ops.idl b/src/mongo/db/repl/apply_ops.idl index 89400a91c4c..792f6a63d1e 100644 --- a/src/mongo/db/repl/apply_ops.idl +++ b/src/mongo/db/repl/apply_ops.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo::repl" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: ApplyOpsCommandInfoBase: diff --git a/src/mongo/db/repl/database_cloner.idl b/src/mongo/db/repl/database_cloner.idl index c5d5d3342d9..529e1ad5aa9 100644 --- a/src/mongo/db/repl/database_cloner.idl +++ b/src/mongo/db/repl/database_cloner.idl @@ -31,7 +31,7 @@ global: - "mongo/db/repl/database_cloner_common.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" types: CollectionOptions: diff --git a/src/mongo/db/repl/dbcheck.idl b/src/mongo/db/repl/dbcheck.idl index 8246c46e70d..9d3b20b68f5 100644 --- a/src/mongo/db/repl/dbcheck.idl +++ b/src/mongo/db/repl/dbcheck.idl @@ -34,7 +34,7 @@ global: - "mongo/db/repl/dbcheck_idl.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/write_concern_options.idl" server_parameters: diff --git a/src/mongo/db/repl/election_reason_counter.idl b/src/mongo/db/repl/election_reason_counter.idl index 3cc0059eb13..4183ae240e6 100644 --- a/src/mongo/db/repl/election_reason_counter.idl +++ b/src/mongo/db/repl/election_reason_counter.idl @@ -33,7 +33,7 @@ global: cpp_namespace: "mongo::repl" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: ElectionReasonCounterBase: diff --git a/src/mongo/db/repl/hello.idl b/src/mongo/db/repl/hello.idl index 9f5fd99addf..a566ed5b878 100644 --- a/src/mongo/db/repl/hello.idl +++ b/src/mongo/db/repl/hello.idl @@ -33,7 +33,7 @@ imports: - "mongo/db/auth/auth_types.idl" - "mongo/db/repl/replication_types.idl" - "mongo/db/write_concern_options.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/rpc/metadata/client_metadata.idl" - "mongo/rpc/topology_version.idl" diff --git a/src/mongo/db/repl/image_collection_entry.idl b/src/mongo/db/repl/image_collection_entry.idl index e1bba459ed7..3cf2ba057de 100644 --- a/src/mongo/db/repl/image_collection_entry.idl +++ b/src/mongo/db/repl/image_collection_entry.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo::repl" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/session/logical_session_id.idl" - "mongo/db/repl/oplog_entry.idl" diff --git a/src/mongo/db/repl/member_config.idl b/src/mongo/db/repl/member_config.idl index 91665b094e7..71acb8df864 100644 --- a/src/mongo/db/repl/member_config.idl +++ b/src/mongo/db/repl/member_config.idl @@ -37,7 +37,7 @@ global: imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" types: memberId: diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp index 5b9d47ffcf0..ea896fc3114 100644 --- a/src/mongo/db/repl/oplog.cpp +++ b/src/mongo/db/repl/oplog.cpp @@ -60,7 +60,6 @@ #include "mongo/db/client.h" #include "mongo/db/coll_mod_gen.h" #include "mongo/db/commands.h" -#include "mongo/db/commands/feature_compatibility_version_parser.h" #include "mongo/db/concurrency/exception_util.h" #include "mongo/db/db_raii.h" #include "mongo/db/dbdirectclient.h" diff --git a/src/mongo/db/repl/oplog_entry.idl b/src/mongo/db/repl/oplog_entry.idl index 8b74b363609..6e1304973b8 100644 --- a/src/mongo/db/repl/oplog_entry.idl +++ b/src/mongo/db/repl/oplog_entry.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo::repl" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/session/logical_session_id.idl" - "mongo/db/pipeline/value.idl" - "mongo/db/repl/optime_base.idl" diff --git a/src/mongo/db/repl/optime_base.idl b/src/mongo/db/repl/optime_base.idl index 755510ae41b..a3ff57602a8 100644 --- a/src/mongo/db/repl/optime_base.idl +++ b/src/mongo/db/repl/optime_base.idl @@ -31,7 +31,7 @@ global: cpp_namespace: "mongo::repl" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: OpTimeBase: diff --git a/src/mongo/db/repl/read_concern_args.idl b/src/mongo/db/repl/read_concern_args.idl index e791e370bdd..596b70a4aaa 100644 --- a/src/mongo/db/repl/read_concern_args.idl +++ b/src/mongo/db/repl/read_concern_args.idl @@ -32,7 +32,7 @@ global: imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" types: diff --git a/src/mongo/db/repl/repl_server_parameters.idl b/src/mongo/db/repl/repl_server_parameters.idl index 16ae22f7a2a..54d50dd464e 100644 --- a/src/mongo/db/repl/repl_server_parameters.idl +++ b/src/mongo/db/repl/repl_server_parameters.idl @@ -34,7 +34,7 @@ global: - "mongo/client/read_preference.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" server_parameters: # From data_replicator_external_state_impl.cpp diff --git a/src/mongo/db/repl/repl_set_config.idl b/src/mongo/db/repl/repl_set_config.idl index 0848c3a02d5..9df1a636444 100644 --- a/src/mongo/db/repl/repl_set_config.idl +++ b/src/mongo/db/repl/repl_set_config.idl @@ -36,7 +36,7 @@ global: - "mongo/util/string_map.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/util/net/hostandport.idl" - "mongo/db/repl/replication_types.idl" - "mongo/db/repl/member_config.idl" diff --git a/src/mongo/db/repl/repl_set_test_egress.idl b/src/mongo/db/repl/repl_set_test_egress.idl index af9c0595d74..86b79e4b1e0 100644 --- a/src/mongo/db/repl/repl_set_test_egress.idl +++ b/src/mongo/db/repl/repl_set_test_egress.idl @@ -29,7 +29,7 @@ global: cpp_namespace: "mongo::repl" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: replSetTestEgressReply: diff --git a/src/mongo/db/repl/replication_consistency_markers.idl b/src/mongo/db/repl/replication_consistency_markers.idl index 7610f82e1fa..2be89ebbaf8 100644 --- a/src/mongo/db/repl/replication_consistency_markers.idl +++ b/src/mongo/db/repl/replication_consistency_markers.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo::repl" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/repl/replication_types.idl" structs: diff --git a/src/mongo/db/repl/replication_metrics.idl b/src/mongo/db/repl/replication_metrics.idl index 4fb062411ed..e6efea85c7a 100644 --- a/src/mongo/db/repl/replication_metrics.idl +++ b/src/mongo/db/repl/replication_metrics.idl @@ -37,7 +37,7 @@ global: - "mongo/db/repl/optime.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/repl/replication_types.idl" enums: diff --git a/src/mongo/db/repl/replication_types.idl b/src/mongo/db/repl/replication_types.idl index 3e2a702c565..538a36ce494 100644 --- a/src/mongo/db/repl/replication_types.idl +++ b/src/mongo/db/repl/replication_types.idl @@ -34,7 +34,7 @@ global: - "mongo/db/repl/optime.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" types: optime: diff --git a/src/mongo/db/repl/rollback.idl b/src/mongo/db/repl/rollback.idl index 443ad1bcae4..8c4607986cc 100644 --- a/src/mongo/db/repl/rollback.idl +++ b/src/mongo/db/repl/rollback.idl @@ -34,7 +34,7 @@ global: - "mongo/db/repl/optime.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/repl/replication_types.idl" structs: diff --git a/src/mongo/db/repl/tenant_migration_pem_payload.idl b/src/mongo/db/repl/tenant_migration_pem_payload.idl index 13ec011929d..8573c96b164 100644 --- a/src/mongo/db/repl/tenant_migration_pem_payload.idl +++ b/src/mongo/db/repl/tenant_migration_pem_payload.idl @@ -31,7 +31,7 @@ global: - "mongo/db/repl/tenant_migration_util.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: TenantMigrationPEMPayload: diff --git a/src/mongo/db/repl/tenant_migration_state_machine.idl b/src/mongo/db/repl/tenant_migration_state_machine.idl index d10ba45de43..96e46bfb562 100644 --- a/src/mongo/db/repl/tenant_migration_state_machine.idl +++ b/src/mongo/db/repl/tenant_migration_state_machine.idl @@ -37,7 +37,7 @@ imports: - "mongo/db/repl/replication_types.idl" - "mongo/db/repl/tenant_migration_pem_payload.idl" - "mongo/db/serverless/serverless_types.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" enums: TenantMigrationDonorState: diff --git a/src/mongo/db/resumable_index_builds.idl b/src/mongo/db/resumable_index_builds.idl index bf6f3ffcb30..da6f601fd8e 100644 --- a/src/mongo/db/resumable_index_builds.idl +++ b/src/mongo/db/resumable_index_builds.idl @@ -31,7 +31,7 @@ global: - "mongo/util/uuid.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/record_id.idl" - "mongo/db/sorter/sorter.idl" diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript index 93f5d564982..9fbe9999559 100644 --- a/src/mongo/db/s/SConscript +++ b/src/mongo/db/s/SConscript @@ -301,6 +301,7 @@ env.Library( LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/bson/util/bson_extract', + '$BUILD_DIR/mongo/client/fetcher', '$BUILD_DIR/mongo/db/audit', '$BUILD_DIR/mongo/db/catalog/collection_options', '$BUILD_DIR/mongo/db/catalog_raii', diff --git a/src/mongo/db/s/add_shard_cmd.idl b/src/mongo/db/s/add_shard_cmd.idl index 4955d8e57a5..79e837de884 100644 --- a/src/mongo/db/s/add_shard_cmd.idl +++ b/src/mongo/db/s/add_shard_cmd.idl @@ -31,7 +31,7 @@ global: - "mongo/client/connection_string.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: ShardIdentity: diff --git a/src/mongo/db/s/analyze_shard_key_cmd.idl b/src/mongo/db/s/analyze_shard_key_cmd.idl index aa6e33107eb..f15fcb7e78c 100644 --- a/src/mongo/db/s/analyze_shard_key_cmd.idl +++ b/src/mongo/db/s/analyze_shard_key_cmd.idl @@ -31,7 +31,7 @@ global: imports: - "mongo/db/keypattern.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: analyzeShardKeyResponse: diff --git a/src/mongo/db/s/analyze_shard_key_feature_flag.idl b/src/mongo/db/s/analyze_shard_key_feature_flag.idl index fde43803843..96433110210 100644 --- a/src/mongo/db/s/analyze_shard_key_feature_flag.idl +++ b/src/mongo/db/s/analyze_shard_key_feature_flag.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo::analyze_shard_key" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" feature_flags: featureFlagAnalyzeShardKey: diff --git a/src/mongo/db/s/collection_critical_section_document.idl b/src/mongo/db/s/collection_critical_section_document.idl index 6a130a9c17b..f05055dbc36 100644 --- a/src/mongo/db/s/collection_critical_section_document.idl +++ b/src/mongo/db/s/collection_critical_section_document.idl @@ -35,7 +35,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: collectionCriticalSectionDocument: diff --git a/src/mongo/db/s/collmod_coordinator_document.idl b/src/mongo/db/s/collmod_coordinator_document.idl index 8d0ed2a1db5..06fb23aa9c1 100644 --- a/src/mongo/db/s/collmod_coordinator_document.idl +++ b/src/mongo/db/s/collmod_coordinator_document.idl @@ -35,7 +35,7 @@ global: - "mongo/s/catalog/type_collection.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/coll_mod.idl" - "mongo/db/s/sharding_ddl_coordinator.idl" - "mongo/s/sharding_types.idl" diff --git a/src/mongo/db/s/commit_chunk_migration.idl b/src/mongo/db/s/commit_chunk_migration.idl index e275e0c28bb..1e5f80aa814 100644 --- a/src/mongo/db/s/commit_chunk_migration.idl +++ b/src/mongo/db/s/commit_chunk_migration.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/sharding_types.idl" - "mongo/s/chunk_version.idl" diff --git a/src/mongo/db/s/compact_structured_encryption_data_coordinator.idl b/src/mongo/db/s/compact_structured_encryption_data_coordinator.idl index 5a725d3ec82..2c634226b2b 100644 --- a/src/mongo/db/s/compact_structured_encryption_data_coordinator.idl +++ b/src/mongo/db/s/compact_structured_encryption_data_coordinator.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/commands/fle2_compact.idl" - "mongo/db/s/sharding_ddl_coordinator.idl" diff --git a/src/mongo/db/s/config/configsvr_coordinator.idl b/src/mongo/db/s/config/configsvr_coordinator.idl index 8727d749058..647fd8f7ad4 100644 --- a/src/mongo/db/s/config/configsvr_coordinator.idl +++ b/src/mongo/db/s/config/configsvr_coordinator.idl @@ -32,7 +32,7 @@ global: imports: - "mongo/db/session/logical_session_id.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" enums: ConfigsvrCoordinatorType: diff --git a/src/mongo/db/s/config/set_cluster_parameter_coordinator_document.idl b/src/mongo/db/s/config/set_cluster_parameter_coordinator_document.idl index ebffbc826a1..f8c7d7878bf 100644 --- a/src/mongo/db/s/config/set_cluster_parameter_coordinator_document.idl +++ b/src/mongo/db/s/config/set_cluster_parameter_coordinator_document.idl @@ -32,7 +32,7 @@ global: imports: - "mongo/db/s/config/configsvr_coordinator.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/request_types/sharded_ddl_commands.idl" enums: diff --git a/src/mongo/db/s/config/set_user_write_block_mode_coordinator_document.idl b/src/mongo/db/s/config/set_user_write_block_mode_coordinator_document.idl index 654624d03f1..32486e183dc 100644 --- a/src/mongo/db/s/config/set_user_write_block_mode_coordinator_document.idl +++ b/src/mongo/db/s/config/set_user_write_block_mode_coordinator_document.idl @@ -32,7 +32,7 @@ global: imports: - "mongo/db/s/config/configsvr_coordinator.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/request_types/sharded_ddl_commands.idl" enums: diff --git a/src/mongo/db/s/configure_query_analyzer_cmd.idl b/src/mongo/db/s/configure_query_analyzer_cmd.idl index 5a55989e022..c0564c23d01 100644 --- a/src/mongo/db/s/configure_query_analyzer_cmd.idl +++ b/src/mongo/db/s/configure_query_analyzer_cmd.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" enums: QueryAnalyzerMode: diff --git a/src/mongo/db/s/create_collection_coordinator_document.idl b/src/mongo/db/s/create_collection_coordinator_document.idl index 0e026e8c0d4..8e8cbe80c07 100644 --- a/src/mongo/db/s/create_collection_coordinator_document.idl +++ b/src/mongo/db/s/create_collection_coordinator_document.idl @@ -33,7 +33,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/s/sharding_ddl_coordinator.idl" - "mongo/s/request_types/sharded_ddl_commands.idl" diff --git a/src/mongo/db/s/drop_collection_coordinator_document.idl b/src/mongo/db/s/drop_collection_coordinator_document.idl index 250ec237455..a0388729cac 100644 --- a/src/mongo/db/s/drop_collection_coordinator_document.idl +++ b/src/mongo/db/s/drop_collection_coordinator_document.idl @@ -35,7 +35,7 @@ global: - "mongo/s/catalog/type_collection.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/s/sharding_ddl_coordinator.idl" enums: diff --git a/src/mongo/db/s/drop_database_coordinator_document.idl b/src/mongo/db/s/drop_database_coordinator_document.idl index f7f6bb7d11f..5efdaf37fc7 100644 --- a/src/mongo/db/s/drop_database_coordinator_document.idl +++ b/src/mongo/db/s/drop_database_coordinator_document.idl @@ -34,7 +34,7 @@ global: - "mongo/s/catalog/type_collection.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/s/sharding_ddl_coordinator.idl" enums: diff --git a/src/mongo/db/s/forwardable_operation_metadata.idl b/src/mongo/db/s/forwardable_operation_metadata.idl index 68c8c74042c..e914f051ee9 100644 --- a/src/mongo/db/s/forwardable_operation_metadata.idl +++ b/src/mongo/db/s/forwardable_operation_metadata.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/rpc/metadata/impersonated_user_metadata.idl" structs: diff --git a/src/mongo/db/s/global_index/global_index_entry.idl b/src/mongo/db/s/global_index/global_index_entry.idl index 4c09dbad7b2..0334c46577b 100644 --- a/src/mongo/db/s/global_index/global_index_entry.idl +++ b/src/mongo/db/s/global_index/global_index_entry.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo::global_index" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: GlobalIndexEntry: diff --git a/src/mongo/db/s/migration_coordinator_document.idl b/src/mongo/db/s/migration_coordinator_document.idl index af557b55e71..801758ef3b6 100644 --- a/src/mongo/db/s/migration_coordinator_document.idl +++ b/src/mongo/db/s/migration_coordinator_document.idl @@ -35,7 +35,7 @@ global: - "mongo/db/s/migration_session_id.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/sharding_types.idl" - "mongo/s/chunk_range.idl" - "mongo/s/chunk_version.idl" diff --git a/src/mongo/db/s/migration_recipient_recovery_document.idl b/src/mongo/db/s/migration_recipient_recovery_document.idl index 6a4a000c947..3c024abe7d3 100644 --- a/src/mongo/db/s/migration_recipient_recovery_document.idl +++ b/src/mongo/db/s/migration_recipient_recovery_document.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/s/migration_coordinator_document.idl" structs: diff --git a/src/mongo/db/s/move_primary_coordinator_document.idl b/src/mongo/db/s/move_primary_coordinator_document.idl index 32c84091220..50940a651bc 100644 --- a/src/mongo/db/s/move_primary_coordinator_document.idl +++ b/src/mongo/db/s/move_primary_coordinator_document.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/sharding_types.idl" - "mongo/db/s/sharding_ddl_coordinator.idl" diff --git a/src/mongo/db/s/participant_block.idl b/src/mongo/db/s/participant_block.idl index 899f6f8b5e9..a2473c8700e 100644 --- a/src/mongo/db/s/participant_block.idl +++ b/src/mongo/db/s/participant_block.idl @@ -29,7 +29,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" enums: CriticalSectionBlockType: diff --git a/src/mongo/db/s/range_deletion_task.idl b/src/mongo/db/s/range_deletion_task.idl index 9e6e0da71b5..f33b2b24463 100644 --- a/src/mongo/db/s/range_deletion_task.idl +++ b/src/mongo/db/s/range_deletion_task.idl @@ -33,7 +33,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/sharding_types.idl" - "mongo/db/session/logical_session_id.idl" - "mongo/s/chunk_range.idl" diff --git a/src/mongo/db/s/refine_collection_shard_key_coordinator_document.idl b/src/mongo/db/s/refine_collection_shard_key_coordinator_document.idl index 073d99e83af..6644c9675bf 100644 --- a/src/mongo/db/s/refine_collection_shard_key_coordinator_document.idl +++ b/src/mongo/db/s/refine_collection_shard_key_coordinator_document.idl @@ -33,7 +33,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/s/sharding_ddl_coordinator.idl" - "mongo/s/request_types/sharded_ddl_commands.idl" diff --git a/src/mongo/db/s/remove_chunks.idl b/src/mongo/db/s/remove_chunks.idl index a997b8c282e..ff35c8d26f7 100644 --- a/src/mongo/db/s/remove_chunks.idl +++ b/src/mongo/db/s/remove_chunks.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: _configsvrRemoveChunks: diff --git a/src/mongo/db/s/remove_tags.idl b/src/mongo/db/s/remove_tags.idl index c0d91aae56c..0821fc96b89 100644 --- a/src/mongo/db/s/remove_tags.idl +++ b/src/mongo/db/s/remove_tags.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: _configsvrRemoveTags: diff --git a/src/mongo/db/s/reshard_collection_coordinator_document.idl b/src/mongo/db/s/reshard_collection_coordinator_document.idl index e3d9134a8ac..eee053adb73 100644 --- a/src/mongo/db/s/reshard_collection_coordinator_document.idl +++ b/src/mongo/db/s/reshard_collection_coordinator_document.idl @@ -34,7 +34,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/s/sharding_ddl_coordinator.idl" - "mongo/s/request_types/sharded_ddl_commands.idl" diff --git a/src/mongo/db/s/resharding/donor_oplog_id.idl b/src/mongo/db/s/resharding/donor_oplog_id.idl index 0c4fdeecc7f..f8cac595622 100644 --- a/src/mongo/db/s/resharding/donor_oplog_id.idl +++ b/src/mongo/db/s/resharding/donor_oplog_id.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: ReshardingDonorOplogId: diff --git a/src/mongo/db/s/resharding/resharding_change_event_o2_field.idl b/src/mongo/db/s/resharding/resharding_change_event_o2_field.idl index 7b6088669d2..697b3dd1176 100644 --- a/src/mongo/db/s/resharding/resharding_change_event_o2_field.idl +++ b/src/mongo/db/s/resharding/resharding_change_event_o2_field.idl @@ -35,7 +35,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: ReshardBeginChangeEventO2Field: diff --git a/src/mongo/db/s/resharding/resharding_oplog_applier_progress.idl b/src/mongo/db/s/resharding/resharding_oplog_applier_progress.idl index cb1b38a59e4..f48492d624b 100644 --- a/src/mongo/db/s/resharding/resharding_oplog_applier_progress.idl +++ b/src/mongo/db/s/resharding/resharding_oplog_applier_progress.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/s/resharding/donor_oplog_id.idl" - "mongo/s/resharding/common_types.idl" - "mongo/s/sharding_types.idl" diff --git a/src/mongo/db/s/resharding/resharding_recipient_service.cpp b/src/mongo/db/s/resharding/resharding_recipient_service.cpp index 6cf951313cd..5e096b1e7f2 100644 --- a/src/mongo/db/s/resharding/resharding_recipient_service.cpp +++ b/src/mongo/db/s/resharding/resharding_recipient_service.cpp @@ -27,7 +27,6 @@ * it in the license file. */ - #include "mongo/db/s/resharding/resharding_recipient_service.h" #include <algorithm> @@ -40,7 +39,6 @@ #include "mongo/db/dbhelpers.h" #include "mongo/db/ops/delete.h" #include "mongo/db/persistent_task_store.h" -#include "mongo/db/query/collation/collation_spec.h" #include "mongo/db/repl/change_stream_oplog_notification.h" #include "mongo/db/repl/oplog_applier.h" #include "mongo/db/repl/read_concern_args.h" @@ -70,7 +68,6 @@ #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kResharding - namespace mongo { MONGO_FAIL_POINT_DEFINE(removeRecipientDocFailpoint); diff --git a/src/mongo/db/s/resharding/resharding_server_parameters.idl b/src/mongo/db/s/resharding/resharding_server_parameters.idl index daaedfc9ea4..ea5703cf34d 100644 --- a/src/mongo/db/s/resharding/resharding_server_parameters.idl +++ b/src/mongo/db/s/resharding/resharding_server_parameters.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo::resharding" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" server_parameters: reshardingCoordinatorServiceMaxThreadCount: diff --git a/src/mongo/db/s/resharding/resharding_txn_cloner_progress.idl b/src/mongo/db/s/resharding/resharding_txn_cloner_progress.idl index d9a7604c283..b57c197b516 100644 --- a/src/mongo/db/s/resharding/resharding_txn_cloner_progress.idl +++ b/src/mongo/db/s/resharding/resharding_txn_cloner_progress.idl @@ -34,7 +34,7 @@ global: imports: - "mongo/db/session/logical_session_id.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/resharding/common_types.idl" - "mongo/s/sharding_types.idl" diff --git a/src/mongo/db/s/resharding_test_commands.idl b/src/mongo/db/s/resharding_test_commands.idl index c9aa618dada..b11d132455c 100644 --- a/src/mongo/db/s/resharding_test_commands.idl +++ b/src/mongo/db/s/resharding_test_commands.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/sharding_types.idl" commands: diff --git a/src/mongo/db/s/set_allow_migrations_coordinator_document.idl b/src/mongo/db/s/set_allow_migrations_coordinator_document.idl index a248c8763a2..e45b3885e1d 100644 --- a/src/mongo/db/s/set_allow_migrations_coordinator_document.idl +++ b/src/mongo/db/s/set_allow_migrations_coordinator_document.idl @@ -33,7 +33,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/s/sharding_ddl_coordinator.idl" - "mongo/s/request_types/sharded_ddl_commands.idl" diff --git a/src/mongo/db/s/sharded_collmod.idl b/src/mongo/db/s/sharded_collmod.idl index 2fdb76ed30c..998db7303c8 100644 --- a/src/mongo/db/s/sharded_collmod.idl +++ b/src/mongo/db/s/sharded_collmod.idl @@ -30,7 +30,7 @@ global: imports: - "mongo/db/coll_mod.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: _configsvrCollMod: diff --git a/src/mongo/db/s/sharded_index_catalog_commands.idl b/src/mongo/db/s/sharded_index_catalog_commands.idl index 1010d2e6588..b52232d0c4c 100644 --- a/src/mongo/db/s/sharded_index_catalog_commands.idl +++ b/src/mongo/db/s/sharded_index_catalog_commands.idl @@ -49,7 +49,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/sharding_types.idl" - "mongo/s/catalog/type_index_catalog.idl" diff --git a/src/mongo/db/s/sharded_rename_collection.idl b/src/mongo/db/s/sharded_rename_collection.idl index 0d972dc6f64..5d0ef913d3c 100644 --- a/src/mongo/db/s/sharded_rename_collection.idl +++ b/src/mongo/db/s/sharded_rename_collection.idl @@ -35,7 +35,7 @@ global: - "mongo/s/catalog/type_collection.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/s/sharding_ddl_coordinator.idl" - "mongo/s/request_types/sharded_ddl_commands.idl" diff --git a/src/mongo/db/s/sharding_ddl_coordinator.idl b/src/mongo/db/s/sharding_ddl_coordinator.idl index 051ee6405c4..e38a0f63334 100644 --- a/src/mongo/db/s/sharding_ddl_coordinator.idl +++ b/src/mongo/db/s/sharding_ddl_coordinator.idl @@ -35,7 +35,7 @@ global: - "mongo/s/database_version.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/session/logical_session_id.idl" enums: diff --git a/src/mongo/db/s/transaction_coordinator_document.idl b/src/mongo/db/s/transaction_coordinator_document.idl index b979de97c79..b3cbca27870 100644 --- a/src/mongo/db/s/transaction_coordinator_document.idl +++ b/src/mongo/db/s/transaction_coordinator_document.idl @@ -32,7 +32,7 @@ global: - "mongo/db/s/transaction_coordinator_structures.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/session/logical_session_id.idl" - "mongo/s/sharding_types.idl" diff --git a/src/mongo/db/s/transaction_coordinators_stats.idl b/src/mongo/db/s/transaction_coordinators_stats.idl index 37dc681d71e..5be9cc0b605 100644 --- a/src/mongo/db/s/transaction_coordinators_stats.idl +++ b/src/mongo/db/s/transaction_coordinators_stats.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: diff --git a/src/mongo/db/s/type_shard_collection.idl b/src/mongo/db/s/type_shard_collection.idl index cd4b22cc5e9..1b55e8ac911 100644 --- a/src/mongo/db/s/type_shard_collection.idl +++ b/src/mongo/db/s/type_shard_collection.idl @@ -74,7 +74,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/keypattern.idl" - "mongo/s/chunk_version.idl" - "mongo/s/resharding/type_collection_fields.idl" diff --git a/src/mongo/db/s/type_shard_database.idl b/src/mongo/db/s/type_shard_database.idl index 823563e7ecc..f16680f85f9 100644 --- a/src/mongo/db/s/type_shard_database.idl +++ b/src/mongo/db/s/type_shard_database.idl @@ -32,7 +32,7 @@ global: - "mongo/s/catalog/types_validators.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/sharding_types.idl" structs: diff --git a/src/mongo/db/s/user_writes_critical_section_document.idl b/src/mongo/db/s/user_writes_critical_section_document.idl index 10b642c5964..e0559ac9b86 100644 --- a/src/mongo/db/s/user_writes_critical_section_document.idl +++ b/src/mongo/db/s/user_writes_critical_section_document.idl @@ -34,7 +34,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: userWriteBlockingCriticalSectionDocument: diff --git a/src/mongo/db/serverless/SConscript b/src/mongo/db/serverless/SConscript index 1111a1e912b..9155a721bf6 100644 --- a/src/mongo/db/serverless/SConscript +++ b/src/mongo/db/serverless/SConscript @@ -9,9 +9,7 @@ env.Library( 'serverless_types.idl', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/idl/basic_types', - '$BUILD_DIR/mongo/idl/idl_parser', + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -21,10 +19,9 @@ env.Library( 'shard_split_state_machine.idl', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/client/connection_string', '$BUILD_DIR/mongo/db/repl/tenant_migration_utils', - '$BUILD_DIR/mongo/idl/idl_parser', + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -35,13 +32,12 @@ env.Library( 'shard_split_commands.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/client/connection_string', '$BUILD_DIR/mongo/client/replica_set_monitor_server_parameters', '$BUILD_DIR/mongo/db/auth/auth', '$BUILD_DIR/mongo/db/global_settings', '$BUILD_DIR/mongo/db/repl/tenant_migration_utils', - '$BUILD_DIR/mongo/idl/idl_parser', + '$BUILD_DIR/mongo/db/server_base', 'shard_split_donor_service', ], ) diff --git a/src/mongo/db/serverless/serverless_types.idl b/src/mongo/db/serverless/serverless_types.idl index e906e7a52c3..f67af9c24d2 100644 --- a/src/mongo/db/serverless/serverless_types.idl +++ b/src/mongo/db/serverless/serverless_types.idl @@ -29,7 +29,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" enums: MigrationProtocol: diff --git a/src/mongo/db/serverless/shard_split_commands.idl b/src/mongo/db/serverless/shard_split_commands.idl index d3b042f408c..3856f9a3ddc 100644 --- a/src/mongo/db/serverless/shard_split_commands.idl +++ b/src/mongo/db/serverless/shard_split_commands.idl @@ -33,7 +33,7 @@ global: imports: - "mongo/db/serverless/shard_split_state_machine.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: CommitShardSplitResponse: diff --git a/src/mongo/db/serverless/shard_split_state_machine.idl b/src/mongo/db/serverless/shard_split_state_machine.idl index 49fa577b252..d9a54dd19a3 100644 --- a/src/mongo/db/serverless/shard_split_state_machine.idl +++ b/src/mongo/db/serverless/shard_split_state_machine.idl @@ -32,7 +32,7 @@ global: imports: - "mongo/db/repl/replication_types.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" enums: ShardSplitDonorState: diff --git a/src/mongo/db/session/kill_sessions.idl b/src/mongo/db/session/kill_sessions.idl index 6081f8b0cef..3e69cbecf29 100644 --- a/src/mongo/db/session/kill_sessions.idl +++ b/src/mongo/db/session/kill_sessions.idl @@ -34,7 +34,7 @@ global: imports: - "mongo/crypto/sha256_block.idl" - "mongo/db/session/logical_session_id.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: diff --git a/src/mongo/db/session/logical_session_cache_stats.idl b/src/mongo/db/session/logical_session_cache_stats.idl index b0adff82caa..536e869bfee 100644 --- a/src/mongo/db/session/logical_session_cache_stats.idl +++ b/src/mongo/db/session/logical_session_cache_stats.idl @@ -34,7 +34,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: diff --git a/src/mongo/db/session/logical_session_id.idl b/src/mongo/db/session/logical_session_id.idl index f93e8d6db1d..eb875e0e2a4 100644 --- a/src/mongo/db/session/logical_session_id.idl +++ b/src/mongo/db/session/logical_session_id.idl @@ -36,7 +36,7 @@ global: - "mongo/util/uuid.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/crypto/sha256_block.idl" types: diff --git a/src/mongo/db/session/session_txn_record.idl b/src/mongo/db/session/session_txn_record.idl index 8bf014a16b7..3eaef34b007 100644 --- a/src/mongo/db/session/session_txn_record.idl +++ b/src/mongo/db/session/session_txn_record.idl @@ -35,7 +35,7 @@ global: - "mongo/db/repl/optime.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/session/logical_session_id.idl" - "mongo/db/repl/replication_types.idl" diff --git a/src/mongo/db/set_change_stream_state_coordinator.idl b/src/mongo/db/set_change_stream_state_coordinator.idl index 0a43f78e264..514846f171a 100644 --- a/src/mongo/db/set_change_stream_state_coordinator.idl +++ b/src/mongo/db/set_change_stream_state_coordinator.idl @@ -32,7 +32,7 @@ global: imports: - "mongo/db/session/logical_session_id.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: SetChangeStreamStateCoordinatorId: diff --git a/src/mongo/db/snapshot_window_options.idl b/src/mongo/db/snapshot_window_options.idl index 33943e4a4f1..8f535a55630 100644 --- a/src/mongo/db/snapshot_window_options.idl +++ b/src/mongo/db/snapshot_window_options.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" server_parameters: minSnapshotHistoryWindowInSeconds: diff --git a/src/mongo/db/sorter/sorter.idl b/src/mongo/db/sorter/sorter.idl index e17ddb8703b..c7f7c1c45ef 100644 --- a/src/mongo/db/sorter/sorter.idl +++ b/src/mongo/db/sorter/sorter.idl @@ -2,7 +2,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: SorterRange: diff --git a/src/mongo/db/startup_recovery.cpp b/src/mongo/db/startup_recovery.cpp index f9ab1c1052d..72b5db2ebf6 100644 --- a/src/mongo/db/startup_recovery.cpp +++ b/src/mongo/db/startup_recovery.cpp @@ -37,7 +37,6 @@ #include "mongo/db/commands/feature_compatibility_version.h" #include "mongo/db/commands/feature_compatibility_version_document_gen.h" #include "mongo/db/commands/feature_compatibility_version_documentation.h" -#include "mongo/db/commands/feature_compatibility_version_parser.h" #include "mongo/db/concurrency/exception_util.h" #include "mongo/db/database_name.h" #include "mongo/db/db_raii.h" diff --git a/src/mongo/db/stats/read_concern_stats.idl b/src/mongo/db/stats/read_concern_stats.idl index d3d4f89f61c..347b58f2b8d 100644 --- a/src/mongo/db/stats/read_concern_stats.idl +++ b/src/mongo/db/stats/read_concern_stats.idl @@ -34,7 +34,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: diff --git a/src/mongo/db/storage/wiredtiger/SConscript b/src/mongo/db/storage/wiredtiger/SConscript index 7e21b13c355..bf20bf0112b 100644 --- a/src/mongo/db/storage/wiredtiger/SConscript +++ b/src/mongo/db/storage/wiredtiger/SConscript @@ -192,7 +192,7 @@ wtEnv.Library( 'oplog_stone_parameters.idl', ], LIBDEPS=[ - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/server_base', ], ) diff --git a/src/mongo/db/timeseries/timeseries.idl b/src/mongo/db/timeseries/timeseries.idl index a21a6dc74a1..83e89ae580c 100644 --- a/src/mongo/db/timeseries/timeseries.idl +++ b/src/mongo/db/timeseries/timeseries.idl @@ -31,7 +31,7 @@ global: - "mongo/db/timeseries/timeseries_global_options.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" server_parameters: "timeseriesBucketMaxCount": diff --git a/src/mongo/db/traffic_recorder.idl b/src/mongo/db/traffic_recorder.idl index ed6a141fe3e..e5e51c63a11 100644 --- a/src/mongo/db/traffic_recorder.idl +++ b/src/mongo/db/traffic_recorder.idl @@ -34,7 +34,7 @@ global: cpp_includes: "mongo/db/traffic_recorder_validators.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: diff --git a/src/mongo/db/transaction/SConscript b/src/mongo/db/transaction/SConscript index 8a9ed044aa1..12515912ade 100644 --- a/src/mongo/db/transaction/SConscript +++ b/src/mongo/db/transaction/SConscript @@ -43,13 +43,12 @@ env.Library( '$BUILD_DIR/mongo/db/repl/apply_ops_command_info', '$BUILD_DIR/mongo/db/repl/repl_server_parameters', '$BUILD_DIR/mongo/db/repl/replica_set_aware_service', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/session/session_catalog', '$BUILD_DIR/mongo/db/stats/fill_locker_info', '$BUILD_DIR/mongo/db/stats/top', '$BUILD_DIR/mongo/db/stats/transaction_stats', '$BUILD_DIR/mongo/db/update/update_driver', - '$BUILD_DIR/mongo/idl/idl_parser', - '$BUILD_DIR/mongo/idl/server_parameter', '$BUILD_DIR/mongo/s/sharding_router_api', '$BUILD_DIR/mongo/util/concurrency/thread_pool', ], diff --git a/src/mongo/db/transaction/transactions_stats.idl b/src/mongo/db/transaction/transactions_stats.idl index eb55df77a74..a8f50ffe143 100644 --- a/src/mongo/db/transaction/transactions_stats.idl +++ b/src/mongo/db/transaction/transactions_stats.idl @@ -34,7 +34,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/repl/replication_types.idl" structs: diff --git a/src/mongo/db/vector_clock_document.idl b/src/mongo/db/vector_clock_document.idl index 1db0f4c35e4..ebf5f450966 100644 --- a/src/mongo/db/vector_clock_document.idl +++ b/src/mongo/db/vector_clock_document.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: vectorClockDocument: diff --git a/src/mongo/db/write_concern_options.idl b/src/mongo/db/write_concern_options.idl index 538fe368dad..0269a3869d8 100644 --- a/src/mongo/db/write_concern_options.idl +++ b/src/mongo/db/write_concern_options.idl @@ -32,7 +32,7 @@ global: imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/read_write_concern_provenance_base.idl" types: diff --git a/src/mongo/executor/SConscript b/src/mongo/executor/SConscript index 32ba11beaa6..7aaf62c33a4 100644 --- a/src/mongo/executor/SConscript +++ b/src/mongo/executor/SConscript @@ -273,10 +273,10 @@ env.Library( target='task_executor_pool', source=[ 'task_executor_pool.cpp', - "task_executor_pool_parameters.idl", + 'task_executor_pool_parameters.idl', ], LIBDEPS=[ - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/util/processinfo', 'task_executor_interface', ], diff --git a/src/mongo/idl/SConscript b/src/mongo/idl/SConscript index 6ecab766123..31fd80eea00 100644 --- a/src/mongo/idl/SConscript +++ b/src/mongo/idl/SConscript @@ -17,17 +17,6 @@ env.Library( ) env.Library( - target='basic_types', - source=[ - 'basic_types.idl', - ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - 'idl_parser', - ], -) - -env.Library( target='server_parameter', source=[ 'server_parameter.cpp', @@ -183,7 +172,6 @@ env.CppUnitTest( '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/util/cmdline_utils/cmdline_utils', '$BUILD_DIR/mongo/util/options_parser/options_parser', - 'basic_types', 'cluster_server_parameter', 'feature_flag', 'server_parameter', diff --git a/src/mongo/idl/cluster_server_parameter.idl b/src/mongo/idl/cluster_server_parameter.idl index ff695a437f9..7c8485e9374 100644 --- a/src/mongo/idl/cluster_server_parameter.idl +++ b/src/mongo/idl/cluster_server_parameter.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: ClusterServerParameter: diff --git a/src/mongo/idl/cluster_server_parameter_refresher.idl b/src/mongo/idl/cluster_server_parameter_refresher.idl index 6609b83f544..38343cc33bd 100644 --- a/src/mongo/idl/cluster_server_parameter_refresher.idl +++ b/src/mongo/idl/cluster_server_parameter_refresher.idl @@ -31,7 +31,7 @@ global: - "mongo/idl/cluster_server_parameter_refresher.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" server_parameters: clusterServerParameterRefreshIntervalSecs: diff --git a/src/mongo/idl/cluster_server_parameter_test.idl b/src/mongo/idl/cluster_server_parameter_test.idl index 9b19cfc03bd..c92ea485d5b 100644 --- a/src/mongo/idl/cluster_server_parameter_test.idl +++ b/src/mongo/idl/cluster_server_parameter_test.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/idl/cluster_server_parameter.idl" structs: diff --git a/src/mongo/idl/feature_flag.cpp b/src/mongo/idl/feature_flag.cpp index 8b2c72b8711..9bd50864e9e 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/db/commands/feature_compatibility_version_parser.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 eb415800d2b..4c71407ad62 100644 --- a/src/mongo/idl/feature_flag.h +++ b/src/mongo/idl/feature_flag.h @@ -29,7 +29,6 @@ #pragma once -#include <stdexcept> #include <string> #include "mongo/db/commands/feature_compatibility_version_parser.h" diff --git a/src/mongo/idl/server_parameter.idl b/src/mongo/idl/server_parameter.idl index 2fb39ad0815..999da3747ab 100644 --- a/src/mongo/idl/server_parameter.idl +++ b/src/mongo/idl/server_parameter.idl @@ -31,7 +31,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" # Options for the getParameter command. Describes the object "options" when the command is run as # {getParameter: <options>} diff --git a/src/mongo/idl/server_parameter_with_storage_test.idl b/src/mongo/idl/server_parameter_with_storage_test.idl index 19238b07704..c34eb3a8c21 100644 --- a/src/mongo/idl/server_parameter_with_storage_test.idl +++ b/src/mongo/idl/server_parameter_with_storage_test.idl @@ -32,7 +32,7 @@ global: - "mongo/idl/server_parameter_with_storage_test.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/idl/server_parameter_with_storage_test_structs.idl" server_parameters: diff --git a/src/mongo/idl/server_parameter_with_storage_test_structs.idl b/src/mongo/idl/server_parameter_with_storage_test_structs.idl index 84118d40794..85109a4b9b9 100644 --- a/src/mongo/idl/server_parameter_with_storage_test_structs.idl +++ b/src/mongo/idl/server_parameter_with_storage_test_structs.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo::test" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/idl/cluster_server_parameter.idl" structs: diff --git a/src/mongo/idl/unittest.idl b/src/mongo/idl/unittest.idl index 0b06c0ad5a2..3fe6bac9bcf 100644 --- a/src/mongo/idl/unittest.idl +++ b/src/mongo/idl/unittest.idl @@ -35,7 +35,7 @@ global: - "mongo/idl/idl_test.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/idl/unittest_import.idl" - "mongo/db/auth/access_checks.idl" - "mongo/db/auth/action_type.idl" diff --git a/src/mongo/idl/unittest_import.idl b/src/mongo/idl/unittest_import.idl index e9773e0629b..790db64ff3a 100644 --- a/src/mongo/idl/unittest_import.idl +++ b/src/mongo/idl/unittest_import.idl @@ -31,7 +31,7 @@ global: cpp_namespace: "mongo::idl::import" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" ################################################################################################## diff --git a/src/mongo/logv2/SConscript b/src/mongo/logv2/SConscript index cf0725deb9e..af44c667c3d 100644 --- a/src/mongo/logv2/SConscript +++ b/src/mongo/logv2/SConscript @@ -34,7 +34,6 @@ env.Library( 'logv2_options.idl', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/server_base', ], ) diff --git a/src/mongo/logv2/logv2_options.idl b/src/mongo/logv2/logv2_options.idl index f385e0c5f07..70e5929b222 100644 --- a/src/mongo/logv2/logv2_options.idl +++ b/src/mongo/logv2/logv2_options.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" server_parameters: redactEncryptedFields: diff --git a/src/mongo/rpc/SConscript b/src/mongo/rpc/SConscript index 7747508771b..4d88e49c8b0 100644 --- a/src/mongo/rpc/SConscript +++ b/src/mongo/rpc/SConscript @@ -16,10 +16,9 @@ env.Library( 'write_concern_error.idl', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/bson/util/bson_extract', '$BUILD_DIR/mongo/db/common', - '$BUILD_DIR/mongo/idl/basic_types', + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -62,18 +61,16 @@ env.Library( 'reply_builder_interface.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/dbmessage', '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/stats/counters', - '$BUILD_DIR/mongo/idl/basic_types', '$BUILD_DIR/mongo/s/common_s', '$BUILD_DIR/mongo/util/net/network', 'message', 'metadata', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/server_base', 'rewrite_state_change_errors', ], ) diff --git a/src/mongo/rpc/metadata/client_metadata.idl b/src/mongo/rpc/metadata/client_metadata.idl index d1726153d98..06e99859dda 100644 --- a/src/mongo/rpc/metadata/client_metadata.idl +++ b/src/mongo/rpc/metadata/client_metadata.idl @@ -32,7 +32,7 @@ global: - "mongo/rpc/metadata/client_metadata.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" types: ClientMetadata: diff --git a/src/mongo/rpc/metadata/impersonated_user_metadata.idl b/src/mongo/rpc/metadata/impersonated_user_metadata.idl index 7fb247d7da8..bbd969eeb3e 100644 --- a/src/mongo/rpc/metadata/impersonated_user_metadata.idl +++ b/src/mongo/rpc/metadata/impersonated_user_metadata.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo::rpc" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/auth/auth_types.idl" structs: diff --git a/src/mongo/rpc/reply_builder_interface.cpp b/src/mongo/rpc/reply_builder_interface.cpp index e2c3a9e579f..ac4e3626ec2 100644 --- a/src/mongo/rpc/reply_builder_interface.cpp +++ b/src/mongo/rpc/reply_builder_interface.cpp @@ -27,16 +27,14 @@ * it in the license file. */ -#include "mongo/platform/basic.h" - #include "mongo/rpc/reply_builder_interface.h" #include <utility> #include "mongo/base/status_with.h" +#include "mongo/db/basic_types_gen.h" #include "mongo/db/commands/test_commands_enabled.h" #include "mongo/db/jsobj.h" -#include "mongo/idl/basic_types_gen.h" namespace mongo { namespace rpc { diff --git a/src/mongo/rpc/topology_version.idl b/src/mongo/rpc/topology_version.idl index 48583bf4cf5..a245c46c76b 100644 --- a/src/mongo/rpc/topology_version.idl +++ b/src/mongo/rpc/topology_version.idl @@ -31,7 +31,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: TopologyVersion: diff --git a/src/mongo/rpc/write_concern_error.idl b/src/mongo/rpc/write_concern_error.idl index 4ab1f6cc6e0..34a54b4ffb5 100644 --- a/src/mongo/rpc/write_concern_error.idl +++ b/src/mongo/rpc/write_concern_error.idl @@ -31,7 +31,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: WriteConcernError: diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript index 28f2622ad0b..764c42e65f6 100644 --- a/src/mongo/s/SConscript +++ b/src/mongo/s/SConscript @@ -444,6 +444,7 @@ env.Library( '$BUILD_DIR/mongo/db/startup_warnings_common', '$BUILD_DIR/mongo/db/stats/counters', '$BUILD_DIR/mongo/db/windows_options' if env.TargetOSIs('windows') else [], + '$BUILD_DIR/mongo/executor/hedging_metrics', '$BUILD_DIR/mongo/transport/message_compressor_options_server', '$BUILD_DIR/mongo/transport/service_entry_point', '$BUILD_DIR/mongo/transport/transport_layer_manager', diff --git a/src/mongo/s/catalog/SConscript b/src/mongo/s/catalog/SConscript index 231c0a87acc..9b0c738b8ea 100644 --- a/src/mongo/s/catalog/SConscript +++ b/src/mongo/s/catalog/SConscript @@ -11,6 +11,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/keys_collection_document', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/write_concern_options', ], ) diff --git a/src/mongo/s/catalog/type_chunk_base.idl b/src/mongo/s/catalog/type_chunk_base.idl index 96ce90f3d19..45eab2e7b48 100644 --- a/src/mongo/s/catalog/type_chunk_base.idl +++ b/src/mongo/s/catalog/type_chunk_base.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/sharding_types.idl" structs: diff --git a/src/mongo/s/catalog/type_collection.idl b/src/mongo/s/catalog/type_collection.idl index 5e771f71c56..3f44a15a349 100644 --- a/src/mongo/s/catalog/type_collection.idl +++ b/src/mongo/s/catalog/type_collection.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/keypattern.idl" - "mongo/s/chunk_version.idl" - "mongo/s/resharding/type_collection_fields.idl" diff --git a/src/mongo/s/catalog/type_database.idl b/src/mongo/s/catalog/type_database.idl index 9f2fea34ada..f608bb9bc6a 100644 --- a/src/mongo/s/catalog/type_database.idl +++ b/src/mongo/s/catalog/type_database.idl @@ -32,7 +32,7 @@ global: - "mongo/s/catalog/types_validators.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/sharding_types.idl" structs: diff --git a/src/mongo/s/catalog/type_index_catalog.idl b/src/mongo/s/catalog/type_index_catalog.idl index b7f24760a93..9bdf50664c8 100644 --- a/src/mongo/s/catalog/type_index_catalog.idl +++ b/src/mongo/s/catalog/type_index_catalog.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: IndexCatalogType: diff --git a/src/mongo/s/catalog/type_namespace_placement.idl b/src/mongo/s/catalog/type_namespace_placement.idl index e6bcc4fab6f..3e724b9481f 100644 --- a/src/mongo/s/catalog/type_namespace_placement.idl +++ b/src/mongo/s/catalog/type_namespace_placement.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/sharding_types.idl" diff --git a/src/mongo/s/chunk_range.idl b/src/mongo/s/chunk_range.idl index a60701bf952..7dcae324e75 100644 --- a/src/mongo/s/chunk_range.idl +++ b/src/mongo/s/chunk_range.idl @@ -34,7 +34,7 @@ global: - "mongo/s/catalog/type_chunk.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" types: # Note that in order to use this type for a non-optional field, you must add the IDL struct as a diff --git a/src/mongo/s/chunk_version.idl b/src/mongo/s/chunk_version.idl index 1528945ae44..c72cb91cc3a 100644 --- a/src/mongo/s/chunk_version.idl +++ b/src/mongo/s/chunk_version.idl @@ -34,7 +34,7 @@ global: - "mongo/s/chunk_version.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: CollectionGenerationBase: diff --git a/src/mongo/s/client/SConscript b/src/mongo/s/client/SConscript index 2af79aff8a2..9a0a7440f11 100644 --- a/src/mongo/s/client/SConscript +++ b/src/mongo/s/client/SConscript @@ -11,17 +11,15 @@ env.Library( 'shard_remote.cpp', 'shard_remote.idl', ], - LIBDEPS=[ + LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/client/fetcher', '$BUILD_DIR/mongo/db/commands', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/executor/hedging_metrics', '$BUILD_DIR/mongo/executor/task_executor_pool', '$BUILD_DIR/mongo/s/grid', 'shard_interface', ], - LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/idl/server_parameter', - ], ) env.Library( diff --git a/src/mongo/s/commands/cluster_commands.idl b/src/mongo/s/commands/cluster_commands.idl index bc5edc8c7a4..d065a537b94 100644 --- a/src/mongo/s/commands/cluster_commands.idl +++ b/src/mongo/s/commands/cluster_commands.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/sharding_types.idl" server_parameters: diff --git a/src/mongo/s/commands/cluster_index_filter_cmd.cpp b/src/mongo/s/commands/cluster_index_filter_cmd.cpp index 26fecc0ae19..f58433fbf2e 100644 --- a/src/mongo/s/commands/cluster_index_filter_cmd.cpp +++ b/src/mongo/s/commands/cluster_index_filter_cmd.cpp @@ -27,12 +27,9 @@ * it in the license file. */ -#include "mongo/platform/basic.h" - #include "mongo/db/auth/authorization_session.h" #include "mongo/db/client.h" #include "mongo/db/commands.h" -#include "mongo/db/query/collation/collation_spec.h" #include "mongo/rpc/get_status_from_command_result.h" #include "mongo/s/cluster_commands_helpers.h" #include "mongo/s/grid.h" diff --git a/src/mongo/s/commands/cluster_plan_cache_clear_cmd.cpp b/src/mongo/s/commands/cluster_plan_cache_clear_cmd.cpp index cd042d46071..35602bae6d4 100644 --- a/src/mongo/s/commands/cluster_plan_cache_clear_cmd.cpp +++ b/src/mongo/s/commands/cluster_plan_cache_clear_cmd.cpp @@ -32,7 +32,6 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/client.h" #include "mongo/db/commands.h" -#include "mongo/db/query/collation/collation_spec.h" #include "mongo/rpc/get_status_from_command_result.h" #include "mongo/s/cluster_commands_helpers.h" #include "mongo/s/grid.h" @@ -41,10 +40,6 @@ namespace mongo { namespace { -using std::string; -using std::stringstream; -using std::vector; - /** * Mongos implementation of the 'planCacheClear' command. Forwards the command to one node in each * targeted shard. For example, with the default read preference ("primary"), clears plan cache diff --git a/src/mongo/s/commands/refine_collection_shard_key.idl b/src/mongo/s/commands/refine_collection_shard_key.idl index c77a44a1725..8d9a1013438 100644 --- a/src/mongo/s/commands/refine_collection_shard_key.idl +++ b/src/mongo/s/commands/refine_collection_shard_key.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: refineCollectionShardKey: diff --git a/src/mongo/s/commands/shard_collection.idl b/src/mongo/s/commands/shard_collection.idl index 6556d524ba7..cefafadd072 100644 --- a/src/mongo/s/commands/shard_collection.idl +++ b/src/mongo/s/commands/shard_collection.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/timeseries/timeseries.idl" structs: diff --git a/src/mongo/s/database_version.idl b/src/mongo/s/database_version.idl index 9b073f5a34e..9c0e4f8ffce 100644 --- a/src/mongo/s/database_version.idl +++ b/src/mongo/s/database_version.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: DatabaseVersionBase: diff --git a/src/mongo/s/index_version.idl b/src/mongo/s/index_version.idl index 74d62224946..0e8d2d3edde 100644 --- a/src/mongo/s/index_version.idl +++ b/src/mongo/s/index_version.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: CollectionIndexesBase: diff --git a/src/mongo/s/mongod_and_mongos_server_parameters.idl b/src/mongo/s/mongod_and_mongos_server_parameters.idl index 9d9929174e0..f6ede2f5bcf 100644 --- a/src/mongo/s/mongod_and_mongos_server_parameters.idl +++ b/src/mongo/s/mongod_and_mongos_server_parameters.idl @@ -33,7 +33,7 @@ global: - "mongo/s/mongos_server_parameters.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" server_parameters: loadRoutingTableOnStartup: diff --git a/src/mongo/s/mongos_server_parameters.idl b/src/mongo/s/mongos_server_parameters.idl index e51b9ccb393..03b283616e6 100644 --- a/src/mongo/s/mongos_server_parameters.idl +++ b/src/mongo/s/mongos_server_parameters.idl @@ -33,7 +33,7 @@ global: - "mongo/s/mongos_server_parameters.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" server_parameters: readHedgingMode: diff --git a/src/mongo/s/query/SConscript b/src/mongo/s/query/SConscript index d06f445235a..1215f24af74 100644 --- a/src/mongo/s/query/SConscript +++ b/src/mongo/s/query/SConscript @@ -5,9 +5,9 @@ Import("env") env = env.Clone() env.Library( - target="cluster_query", + target='cluster_query', source=[ - "cluster_find.cpp", + 'cluster_find.cpp', 'cluster_query_knobs.idl', ], LIBDEPS=[ @@ -16,13 +16,13 @@ env.Library( '$BUILD_DIR/mongo/db/curop_failpoint_helpers', '$BUILD_DIR/mongo/db/query/query_common', '$BUILD_DIR/mongo/s/sharding_router_api', - "cluster_client_cursor", - "cluster_cursor_cleanup_job", - "store_possible_cursor", + 'cluster_client_cursor', + 'cluster_cursor_cleanup_job', + 'store_possible_cursor', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/catalog/collection_uuid_mismatch_info', - '$BUILD_DIR/mongo/idl/server_parameter', + '$BUILD_DIR/mongo/db/server_base', ], ) @@ -49,18 +49,18 @@ env.Library( ) env.Library( - target="cluster_client_cursor", + target='cluster_client_cursor', source=[ - "cluster_client_cursor_impl.cpp", + 'cluster_client_cursor_impl.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/shared_request_handling', - "router_exec_stage", + 'router_exec_stage', ], ) env.Library( - target="router_exec_stage", + target='router_exec_stage', source=[ 'document_source_merge_cursors.cpp', 'router_stage_limit.cpp', @@ -76,19 +76,19 @@ env.Library( ) env.Library( - target="async_results_merger", + target='async_results_merger', source=[ - "async_results_merger.cpp", - "blocking_results_merger.cpp", - "establish_cursors.cpp", + 'async_results_merger.cpp', + 'blocking_results_merger.cpp', + 'establish_cursors.cpp', 'async_results_merger_params.idl', ], LIBDEPS=[ - "$BUILD_DIR/mongo/db/query/command_request_response", - "$BUILD_DIR/mongo/db/query/query_common", - "$BUILD_DIR/mongo/executor/task_executor_interface", - "$BUILD_DIR/mongo/s/client/sharding_client", - "$BUILD_DIR/mongo/s/sharding_router_api", + '$BUILD_DIR/mongo/db/query/command_request_response', + '$BUILD_DIR/mongo/db/query/query_common', + '$BUILD_DIR/mongo/executor/task_executor_interface', + '$BUILD_DIR/mongo/s/client/sharding_client', + '$BUILD_DIR/mongo/s/sharding_router_api', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/catalog/collection_uuid_mismatch_info', diff --git a/src/mongo/s/query/async_results_merger_params.idl b/src/mongo/s/query/async_results_merger_params.idl index d9a0e959238..1a1371fe0d4 100644 --- a/src/mongo/s/query/async_results_merger_params.idl +++ b/src/mongo/s/query/async_results_merger_params.idl @@ -36,7 +36,7 @@ global: imports: - "mongo/db/session/logical_session_id.idl" - "mongo/db/query/tailable_mode.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/util/net/hostandport.idl" types: diff --git a/src/mongo/s/request_types/abort_reshard_collection.idl b/src/mongo/s/request_types/abort_reshard_collection.idl index 8d24ba92b5e..99e7a3277c1 100644 --- a/src/mongo/s/request_types/abort_reshard_collection.idl +++ b/src/mongo/s/request_types/abort_reshard_collection.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: abortReshardCollection: diff --git a/src/mongo/s/request_types/auto_split_vector.idl b/src/mongo/s/request_types/auto_split_vector.idl index 360003f7081..be25b1c00ce 100644 --- a/src/mongo/s/request_types/auto_split_vector.idl +++ b/src/mongo/s/request_types/auto_split_vector.idl @@ -34,7 +34,7 @@ global: - "mongo/db/s/auto_split_vector.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" types: bson_vector: diff --git a/src/mongo/s/request_types/balancer_collection_status.idl b/src/mongo/s/request_types/balancer_collection_status.idl index 53e86886562..db49dc9f3e9 100644 --- a/src/mongo/s/request_types/balancer_collection_status.idl +++ b/src/mongo/s/request_types/balancer_collection_status.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: BalancerCollectionStatusResponse: diff --git a/src/mongo/s/request_types/cleanup_reshard_collection.idl b/src/mongo/s/request_types/cleanup_reshard_collection.idl index 3183d05ad43..98e02fae082 100644 --- a/src/mongo/s/request_types/cleanup_reshard_collection.idl +++ b/src/mongo/s/request_types/cleanup_reshard_collection.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: cleanupReshardCollection: diff --git a/src/mongo/s/request_types/clone_catalog_data.idl b/src/mongo/s/request_types/clone_catalog_data.idl index 36046e1f413..8e6ab1b4bd4 100644 --- a/src/mongo/s/request_types/clone_catalog_data.idl +++ b/src/mongo/s/request_types/clone_catalog_data.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: cloneCatalogData: diff --git a/src/mongo/s/request_types/commit_reshard_collection.idl b/src/mongo/s/request_types/commit_reshard_collection.idl index 0d4b37bb9f3..ce8e9e98ca9 100644 --- a/src/mongo/s/request_types/commit_reshard_collection.idl +++ b/src/mongo/s/request_types/commit_reshard_collection.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: commitReshardCollection: diff --git a/src/mongo/s/request_types/configure_collection_balancing.idl b/src/mongo/s/request_types/configure_collection_balancing.idl index 7c39e968222..9cc035d13f8 100644 --- a/src/mongo/s/request_types/configure_collection_balancing.idl +++ b/src/mongo/s/request_types/configure_collection_balancing.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: configure_coll_balancing_params: diff --git a/src/mongo/s/request_types/drop_collection_if_uuid_not_matching.idl b/src/mongo/s/request_types/drop_collection_if_uuid_not_matching.idl index 7b9f30c7fce..445a72e8d23 100644 --- a/src/mongo/s/request_types/drop_collection_if_uuid_not_matching.idl +++ b/src/mongo/s/request_types/drop_collection_if_uuid_not_matching.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: _shardsvrDropCollectionIfUUIDNotMatching: diff --git a/src/mongo/s/request_types/ensure_chunk_version_is_greater_than.idl b/src/mongo/s/request_types/ensure_chunk_version_is_greater_than.idl index a90b776fff7..e323ac22f01 100644 --- a/src/mongo/s/request_types/ensure_chunk_version_is_greater_than.idl +++ b/src/mongo/s/request_types/ensure_chunk_version_is_greater_than.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/chunk_version.idl" commands: diff --git a/src/mongo/s/request_types/flush_database_cache_updates.idl b/src/mongo/s/request_types/flush_database_cache_updates.idl index fb77d853623..ae4bfc63529 100644 --- a/src/mongo/s/request_types/flush_database_cache_updates.idl +++ b/src/mongo/s/request_types/flush_database_cache_updates.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: _flushDatabaseCacheUpdates: diff --git a/src/mongo/s/request_types/flush_resharding_state_change.idl b/src/mongo/s/request_types/flush_resharding_state_change.idl index 0201235e55f..7a56c05d0c6 100644 --- a/src/mongo/s/request_types/flush_resharding_state_change.idl +++ b/src/mongo/s/request_types/flush_resharding_state_change.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: _flushReshardingStateChange: diff --git a/src/mongo/s/request_types/flush_routing_table_cache_updates.idl b/src/mongo/s/request_types/flush_routing_table_cache_updates.idl index 62a8e3a94a5..134a197ae4e 100644 --- a/src/mongo/s/request_types/flush_routing_table_cache_updates.idl +++ b/src/mongo/s/request_types/flush_routing_table_cache_updates.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: _flushRoutingTableCacheUpdates: diff --git a/src/mongo/s/request_types/get_database_version.idl b/src/mongo/s/request_types/get_database_version.idl index d5097855ad6..a67679da5d1 100644 --- a/src/mongo/s/request_types/get_database_version.idl +++ b/src/mongo/s/request_types/get_database_version.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: getDatabaseVersion: diff --git a/src/mongo/s/request_types/get_stats_for_balancing.idl b/src/mongo/s/request_types/get_stats_for_balancing.idl index 4257f2dfeb6..a9841a6d691 100644 --- a/src/mongo/s/request_types/get_stats_for_balancing.idl +++ b/src/mongo/s/request_types/get_stats_for_balancing.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: NamespaceWithOptionalUUID: diff --git a/src/mongo/s/request_types/merge_chunk_request.idl b/src/mongo/s/request_types/merge_chunk_request.idl index d5dc8e7e31f..53b183c7113 100644 --- a/src/mongo/s/request_types/merge_chunk_request.idl +++ b/src/mongo/s/request_types/merge_chunk_request.idl @@ -35,7 +35,7 @@ global: - "mongo/util/uuid.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/chunk_range.idl" - "mongo/s/chunk_version.idl" - "mongo/s/sharding_types.idl" diff --git a/src/mongo/s/request_types/move_primary.idl b/src/mongo/s/request_types/move_primary.idl index 51d4a095b8a..00aa33e1aa3 100644 --- a/src/mongo/s/request_types/move_primary.idl +++ b/src/mongo/s/request_types/move_primary.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: movePrimary: diff --git a/src/mongo/s/request_types/move_range_request.idl b/src/mongo/s/request_types/move_range_request.idl index 6fccb39678a..9b8bc2114a9 100644 --- a/src/mongo/s/request_types/move_range_request.idl +++ b/src/mongo/s/request_types/move_range_request.idl @@ -34,7 +34,7 @@ global: imports: - "mongo/db/write_concern_options.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/sharding_types.idl" enums: diff --git a/src/mongo/s/request_types/reshard_collection.idl b/src/mongo/s/request_types/reshard_collection.idl index e29ddf2bb94..63b9544a91e 100644 --- a/src/mongo/s/request_types/reshard_collection.idl +++ b/src/mongo/s/request_types/reshard_collection.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/resharding/common_types.idl" commands: diff --git a/src/mongo/s/request_types/resharding_operation_time.idl b/src/mongo/s/request_types/resharding_operation_time.idl index ec45666f98d..61125a997b8 100644 --- a/src/mongo/s/request_types/resharding_operation_time.idl +++ b/src/mongo/s/request_types/resharding_operation_time.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: _shardsvrReshardingOperationTime: diff --git a/src/mongo/s/request_types/set_allow_migrations.idl b/src/mongo/s/request_types/set_allow_migrations.idl index c779d64f5c9..482b77bc7fe 100644 --- a/src/mongo/s/request_types/set_allow_migrations.idl +++ b/src/mongo/s/request_types/set_allow_migrations.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/s/sharding_ddl_coordinator.idl" - "mongo/s/request_types/sharded_ddl_commands.idl" diff --git a/src/mongo/s/request_types/sharded_ddl_commands.idl b/src/mongo/s/request_types/sharded_ddl_commands.idl index 8e33701bcad..d01e312697c 100644 --- a/src/mongo/s/request_types/sharded_ddl_commands.idl +++ b/src/mongo/s/request_types/sharded_ddl_commands.idl @@ -41,7 +41,7 @@ imports: - "mongo/db/drop_database.idl" - "mongo/db/keypattern.idl" - "mongo/db/coll_mod.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/sharding_types.idl" - "mongo/s/resharding/common_types.idl" - "mongo/db/timeseries/timeseries.idl" diff --git a/src/mongo/s/request_types/shardsvr_join_migrations_request.idl b/src/mongo/s/request_types/shardsvr_join_migrations_request.idl index e779dd5da84..4c072d2efee 100644 --- a/src/mongo/s/request_types/shardsvr_join_migrations_request.idl +++ b/src/mongo/s/request_types/shardsvr_join_migrations_request.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: _shardsvrJoinMigrations: diff --git a/src/mongo/s/request_types/wait_for_fail_point.idl b/src/mongo/s/request_types/wait_for_fail_point.idl index 2d5af8e370b..e0ee8c35c3f 100644 --- a/src/mongo/s/request_types/wait_for_fail_point.idl +++ b/src/mongo/s/request_types/wait_for_fail_point.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" commands: waitForFailPoint: diff --git a/src/mongo/s/resharding/common_types.idl b/src/mongo/s/resharding/common_types.idl index fb0547b7091..b28385881d2 100644 --- a/src/mongo/s/resharding/common_types.idl +++ b/src/mongo/s/resharding/common_types.idl @@ -33,7 +33,7 @@ global: imports: - "mongo/db/keypattern.idl" - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/s/sharding_types.idl" enums: diff --git a/src/mongo/s/resharding/resharding_feature_flag.idl b/src/mongo/s/resharding/resharding_feature_flag.idl index e83de02e286..afdad3d093e 100644 --- a/src/mongo/s/resharding/resharding_feature_flag.idl +++ b/src/mongo/s/resharding/resharding_feature_flag.idl @@ -32,7 +32,7 @@ global: cpp_namespace: "mongo::resharding" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" feature_flags: featureFlagResharding: diff --git a/src/mongo/s/resharding/resume_token.idl b/src/mongo/s/resharding/resume_token.idl index f89101c389b..446da98d09a 100644 --- a/src/mongo/s/resharding/resume_token.idl +++ b/src/mongo/s/resharding/resume_token.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: ResumeTokenOplogTimestamp: diff --git a/src/mongo/s/router_transactions_stats.idl b/src/mongo/s/router_transactions_stats.idl index 0829d66fe92..399b5e25b46 100644 --- a/src/mongo/s/router_transactions_stats.idl +++ b/src/mongo/s/router_transactions_stats.idl @@ -34,7 +34,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: diff --git a/src/mongo/s/sharding_types.idl b/src/mongo/s/sharding_types.idl index 06b7116f7fe..50bd9dc4f5c 100644 --- a/src/mongo/s/sharding_types.idl +++ b/src/mongo/s/sharding_types.idl @@ -35,7 +35,7 @@ global: - "mongo/s/database_version.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" types: shard_id: diff --git a/src/mongo/s/type_collection_common_types.idl b/src/mongo/s/type_collection_common_types.idl index 1fd68bb70de..1ed1ba1f505 100644 --- a/src/mongo/s/type_collection_common_types.idl +++ b/src/mongo/s/type_collection_common_types.idl @@ -29,7 +29,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" - "mongo/db/timeseries/timeseries.idl" structs: diff --git a/src/mongo/scripting/mozjs/scripting_util.idl b/src/mongo/scripting/mozjs/scripting_util.idl index 8e1fe6bff48..dbd422a6424 100644 --- a/src/mongo/scripting/mozjs/scripting_util.idl +++ b/src/mongo/scripting/mozjs/scripting_util.idl @@ -34,7 +34,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" structs: diff --git a/src/mongo/shell/kms.idl b/src/mongo/shell/kms.idl index 53ac55f2c7b..5124a22c26f 100644 --- a/src/mongo/shell/kms.idl +++ b/src/mongo/shell/kms.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" enums: KMSProvider: diff --git a/src/mongo/shell/shell_options.idl b/src/mongo/shell/shell_options.idl index c5005875687..b161325c43c 100644 --- a/src/mongo/shell/shell_options.idl +++ b/src/mongo/shell/shell_options.idl @@ -35,7 +35,7 @@ global: source: [ cli, ini, yaml ] imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" configs: "ipv6": diff --git a/src/mongo/tools/mongobridge_options.idl b/src/mongo/tools/mongobridge_options.idl index e6d2018d597..240f9eba04c 100644 --- a/src/mongo/tools/mongobridge_options.idl +++ b/src/mongo/tools/mongobridge_options.idl @@ -34,7 +34,7 @@ global: - "mongo/tools/mongobridge_options.h" imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" configs: help: diff --git a/src/mongo/util/net/SConscript b/src/mongo/util/net/SConscript index a8349820084..b3db9e6404d 100644 --- a/src/mongo/util/net/SConscript +++ b/src/mongo/util/net/SConscript @@ -132,9 +132,9 @@ if not get_option('ssl') == 'off': '$BUILD_DIR/mongo/base/secure_allocator', '$BUILD_DIR/mongo/crypto/sha_block_${MONGO_CRYPTO}', '$BUILD_DIR/mongo/db/auth/cluster_auth_mode', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/service_context', - '$BUILD_DIR/mongo/idl/server_parameter', '$BUILD_DIR/mongo/util/background_job', '$BUILD_DIR/mongo/util/icu', '$BUILD_DIR/mongo/util/winutil', @@ -151,8 +151,8 @@ if not get_option('ssl') == 'off': LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/client/authentication', '$BUILD_DIR/mongo/db/auth/cluster_auth_mode', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/server_options_core', - '$BUILD_DIR/mongo/idl/server_parameter', 'ssl_options', ], ) diff --git a/src/mongo/util/net/ssl_options_client.idl b/src/mongo/util/net/ssl_options_client.idl index 1c40af194b4..582a2fa23ec 100644 --- a/src/mongo/util/net/ssl_options_client.idl +++ b/src/mongo/util/net/ssl_options_client.idl @@ -36,7 +36,7 @@ global: source: [ yaml, cli, ini ] imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" configs: tls: diff --git a/src/mongo/util/net/ssl_options_server.idl b/src/mongo/util/net/ssl_options_server.idl index 58b05893a36..cdb0a4602f0 100644 --- a/src/mongo/util/net/ssl_options_server.idl +++ b/src/mongo/util/net/ssl_options_server.idl @@ -38,7 +38,7 @@ global: initializer: SSLServerOptionsIDL imports: - - "mongo/idl/basic_types.idl" + - "mongo/db/basic_types.idl" configs: "net.tls.tlsOnNormalPorts": diff --git a/src/mongo/watchdog/SConscript b/src/mongo/watchdog/SConscript index b04db62fba7..6704969f115 100644 --- a/src/mongo/watchdog/SConscript +++ b/src/mongo/watchdog/SConscript @@ -29,8 +29,8 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/commands/server_status', + '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/server_options_core', - '$BUILD_DIR/mongo/idl/server_parameter', 'watchdog', 'watchdog_register', ], |