diff --git a/modules_poc/modules.yaml b/modules_poc/modules.yaml index 4a67aa67c33..e25325ade04 100644 --- a/modules_poc/modules.yaml +++ b/modules_poc/modules.yaml @@ -276,8 +276,6 @@ catalog_and_routing: - src/mongo/db/database_name[._]* - src/mongo/db/namespace_string[._]* - src/mongo/db/stats/system_buckets_metrics* - - src/mongo/util/namespace_string[._]* - - src/mongo/util/database_name[._]* catalog_and_routing.shard_role: meta: diff --git a/src/mongo/client/dbclient_base.cpp b/src/mongo/client/dbclient_base.cpp index 8d384c8eb79..65a8e1eb605 100644 --- a/src/mongo/client/dbclient_base.cpp +++ b/src/mongo/client/dbclient_base.cpp @@ -45,9 +45,11 @@ #include "mongo/db/api_parameters_gen.h" #include "mongo/db/auth/user_name.h" #include "mongo/db/client.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/dbmessage.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/client_cursor/cursor_id.h" #include "mongo/db/query/client_cursor/kill_cursors_gen.h" @@ -65,10 +67,8 @@ #include "mongo/rpc/protocol.h" #include "mongo/rpc/reply_interface.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/future.h" #include "mongo/util/future_impl.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/net/hostandport.h" #include "mongo/util/str.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/client/dbclient_connection.cpp b/src/mongo/client/dbclient_connection.cpp index 0797e7debf4..a474a4b663a 100644 --- a/src/mongo/client/dbclient_connection.cpp +++ b/src/mongo/client/dbclient_connection.cpp @@ -46,6 +46,7 @@ #include "mongo/db/auth/sasl_command_constants.h" #include "mongo/db/auth/user_name.h" #include "mongo/db/commands/test_commands_enabled.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/tenant_id.h" @@ -61,7 +62,6 @@ #include "mongo/transport/transport_layer_manager.h" #include "mongo/util/assert_util.h" #include "mongo/util/clock_source.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/fail_point.h" #include "mongo/util/future.h" #include "mongo/util/net/socket_exception.h" diff --git a/src/mongo/client/dbclient_session.cpp b/src/mongo/client/dbclient_session.cpp index 77d197fd666..3f223482f77 100644 --- a/src/mongo/client/dbclient_session.cpp +++ b/src/mongo/client/dbclient_session.cpp @@ -50,6 +50,7 @@ #include "mongo/db/auth/sasl_command_constants.h" #include "mongo/db/auth/user_name.h" #include "mongo/db/commands/test_commands_enabled.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/stats/counters.h" @@ -63,7 +64,6 @@ #include "mongo/transport/transport_layer.h" #include "mongo/util/assert_util.h" #include "mongo/util/clock_source.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/fail_point.h" #include "mongo/util/future.h" #include "mongo/util/net/socket_exception.h" diff --git a/src/mongo/db/BUILD.bazel b/src/mongo/db/BUILD.bazel index 0bb33105259..b142b9aeabb 100644 --- a/src/mongo/db/BUILD.bazel +++ b/src/mongo/db/BUILD.bazel @@ -1317,6 +1317,7 @@ mongo_cc_library( mongo_cc_library( name = "server_base", srcs = [ + "database_name_util.cpp", "feature_compatibility_version_parser.cpp", "feature_flag.cpp", "feature_flag_server_parameter.cpp", @@ -1325,6 +1326,7 @@ mongo_cc_library( "index_names.cpp", "keypattern.cpp", "mirror_maestro_feature_flags_gen", + "namespace_string_util.cpp", "read_write_concern_provenance.cpp", "server_options.cpp", "shutdown_in_progress_quiesce_info.cpp", @@ -1373,9 +1375,7 @@ mongo_cc_library( "//src/mongo/idl:generic_argument.cpp", "//src/mongo/idl:generic_argument_gen", "//src/mongo/rpc/metadata:audit_metadata_gen", - "//src/mongo/util:database_name_util.cpp", "//src/mongo/util:fail_point_server_parameter_gen", - "//src/mongo/util:namespace_string_util.cpp", ], deps = [ ":cluster_role", @@ -2937,8 +2937,8 @@ mongo_cc_unit_test( mongo_cc_unit_test( name = "server_base_test", srcs = [ - "//src/mongo/util:database_name_util_test.cpp", - "//src/mongo/util:namespace_string_util_test.cpp", + "database_name_util_test.cpp", + "namespace_string_util_test.cpp", ], tags = ["mongo_unittest_sixth_group"], deps = [ diff --git a/src/mongo/db/auth/auth_op_observer.cpp b/src/mongo/db/auth/auth_op_observer.cpp index 1922a9b4f55..32321e98220 100644 --- a/src/mongo/db/auth/auth_op_observer.cpp +++ b/src/mongo/db/auth/auth_op_observer.cpp @@ -35,6 +35,7 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/audit.h" #include "mongo/db/auth/authorization_manager.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/op_observer/op_observer_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog_entry.h" @@ -42,7 +43,6 @@ #include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/auth/authorization_checks.cpp b/src/mongo/db/auth/authorization_checks.cpp index d0e8b07a6f4..1b5d0007ff5 100644 --- a/src/mongo/db/auth/authorization_checks.cpp +++ b/src/mongo/db/auth/authorization_checks.cpp @@ -39,6 +39,7 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/auth/validated_tenancy_scope.h" #include "mongo/db/database_name.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/pipeline/aggregation_request_helper.h" #include "mongo/db/pipeline/lite_parsed_document_source.h" #include "mongo/db/server_feature_flags_gen.h" @@ -48,7 +49,6 @@ #include "mongo/platform/compiler.h" #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/auth/builtin_roles_test.cpp b/src/mongo/db/auth/builtin_roles_test.cpp index 9d3ccaf24a5..798be368c49 100644 --- a/src/mongo/db/auth/builtin_roles_test.cpp +++ b/src/mongo/db/auth/builtin_roles_test.cpp @@ -38,9 +38,9 @@ #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/auth_name.h" #include "mongo/db/auth/resource_pattern.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/namespace_string.h" #include "mongo/unittest/unittest.h" -#include "mongo/util/database_name_util.h" #include diff --git a/src/mongo/db/auth/resource_pattern.cpp b/src/mongo/db/auth/resource_pattern.cpp index 297b9ee9aaa..ecb0be42463 100644 --- a/src/mongo/db/auth/resource_pattern.cpp +++ b/src/mongo/db/auth/resource_pattern.cpp @@ -29,7 +29,7 @@ #include "mongo/db/auth/resource_pattern.h" -#include "mongo/util/namespace_string_util.h" +#include "mongo/db/namespace_string_util.h" namespace mongo { diff --git a/src/mongo/db/auth/resource_pattern_search_list.h b/src/mongo/db/auth/resource_pattern_search_list.h index 22ecdceb5df..f6ce27321df 100644 --- a/src/mongo/db/auth/resource_pattern_search_list.h +++ b/src/mongo/db/auth/resource_pattern_search_list.h @@ -32,9 +32,9 @@ #include "mongo/base/string_data.h" #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/util/assert_util.h" #include "mongo/util/modules.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/auth/sasl_commands.cpp b/src/mongo/db/auth/sasl_commands.cpp index 2c4a72a57da..9253870a853 100644 --- a/src/mongo/db/auth/sasl_commands.cpp +++ b/src/mongo/db/auth/sasl_commands.cpp @@ -47,6 +47,7 @@ #include "mongo/db/auth/sasl_options.h" #include "mongo/db/auth/sasl_payload.h" #include "mongo/db/commands.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" @@ -55,7 +56,6 @@ #include "mongo/platform/atomic_word.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/duration.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/basic_types.idl b/src/mongo/db/basic_types.idl index 33b64f581ad..21438cb6c90 100644 --- a/src/mongo/db/basic_types.idl +++ b/src/mongo/db/basic_types.idl @@ -32,8 +32,8 @@ global: cpp_includes: - "mongo/client/connection_string.h" - "mongo/db/basic_types.h" - - "mongo/util/database_name_util.h" - - "mongo/util/namespace_string_util.h" + - "mongo/db/database_name_util.h" + - "mongo/db/namespace_string_util.h" - "mongo/db/namespace_string.h" - "mongo/db/logical_time.h" - "mongo/db/tenant_id.h" diff --git a/src/mongo/db/cleanup_structured_encryption_data_coordinator.cpp b/src/mongo/db/cleanup_structured_encryption_data_coordinator.cpp index 1ba05f2c3b9..e30c9abe6b2 100644 --- a/src/mongo/db/cleanup_structured_encryption_data_coordinator.cpp +++ b/src/mongo/db/cleanup_structured_encryption_data_coordinator.cpp @@ -40,6 +40,7 @@ #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharding_coordinator_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/router_role/router_role.h" #include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/server_parameter.h" @@ -61,7 +62,6 @@ #include "mongo/rpc/reply_interface.h" #include "mongo/util/fail_point.h" #include "mongo/util/future_impl.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/cloner.cpp b/src/mongo/db/cloner.cpp index 7f5a9c6b31e..f65f86260b0 100644 --- a/src/mongo/db/cloner.cpp +++ b/src/mongo/db/cloner.cpp @@ -46,6 +46,7 @@ #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/curop.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/index/index_constants.h" #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/namespace_string.h" @@ -80,7 +81,6 @@ #include "mongo/platform/atomic_word.h" #include "mongo/platform/compiler.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/debug_util.h" #include "mongo/util/fail_point.h" #include "mongo/util/net/hostandport.h" diff --git a/src/mongo/db/collection_crud/collection_write_path.cpp b/src/mongo/db/collection_crud/collection_write_path.cpp index db4e182df38..a9877d4d7f2 100644 --- a/src/mongo/db/collection_crud/collection_write_path.cpp +++ b/src/mongo/db/collection_crud/collection_write_path.cpp @@ -41,6 +41,7 @@ #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/write_stage_common.h" #include "mongo/db/feature_flag.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_util.h" #include "mongo/db/record_id_helpers.h" @@ -72,7 +73,6 @@ #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/commands.cpp b/src/mongo/db/commands.cpp index c288e3f5cc6..cf81c91bc3a 100644 --- a/src/mongo/db/commands.cpp +++ b/src/mongo/db/commands.cpp @@ -45,6 +45,7 @@ #include "mongo/db/exec/mutable_bson/document.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/tenant_id.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/version_context.h" @@ -62,7 +63,6 @@ #include "mongo/util/decorable.h" #include "mongo/util/duration.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/static_immortal.h" #include "mongo/util/str.h" #include "mongo/util/string_map.h" diff --git a/src/mongo/db/commands/authentication_commands.cpp b/src/mongo/db/commands/authentication_commands.cpp index a2e3355a1f6..4f60a92eb8b 100644 --- a/src/mongo/db/commands/authentication_commands.cpp +++ b/src/mongo/db/commands/authentication_commands.cpp @@ -52,6 +52,7 @@ #include "mongo/db/commands/authentication_commands_gen.h" #include "mongo/db/commands/test_commands_enabled.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/server_feature_flags_gen.h" @@ -62,7 +63,6 @@ #include "mongo/rpc/op_msg.h" #include "mongo/transport/session.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/commands/collection_to_capped.cpp b/src/mongo/db/commands/collection_to_capped.cpp index 5b1b0b6e1b8..1729e47bc06 100644 --- a/src/mongo/db/commands/collection_to_capped.cpp +++ b/src/mongo/db/commands/collection_to_capped.cpp @@ -41,6 +41,7 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/service_context.h" @@ -50,7 +51,6 @@ #include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/shard_role/shard_role.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/commands/dbcheck_command.h b/src/mongo/db/commands/dbcheck_command.h index 9c9bf354877..5d763912118 100644 --- a/src/mongo/db/commands/dbcheck_command.h +++ b/src/mongo/db/commands/dbcheck_command.h @@ -29,6 +29,7 @@ #pragma once #include "mongo/bson/bsonobj.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/repl/dbcheck/dbcheck.h" #include "mongo/db/repl/dbcheck/dbcheck_gen.h" #include "mongo/db/repl/dbcheck/dbcheck_idl.h" @@ -37,7 +38,6 @@ #include "mongo/db/write_concern_options.h" #include "mongo/util/background.h" #include "mongo/util/modules.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/uuid.h" namespace mongo { diff --git a/src/mongo/db/commands/dbcommands.cpp b/src/mongo/db/commands/dbcommands.cpp index 5eb25ca8990..d252c586b8f 100644 --- a/src/mongo/db/commands/dbcommands.cpp +++ b/src/mongo/db/commands/dbcommands.cpp @@ -52,6 +52,7 @@ #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/keypattern.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/profile_settings.h" #include "mongo/db/query/explain_verbosity_gen.h" @@ -94,7 +95,6 @@ #include "mongo/util/decorable.h" #include "mongo/util/fail_point.h" #include "mongo/util/future.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/serialization_context.h" #include "mongo/util/str.h" #include "mongo/util/timer.h" diff --git a/src/mongo/db/commands/filemd5_cmd.cpp b/src/mongo/db/commands/filemd5_cmd.cpp index 60a7d5c8728..e81b1523243 100644 --- a/src/mongo/db/commands/filemd5_cmd.cpp +++ b/src/mongo/db/commands/filemd5_cmd.cpp @@ -40,6 +40,7 @@ #include "mongo/db/database_name.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/profile_collection.h" @@ -57,7 +58,6 @@ #include "mongo/util/assert_util.h" #include "mongo/util/fail_point.h" #include "mongo/util/md5.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/commands/oplog_application_checks.cpp b/src/mongo/db/commands/oplog_application_checks.cpp index 601c3055472..9b95a2f764c 100644 --- a/src/mongo/db/commands/oplog_application_checks.cpp +++ b/src/mongo/db/commands/oplog_application_checks.cpp @@ -42,7 +42,9 @@ #include "mongo/db/auth/validated_tenancy_scope_factory.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" #include "mongo/db/shard_role/shard_catalog/collection_catalog.h" @@ -51,8 +53,6 @@ #include "mongo/db/tenant_id.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/commands/profile_common.cpp b/src/mongo/db/commands/profile_common.cpp index f3eccf65d2f..224c37eaf7f 100644 --- a/src/mongo/db/commands/profile_common.cpp +++ b/src/mongo/db/commands/profile_common.cpp @@ -35,6 +35,7 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands/profile_gen.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/profile_filter.h" #include "mongo/db/profile_settings.h" #include "mongo/db/server_options.h" @@ -43,7 +44,6 @@ #include "mongo/logv2/log.h" #include "mongo/platform/atomic_word.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include diff --git a/src/mongo/db/commands/query_cmd/current_op_common.cpp b/src/mongo/db/commands/query_cmd/current_op_common.cpp index d74bbd9a7ec..4cdaee7d6fc 100644 --- a/src/mongo/db/commands/query_cmd/current_op_common.cpp +++ b/src/mongo/db/commands/query_cmd/current_op_common.cpp @@ -34,10 +34,10 @@ #include "mongo/bson/bsonelement.h" #include "mongo/db/auth/validated_tenancy_scope.h" #include "mongo/db/commands/test_commands_enabled.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/namespace_string.h" #include "mongo/idl/command_generic_argument.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/serialization_context.h" #include "mongo/util/string_map.h" diff --git a/src/mongo/db/commands/query_cmd/explain_cmd.cpp b/src/mongo/db/commands/query_cmd/explain_cmd.cpp index 78ef769f3e2..c6a9601a9c7 100644 --- a/src/mongo/db/commands/query_cmd/explain_cmd.cpp +++ b/src/mongo/db/commands/query_cmd/explain_cmd.cpp @@ -38,6 +38,7 @@ #include "mongo/db/commands/query_cmd/explain_cmd_helpers.h" #include "mongo/db/commands/query_cmd/explain_gen.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/aggregation_request_helper.h" @@ -46,7 +47,6 @@ #include "mongo/rpc/op_msg.h" #include "mongo/rpc/reply_builder_interface.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/commands/query_cmd/find_cmd.cpp b/src/mongo/db/commands/query_cmd/find_cmd.cpp index f3a593396e3..7a93dd90c04 100644 --- a/src/mongo/db/commands/query_cmd/find_cmd.cpp +++ b/src/mongo/db/commands/query_cmd/find_cmd.cpp @@ -52,6 +52,7 @@ #include "mongo/db/curop.h" #include "mongo/db/curop_failpoint_helpers.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/exec/classic/projection.h" #include "mongo/db/exec/disk_use_options_gen.h" #include "mongo/db/exec/shard_filterer_impl.h" @@ -131,7 +132,6 @@ #include "mongo/transport/session.h" #include "mongo/util/assert_util.h" #include "mongo/util/concurrency/admission_context.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" #include "mongo/util/fail_point.h" #include "mongo/util/future.h" diff --git a/src/mongo/db/commands/query_cmd/getmore_cmd.cpp b/src/mongo/db/commands/query_cmd/getmore_cmd.cpp index 5e901dcc015..e3d06a000fa 100644 --- a/src/mongo/db/commands/query_cmd/getmore_cmd.cpp +++ b/src/mongo/db/commands/query_cmd/getmore_cmd.cpp @@ -47,6 +47,7 @@ #include "mongo/db/cursor_in_use_info.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/change_stream_invalidation_info.h" #include "mongo/db/query/canonical_query.h" @@ -89,7 +90,6 @@ #include "mongo/util/decorable.h" #include "mongo/util/duration.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/scopeguard.h" #include "mongo/util/serialization_context.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/commands/query_cmd/map_reduce_command_base.h b/src/mongo/db/commands/query_cmd/map_reduce_command_base.h index 3529a357391..75f1a3b5f0c 100644 --- a/src/mongo/db/commands/query_cmd/map_reduce_command_base.h +++ b/src/mongo/db/commands/query_cmd/map_reduce_command_base.h @@ -31,8 +31,8 @@ #include "mongo/db/commands.h" #include "mongo/db/commands/query_cmd/mr_common.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/repl/replication_coordinator.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/modules.h" namespace mongo { diff --git a/src/mongo/db/commands/query_cmd/map_reduce_out_options.cpp b/src/mongo/db/commands/query_cmd/map_reduce_out_options.cpp index df4e298153f..77f2d57fac7 100644 --- a/src/mongo/db/commands/query_cmd/map_reduce_out_options.cpp +++ b/src/mongo/db/commands/query_cmd/map_reduce_out_options.cpp @@ -34,10 +34,10 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsontypes.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" #include "mongo/util/debug_util.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/commands/query_cmd/pipeline_command.cpp b/src/mongo/db/commands/query_cmd/pipeline_command.cpp index f48d5c24dfd..7e2c68ecf03 100644 --- a/src/mongo/db/commands/query_cmd/pipeline_command.cpp +++ b/src/mongo/db/commands/query_cmd/pipeline_command.cpp @@ -39,6 +39,7 @@ #include "mongo/db/commands/query_cmd/extension_metrics.h" #include "mongo/db/commands/query_cmd/run_aggregate.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/aggregate_command_gen.h" @@ -62,7 +63,6 @@ #include "mongo/rpc/reply_builder_interface.h" #include "mongo/stdx/unordered_set.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" #include "mongo/util/serialization_context.h" diff --git a/src/mongo/db/commands/query_cmd/write_commands.cpp b/src/mongo/db/commands/query_cmd/write_commands.cpp index 15624d9fc4c..503cd2a7b5b 100644 --- a/src/mongo/db/commands/query_cmd/write_commands.cpp +++ b/src/mongo/db/commands/query_cmd/write_commands.cpp @@ -48,6 +48,7 @@ #include "mongo/db/fle_crud.h" #include "mongo/db/local_executor.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/not_primary_error_tracker.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/variables.h" @@ -90,7 +91,6 @@ #include "mongo/util/concurrency/admission_context.h" #include "mongo/util/decorable.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/serialization_context.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/commands/set_feature_compatibility_version_command.cpp b/src/mongo/db/commands/set_feature_compatibility_version_command.cpp index e141461abb0..c3e4539f5ed 100644 --- a/src/mongo/db/commands/set_feature_compatibility_version_command.cpp +++ b/src/mongo/db/commands/set_feature_compatibility_version_command.cpp @@ -67,6 +67,7 @@ #include "mongo/db/index_names.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/pipeline/aggregate_command_gen.h" @@ -118,7 +119,6 @@ #include "mongo/s/migration_blocking_operation/migration_blocking_operation_feature_flags_gen.h" #include "mongo/util/assert_util.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/scopeguard.h" #include "mongo/util/str.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/commands/user_management_commands.cpp b/src/mongo/db/commands/user_management_commands.cpp index bd4d418a033..3f98353fc41 100644 --- a/src/mongo/db/commands/user_management_commands.cpp +++ b/src/mongo/db/commands/user_management_commands.cpp @@ -71,10 +71,12 @@ #include "mongo/db/commands/user_management_commands_common.h" #include "mongo/db/commands/user_management_commands_gen.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/dbmessage.h" #include "mongo/db/local_executor.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/aggregation_request_helper.h" @@ -107,13 +109,11 @@ #include "mongo/transport/service_entry_point.h" #include "mongo/transport/session.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" #include "mongo/util/duration.h" #include "mongo/util/fail_point.h" #include "mongo/util/future.h" #include "mongo/util/icu.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/net/ssl_manager.h" #include "mongo/util/net/ssl_options.h" #include "mongo/util/net/ssl_types.h" diff --git a/src/mongo/db/commands/user_management_commands_common.cpp b/src/mongo/db/commands/user_management_commands_common.cpp index 40fcf3d4510..45f5d424ebc 100644 --- a/src/mongo/db/commands/user_management_commands_common.cpp +++ b/src/mongo/db/commands/user_management_commands_common.cpp @@ -46,13 +46,13 @@ #include "mongo/db/auth/user_name.h" #include "mongo/db/commands/user_management_commands_common.h" #include "mongo/db/commands/user_management_commands_gen.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/multitenancy.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/tenant_id.h" #include "mongo/stdx/unordered_set.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/compact_structured_encryption_data_coordinator.cpp b/src/mongo/db/compact_structured_encryption_data_coordinator.cpp index ba078212019..a0bb38a178f 100644 --- a/src/mongo/db/compact_structured_encryption_data_coordinator.cpp +++ b/src/mongo/db/compact_structured_encryption_data_coordinator.cpp @@ -41,6 +41,7 @@ #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharding_coordinator_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/server_parameter.h" #include "mongo/db/server_parameter_with_storage.h" #include "mongo/db/shard_role/ddl/create_gen.h" @@ -58,7 +59,6 @@ #include "mongo/rpc/unique_message.h" #include "mongo/util/fail_point.h" #include "mongo/util/future_impl.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/curop.cpp b/src/mongo/db/curop.cpp index 22a5b0a8d3b..78b00a39c28 100644 --- a/src/mongo/db/curop.cpp +++ b/src/mongo/db/curop.cpp @@ -43,6 +43,8 @@ #include "mongo/db/commands.h" #include "mongo/db/commands/server_status/server_status_metric.h" #include "mongo/db/curop_bson_helpers.h" +#include "mongo/db/database_name_util.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context_options_gen.h" #include "mongo/db/profile_filter.h" #include "mongo/db/profile_settings.h" @@ -65,11 +67,9 @@ #include "mongo/util/assert_util.h" #include "mongo/util/clock_source.h" #include "mongo/util/concurrency/ticketholder_queue_stats.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/duration.h" #include "mongo/util/fail_point.h" #include "mongo/util/log_with_sampling.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/net/socket_utils.h" #include "mongo/util/str.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/curop_failpoint_helpers.cpp b/src/mongo/db/curop_failpoint_helpers.cpp index 1bb0674b0f0..bd866cbf5c1 100644 --- a/src/mongo/db/curop_failpoint_helpers.cpp +++ b/src/mongo/db/curop_failpoint_helpers.cpp @@ -35,10 +35,10 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/client.h" #include "mongo/db/curop.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/platform/compiler.h" #include "mongo/util/assert_util.h" #include "mongo/util/duration.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/time_support.h" #include diff --git a/src/mongo/util/database_name_util.cpp b/src/mongo/db/database_name_util.cpp similarity index 99% rename from src/mongo/util/database_name_util.cpp rename to src/mongo/db/database_name_util.cpp index 1016da0118b..07a48e73d92 100644 --- a/src/mongo/util/database_name_util.cpp +++ b/src/mongo/db/database_name_util.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/util/database_name_util.h" +#include "mongo/db/database_name_util.h" #include "mongo/base/error_codes.h" #include "mongo/base/status.h" diff --git a/src/mongo/util/database_name_util.h b/src/mongo/db/database_name_util.h similarity index 100% rename from src/mongo/util/database_name_util.h rename to src/mongo/db/database_name_util.h diff --git a/src/mongo/util/database_name_util_test.cpp b/src/mongo/db/database_name_util_test.cpp similarity index 99% rename from src/mongo/util/database_name_util_test.cpp rename to src/mongo/db/database_name_util_test.cpp index d137ad66823..6ae4c1b552b 100644 --- a/src/mongo/util/database_name_util_test.cpp +++ b/src/mongo/db/database_name_util_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/util/database_name_util.h" +#include "mongo/db/database_name_util.h" #include "mongo/bson/oid.h" #include "mongo/db/database_name.h" diff --git a/src/mongo/db/exec/agg/coll_stats_stage.cpp b/src/mongo/db/exec/agg/coll_stats_stage.cpp index 0fc6056f534..932f18699c8 100644 --- a/src/mongo/db/exec/agg/coll_stats_stage.cpp +++ b/src/mongo/db/exec/agg/coll_stats_stage.cpp @@ -34,10 +34,10 @@ #include "mongo/db/admission/execution_control/execution_admission_context.h" #include "mongo/db/exec/agg/document_source_to_stage_registry.h" #include "mongo/db/exec/document_value/document.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/pipeline/document_source.h" #include "mongo/db/pipeline/document_source_coll_stats.h" #include "mongo/db/version_context.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/net/socket_utils.h" #include "mongo/util/serialization_context.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/exec/classic/batched_delete_stage.cpp b/src/mongo/db/exec/classic/batched_delete_stage.cpp index 1dde3b74d39..9f6897c971c 100644 --- a/src/mongo/db/exec/classic/batched_delete_stage.cpp +++ b/src/mongo/db/exec/classic/batched_delete_stage.cpp @@ -42,6 +42,7 @@ #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/write_stage_common.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/canonical_query.h" #include "mongo/db/query/plan_executor.h" @@ -59,7 +60,6 @@ #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/scopeguard.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/extension/host/catalog_context.h b/src/mongo/db/extension/host/catalog_context.h index 8155a55bced..26f3b30c909 100644 --- a/src/mongo/db/extension/host/catalog_context.h +++ b/src/mongo/db/extension/host/catalog_context.h @@ -28,12 +28,12 @@ */ #pragma once +#include "mongo/db/database_name_util.h" #include "mongo/db/extension/public/api.h" #include "mongo/db/extension/shared/byte_buf_utils.h" #include "mongo/db/extension/shared/explain_utils.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/search/document_source_internal_search_id_lookup.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/modules.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/extension/host/document_source_extension_optimizable_test.cpp b/src/mongo/db/extension/host/document_source_extension_optimizable_test.cpp index ba38a0f5be3..ee33ad11f31 100644 --- a/src/mongo/db/extension/host/document_source_extension_optimizable_test.cpp +++ b/src/mongo/db/extension/host/document_source_extension_optimizable_test.cpp @@ -42,6 +42,7 @@ #include "mongo/db/extension/sdk/query_shape_opts_handle.h" #include "mongo/db/extension/sdk/tests/fruits_test_stage.h" #include "mongo/db/extension/sdk/tests/shared_test_stages.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/pipeline/aggregation_context_fixture.h" #include "mongo/db/pipeline/document_source_documents.h" #include "mongo/db/pipeline/lite_parsed_document_source.h" @@ -51,7 +52,6 @@ #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/unittest/death_test.h" #include "mongo/unittest/unittest.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/serialization_context.h" namespace mongo::extension { diff --git a/src/mongo/db/fle_crud.cpp b/src/mongo/db/fle_crud.cpp index 80187853a68..ee9058fceec 100644 --- a/src/mongo/db/fle_crud.cpp +++ b/src/mongo/db/fle_crud.cpp @@ -55,6 +55,7 @@ #include "mongo/db/logical_time.h" #include "mongo/db/multitenancy_gen.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_time_tracker.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/query/collation/collator_factory_interface.h" @@ -84,7 +85,6 @@ #include "mongo/util/assert_util.h" #include "mongo/util/fail_point.h" #include "mongo/util/future.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/out_of_line_executor.h" #include "mongo/util/str.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/global_catalog/ddl/cannot_implicitly_create_collection_info.cpp b/src/mongo/db/global_catalog/ddl/cannot_implicitly_create_collection_info.cpp index e19b4b0a8b5..cc9a6c6d7a1 100644 --- a/src/mongo/db/global_catalog/ddl/cannot_implicitly_create_collection_info.cpp +++ b/src/mongo/db/global_catalog/ddl/cannot_implicitly_create_collection_info.cpp @@ -32,7 +32,7 @@ #include "mongo/base/init.h" // IWYU pragma: keep #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/util/namespace_string_util.h" +#include "mongo/db/namespace_string_util.h" namespace mongo { namespace { diff --git a/src/mongo/db/global_catalog/ddl/cluster_collmod_cmd.cpp b/src/mongo/db/global_catalog/ddl/cluster_collmod_cmd.cpp index ed3b9812ce4..e0cc348304b 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_collmod_cmd.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_collmod_cmd.cpp @@ -43,6 +43,7 @@ #include "mongo/db/client.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/namespace_string.h" @@ -61,7 +62,6 @@ #include "mongo/logv2/log.h" #include "mongo/s/async_requests_sender.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/read_through_cache.h" #include "mongo/util/str.h" #include "mongo/util/string_map.h" diff --git a/src/mongo/db/global_catalog/ddl/cluster_create_cmd.cpp b/src/mongo/db/global_catalog/ddl/cluster_create_cmd.cpp index f132cbf3731..a8d64eea59f 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_create_cmd.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_create_cmd.cpp @@ -33,6 +33,7 @@ #include "mongo/db/auth/authorization_checks.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/commands.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/global_catalog/ddl/cluster_ddl.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -49,7 +50,6 @@ #include "mongo/rpc/op_msg.h" #include "mongo/s/async_requests_sender.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include #include diff --git a/src/mongo/db/global_catalog/ddl/cluster_create_indexes_cmd.cpp b/src/mongo/db/global_catalog/ddl/cluster_create_indexes_cmd.cpp index b0073102db5..9aa1c7f78ea 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_create_indexes_cmd.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_create_indexes_cmd.cpp @@ -41,6 +41,7 @@ #include "mongo/db/basic_types_gen.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/global_catalog/ddl/cluster_ddl.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -57,7 +58,6 @@ #include "mongo/db/timeseries/timeseries_commands_conversion_helper.h" #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/string_map.h" #include diff --git a/src/mongo/db/global_catalog/ddl/cluster_drop_database_cmd.cpp b/src/mongo/db/global_catalog/ddl/cluster_drop_database_cmd.cpp index c1e8e5cf3fd..200ff12a467 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_drop_database_cmd.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_drop_database_cmd.cpp @@ -35,6 +35,7 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/namespace_string.h" @@ -50,7 +51,6 @@ #include "mongo/rpc/op_msg.h" #include "mongo/s/async_requests_sender.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/scopeguard.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/global_catalog/ddl/cluster_drop_indexes_cmd.cpp b/src/mongo/db/global_catalog/ddl/cluster_drop_indexes_cmd.cpp index 1c42ffc5d61..52b46998c76 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_drop_indexes_cmd.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_drop_indexes_cmd.cpp @@ -39,6 +39,7 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/namespace_string.h" @@ -55,7 +56,6 @@ #include "mongo/logv2/log.h" #include "mongo/s/async_requests_sender.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include #include diff --git a/src/mongo/db/global_catalog/ddl/cluster_enable_sharding_cmd.cpp b/src/mongo/db/global_catalog/ddl/cluster_enable_sharding_cmd.cpp index 161d8f8bda3..130c65940f5 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_enable_sharding_cmd.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_enable_sharding_cmd.cpp @@ -35,6 +35,7 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/namespace_string.h" @@ -50,7 +51,6 @@ #include "mongo/idl/idl_parser.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/scopeguard.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/global_catalog/ddl/cluster_list_collections_cmd.cpp b/src/mongo/db/global_catalog/ddl/cluster_list_collections_cmd.cpp index a6bf9e9a075..82744e1c3ea 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_list_collections_cmd.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_list_collections_cmd.cpp @@ -45,6 +45,7 @@ #include "mongo/db/commands.h" #include "mongo/db/commands/test_commands_enabled.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/exec/mutable_bson/algorithm.h" #include "mongo/db/exec/mutable_bson/document.h" #include "mongo/db/exec/mutable_bson/element.h" @@ -65,7 +66,6 @@ #include "mongo/s/async_requests_sender.h" #include "mongo/s/query/exec/store_possible_cursor.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" #include "mongo/util/read_through_cache.h" #include "mongo/util/string_map.h" diff --git a/src/mongo/db/global_catalog/ddl/cluster_list_databases_cmd.cpp b/src/mongo/db/global_catalog/ddl/cluster_list_databases_cmd.cpp index 61f4e922172..2476d07dbc0 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_list_databases_cmd.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_list_databases_cmd.cpp @@ -38,6 +38,7 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/router_role/cluster_commands_helpers.h" @@ -50,7 +51,6 @@ #include "mongo/db/topology/shard_registry.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/global_catalog/ddl/cluster_shard_collection_cmd.cpp b/src/mongo/db/global_catalog/ddl/cluster_shard_collection_cmd.cpp index a2e13485adb..85e5ed25d72 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_shard_collection_cmd.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_shard_collection_cmd.cpp @@ -42,12 +42,12 @@ #include "mongo/db/global_catalog/ddl/shard_collection_gen.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/idl/idl_parser.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/uuid.h" #include diff --git a/src/mongo/db/global_catalog/ddl/configsvr_repair_sharded_collection_chunks_history_command.cpp b/src/mongo/db/global_catalog/ddl/configsvr_repair_sharded_collection_chunks_history_command.cpp index edc18cc139d..187de8ad7cb 100644 --- a/src/mongo/db/global_catalog/ddl/configsvr_repair_sharded_collection_chunks_history_command.cpp +++ b/src/mongo/db/global_catalog/ddl/configsvr_repair_sharded_collection_chunks_history_command.cpp @@ -43,6 +43,7 @@ #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/read_concern_level.h" @@ -53,7 +54,6 @@ #include "mongo/db/topology/cluster_role.h" #include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include diff --git a/src/mongo/db/global_catalog/ddl/configsvr_run_restore_command.cpp b/src/mongo/db/global_catalog/ddl/configsvr_run_restore_command.cpp index c72eed7965b..c977318514a 100644 --- a/src/mongo/db/global_catalog/ddl/configsvr_run_restore_command.cpp +++ b/src/mongo/db/global_catalog/ddl/configsvr_run_restore_command.cpp @@ -42,10 +42,12 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_catalog/ddl/configsvr_run_restore_gen.h" #include "mongo/db/global_catalog/known_collections.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/find_command.h" #include "mongo/db/repl/repl_settings.h" @@ -60,8 +62,6 @@ #include "mongo/logv2/log.h" #include "mongo/stdx/unordered_map.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include "mongo/util/string_map.h" #include "mongo/util/testing_proctor.h" diff --git a/src/mongo/db/global_catalog/ddl/configsvr_split_chunk_command.cpp b/src/mongo/db/global_catalog/ddl/configsvr_split_chunk_command.cpp index a5a6913b728..103cf4840bf 100644 --- a/src/mongo/db/global_catalog/ddl/configsvr_split_chunk_command.cpp +++ b/src/mongo/db/global_catalog/ddl/configsvr_split_chunk_command.cpp @@ -41,6 +41,7 @@ #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" #include "mongo/db/global_catalog/ddl/split_chunk_request_type.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/read_concern_level.h" @@ -49,7 +50,6 @@ #include "mongo/db/topology/cluster_role.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include diff --git a/src/mongo/db/global_catalog/ddl/create_collection_coordinator.h b/src/mongo/db/global_catalog/ddl/create_collection_coordinator.h index c43ec7c2179..1dd4ca3144d 100644 --- a/src/mongo/db/global_catalog/ddl/create_collection_coordinator.h +++ b/src/mongo/db/global_catalog/ddl/create_collection_coordinator.h @@ -40,6 +40,7 @@ #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/write_ops.h" #include "mongo/db/s/config/initial_split_policy.h" @@ -52,7 +53,6 @@ #include "mongo/util/cancellation.h" #include "mongo/util/future.h" #include "mongo/util/modules.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/uuid.h" #include diff --git a/src/mongo/db/global_catalog/ddl/drop_collection_coordinator.h b/src/mongo/db/global_catalog/ddl/drop_collection_coordinator.h index 37ff92f4729..49ec8a229f9 100644 --- a/src/mongo/db/global_catalog/ddl/drop_collection_coordinator.h +++ b/src/mongo/db/global_catalog/ddl/drop_collection_coordinator.h @@ -39,6 +39,7 @@ #include "mongo/db/global_catalog/ddl/sharding_coordinator_service.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/write_ops.h" #include "mongo/db/shard_role/shard_catalog/drop_collection.h" @@ -47,7 +48,6 @@ #include "mongo/util/cancellation.h" #include "mongo/util/future.h" #include "mongo/util/modules.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/global_catalog/ddl/drop_database_coordinator.cpp b/src/mongo/db/global_catalog/ddl/drop_database_coordinator.cpp index 12fd704b0b0..f2500a56c25 100644 --- a/src/mongo/db/global_catalog/ddl/drop_database_coordinator.cpp +++ b/src/mongo/db/global_catalog/ddl/drop_database_coordinator.cpp @@ -35,6 +35,7 @@ #include "mongo/db/client.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/notify_sharding_event_gen.h" @@ -47,6 +48,7 @@ #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/global_catalog/type_namespace_placement_gen.h" #include "mongo/db/logical_time.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/query/query_feature_flags_gen.h" #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/repl/read_concern_level.h" @@ -76,10 +78,8 @@ #include "mongo/rpc/op_msg.h" #include "mongo/rpc/reply_interface.h" #include "mongo/s/write_ops/batched_command_response.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/duration.h" #include "mongo/util/future_impl.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/out_of_line_executor.h" #include "mongo/util/str.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/global_catalog/ddl/move_primary_coordinator.cpp b/src/mongo/db/global_catalog/ddl/move_primary_coordinator.cpp index 575225cc8ad..ee0a7af5616 100644 --- a/src/mongo/db/global_catalog/ddl/move_primary_coordinator.cpp +++ b/src/mongo/db/global_catalog/ddl/move_primary_coordinator.cpp @@ -39,6 +39,7 @@ #include "mongo/client/read_preference.h" #include "mongo/db/client.h" #include "mongo/db/commands.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/move_primary_gen.h" @@ -47,6 +48,7 @@ #include "mongo/db/global_catalog/ddl/shardsvr_commit_create_database_metadata_command.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_shard.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/repl/change_stream_oplog_notification.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/s/forwardable_operation_metadata.h" @@ -76,11 +78,9 @@ #include "mongo/platform/compiler.h" #include "mongo/rpc/get_status_from_command_result.h" #include "mongo/s/resharding/resharding_feature_flag_gen.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/duration.h" #include "mongo/util/fail_point.h" #include "mongo/util/future_impl.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/global_catalog/ddl/placement_history_cleaner.cpp b/src/mongo/db/global_catalog/ddl/placement_history_cleaner.cpp index 645668954ac..b935114a3a8 100644 --- a/src/mongo/db/global_catalog/ddl/placement_history_cleaner.cpp +++ b/src/mongo/db/global_catalog/ddl/placement_history_cleaner.cpp @@ -42,6 +42,7 @@ #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_namespace_placement_gen.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/shard_registry.h" @@ -53,7 +54,6 @@ #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" #include "mongo/util/duration.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/global_catalog/ddl/rename_collection_coordinator.cpp b/src/mongo/db/global_catalog/ddl/rename_collection_coordinator.cpp index 0910e7cfc4a..5c81aff0174 100644 --- a/src/mongo/db/global_catalog/ddl/rename_collection_coordinator.cpp +++ b/src/mongo/db/global_catalog/ddl/rename_collection_coordinator.cpp @@ -50,6 +50,7 @@ #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/global_catalog/type_tags.h" #include "mongo/db/logical_time.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/query_feature_flags_gen.h" #include "mongo/db/query/write_ops/write_ops_gen.h" @@ -86,7 +87,6 @@ #include "mongo/s/write_ops/batched_command_request.h" #include "mongo/s/write_ops/batched_command_response.h" #include "mongo/util/future_impl.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/out_of_line_executor.h" #include "mongo/util/str.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/global_catalog/ddl/rename_collection_participant_service.cpp b/src/mongo/db/global_catalog/ddl/rename_collection_participant_service.cpp index 89d742d73ff..58874c8f868 100644 --- a/src/mongo/db/global_catalog/ddl/rename_collection_participant_service.cpp +++ b/src/mongo/db/global_catalog/ddl/rename_collection_participant_service.cpp @@ -35,12 +35,14 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/simple_bsonobj_comparator.h" #include "mongo/db/client.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/drop_collection_coordinator.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_util.h" #include "mongo/db/global_catalog/ddl/sharding_recovery_service.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_database_gen.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/repl/replication_coordinator.h" @@ -61,10 +63,8 @@ #include "mongo/db/topology/sharding_state.h" #include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/logv2/log.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/duration.h" #include "mongo/util/future_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/global_catalog/ddl/sessions_collection_config_server.cpp b/src/mongo/db/global_catalog/ddl/sessions_collection_config_server.cpp index cc40132d7be..72e67b422e8 100644 --- a/src/mongo/db/global_catalog/ddl/sessions_collection_config_server.cpp +++ b/src/mongo/db/global_catalog/ddl/sessions_collection_config_server.cpp @@ -45,6 +45,7 @@ #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/global_catalog/type_collection_gen.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/legacy_runtime_constants_gen.h" #include "mongo/db/repl/replication_coordinator.h" @@ -62,7 +63,6 @@ #include "mongo/rpc/get_status_from_command_result.h" #include "mongo/s/async_requests_sender.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/global_catalog/ddl/set_allow_migrations_coordinator.cpp b/src/mongo/db/global_catalog/ddl/set_allow_migrations_coordinator.cpp index a5925cda129..b3ba08b4357 100644 --- a/src/mongo/db/global_catalog/ddl/set_allow_migrations_coordinator.cpp +++ b/src/mongo/db/global_catalog/ddl/set_allow_migrations_coordinator.cpp @@ -40,6 +40,7 @@ #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/global_catalog/type_collection_gen.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" @@ -54,7 +55,6 @@ #include "mongo/s/write_ops/batched_command_response.h" #include "mongo/util/assert_util.h" #include "mongo/util/future_impl.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/global_catalog/ddl/shard_key_util.cpp b/src/mongo/db/global_catalog/ddl/shard_key_util.cpp index 3fcfa7feace..627a7456c90 100644 --- a/src/mongo/db/global_catalog/ddl/shard_key_util.cpp +++ b/src/mongo/db/global_catalog/ddl/shard_key_util.cpp @@ -54,6 +54,7 @@ #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/shard_key_index_util.h" #include "mongo/db/hasher.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/query/collation/collation_spec.h" #include "mongo/db/router_role/cluster_commands_helpers.h" #include "mongo/db/s/migration_destination_manager.h" @@ -77,7 +78,6 @@ #include "mongo/rpc/get_status_from_command_result.h" #include "mongo/util/assert_util.h" #include "mongo/util/duration.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/global_catalog/ddl/shard_metadata_util.cpp b/src/mongo/db/global_catalog/ddl/shard_metadata_util.cpp index 72f5dcf153f..0debd7fd6e8 100644 --- a/src/mongo/db/global_catalog/ddl/shard_metadata_util.cpp +++ b/src/mongo/db/global_catalog/ddl/shard_metadata_util.cpp @@ -41,6 +41,7 @@ #include "mongo/db/global_catalog/type_shard_database.h" #include "mongo/db/global_catalog/type_shard_database_gen.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/find_command.h" #include "mongo/db/query/write_ops/write_ops_exec.h" @@ -56,7 +57,6 @@ #include "mongo/s/write_ops/batched_command_response.h" #include "mongo/util/assert_util.h" #include "mongo/util/duration.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/global_catalog/ddl/shard_util.cpp b/src/mongo/db/global_catalog/ddl/shard_util.cpp index 6fc75888ed0..1e0f9a1169e 100644 --- a/src/mongo/db/global_catalog/ddl/shard_util.cpp +++ b/src/mongo/db/global_catalog/ddl/shard_util.cpp @@ -43,6 +43,7 @@ #include "mongo/client/read_preference.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/shard_registry.h" @@ -51,7 +52,6 @@ #include "mongo/s/request_types/auto_split_vector_gen.h" #include "mongo/util/assert_util.h" #include "mongo/util/duration.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager.cpp b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager.cpp index 845ffb3e06d..ef45a00ac28 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager.cpp @@ -52,6 +52,7 @@ #include "mongo/db/global_catalog/type_shard.h" #include "mongo/db/global_catalog/type_tags.h" #include "mongo/db/logical_time.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/expression_context.h" @@ -95,7 +96,6 @@ #include "mongo/util/future.h" #include "mongo/util/future_impl.h" #include "mongo/util/log_and_backoff.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/out_of_line_executor.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_chunk_operations.cpp b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_chunk_operations.cpp index 9fd0e20d3ec..b42f9358aa4 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_chunk_operations.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_chunk_operations.cpp @@ -64,6 +64,7 @@ #include "mongo/db/global_catalog/type_tags.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/query/client_cursor/cursor_response.h" @@ -108,7 +109,6 @@ #include "mongo/util/future.h" #include "mongo/util/future_impl.h" #include "mongo/util/future_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/out_of_line_executor.h" #include "mongo/util/scopeguard.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_collection_operations.cpp b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_collection_operations.cpp index 72888ad2825..86cb10800ab 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_collection_operations.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_collection_operations.cpp @@ -54,6 +54,7 @@ #include "mongo/db/global_catalog/type_tags.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/write_ops.h" #include "mongo/db/query/write_ops/write_ops_gen.h" @@ -85,7 +86,6 @@ #include "mongo/util/fail_point.h" #include "mongo/util/future.h" #include "mongo/util/future_impl.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/out_of_line_executor.h" #include "mongo/util/scopeguard.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_database_operations.cpp b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_database_operations.cpp index 2b94685b9c1..8d2f96b5ed3 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_database_operations.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_database_operations.cpp @@ -36,6 +36,7 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/client/read_preference.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/create_database_util.h" @@ -74,7 +75,6 @@ #include "mongo/logv2/log.h" #include "mongo/s/write_ops/batched_command_response.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" #include "mongo/util/future.h" #include "mongo/util/future_impl.h" diff --git a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_zone_operations.cpp b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_zone_operations.cpp index 30d3130dae7..e744c158521 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_zone_operations.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_zone_operations.cpp @@ -51,6 +51,7 @@ #include "mongo/db/global_catalog/type_tags.h" #include "mongo/db/keypattern.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/s/balancer/balancer_policy.h" @@ -61,7 +62,6 @@ #include "mongo/db/write_concern_options.h" #include "mongo/util/assert_util.h" #include "mongo/util/duration.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/global_catalog/ddl/sharding_coordinator.h b/src/mongo/db/global_catalog/ddl/sharding_coordinator.h index f18e70fa495..5a5e021b016 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_coordinator.h +++ b/src/mongo/db/global_catalog/ddl/sharding_coordinator.h @@ -41,6 +41,7 @@ #include "mongo/db/global_catalog/ddl/sharding_coordinator_service.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_util.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/pipeline/process_interface/mongo_process_interface.h" @@ -66,7 +67,6 @@ #include "mongo/util/future.h" #include "mongo/util/future_impl.h" #include "mongo/util/modules.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/version/releases.h" #include diff --git a/src/mongo/db/global_catalog/ddl/sharding_ddl_util.cpp b/src/mongo/db/global_catalog/ddl/sharding_ddl_util.cpp index 47869aa4a07..a975a1cbf46 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_ddl_util.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_ddl_util.cpp @@ -55,6 +55,7 @@ #include "mongo/db/global_catalog/type_tags.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/query/distinct_command_gen.h" #include "mongo/db/query/write_ops/write_ops_gen.h" @@ -96,7 +97,6 @@ #include "mongo/util/decorable.h" #include "mongo/util/duration.h" #include "mongo/util/future_impl.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/out_of_line_executor.h" #include "mongo/util/scopeguard.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/global_catalog/ddl/sharding_recovery_service.cpp b/src/mongo/db/global_catalog/ddl/sharding_recovery_service.cpp index 14f65000a7e..d09f19e97eb 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_recovery_service.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_recovery_service.cpp @@ -38,6 +38,7 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/global_catalog/type_database_gen.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/pipeline.h" @@ -65,7 +66,6 @@ #include "mongo/s/write_ops/batched_command_response.h" #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_collmod_participant_command.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_collmod_participant_command.cpp index 21414a4141d..a1e6afe4d55 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_collmod_participant_command.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_collmod_participant_command.cpp @@ -47,6 +47,7 @@ #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" #include "mongo/db/shard_role/ddl/coll_mod_gen.h" @@ -64,7 +65,6 @@ #include "mongo/idl/idl_parser.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/out_of_line_executor.h" #include diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_convert_to_capped_participant_command.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_convert_to_capped_participant_command.cpp index 1fbcee1fb2b..b35bb2cac06 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_convert_to_capped_participant_command.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_convert_to_capped_participant_command.cpp @@ -45,12 +45,12 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" #include "mongo/db/shard_role/shard_catalog/catalog_raii.h" #include "mongo/db/transaction/transaction_participant.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_participant_block_command.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_participant_block_command.cpp index e407e468bbd..fa3fde9c7c3 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_participant_block_command.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_participant_block_command.cpp @@ -43,6 +43,7 @@ #include "mongo/db/global_catalog/ddl/sharding_recovery_service.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" #include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" @@ -53,7 +54,6 @@ #include "mongo/executor/task_executor_pool.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/out_of_line_executor.h" #include diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_rename_collection_participant_command.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_rename_collection_participant_command.cpp index 9695a007470..a2e6cba3dc6 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_rename_collection_participant_command.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_rename_collection_participant_command.cpp @@ -42,6 +42,7 @@ #include "mongo/db/global_catalog/ddl/rename_collection_participant_service.h" #include "mongo/db/global_catalog/ddl/sharded_rename_collection_gen.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/s/forwardable_operation_metadata.h" #include "mongo/db/service_context.h" @@ -50,7 +51,6 @@ #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" #include "mongo/util/future.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_split_chunk_command.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_split_chunk_command.cpp index 377b699a54d..3f56e2c304f 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_split_chunk_command.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_split_chunk_command.cpp @@ -44,9 +44,11 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/global_catalog/ddl/split_chunk.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/s/chunk_operation_precondition_checks.h" #include "mongo/db/service_context.h" @@ -57,8 +59,6 @@ #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/global_catalog/ddl/split_chunk_request_type.cpp b/src/mongo/db/global_catalog/ddl/split_chunk_request_type.cpp index f296a3a684e..dfd25989531 100644 --- a/src/mongo/db/global_catalog/ddl/split_chunk_request_type.cpp +++ b/src/mongo/db/global_catalog/ddl/split_chunk_request_type.cpp @@ -35,8 +35,8 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/bsontypes.h" #include "mongo/bson/util/bson_extract.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/write_concern_options.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/global_catalog/metadata_consistency_validation/check_sharding_index_command.cpp b/src/mongo/db/global_catalog/metadata_consistency_validation/check_sharding_index_command.cpp index 2926bfd11e0..4b4da87b26b 100644 --- a/src/mongo/db/global_catalog/metadata_consistency_validation/check_sharding_index_command.cpp +++ b/src/mongo/db/global_catalog/metadata_consistency_validation/check_sharding_index_command.cpp @@ -38,13 +38,13 @@ #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/ddl/shard_key_index_util.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/profile_settings.h" #include "mongo/db/service_context.h" #include "mongo/db/shard_role/shard_catalog/db_raii.h" #include "mongo/db/shard_role/shard_role.h" #include "mongo/db/tenant_id.h" -#include "mongo/util/namespace_string_util.h" #include diff --git a/src/mongo/db/global_catalog/metadata_consistency_validation/cluster_check_metadata_consistency_cmd.cpp b/src/mongo/db/global_catalog/metadata_consistency_validation/cluster_check_metadata_consistency_cmd.cpp index b527c773c17..ef143dfcaa9 100644 --- a/src/mongo/db/global_catalog/metadata_consistency_validation/cluster_check_metadata_consistency_cmd.cpp +++ b/src/mongo/db/global_catalog/metadata_consistency_validation/cluster_check_metadata_consistency_cmd.cpp @@ -43,6 +43,7 @@ #include "mongo/db/commands.h" #include "mongo/db/curop.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/global_catalog/metadata_consistency_validation/check_metadata_consistency_gen.h" @@ -77,7 +78,6 @@ #include "mongo/s/query/exec/establish_cursors.h" #include "mongo/stdx/unordered_set.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" #include "mongo/util/str.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/global_catalog/sharding_catalog_client_impl.cpp b/src/mongo/db/global_catalog/sharding_catalog_client_impl.cpp index e2a6e6de798..a54690910c2 100644 --- a/src/mongo/db/global_catalog/sharding_catalog_client_impl.cpp +++ b/src/mongo/db/global_catalog/sharding_catalog_client_impl.cpp @@ -52,6 +52,7 @@ #include "mongo/db/global_catalog/type_shard.h" #include "mongo/db/global_catalog/type_tags.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/document_source_group.h" @@ -80,7 +81,6 @@ #include "mongo/s/write_ops/batched_command_response.h" #include "mongo/util/assert_util.h" #include "mongo/util/intrusive_counter.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/pcre_util.h" #include "mongo/util/str.h" #include "mongo/util/string_map.h" diff --git a/src/mongo/db/global_catalog/type_changelog.cpp b/src/mongo/db/global_catalog/type_changelog.cpp index 346daff7d09..fa16ad11ac9 100644 --- a/src/mongo/db/global_catalog/type_changelog.cpp +++ b/src/mongo/db/global_catalog/type_changelog.cpp @@ -37,8 +37,8 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/bsontypes.h" #include "mongo/bson/util/bson_extract.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/global_catalog/type_tags.cpp b/src/mongo/db/global_catalog/type_tags.cpp index 84eefe5905e..e4401f394d6 100644 --- a/src/mongo/db/global_catalog/type_tags.cpp +++ b/src/mongo/db/global_catalog/type_tags.cpp @@ -36,8 +36,8 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/util/bson_extract.h" #include "mongo/db/global_catalog/type_chunk.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/index_builds/side_writes_tracker.cpp b/src/mongo/db/index_builds/side_writes_tracker.cpp index b9c2630e4e6..e6cf08f48cf 100644 --- a/src/mongo/db/index_builds/side_writes_tracker.cpp +++ b/src/mongo/db/index_builds/side_writes_tracker.cpp @@ -42,6 +42,7 @@ #include "mongo/db/index_builds/index_build_interceptor_gen.h" #include "mongo/db/index_builds/side_writes_tracker.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" #include "mongo/db/shard_role/lock_manager/exception_util.h" @@ -59,7 +60,6 @@ #include "mongo/otel/metrics/metrics_service.h" #include "mongo/util/assert_util.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/progress_meter.h" #include "mongo/util/timer.h" diff --git a/src/mongo/util/namespace_string_util.cpp b/src/mongo/db/namespace_string_util.cpp similarity index 99% rename from src/mongo/util/namespace_string_util.cpp rename to src/mongo/db/namespace_string_util.cpp index cef2f18dee7..76bf04f2fd1 100644 --- a/src/mongo/util/namespace_string_util.cpp +++ b/src/mongo/db/namespace_string_util.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/util/namespace_string_util.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/base/error_codes.h" #include "mongo/base/status.h" diff --git a/src/mongo/util/namespace_string_util.h b/src/mongo/db/namespace_string_util.h similarity index 100% rename from src/mongo/util/namespace_string_util.h rename to src/mongo/db/namespace_string_util.h diff --git a/src/mongo/util/namespace_string_util_test.cpp b/src/mongo/db/namespace_string_util_test.cpp similarity index 99% rename from src/mongo/util/namespace_string_util_test.cpp rename to src/mongo/db/namespace_string_util_test.cpp index 91b1aec80cf..39f4d0ea0c5 100644 --- a/src/mongo/util/namespace_string_util_test.cpp +++ b/src/mongo/db/namespace_string_util_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/util/namespace_string_util.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/oid.h" diff --git a/src/mongo/db/op_observer/fallback_op_observer.cpp b/src/mongo/db/op_observer/fallback_op_observer.cpp index 9cd1672d2c4..ec3c4f9fa04 100644 --- a/src/mongo/db/op_observer/fallback_op_observer.cpp +++ b/src/mongo/db/op_observer/fallback_op_observer.cpp @@ -34,6 +34,7 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/keys_collection_document_gen.h" #include "mongo/db/logical_time_validator.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/op_observer/batched_write_context.h" #include "mongo/db/op_observer/op_observer_util.h" #include "mongo/db/read_write_concern_defaults.h" @@ -52,7 +53,6 @@ #include "mongo/scripting/engine.h" #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/op_observer/op_observer_impl.cpp b/src/mongo/db/op_observer/op_observer_impl.cpp index 2f60584da3e..22a590efd22 100644 --- a/src/mongo/db/op_observer/op_observer_impl.cpp +++ b/src/mongo/db/op_observer/op_observer_impl.cpp @@ -43,6 +43,7 @@ #include "mongo/db/logical_time_validator.h" #include "mongo/db/namespace_string.h" #include "mongo/db/namespace_string_reserved.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/op_observer/batched_write_context.h" #include "mongo/db/op_observer/op_observer_util.h" #include "mongo/db/operation_context.h" @@ -92,7 +93,6 @@ #include "mongo/util/decorable.h" #include "mongo/util/duration.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/pipeline/change_stream.cpp b/src/mongo/db/pipeline/change_stream.cpp index 2cbda81fd37..091a9d3fe65 100644 --- a/src/mongo/db/pipeline/change_stream.cpp +++ b/src/mongo/db/pipeline/change_stream.cpp @@ -30,8 +30,8 @@ #include "mongo/db/pipeline/change_stream.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include diff --git a/src/mongo/db/pipeline/change_stream_event_transform.cpp b/src/mongo/db/pipeline/change_stream_event_transform.cpp index 62e2104bc3a..c01ad331248 100644 --- a/src/mongo/db/pipeline/change_stream_event_transform.cpp +++ b/src/mongo/db/pipeline/change_stream_event_transform.cpp @@ -34,6 +34,7 @@ #include "mongo/db/database_name.h" #include "mongo/db/exec/document_value/document_metadata_fields.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/pipeline/change_stream.h" #include "mongo/db/pipeline/change_stream_document_diff_parser.h" #include "mongo/db/pipeline/change_stream_helpers.h" @@ -48,7 +49,6 @@ #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/pipeline/document_source_graph_lookup.cpp b/src/mongo/db/pipeline/document_source_graph_lookup.cpp index 12bca377dc9..c13cf1a4a63 100644 --- a/src/mongo/db/pipeline/document_source_graph_lookup.cpp +++ b/src/mongo/db/pipeline/document_source_graph_lookup.cpp @@ -36,6 +36,7 @@ #include "mongo/db/database_name.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/document_value/value.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/pipeline/expression.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/expression_context_builder.h" @@ -50,7 +51,6 @@ #include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/stats/counters.h" #include "mongo/db/topology/sharding_state.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/pipeline/document_source_lookup.cpp b/src/mongo/db/pipeline/document_source_lookup.cpp index c7d8632fc79..9c81e4d3367 100644 --- a/src/mongo/db/pipeline/document_source_lookup.cpp +++ b/src/mongo/db/pipeline/document_source_lookup.cpp @@ -44,6 +44,7 @@ #include "mongo/db/matcher/expression.h" #include "mongo/db/matcher/expression_algo.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/pipeline/aggregation_request_helper.h" #include "mongo/db/pipeline/document_path_support.h" #include "mongo/db/pipeline/document_source.h" @@ -63,7 +64,6 @@ #include "mongo/db/stats/counters.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/idl/idl_parser.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" namespace mongo { diff --git a/src/mongo/db/pipeline/document_source_merge.cpp b/src/mongo/db/pipeline/document_source_merge.cpp index 759dfeaeb12..db83d648657 100644 --- a/src/mongo/db/pipeline/document_source_merge.cpp +++ b/src/mongo/db/pipeline/document_source_merge.cpp @@ -33,6 +33,7 @@ #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/database_name.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/document_source_merge_gen.h" #include "mongo/db/pipeline/document_source_merge_spec.h" @@ -48,7 +49,6 @@ #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/pipeline/document_source_merge_spec.cpp b/src/mongo/db/pipeline/document_source_merge_spec.cpp index 7cb8c6248d6..2c3eb1b45b8 100644 --- a/src/mongo/db/pipeline/document_source_merge_spec.cpp +++ b/src/mongo/db/pipeline/document_source_merge_spec.cpp @@ -33,14 +33,14 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/bsontypes.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/pipeline/aggregation_request_helper.h" #include "mongo/db/pipeline/document_source_merge.h" #include "mongo/db/pipeline/document_source_merge_gen.h" #include "mongo/db/query/query_shape/serialization_options.h" #include "mongo/idl/idl_parser.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/pipeline/document_source_out.cpp b/src/mongo/db/pipeline/document_source_out.cpp index c5e05404ffa..54e45c09a0a 100644 --- a/src/mongo/db/pipeline/document_source_out.cpp +++ b/src/mongo/db/pipeline/document_source_out.cpp @@ -33,6 +33,7 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/bsontypes.h" #include "mongo/db/client.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/allowed_contexts.h" #include "mongo/db/service_context.h" @@ -41,7 +42,6 @@ #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/pipeline/document_source_union_with.cpp b/src/mongo/db/pipeline/document_source_union_with.cpp index 5f6667ef47e..2fbe3629861 100644 --- a/src/mongo/db/pipeline/document_source_union_with.cpp +++ b/src/mongo/db/pipeline/document_source_union_with.cpp @@ -38,6 +38,7 @@ #include "mongo/db/exec/agg/pipeline_builder.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/pipeline/document_source_documents.h" #include "mongo/db/pipeline/document_source_hybrid_scoring_util.h" #include "mongo/db/pipeline/document_source_match.h" @@ -59,7 +60,6 @@ #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" #include "mongo/platform/compiler.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/pipeline/lite_parsed_union_with.cpp b/src/mongo/db/pipeline/lite_parsed_union_with.cpp index a184c375859..d0516819448 100644 --- a/src/mongo/db/pipeline/lite_parsed_union_with.cpp +++ b/src/mongo/db/pipeline/lite_parsed_union_with.cpp @@ -29,6 +29,7 @@ #include "mongo/db/pipeline/lite_parsed_union_with.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/pipeline/document_source_documents.h" // for kStageName in validation #include "mongo/db/pipeline/document_source_queue.h" // for kStageName in validation #include "mongo/db/pipeline/document_source_union_with_gen.h" // UnionWithSpec IDL @@ -36,7 +37,6 @@ #include "mongo/db/query/allowed_contexts.h" #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/pipeline/process_interface/common_mongod_process_interface.cpp b/src/mongo/db/pipeline/process_interface/common_mongod_process_interface.cpp index aef4295b35d..025ffc0a16f 100644 --- a/src/mongo/db/pipeline/process_interface/common_mongod_process_interface.cpp +++ b/src/mongo/db/pipeline/process_interface/common_mongod_process_interface.cpp @@ -37,11 +37,13 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/collection_index_usage_tracker.h" #include "mongo/db/curop.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/exec/agg/pipeline_builder.h" #include "mongo/db/exec/document_value/value.h" #include "mongo/db/exec/matcher/matcher.h" #include "mongo/db/flow_control_ticketholder.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/catalog_resource_handle.h" #include "mongo/db/pipeline/document_source.h" @@ -116,9 +118,7 @@ #include "mongo/s/query_analysis_sample_tracker.h" #include "mongo/s/query_analysis_sampler_util.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/future.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/pipeline/process_interface/common_process_interface.cpp b/src/mongo/db/pipeline/process_interface/common_process_interface.cpp index b157146d0d9..d21a2813f95 100644 --- a/src/mongo/db/pipeline/process_interface/common_process_interface.cpp +++ b/src/mongo/db/pipeline/process_interface/common_process_interface.cpp @@ -41,6 +41,7 @@ #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/logical_time.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/operation_time_tracker.h" #include "mongo/db/pipeline/expression_context.h" @@ -58,7 +59,6 @@ #include "mongo/db/topology/cluster_role.h" #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/net/socket_utils.h" #include "mongo/util/serialization_context.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/query/client_cursor/cursor_response.cpp b/src/mongo/db/query/client_cursor/cursor_response.cpp index b22395bf970..8cd4a05d174 100644 --- a/src/mongo/db/query/client_cursor/cursor_response.cpp +++ b/src/mongo/db/query/client_cursor/cursor_response.cpp @@ -34,10 +34,10 @@ #include "mongo/base/status.h" #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsontypes.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/query/client_cursor/cursor_response_gen.h" #include "mongo/idl/idl_parser.h" #include "mongo/rpc/get_status_from_command_result.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/query/client_cursor/cursor_response_test.cpp b/src/mongo/db/query/client_cursor/cursor_response_test.cpp index aba01b52745..9fba3e382ff 100644 --- a/src/mongo/db/query/client_cursor/cursor_response_test.cpp +++ b/src/mongo/db/query/client_cursor/cursor_response_test.cpp @@ -34,12 +34,12 @@ #include "mongo/bson/json.h" #include "mongo/bson/oid.h" #include "mongo/db/exec/document_value/document.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/pipeline/resume_token.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/rpc/op_msg.h" #include "mongo/rpc/op_msg_rpc_impls.h" #include "mongo/unittest/unittest.h" -#include "mongo/util/namespace_string_util.h" #include diff --git a/src/mongo/db/query/explain.cpp b/src/mongo/db/query/explain.cpp index eb0053c2da8..e9e56c1ed8d 100644 --- a/src/mongo/db/query/explain.cpp +++ b/src/mongo/db/query/explain.cpp @@ -36,6 +36,7 @@ #include "mongo/db/exec/document_value/value.h" #include "mongo/db/exec/sbe/util/debug_print.h" #include "mongo/db/matcher/expression.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/pipeline/plan_executor_pipeline.h" #include "mongo/db/query/canonical_query.h" @@ -57,7 +58,6 @@ #include "mongo/util/assert_util.h" #include "mongo/util/duration.h" #include "mongo/util/hex.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/overloaded_visitor.h" // IWYU pragma: keep #include diff --git a/src/mongo/db/query/fle/server_rewrite.cpp b/src/mongo/db/query/fle/server_rewrite.cpp index 2e7902e07f4..42d75427473 100644 --- a/src/mongo/db/query/fle/server_rewrite.cpp +++ b/src/mongo/db/query/fle/server_rewrite.cpp @@ -39,6 +39,7 @@ #include "mongo/crypto/fle_crypto.h" #include "mongo/crypto/fle_field_schema_gen.h" #include "mongo/db/fle_crud.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/document_source.h" #include "mongo/db/pipeline/document_source_geo_near.h" @@ -56,7 +57,6 @@ #include "mongo/util/assert_util.h" #include "mongo/util/future.h" #include "mongo/util/intrusive_counter.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/query/plan_executor_impl.cpp b/src/mongo/db/query/plan_executor_impl.cpp index 4b0a1cce2a1..78b320cd77e 100644 --- a/src/mongo/db/query/plan_executor_impl.cpp +++ b/src/mongo/db/query/plan_executor_impl.cpp @@ -40,6 +40,7 @@ #include "mongo/db/exec/classic/update_stage.h" #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/plan_stats.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h" #include "mongo/db/query/find_command.h" #include "mongo/db/query/find_common.h" @@ -57,7 +58,6 @@ #include "mongo/util/decorable.h" #include "mongo/util/fail_point.h" #include "mongo/util/future.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/query/plan_executor_sbe.cpp b/src/mongo/db/query/plan_executor_sbe.cpp index 32ba35a802c..d750f8c0aa4 100644 --- a/src/mongo/db/query/plan_executor_sbe.cpp +++ b/src/mongo/db/query/plan_executor_sbe.cpp @@ -36,6 +36,7 @@ #include "mongo/bson/oid.h" #include "mongo/db/exec/document_value/value.h" #include "mongo/db/exec/sbe/values/bson.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/query/plan_explainer_factory.h" #include "mongo/db/query/plan_insert_listener.h" @@ -48,7 +49,6 @@ #include "mongo/platform/compiler.h" #include "mongo/platform/decimal128.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/shared_buffer.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/query/plan_explainer_sbe.cpp b/src/mongo/db/query/plan_explainer_sbe.cpp index cb0a885c557..524bd639598 100644 --- a/src/mongo/db/query/plan_explainer_sbe.cpp +++ b/src/mongo/db/query/plan_explainer_sbe.cpp @@ -37,6 +37,7 @@ #include "mongo/db/fts/fts_query_impl.h" #include "mongo/db/index/multikey_paths.h" #include "mongo/db/matcher/expression.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/pipeline/field_path.h" #include "mongo/db/query/compiler/logical_model/projection/projection.h" #include "mongo/db/query/compiler/logical_model/projection/projection_ast_util.h" @@ -56,7 +57,6 @@ #include "mongo/platform/atomic_word.h" #include "mongo/stdx/unordered_map.h" #include "mongo/util/duration.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/query/query_settings/query_settings_manager_test.cpp b/src/mongo/db/query/query_settings/query_settings_manager_test.cpp index 4908f4a746c..b8a75bbaedd 100644 --- a/src/mongo/db/query/query_settings/query_settings_manager_test.cpp +++ b/src/mongo/db/query/query_settings/query_settings_manager_test.cpp @@ -35,6 +35,7 @@ #include "mongo/bson/simple_bsonobj_comparator.h" #include "mongo/db/client.h" #include "mongo/db/logical_time.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/query/query_execution_knobs_gen.h" #include "mongo/db/query/query_integration_knobs_gen.h" #include "mongo/db/query/query_optimization_knobs_gen.h" @@ -45,7 +46,6 @@ #include "mongo/db/tenant_id.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/unittest/unittest.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/serialization_context.h" #include diff --git a/src/mongo/db/query/query_settings/query_settings_service_test.cpp b/src/mongo/db/query/query_settings/query_settings_service_test.cpp index e3f4e93d379..4a0ab120e73 100644 --- a/src/mongo/db/query/query_settings/query_settings_service_test.cpp +++ b/src/mongo/db/query/query_settings/query_settings_service_test.cpp @@ -35,6 +35,7 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/client.h" #include "mongo/db/logical_time.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/pipeline/pipeline_factory.h" @@ -53,7 +54,6 @@ #include "mongo/db/tenant_id.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/unittest/unittest.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/serialization_context.h" #include diff --git a/src/mongo/db/query/shard_key_diagnostic_printer.h b/src/mongo/db/query/shard_key_diagnostic_printer.h index 73833efcafe..5bbb03dc7dd 100644 --- a/src/mongo/db/query/shard_key_diagnostic_printer.h +++ b/src/mongo/db/query/shard_key_diagnostic_printer.h @@ -32,8 +32,8 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/util/modules.h" -#include "mongo/util/namespace_string_util.h" #include diff --git a/src/mongo/db/query/write_ops/write_ops_exec.cpp b/src/mongo/db/query/write_ops/write_ops_exec.cpp index c20350f2ada..df8ef14f4aa 100644 --- a/src/mongo/db/query/write_ops/write_ops_exec.cpp +++ b/src/mongo/db/query/write_ops/write_ops_exec.cpp @@ -50,6 +50,7 @@ #include "mongo/db/feature_flag.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/matcher/expression_leaf.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/not_primary_error_tracker.h" #include "mongo/db/pipeline/expression_context_diagnostic_printer.h" #include "mongo/db/pipeline/legacy_runtime_constants_gen.h" @@ -139,7 +140,6 @@ #include "mongo/util/fail_point.h" #include "mongo/util/future.h" #include "mongo/util/log_and_backoff.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/out_of_line_executor.h" #include "mongo/util/scopeguard.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/query/yield_policy_callbacks_impl.cpp b/src/mongo/db/query/yield_policy_callbacks_impl.cpp index 847f6f38eff..dfc19bff1d1 100644 --- a/src/mongo/db/query/yield_policy_callbacks_impl.cpp +++ b/src/mongo/db/query/yield_policy_callbacks_impl.cpp @@ -33,11 +33,11 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/curop.h" #include "mongo/db/curop_failpoint_helpers.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/platform/compiler.h" #include "mongo/util/duration.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/time_support.h" #include diff --git a/src/mongo/db/repl/apply_ops.cpp b/src/mongo/db/repl/apply_ops.cpp index c47d665cac2..623912696e1 100644 --- a/src/mongo/db/repl/apply_ops.cpp +++ b/src/mongo/db/repl/apply_ops.cpp @@ -36,6 +36,7 @@ #include "mongo/crypto/oplog_key_entry_handler.h" #include "mongo/db/database_name.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/profile_settings.h" #include "mongo/db/repl/apply_ops_command_info.h" @@ -53,7 +54,6 @@ #include "mongo/platform/compiler.h" #include "mongo/util/assert_util.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include "mongo/util/time_support.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/repl/initial_sync/all_database_cloner.cpp b/src/mongo/db/repl/initial_sync/all_database_cloner.cpp index cadcc527833..934c6373597 100644 --- a/src/mongo/db/repl/initial_sync/all_database_cloner.cpp +++ b/src/mongo/db/repl/initial_sync/all_database_cloner.cpp @@ -37,6 +37,7 @@ #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsonmisc.h" #include "mongo/db/client.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/feature_flag.h" #include "mongo/db/multitenancy_gen.h" #include "mongo/db/namespace_string.h" @@ -55,7 +56,6 @@ #include "mongo/rpc/get_status_from_command_result.h" #include "mongo/stdx/mutex.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/repl/initial_sync/collection_cloner.cpp b/src/mongo/db/repl/initial_sync/collection_cloner.cpp index f720f0957e4..b06809a80e1 100644 --- a/src/mongo/db/repl/initial_sync/collection_cloner.cpp +++ b/src/mongo/db/repl/initial_sync/collection_cloner.cpp @@ -40,6 +40,7 @@ #include "mongo/db/index/index_constants.h" #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/multitenancy_gen.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/count_command_gen.h" #include "mongo/db/query/find_command.h" @@ -64,7 +65,6 @@ #include "mongo/util/clock_source.h" #include "mongo/util/duration.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/repl/initial_sync/database_cloner.cpp b/src/mongo/db/repl/initial_sync/database_cloner.cpp index beabd5bd820..fce7feb5862 100644 --- a/src/mongo/db/repl/initial_sync/database_cloner.cpp +++ b/src/mongo/db/repl/initial_sync/database_cloner.cpp @@ -36,6 +36,7 @@ #include "mongo/base/status.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonelement.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/repl/initial_sync/database_cloner.h" #include "mongo/db/repl/initial_sync/database_cloner_gen.h" #include "mongo/db/service_context.h" @@ -49,7 +50,6 @@ #include "mongo/util/assert_util.h" #include "mongo/util/clock_source.h" #include "mongo/util/duration.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp index 05c3feb16f6..cca42a602ea 100644 --- a/src/mongo/db/repl/oplog.cpp +++ b/src/mongo/db/repl/oplog.cpp @@ -54,6 +54,7 @@ #include "mongo/db/index_builds/index_builds_manager.h" #include "mongo/db/index_builds/primary_driven/util.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_util.h" #include "mongo/db/pipeline/change_stream_preimage_gen.h" @@ -140,7 +141,6 @@ #include "mongo/util/decorable.h" #include "mongo/util/fail_point.h" #include "mongo/util/file.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/processinfo.h" #include "mongo/util/serialization_context.h" #include "mongo/util/stacktrace.h" diff --git a/src/mongo/db/repl/oplog_entry.cpp b/src/mongo/db/repl/oplog_entry.cpp index a47d39f2f35..21abe903a78 100644 --- a/src/mongo/db/repl/oplog_entry.cpp +++ b/src/mongo/db/repl/oplog_entry.cpp @@ -35,11 +35,11 @@ #include "mongo/db/feature_flag.h" #include "mongo/db/multitenancy_gen.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/server_options.h" #include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/logv2/redaction.h" #include "mongo/shell/bench.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/repl/rollback_impl.cpp b/src/mongo/db/repl/rollback_impl.cpp index d1c41fe3cc5..304aec11928 100644 --- a/src/mongo/db/repl/rollback_impl.cpp +++ b/src/mongo/db/repl/rollback_impl.cpp @@ -44,6 +44,7 @@ #include "mongo/db/global_catalog/type_shard_identity.h" #include "mongo/db/import_collection_oplog_entry_gen.h" #include "mongo/db/index_builds/index_builds_coordinator.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/find_command.h" #include "mongo/db/query/get_executor.h" @@ -100,7 +101,6 @@ #include "mongo/util/clock_source.h" #include "mongo/util/duration.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/net/hostandport.h" #include "mongo/util/scopeguard.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/repl/rollback_impl_test.cpp b/src/mongo/db/repl/rollback_impl_test.cpp index e0270192d21..291aa9b4fbe 100644 --- a/src/mongo/db/repl/rollback_impl_test.cpp +++ b/src/mongo/db/repl/rollback_impl_test.cpp @@ -40,6 +40,7 @@ #include "mongo/db/database_name.h" #include "mongo/db/exec/document_value/value.h" #include "mongo/db/global_catalog/type_shard_identity.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/op_observer/op_observer_util.h" #include "mongo/db/record_id.h" #include "mongo/db/repl/member_state.h" @@ -79,7 +80,6 @@ #include "mongo/unittest/death_test.h" #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/uuid.h" #include diff --git a/src/mongo/db/router_role/collection_uuid_mismatch.cpp b/src/mongo/db/router_role/collection_uuid_mismatch.cpp index 373ba8f1ae0..73b54473597 100644 --- a/src/mongo/db/router_role/collection_uuid_mismatch.cpp +++ b/src/mongo/db/router_role/collection_uuid_mismatch.cpp @@ -37,6 +37,7 @@ #include "mongo/bson/dotted_path/dotted_path_support.h" #include "mongo/client/read_preference.h" #include "mongo/db/client.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/router_role/cluster_commands_helpers.h" #include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/service_context.h" @@ -48,7 +49,6 @@ #include "mongo/rpc/get_status_from_command_result.h" #include "mongo/s/async_requests_sender.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/str.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.cpp b/src/mongo/db/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.cpp index fba74b13fdb..5c4c720cdc1 100644 --- a/src/mongo/db/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.cpp +++ b/src/mongo/db/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.cpp @@ -32,7 +32,7 @@ #include "mongo/base/init.h" // IWYU pragma: keep #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/util/namespace_string_util.h" +#include "mongo/db/namespace_string_util.h" namespace mongo { namespace { diff --git a/src/mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_impl.cpp b/src/mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_impl.cpp index 129cc83c805..bee7d60bd4f 100644 --- a/src/mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_impl.cpp +++ b/src/mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_impl.cpp @@ -51,6 +51,7 @@ #include "mongo/db/global_catalog/type_shard_database_gen.h" #include "mongo/db/keypattern.h" #include "mongo/db/logical_time.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" #include "mongo/db/operation_context_group.h" @@ -79,7 +80,6 @@ #include "mongo/util/duration.h" #include "mongo/util/fail_point.h" #include "mongo/util/future_impl.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include "mongo/util/timer.h" diff --git a/src/mongo/db/s/balancer/balancer_commands_scheduler_impl.h b/src/mongo/db/s/balancer/balancer_commands_scheduler_impl.h index 63e99527cff..8237373e933 100644 --- a/src/mongo/db/s/balancer/balancer_commands_scheduler_impl.h +++ b/src/mongo/db/s/balancer/balancer_commands_scheduler_impl.h @@ -43,6 +43,7 @@ #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/keypattern.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/router_role/cluster_commands_helpers.h" #include "mongo/db/s/balancer/auto_merger_policy.h" @@ -71,7 +72,6 @@ #include "mongo/util/future.h" #include "mongo/util/future_impl.h" #include "mongo/util/modules.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/uuid.h" #include diff --git a/src/mongo/db/s/balancer/balancer_policy.cpp b/src/mongo/db/s/balancer/balancer_policy.cpp index 010f694f162..12da9a3d342 100644 --- a/src/mongo/db/s/balancer/balancer_policy.cpp +++ b/src/mongo/db/s/balancer/balancer_policy.cpp @@ -40,13 +40,13 @@ #include "mongo/db/global_catalog/ddl/sharding_util.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_tags.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/logv2/log.h" #include "mongo/platform/compiler.h" #include "mongo/util/assert_util.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/s/config/configsvr_cleanup_reshard_collection_command.cpp b/src/mongo/db/s/config/configsvr_cleanup_reshard_collection_command.cpp index 339e7734eaa..25f241421ad 100644 --- a/src/mongo/db/s/config/configsvr_cleanup_reshard_collection_command.cpp +++ b/src/mongo/db/s/config/configsvr_cleanup_reshard_collection_command.cpp @@ -43,6 +43,7 @@ #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/global_catalog/type_collection_gen.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/read_concern_level.h" @@ -58,7 +59,6 @@ #include "mongo/s/write_ops/batched_command_request.h" #include "mongo/util/assert_util.h" #include "mongo/util/clock_source.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/s/config/configsvr_remove_tags_command.cpp b/src/mongo/db/s/config/configsvr_remove_tags_command.cpp index 747181a5850..4157fc76da0 100644 --- a/src/mongo/db/s/config/configsvr_remove_tags_command.cpp +++ b/src/mongo/db/s/config/configsvr_remove_tags_command.cpp @@ -45,6 +45,7 @@ #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_tags.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/read_concern_level.h" @@ -57,7 +58,6 @@ #include "mongo/executor/task_executor_pool.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/out_of_line_executor.h" #include diff --git a/src/mongo/db/s/configure_query_analyzer_cmd.cpp b/src/mongo/db/s/configure_query_analyzer_cmd.cpp index 5c49122fd9c..47fa4aa3a68 100644 --- a/src/mongo/db/s/configure_query_analyzer_cmd.cpp +++ b/src/mongo/db/s/configure_query_analyzer_cmd.cpp @@ -43,6 +43,7 @@ #include "mongo/db/generic_argument_util.h" #include "mongo/db/multitenancy_gen.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" @@ -72,7 +73,6 @@ #include "mongo/util/decorable.h" #include "mongo/util/duration.h" #include "mongo/util/future.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include "mongo/util/testing_proctor.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/s/migration_batch_fetcher.h b/src/mongo/db/s/migration_batch_fetcher.h index 79f2e8dca4a..5a331ed790a 100644 --- a/src/mongo/db/s/migration_batch_fetcher.h +++ b/src/mongo/db/s/migration_batch_fetcher.h @@ -34,6 +34,7 @@ #include "mongo/db/client.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/s/migration_batch_inserter.h" #include "mongo/db/s/migration_session_id.h" @@ -45,7 +46,6 @@ #include "mongo/util/concurrency/thread_pool.h" #include "mongo/util/concurrency/ticketholder.h" #include "mongo/util/modules.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/uuid.h" #include diff --git a/src/mongo/db/s/migration_chunk_cloner_source.cpp b/src/mongo/db/s/migration_chunk_cloner_source.cpp index d86e84f5795..cba079d808e 100644 --- a/src/mongo/db/s/migration_chunk_cloner_source.cpp +++ b/src/mongo/db/s/migration_chunk_cloner_source.cpp @@ -51,6 +51,7 @@ #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/keypattern.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/query/plan_yield_policy.h" #include "mongo/db/query/query_execution_knobs_gen.h" #include "mongo/db/query/query_integration_knobs_gen.h" @@ -90,7 +91,6 @@ #include "mongo/util/assert_util.h" #include "mongo/util/elapsed_tracker.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/scopeguard.h" #include "mongo/util/str.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/s/migration_destination_manager.cpp b/src/mongo/db/s/migration_destination_manager.cpp index 4ea1a9b5a0d..85966b3d862 100644 --- a/src/mongo/db/s/migration_destination_manager.cpp +++ b/src/mongo/db/s/migration_destination_manager.cpp @@ -42,6 +42,7 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/cancelable_operation_context.h" #include "mongo/db/client.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/feature_flag.h" @@ -56,6 +57,7 @@ #include "mongo/db/keypattern.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/query/internal_plans.h" @@ -115,12 +117,10 @@ #include "mongo/rpc/get_status_from_command_result.h" #include "mongo/util/assert_util.h" #include "mongo/util/clock_source.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/debug_util.h" #include "mongo/util/decorable.h" #include "mongo/util/duration.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/out_of_line_executor.h" #include "mongo/util/producer_consumer_queue.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/s/migration_destination_manager_commands.cpp b/src/mongo/db/s/migration_destination_manager_commands.cpp index ffa5f55f6ae..7a2cea03d70 100644 --- a/src/mongo/db/s/migration_destination_manager_commands.cpp +++ b/src/mongo/db/s/migration_destination_manager_commands.cpp @@ -39,8 +39,10 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/s/active_migrations_registry.h" #include "mongo/db/s/chunk_move_write_concern_options.h" @@ -62,9 +64,7 @@ #include "mongo/db/versioning_protocol/stale_exception.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/future.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/s/migration_source_manager.cpp b/src/mongo/db/s/migration_source_manager.cpp index b50744ec2e4..897137ebc53 100644 --- a/src/mongo/db/s/migration_source_manager.cpp +++ b/src/mongo/db/s/migration_source_manager.cpp @@ -49,6 +49,7 @@ #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_shard_collection.h" #include "mongo/db/keypattern.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/read_concern.h" @@ -93,7 +94,6 @@ #include "mongo/util/decorable.h" #include "mongo/util/duration.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/scopeguard.h" #include "mongo/util/str.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/s/migration_util.cpp b/src/mongo/db/s/migration_util.cpp index 098ff974eb6..e9fef4a3de9 100644 --- a/src/mongo/db/s/migration_util.cpp +++ b/src/mongo/db/s/migration_util.cpp @@ -48,6 +48,7 @@ #include "mongo/db/global_catalog/ddl/sharding_util.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_chunk.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/query/find_command.h" #include "mongo/db/query/write_ops/write_ops_gen.h" @@ -88,7 +89,6 @@ #include "mongo/util/exit.h" #include "mongo/util/fail_point.h" #include "mongo/util/future_impl.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/s/query_cmd/cluster_pipeline_cmd_d.cpp b/src/mongo/db/s/query_cmd/cluster_pipeline_cmd_d.cpp index 1eb49495c09..ca3b46f8c37 100644 --- a/src/mongo/db/s/query_cmd/cluster_pipeline_cmd_d.cpp +++ b/src/mongo/db/s/query_cmd/cluster_pipeline_cmd_d.cpp @@ -34,6 +34,7 @@ #include "mongo/db/auth/privilege.h" #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/sharding_environment/grid.h" diff --git a/src/mongo/db/s/range_deleter_service.cpp b/src/mongo/db/s/range_deleter_service.cpp index de34b674b78..9b1af9168c3 100644 --- a/src/mongo/db/s/range_deleter_service.cpp +++ b/src/mongo/db/s/range_deleter_service.cpp @@ -37,6 +37,7 @@ #include "mongo/client/dbclient_cursor.h" #include "mongo/db/client.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/keypattern.h" @@ -63,7 +64,6 @@ #include "mongo/platform/atomic_word.h" #include "mongo/util/cancellation.h" #include "mongo/util/concurrency/idle_thread_block.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" #include "mongo/util/duration.h" #include "mongo/util/future_util.h" diff --git a/src/mongo/db/s/range_deletion_util.cpp b/src/mongo/db/s/range_deletion_util.cpp index 1b9310d157b..8231b42115c 100644 --- a/src/mongo/db/s/range_deletion_util.cpp +++ b/src/mongo/db/s/range_deletion_util.cpp @@ -41,6 +41,7 @@ #include "mongo/db/global_catalog/ddl/shard_key_index_util.h" #include "mongo/db/global_catalog/ddl/sharding_util.h" #include "mongo/db/keypattern.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/query/explain_options.h" @@ -70,7 +71,6 @@ #include "mongo/util/concurrency/admission_context.h" #include "mongo/util/duration.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/s/resharding/reshard_collection_coordinator.cpp b/src/mongo/db/s/resharding/reshard_collection_coordinator.cpp index 2fbf18b4b35..d406dd5062f 100644 --- a/src/mongo/db/s/resharding/reshard_collection_coordinator.cpp +++ b/src/mongo/db/s/resharding/reshard_collection_coordinator.cpp @@ -44,6 +44,7 @@ #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/keypattern.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" @@ -66,7 +67,6 @@ #include "mongo/s/resharding/common_types_gen.h" #include "mongo/s/resharding/resharding_feature_flag_gen.h" #include "mongo/util/future_impl.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/s/resharding/resharding_collection_cloner.cpp b/src/mongo/db/s/resharding/resharding_collection_cloner.cpp index ebb2d32f3f5..ed28d39054d 100644 --- a/src/mongo/db/s/resharding/resharding_collection_cloner.cpp +++ b/src/mongo/db/s/resharding/resharding_collection_cloner.cpp @@ -44,6 +44,7 @@ #include "mongo/db/feature_flag.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/chunk_manager.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/pipeline/pipeline_factory.h" @@ -79,7 +80,6 @@ #include "mongo/util/duration.h" #include "mongo/util/future_impl.h" #include "mongo/util/future_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/producer_consumer_queue.h" #include "mongo/util/scopeguard.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/s/resharding/resharding_coordinator_commit_monitor.cpp b/src/mongo/db/s/resharding/resharding_coordinator_commit_monitor.cpp index 32daf0589f1..ba71edabb8e 100644 --- a/src/mongo/db/s/resharding/resharding_coordinator_commit_monitor.cpp +++ b/src/mongo/db/s/resharding/resharding_coordinator_commit_monitor.cpp @@ -39,6 +39,7 @@ #include "mongo/db/cancelable_operation_context.h" #include "mongo/db/client.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/s/resharding/resharding_server_parameters_gen.h" #include "mongo/db/shard_role/resource_yielder.h" #include "mongo/db/sharding_environment/client/shard.h" @@ -49,7 +50,6 @@ #include "mongo/s/async_requests_sender.h" #include "mongo/s/request_types/resharding_operation_time_gen.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/duration.h" #include "mongo/util/fail_point.h" #include "mongo/util/future_impl.h" diff --git a/src/mongo/db/s/resharding/resharding_coordinator_service_util.cpp b/src/mongo/db/s/resharding/resharding_coordinator_service_util.cpp index 07de37d0bff..369085800d3 100644 --- a/src/mongo/db/s/resharding/resharding_coordinator_service_util.cpp +++ b/src/mongo/db/s/resharding/resharding_coordinator_service_util.cpp @@ -55,6 +55,7 @@ #include "mongo/db/global_catalog/type_tags.h" #include "mongo/db/keypattern.h" #include "mongo/db/logical_time.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/query/collation/collation_spec.h" #include "mongo/db/repl/optime_with.h" #include "mongo/db/repl/primary_only_service.h" @@ -101,7 +102,6 @@ #include "mongo/util/fail_point.h" #include "mongo/util/functional.h" #include "mongo/util/future_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/out_of_line_executor.h" #include "mongo/util/str.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/s/resharding/resharding_donor_service.cpp b/src/mongo/db/s/resharding/resharding_donor_service.cpp index a0328de1657..79124c7fb2c 100644 --- a/src/mongo/db/s/resharding/resharding_donor_service.cpp +++ b/src/mongo/db/s/resharding/resharding_donor_service.cpp @@ -40,6 +40,7 @@ #include "mongo/db/global_catalog/ddl/sharding_recovery_service.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/index_builds/index_builds_coordinator.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/query/write_ops/delete.h" @@ -93,7 +94,6 @@ #include "mongo/util/fail_point.h" #include "mongo/util/future.h" #include "mongo/util/future_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/out_of_line_executor.h" #include "mongo/util/str.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/s/resharding/resharding_metrics.cpp b/src/mongo/db/s/resharding/resharding_metrics.cpp index 26fede9794e..2e47be81ddf 100644 --- a/src/mongo/db/s/resharding/resharding_metrics.cpp +++ b/src/mongo/db/s/resharding/resharding_metrics.cpp @@ -33,6 +33,7 @@ #include "mongo/db/exec/document_value/value.h" #include "mongo/db/feature_flag.h" #include "mongo/db/keypattern.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/s/resharding/resharding_metrics_common.h" #include "mongo/db/s/resharding/resharding_metrics_field_names.h" #include "mongo/db/s/resharding/resharding_metrics_observer_impl.h" @@ -43,7 +44,6 @@ #include "mongo/s/resharding/resharding_feature_flag_gen.h" #include "mongo/util/assert_util.h" #include "mongo/util/duration.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/s/resharding/resharding_recipient_service.cpp b/src/mongo/db/s/resharding/resharding_recipient_service.cpp index 7d53194858d..086341a0f31 100644 --- a/src/mongo/db/s/resharding/resharding_recipient_service.cpp +++ b/src/mongo/db/s/resharding/resharding_recipient_service.cpp @@ -46,6 +46,7 @@ #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/index_builds/repl_index_build_state.h" #include "mongo/db/keypattern.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/query/collation/collation_spec.h" #include "mongo/db/query/write_ops/delete.h" @@ -102,7 +103,6 @@ #include "mongo/util/decorable.h" #include "mongo/util/fail_point.h" #include "mongo/util/future_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/out_of_line_executor.h" #include "mongo/util/str.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/s/session_catalog_migration_source.cpp b/src/mongo/db/s/session_catalog_migration_source.cpp index 66c71c3c7dd..73b45272dc8 100644 --- a/src/mongo/db/s/session_catalog_migration_source.cpp +++ b/src/mongo/db/s/session_catalog_migration_source.cpp @@ -42,6 +42,7 @@ #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/query/find_command.h" #include "mongo/db/query/write_ops/find_and_modify_image_lookup_util.h" @@ -77,7 +78,6 @@ #include "mongo/util/clock_source.h" #include "mongo/util/decorable.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/scopeguard.h" #include "mongo/util/str.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/s/split_vector_command.cpp b/src/mongo/db/s/split_vector_command.cpp index 64e5ba10975..e94b0f02725 100644 --- a/src/mongo/db/s/split_vector_command.cpp +++ b/src/mongo/db/s/split_vector_command.cpp @@ -38,15 +38,15 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/s/split_vector.h" #include "mongo/db/service_context.h" #include "mongo/db/shard_role/shard_role.h" #include "mongo/db/tenant_id.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/s/start_chunk_clone_request.cpp b/src/mongo/db/s/start_chunk_clone_request.cpp index be9e9da2039..f9edc8b2ea4 100644 --- a/src/mongo/db/s/start_chunk_clone_request.cpp +++ b/src/mongo/db/s/start_chunk_clone_request.cpp @@ -36,8 +36,8 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/bsontypes.h" #include "mongo/bson/util/bson_extract.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/idl/idl_parser.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/service_entry_point_shard_role.cpp b/src/mongo/db/service_entry_point_shard_role.cpp index 99446f52131..77addb3c0a5 100644 --- a/src/mongo/db/service_entry_point_shard_role.cpp +++ b/src/mongo/db/service_entry_point_shard_role.cpp @@ -66,6 +66,7 @@ #include "mongo/db/initialize_operation_session_info.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/not_primary_error_tracker.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/profile_collection.h" @@ -147,7 +148,6 @@ #include "mongo/util/duration.h" #include "mongo/util/fail_point.h" #include "mongo/util/future_impl.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/net/hostandport.h" #include "mongo/util/scopeguard.h" #include "mongo/util/serialization_context.h" diff --git a/src/mongo/db/service_entry_point_shard_role_helpers.cpp b/src/mongo/db/service_entry_point_shard_role_helpers.cpp index 69083ecdf09..246747467a6 100644 --- a/src/mongo/db/service_entry_point_shard_role_helpers.cpp +++ b/src/mongo/db/service_entry_point_shard_role_helpers.cpp @@ -29,13 +29,13 @@ #include "mongo/db/service_entry_point_shard_role_helpers.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/router_role/gossiped_routing_cache_gen.h" #include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/s/transaction_coordinator_service.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/transaction/transaction_participant_gen.h" #include "mongo/logv2/log.h" -#include "mongo/util/namespace_string_util.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kCommand diff --git a/src/mongo/db/shard_role/ddl/clone_catalog_data_command.cpp b/src/mongo/db/shard_role/ddl/clone_catalog_data_command.cpp index 47c1d6d3dba..ee7a235aa79 100644 --- a/src/mongo/db/shard_role/ddl/clone_catalog_data_command.cpp +++ b/src/mongo/db/shard_role/ddl/clone_catalog_data_command.cpp @@ -40,6 +40,7 @@ #include "mongo/db/cloner.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/namespace_string.h" @@ -57,7 +58,6 @@ #include "mongo/db/version_context.h" #include "mongo/idl/idl_parser.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/shard_role/ddl/ddl_lock_manager.cpp b/src/mongo/db/shard_role/ddl/ddl_lock_manager.cpp index e9c2b10f870..8014765dd5c 100644 --- a/src/mongo/db/shard_role/ddl/ddl_lock_manager.cpp +++ b/src/mongo/db/shard_role/ddl/ddl_lock_manager.cpp @@ -32,7 +32,9 @@ #include "mongo/db/cancelable_operation_context.h" #include "mongo/db/client.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/shard_role/lock_manager/resource_catalog.h" #include "mongo/db/shard_role/shard_catalog/database_sharding_state.h" @@ -40,11 +42,9 @@ #include "mongo/logv2/log.h" #include "mongo/stdx/mutex.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" #include "mongo/util/duration.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/scopeguard.h" #include "mongo/util/time_support.h" #include "mongo/util/timer.h" diff --git a/src/mongo/db/shard_role/ddl/list_collections.cpp b/src/mongo/db/shard_role/ddl/list_collections.cpp index 2ade85e8874..efb389d8a80 100644 --- a/src/mongo/db/shard_role/ddl/list_collections.cpp +++ b/src/mongo/db/shard_role/ddl/list_collections.cpp @@ -50,6 +50,7 @@ #include "mongo/db/matcher/expression.h" #include "mongo/db/matcher/expression_leaf.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/expression_context_builder.h" @@ -88,7 +89,6 @@ #include "mongo/util/decorable.h" #include "mongo/util/fail_point.h" #include "mongo/util/intrusive_counter.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/serialization_context.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/shard_role/ddl/list_databases_common.h b/src/mongo/db/shard_role/ddl/list_databases_common.h index 7b51f55afa1..3033a48fa77 100644 --- a/src/mongo/db/shard_role/ddl/list_databases_common.h +++ b/src/mongo/db/shard_role/ddl/list_databases_common.h @@ -30,6 +30,7 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/client.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/exec/matcher/matcher.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/namespace_string.h" @@ -44,7 +45,6 @@ #include "mongo/db/shard_role/shard_catalog/database_holder.h" #include "mongo/db/shard_role/shard_catalog/db_raii.h" #include "mongo/db/storage/storage_engine.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/modules.h" namespace mongo { diff --git a/src/mongo/db/shard_role/lock_manager/cluster_lock_info_cmd.cpp b/src/mongo/db/shard_role/lock_manager/cluster_lock_info_cmd.cpp index e5021e34b87..e100e6b9362 100644 --- a/src/mongo/db/shard_role/lock_manager/cluster_lock_info_cmd.cpp +++ b/src/mongo/db/shard_role/lock_manager/cluster_lock_info_cmd.cpp @@ -38,6 +38,7 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/dbcommands_gen.h" #include "mongo/db/operation_context.h" #include "mongo/db/router_role/cluster_commands_helpers.h" @@ -49,7 +50,6 @@ #include "mongo/idl/idl_parser.h" #include "mongo/s/async_requests_sender.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" #include diff --git a/src/mongo/db/shard_role/lock_manager/resource_catalog.cpp b/src/mongo/db/shard_role/lock_manager/resource_catalog.cpp index 1165c5cafd6..2ec25354257 100644 --- a/src/mongo/db/shard_role/lock_manager/resource_catalog.cpp +++ b/src/mongo/db/shard_role/lock_manager/resource_catalog.cpp @@ -29,9 +29,9 @@ #include "mongo/db/shard_role/lock_manager/resource_catalog.h" +#include "mongo/db/database_name_util.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/static_immortal.h" #include diff --git a/src/mongo/db/shard_role/shard_catalog/cluster_coll_stats_cmd.cpp b/src/mongo/db/shard_role/shard_catalog/cluster_coll_stats_cmd.cpp index ac538be0629..8e76d7491f8 100644 --- a/src/mongo/db/shard_role/shard_catalog/cluster_coll_stats_cmd.cpp +++ b/src/mongo/db/shard_role/shard_catalog/cluster_coll_stats_cmd.cpp @@ -42,6 +42,7 @@ #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/legacy_runtime_constants_gen.h" #include "mongo/db/router_role/cluster_commands_helpers.h" @@ -59,7 +60,6 @@ #include "mongo/util/assert_util.h" #include "mongo/util/debug_util.h" #include "mongo/util/decorable.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/shard_role/shard_catalog/cluster_db_stats_cmd.cpp b/src/mongo/db/shard_role/shard_catalog/cluster_db_stats_cmd.cpp index 18fac3b79e0..d0879d7c6ae 100644 --- a/src/mongo/db/shard_role/shard_catalog/cluster_db_stats_cmd.cpp +++ b/src/mongo/db/shard_role/shard_catalog/cluster_db_stats_cmd.cpp @@ -38,6 +38,7 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/dbcommands_gen.h" #include "mongo/db/operation_context.h" #include "mongo/db/router_role/cluster_commands_helpers.h" @@ -47,7 +48,6 @@ #include "mongo/idl/idl_parser.h" #include "mongo/s/async_requests_sender.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" #include diff --git a/src/mongo/db/shard_role/shard_catalog/cluster_validate_db_metadata_cmd.cpp b/src/mongo/db/shard_role/shard_catalog/cluster_validate_db_metadata_cmd.cpp index e7e4bb9f12a..429ef95e881 100644 --- a/src/mongo/db/shard_role/shard_catalog/cluster_validate_db_metadata_cmd.cpp +++ b/src/mongo/db/shard_role/shard_catalog/cluster_validate_db_metadata_cmd.cpp @@ -35,6 +35,7 @@ #include "mongo/bson/bsontypes.h" #include "mongo/client/read_preference.h" #include "mongo/db/commands.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/router_role/cluster_commands_helpers.h" @@ -49,7 +50,6 @@ #include "mongo/rpc/op_msg.h" #include "mongo/s/async_requests_sender.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" #include diff --git a/src/mongo/db/shard_role/shard_catalog/coll_mod.cpp b/src/mongo/db/shard_role/shard_catalog/coll_mod.cpp index 8e70533ce06..9d2de3598f9 100644 --- a/src/mongo/db/shard_role/shard_catalog/coll_mod.cpp +++ b/src/mongo/db/shard_role/shard_catalog/coll_mod.cpp @@ -44,6 +44,7 @@ #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/index_key_validate.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/pipeline/change_stream_pre_and_post_images_options_gen.h" #include "mongo/db/profile_settings.h" @@ -90,7 +91,6 @@ #include "mongo/platform/atomic_word.h" #include "mongo/util/assert_util.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/overloaded_visitor.h" // IWYU pragma: keep #include "mongo/util/str.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/shard_role/shard_catalog/collection_catalog.cpp b/src/mongo/db/shard_role/shard_catalog/collection_catalog.cpp index 0be3c8a2f4b..0045e1e6459 100644 --- a/src/mongo/db/shard_role/shard_catalog/collection_catalog.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_catalog.cpp @@ -48,7 +48,9 @@ #include "mongo/crypto/fle_stats.h" #include "mongo/db/client.h" #include "mongo/db/commands/server_status/server_status.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/index/index_access_method.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/record_id.h" #include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" @@ -72,9 +74,7 @@ #include "mongo/platform/rwmutex.h" #include "mongo/stdx/mutex.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/observable_mutex.h" #include "mongo/util/observable_mutex_registry.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/shard_role/shard_catalog/collection_sharding_runtime.cpp b/src/mongo/db/shard_role/shard_catalog/collection_sharding_runtime.cpp index 368d3716900..2338d744c5a 100644 --- a/src/mongo/db/shard_role/shard_catalog/collection_sharding_runtime.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_sharding_runtime.cpp @@ -34,6 +34,7 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/client.h" #include "mongo/db/feature_flag.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/plan_cache/sbe_plan_cache.h" #include "mongo/db/repl/read_concern_args.h" @@ -58,7 +59,6 @@ #include "mongo/util/clock_source.h" #include "mongo/util/duration.h" #include "mongo/util/future_impl.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include "mongo/util/testing_proctor.h" diff --git a/src/mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.cpp b/src/mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.cpp index 1fc24b67270..921c8758ca1 100644 --- a/src/mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.cpp @@ -34,8 +34,8 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsonobjbuilder.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/tenant_id.h" -#include "mongo/util/database_name_util.h" #include #include diff --git a/src/mongo/db/shard_role/shard_catalog/create_collection.cpp b/src/mongo/db/shard_role/shard_catalog/create_collection.cpp index 738320329d2..b6a0904c89d 100644 --- a/src/mongo/db/shard_role/shard_catalog/create_collection.cpp +++ b/src/mongo/db/shard_role/shard_catalog/create_collection.cpp @@ -43,6 +43,7 @@ #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/index_key_validate.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/change_stream_pre_and_post_images_options_gen.h" @@ -90,7 +91,6 @@ #include "mongo/platform/compiler.h" #include "mongo/util/assert_util.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/shard_role/shard_catalog/database_impl.cpp b/src/mongo/db/shard_role/shard_catalog/database_impl.cpp index 0ac815956a2..1daa324f2e8 100644 --- a/src/mongo/db/shard_role/shard_catalog/database_impl.cpp +++ b/src/mongo/db/shard_role/shard_catalog/database_impl.cpp @@ -35,9 +35,11 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/audit.h" #include "mongo/db/basic_types_gen.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/index_builds/index_build_block.h" #include "mongo/db/index_builds/index_builds_common.h" #include "mongo/db/matcher/extensions_callback_noop.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" @@ -91,11 +93,9 @@ #include "mongo/platform/compiler.h" #include "mongo/util/assert_util.h" #include "mongo/util/ctype.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" #include "mongo/util/fail_point.h" #include "mongo/util/intrusive_counter.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/stacktrace.h" #include "mongo/util/str.h" #include "mongo/util/synchronized_value.h" diff --git a/src/mongo/db/shard_role/shard_catalog/drop_collection.cpp b/src/mongo/db/shard_role/shard_catalog/drop_collection.cpp index 406bfecaebb..d2d44417497 100644 --- a/src/mongo/db/shard_role/shard_catalog/drop_collection.cpp +++ b/src/mongo/db/shard_role/shard_catalog/drop_collection.cpp @@ -34,6 +34,7 @@ #include "mongo/crypto/encryption_fields_gen.h" #include "mongo/db/audit.h" #include "mongo/db/index_builds/index_builds_coordinator.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/profile_settings.h" #include "mongo/db/repl/replication_coordinator.h" @@ -66,7 +67,6 @@ #include "mongo/platform/compiler.h" #include "mongo/util/assert_util.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/shard_role/shard_catalog/durable_catalog.cpp b/src/mongo/db/shard_role/shard_catalog/durable_catalog.cpp index a0e6f48bf94..215561a44e1 100644 --- a/src/mongo/db/shard_role/shard_catalog/durable_catalog.cpp +++ b/src/mongo/db/shard_role/shard_catalog/durable_catalog.cpp @@ -34,6 +34,7 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/bsontypes.h" #include "mongo/db/database_name.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/op_observer/op_observer_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/rss/replicated_storage_service.h" @@ -48,7 +49,6 @@ #include "mongo/db/storage/recovery_unit.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.cpp b/src/mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.cpp index ce9273f01f9..3c596849523 100644 --- a/src/mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.cpp +++ b/src/mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.cpp @@ -41,8 +41,8 @@ #include "mongo/db/field_ref.h" #include "mongo/db/index/multikey_paths.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/shard_role/shard_catalog/flush_database_cache_updates_command.cpp b/src/mongo/db/shard_role/shard_catalog/flush_database_cache_updates_command.cpp index dbd529830e1..e8e546eb88a 100644 --- a/src/mongo/db/shard_role/shard_catalog/flush_database_cache_updates_command.cpp +++ b/src/mongo/db/shard_role/shard_catalog/flush_database_cache_updates_command.cpp @@ -38,6 +38,7 @@ #include "mongo/db/client.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_catalog/ddl/sharding_migration_critical_section.h" #include "mongo/db/global_catalog/type_database_gen.h" @@ -61,7 +62,6 @@ #include "mongo/rpc/reply_interface.h" #include "mongo/rpc/unique_message.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" #include "mongo/util/future.h" diff --git a/src/mongo/db/shard_role/shard_catalog/index_catalog_entry_impl.cpp b/src/mongo/db/shard_role/shard_catalog/index_catalog_entry_impl.cpp index e44936f5b36..bd214ebd572 100644 --- a/src/mongo/db/shard_role/shard_catalog/index_catalog_entry_impl.cpp +++ b/src/mongo/db/shard_role/shard_catalog/index_catalog_entry_impl.cpp @@ -43,6 +43,7 @@ #include "mongo/db/matcher/expression.h" #include "mongo/db/matcher/extensions_callback_noop.h" #include "mongo/db/multi_key_path_tracker.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" @@ -73,7 +74,6 @@ #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/shard_role/shard_catalog/operation_sharding_state.cpp b/src/mongo/db/shard_role/shard_catalog/operation_sharding_state.cpp index eb6b495d055..7e6a400c244 100644 --- a/src/mongo/db/shard_role/shard_catalog/operation_sharding_state.cpp +++ b/src/mongo/db/shard_role/shard_catalog/operation_sharding_state.cpp @@ -30,6 +30,8 @@ #include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/base/error_codes.h" +#include "mongo/db/database_name_util.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/service_context.h" #include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/sharding_api_d_params_gen.h" @@ -37,10 +39,8 @@ #include "mongo/platform/atomic_word.h" #include "mongo/util/assert_util.h" #include "mongo/util/clock_source.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" #include "mongo/util/duration.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include "mongo/util/testing_proctor.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/shard_role/shard_catalog/rename_collection.cpp b/src/mongo/db/shard_role/shard_catalog/rename_collection.cpp index 5e4d5fe53ad..29e7a77e41c 100644 --- a/src/mongo/db/shard_role/shard_catalog/rename_collection.cpp +++ b/src/mongo/db/shard_role/shard_catalog/rename_collection.cpp @@ -44,6 +44,7 @@ #include "mongo/db/database_name.h" #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/op_observer/batched_write_policy.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" @@ -89,7 +90,6 @@ #include "mongo/platform/compiler.h" #include "mongo/util/assert_util.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/scopeguard.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/shard_role/shard_catalog/unique_collection_name.cpp b/src/mongo/db/shard_role/shard_catalog/unique_collection_name.cpp index dee16c17c89..3637147b859 100644 --- a/src/mongo/db/shard_role/shard_catalog/unique_collection_name.cpp +++ b/src/mongo/db/shard_role/shard_catalog/unique_collection_name.cpp @@ -31,6 +31,7 @@ #include "mongo/base/error_codes.h" #include "mongo/base/status.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/query/random_utils.h" #include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/db/shard_role/shard_catalog/collection_catalog.h" @@ -38,7 +39,6 @@ #include "mongo/platform/random.h" #include "mongo/stdx/mutex.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/shard_role/shard_catalog/validate_db_metadata_cmd.cpp b/src/mongo/db/shard_role/shard_catalog/validate_db_metadata_cmd.cpp index 9dc9e4362c3..568dc144659 100644 --- a/src/mongo/db/shard_role/shard_catalog/validate_db_metadata_cmd.cpp +++ b/src/mongo/db/shard_role/shard_catalog/validate_db_metadata_cmd.cpp @@ -35,8 +35,10 @@ #include "mongo/db/basic_types.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/index_key_validate.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" #include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" @@ -51,9 +53,7 @@ #include "mongo/db/views/view.h" #include "mongo/db/views/view_catalog_helpers.h" #include "mongo/rpc/op_msg.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/shard_role/shard_catalog/views_for_database.cpp b/src/mongo/db/shard_role/shard_catalog/views_for_database.cpp index de341c5ee26..71baac82b50 100644 --- a/src/mongo/db/shard_role/shard_catalog/views_for_database.cpp +++ b/src/mongo/db/shard_role/shard_catalog/views_for_database.cpp @@ -42,6 +42,7 @@ #include "mongo/db/curop.h" #include "mongo/db/database_name.h" #include "mongo/db/index/index_access_method.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/query/collation/collator_factory_interface.h" #include "mongo/db/record_id.h" #include "mongo/db/repl/oplog.h" @@ -56,7 +57,6 @@ #include "mongo/db/views/util.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/shard_role/shard_catalog/virtual_collection_impl.cpp b/src/mongo/db/shard_role/shard_catalog/virtual_collection_impl.cpp index f2d6f669c61..b8d636c603b 100644 --- a/src/mongo/db/shard_role/shard_catalog/virtual_collection_impl.cpp +++ b/src/mongo/db/shard_role/shard_catalog/virtual_collection_impl.cpp @@ -29,12 +29,12 @@ #include "mongo/db/shard_role/shard_catalog/virtual_collection_impl.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/virtual_collection/external_record_store.h" #include "mongo/db/shard_role/shard_catalog/collection_impl.h" #include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/shard_role/shard_catalog/index_catalog_impl.h" -#include "mongo/util/namespace_string_util.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kStorage diff --git a/src/mongo/db/sharding_environment/shard_server_op_observer.cpp b/src/mongo/db/sharding_environment/shard_server_op_observer.cpp index 625bdb99c63..35d37749c51 100644 --- a/src/mongo/db/sharding_environment/shard_server_op_observer.cpp +++ b/src/mongo/db/sharding_environment/shard_server_op_observer.cpp @@ -39,6 +39,7 @@ #include "mongo/db/global_catalog/ddl/sharding_recovery_service.h" #include "mongo/db/global_catalog/type_shard_collection.h" #include "mongo/db/global_catalog/type_shard_identity.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/s/balancer_stats_registry.h" @@ -64,7 +65,6 @@ #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/stats/storage_stats.cpp b/src/mongo/db/stats/storage_stats.cpp index 6fa569a8271..afa6cbd35ed 100644 --- a/src/mongo/db/stats/storage_stats.cpp +++ b/src/mongo/db/stats/storage_stats.cpp @@ -35,6 +35,7 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/basic_types_gen.h" #include "mongo/db/index/index_access_method.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/profile_settings.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/s/balancer_stats_registry.h" @@ -57,7 +58,6 @@ #include "mongo/logv2/log.h" #include "mongo/stdx/unordered_map.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/stats/top.cpp b/src/mongo/db/stats/top.cpp index 3709f415335..7cb029a93ac 100644 --- a/src/mongo/db/stats/top.cpp +++ b/src/mongo/db/stats/top.cpp @@ -32,8 +32,8 @@ #include "mongo/base/string_data.h" #include "mongo/db/client.h" #include "mongo/db/curop.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/service_context.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/storage/ident.cpp b/src/mongo/db/storage/ident.cpp index 6cba83c8f89..31039010d1b 100644 --- a/src/mongo/db/storage/ident.cpp +++ b/src/mongo/db/storage/ident.cpp @@ -31,7 +31,7 @@ #include "mongo/bson/util/builder.h" #include "mongo/db/database_name.h" -#include "mongo/util/database_name_util.h" +#include "mongo/db/database_name_util.h" #include "mongo/util/serialization_context.h" #include "mongo/util/str.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/timeseries/upgrade_downgrade_viewless_timeseries_sharded_cluster.cpp b/src/mongo/db/timeseries/upgrade_downgrade_viewless_timeseries_sharded_cluster.cpp index 5670a545da4..c5303fb7d51 100644 --- a/src/mongo/db/timeseries/upgrade_downgrade_viewless_timeseries_sharded_cluster.cpp +++ b/src/mongo/db/timeseries/upgrade_downgrade_viewless_timeseries_sharded_cluster.cpp @@ -35,6 +35,7 @@ #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/router_role/cluster_commands_helpers.h" @@ -46,7 +47,6 @@ #include "mongo/util/assert_util.h" #include "mongo/util/fail_point.h" #include "mongo/util/log_and_backoff.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator.cpp b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator.cpp index f18e6f28b20..18e2475dcff 100644 --- a/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator.cpp +++ b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator.cpp @@ -42,6 +42,7 @@ #include "mongo/db/client.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" @@ -63,7 +64,6 @@ #include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/write_concern_options.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/future_impl.h" #include diff --git a/src/mongo/db/topology/remove_shard_exception.h b/src/mongo/db/topology/remove_shard_exception.h index f135f04fb22..0c1f2349fc6 100644 --- a/src/mongo/db/topology/remove_shard_exception.h +++ b/src/mongo/db/topology/remove_shard_exception.h @@ -32,9 +32,9 @@ #include "mongo/base/error_codes.h" #include "mongo/base/error_extra_info.h" #include "mongo/bson/bsonobjbuilder.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/topology/remove_shard_draining_progress_gen.h" #include "mongo/util/modules.h" -#include "mongo/util/namespace_string_util.h" namespace mongo { diff --git a/src/mongo/db/topology/sharding_catalog_manager_shard_operations.cpp b/src/mongo/db/topology/sharding_catalog_manager_shard_operations.cpp index 5804d1ee220..3a02006be9b 100644 --- a/src/mongo/db/topology/sharding_catalog_manager_shard_operations.cpp +++ b/src/mongo/db/topology/sharding_catalog_manager_shard_operations.cpp @@ -58,6 +58,7 @@ #include "mongo/db/commands/feature_compatibility_version.h" #include "mongo/db/commands/set_feature_compatibility_version_gen.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/feature_flag.h" #include "mongo/db/generic_argument_util.h" @@ -77,6 +78,7 @@ #include "mongo/db/keys_collection_util.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/query/find_command.h" @@ -137,13 +139,11 @@ #include "mongo/s/write_ops/batched_command_response.h" #include "mongo/util/assert_util.h" #include "mongo/util/clock_source.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" #include "mongo/util/duration.h" #include "mongo/util/fail_point.h" #include "mongo/util/future.h" #include "mongo/util/future_impl.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/net/hostandport.h" #include "mongo/util/out_of_line_executor.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/topology/topology_change_helpers.cpp b/src/mongo/db/topology/topology_change_helpers.cpp index a011ab4b201..21196038b97 100644 --- a/src/mongo/db/topology/topology_change_helpers.cpp +++ b/src/mongo/db/topology/topology_change_helpers.cpp @@ -49,6 +49,7 @@ #include "mongo/db/audit.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" @@ -113,7 +114,6 @@ #include "mongo/rpc/metadata.h" #include "mongo/s/write_ops/batched_command_request.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/duration.h" #include "mongo/util/net/hostandport.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/topology/user_write_block/set_user_write_block_mode_coordinator.cpp b/src/mongo/db/topology/user_write_block/set_user_write_block_mode_coordinator.cpp index f38c61f0a13..0b5b89c9392 100644 --- a/src/mongo/db/topology/user_write_block/set_user_write_block_mode_coordinator.cpp +++ b/src/mongo/db/topology/user_write_block/set_user_write_block_mode_coordinator.cpp @@ -36,6 +36,7 @@ #include "mongo/db/client.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" @@ -54,7 +55,6 @@ #include "mongo/executor/task_executor.h" #include "mongo/executor/task_executor_pool.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" #include "mongo/util/future_impl.h" diff --git a/src/mongo/db/topology/user_write_block/user_writes_recoverable_critical_section_service.cpp b/src/mongo/db/topology/user_write_block/user_writes_recoverable_critical_section_service.cpp index d8f1b3b5071..d94adad9b85 100644 --- a/src/mongo/db/topology/user_write_block/user_writes_recoverable_critical_section_service.cpp +++ b/src/mongo/db/topology/user_write_block/user_writes_recoverable_critical_section_service.cpp @@ -38,6 +38,7 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/query/find_command.h" #include "mongo/db/query/write_ops/write_ops_gen.h" @@ -59,7 +60,6 @@ #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/validate/validate_results.cpp b/src/mongo/db/validate/validate_results.cpp index ae3726aa3ec..71e2bbf68d7 100644 --- a/src/mongo/db/validate/validate_results.cpp +++ b/src/mongo/db/validate/validate_results.cpp @@ -32,9 +32,9 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/validate/bson_utf8.h" #include "mongo/db/validate/validate_options.h" -#include "mongo/util/namespace_string_util.h" namespace mongo { diff --git a/src/mongo/db/versioning_protocol/catalog_cache_diagnostics_helpers.cpp b/src/mongo/db/versioning_protocol/catalog_cache_diagnostics_helpers.cpp index 3ea37e2cc53..65d9b6273d3 100644 --- a/src/mongo/db/versioning_protocol/catalog_cache_diagnostics_helpers.cpp +++ b/src/mongo/db/versioning_protocol/catalog_cache_diagnostics_helpers.cpp @@ -45,13 +45,13 @@ #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/read_through_cache.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/versioning_protocol/cluster_get_shard_version_cmd.cpp b/src/mongo/db/versioning_protocol/cluster_get_shard_version_cmd.cpp index 5e2091408cc..a8b17a79d46 100644 --- a/src/mongo/db/versioning_protocol/cluster_get_shard_version_cmd.cpp +++ b/src/mongo/db/versioning_protocol/cluster_get_shard_version_cmd.cpp @@ -44,6 +44,7 @@ #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/service_context.h" @@ -54,7 +55,6 @@ #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/read_through_cache.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/versioning_protocol/get_database_version_command.cpp b/src/mongo/db/versioning_protocol/get_database_version_command.cpp index fd88441235b..64dc434b593 100644 --- a/src/mongo/db/versioning_protocol/get_database_version_command.cpp +++ b/src/mongo/db/versioning_protocol/get_database_version_command.cpp @@ -36,7 +36,9 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" @@ -51,8 +53,6 @@ #include "mongo/rpc/op_msg.h" #include "mongo/rpc/reply_builder_interface.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/versioning_protocol/get_shard_version_command.cpp b/src/mongo/db/versioning_protocol/get_shard_version_command.cpp index ffc52cbb257..e1dac8df8d6 100644 --- a/src/mongo/db/versioning_protocol/get_shard_version_command.cpp +++ b/src/mongo/db/versioning_protocol/get_shard_version_command.cpp @@ -44,6 +44,7 @@ #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" #include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" @@ -56,7 +57,6 @@ #include "mongo/db/versioning_protocol/catalog_cache_diagnostics_helpers.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/uuid.h" #include diff --git a/src/mongo/db/versioning_protocol/stale_exception.cpp b/src/mongo/db/versioning_protocol/stale_exception.cpp index 5db53bfb05d..df1df0d9599 100644 --- a/src/mongo/db/versioning_protocol/stale_exception.cpp +++ b/src/mongo/db/versioning_protocol/stale_exception.cpp @@ -31,9 +31,9 @@ #include "mongo/base/init.h" // IWYU pragma: keep #include "mongo/bson/bsonelement.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/versioning_protocol/shard_version.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/views/util.cpp b/src/mongo/db/views/util.cpp index b5ab3e7f590..0fff9c85d5f 100644 --- a/src/mongo/db/views/util.cpp +++ b/src/mongo/db/views/util.cpp @@ -34,9 +34,9 @@ #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsontypes.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/query/collation/collator_factory_interface.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" namespace mongo::view_util { diff --git a/src/mongo/db/views/view.cpp b/src/mongo/db/views/view.cpp index 36753c821d9..bee123b21b1 100644 --- a/src/mongo/db/views/view.cpp +++ b/src/mongo/db/views/view.cpp @@ -31,8 +31,8 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonelement.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/executor/async_rpc.cpp b/src/mongo/executor/async_rpc.cpp index 101de98fd44..7dc7efc1f78 100644 --- a/src/mongo/executor/async_rpc.cpp +++ b/src/mongo/executor/async_rpc.cpp @@ -30,12 +30,12 @@ #include "mongo/executor/async_rpc.h" #include "mongo/base/error_codes.h" +#include "mongo/db/database_name_util.h" #include "mongo/executor/remote_command_request.h" #include "mongo/executor/task_executor.h" #include "mongo/logv2/log.h" #include "mongo/rpc/metadata.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" #include "mongo/util/fail_point.h" #include "mongo/util/future.h" diff --git a/src/mongo/rpc/legacy_request.cpp b/src/mongo/rpc/legacy_request.cpp index e64c714301d..5774c6320f0 100644 --- a/src/mongo/rpc/legacy_request.cpp +++ b/src/mongo/rpc/legacy_request.cpp @@ -33,9 +33,9 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/dbmessage.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/rpc/metadata.h" #include "mongo/util/assert_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" namespace mongo { diff --git a/src/mongo/rpc/op_msg.cpp b/src/mongo/rpc/op_msg.cpp index 877d4afa9df..c89e0332eb3 100644 --- a/src/mongo/rpc/op_msg.cpp +++ b/src/mongo/rpc/op_msg.cpp @@ -36,6 +36,7 @@ #include "mongo/base/error_codes.h" #include "mongo/bson/dotted_path/dotted_path_support.h" #include "mongo/config.h" // IWYU pragma: keep +#include "mongo/db/database_name_util.h" #include "mongo/db/feature_flag.h" #include "mongo/db/multitenancy_gen.h" #include "mongo/db/server_feature_flags_gen.h" @@ -44,7 +45,6 @@ #include "mongo/logv2/log.h" #include "mongo/rpc/object_check.h" // IWYU pragma: keep #include "mongo/util/bufreader.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/debug_util.h" #include "mongo/util/hex.h" #include "mongo/util/str.h" diff --git a/src/mongo/rpc/op_msg.h b/src/mongo/rpc/op_msg.h index 080bf4faadc..34f708ee1d4 100644 --- a/src/mongo/rpc/op_msg.h +++ b/src/mongo/rpc/op_msg.h @@ -36,11 +36,11 @@ #include "mongo/bson/bsontypes.h" #include "mongo/bson/util/builder.h" #include "mongo/db/auth/validated_tenancy_scope_factory.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/tenant_id.h" #include "mongo/platform/atomic_word.h" #include "mongo/rpc/message.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/modules.h" #include "mongo/util/serialization_context.h" #include "mongo/util/shared_buffer.h" diff --git a/src/mongo/s/change_streams/change_stream_reader_builder_impl.cpp b/src/mongo/s/change_streams/change_stream_reader_builder_impl.cpp index 2059e17ac8a..174ae44bac8 100644 --- a/src/mongo/s/change_streams/change_stream_reader_builder_impl.cpp +++ b/src/mongo/s/change_streams/change_stream_reader_builder_impl.cpp @@ -30,7 +30,9 @@ #include "mongo/s/change_streams/change_stream_reader_builder_impl.h" #include "mongo/bson/bsonobj.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/repl/oplog_entry.h" #include "mongo/db/service_context.h" #include "mongo/s/change_streams/all_databases_change_stream_shard_targeter_impl.h" @@ -39,8 +41,6 @@ #include "mongo/s/change_streams/database_change_stream_shard_targeter_impl.h" #include "mongo/s/change_streams/historical_placement_fetcher_impl.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/pcre_util.h" #include diff --git a/src/mongo/s/commands/cluster_filemd5_cmd.cpp b/src/mongo/s/commands/cluster_filemd5_cmd.cpp index dc0e8d17ece..3e0614d2777 100644 --- a/src/mongo/s/commands/cluster_filemd5_cmd.cpp +++ b/src/mongo/s/commands/cluster_filemd5_cmd.cpp @@ -44,6 +44,7 @@ #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/collation/collation_spec.h" #include "mongo/db/router_role/cluster_commands_helpers.h" @@ -54,7 +55,6 @@ #include "mongo/rpc/get_status_from_command_result.h" #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/s/commands/cluster_oplog_note_cmd.cpp b/src/mongo/s/commands/cluster_oplog_note_cmd.cpp index 647dd281f0d..efcd556cb91 100644 --- a/src/mongo/s/commands/cluster_oplog_note_cmd.cpp +++ b/src/mongo/s/commands/cluster_oplog_note_cmd.cpp @@ -41,11 +41,11 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/router_role/cluster_commands_helpers.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" #include diff --git a/src/mongo/s/commands/cluster_set_feature_compatibility_version_cmd.cpp b/src/mongo/s/commands/cluster_set_feature_compatibility_version_cmd.cpp index f94082967d6..436c25d8cdc 100644 --- a/src/mongo/s/commands/cluster_set_feature_compatibility_version_cmd.cpp +++ b/src/mongo/s/commands/cluster_set_feature_compatibility_version_cmd.cpp @@ -36,6 +36,7 @@ #include "mongo/db/commands.h" #include "mongo/db/commands/set_feature_compatibility_version_gen.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/feature_compatibility_version_documentation.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/namespace_string.h" @@ -46,7 +47,6 @@ #include "mongo/db/topology/shard_registry.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/version/releases.h" #include diff --git a/src/mongo/s/commands/cluster_split_cmd.cpp b/src/mongo/s/commands/cluster_split_cmd.cpp index e328a78038e..3212093b726 100644 --- a/src/mongo/s/commands/cluster_split_cmd.cpp +++ b/src/mongo/s/commands/cluster_split_cmd.cpp @@ -40,6 +40,7 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/field_parser.h" #include "mongo/db/global_catalog/chunk.h" #include "mongo/db/global_catalog/chunk_manager.h" @@ -48,6 +49,7 @@ #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_chunk_range.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/router_role/cluster_commands_helpers.h" #include "mongo/db/router_role/routing_cache/catalog_cache.h" @@ -62,8 +64,6 @@ #include "mongo/logv2/log.h" #include "mongo/s/query/shard_key_pattern_query_util.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/s/commands/cluster_split_vector_cmd.cpp b/src/mongo/s/commands/cluster_split_vector_cmd.cpp index 6e22ea8cc26..4b43f2def18 100644 --- a/src/mongo/s/commands/cluster_split_vector_cmd.cpp +++ b/src/mongo/s/commands/cluster_split_vector_cmd.cpp @@ -39,8 +39,10 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/router_role/cluster_commands_helpers.h" #include "mongo/db/router_role/router_role.h" @@ -50,9 +52,7 @@ #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/db/versioning_protocol/shard_version.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/s/commands/cluster_user_management_commands.cpp b/src/mongo/s/commands/cluster_user_management_commands.cpp index c6972983d5c..400c1e3e7a2 100644 --- a/src/mongo/s/commands/cluster_user_management_commands.cpp +++ b/src/mongo/s/commands/cluster_user_management_commands.cpp @@ -42,8 +42,10 @@ #include "mongo/db/commands/user_management_commands_common.h" #include "mongo/db/commands/user_management_commands_gen.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/router_role/cluster_commands_helpers.h" #include "mongo/db/service_context.h" @@ -53,9 +55,7 @@ #include "mongo/rpc/get_status_from_command_result.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/duration.h" -#include "mongo/util/namespace_string_util.h" #include #include diff --git a/src/mongo/s/commands/query_cmd/cluster_distinct_cmd.cpp b/src/mongo/s/commands/query_cmd/cluster_distinct_cmd.cpp index 903bd6ee71b..6af0ae0da57 100644 --- a/src/mongo/s/commands/query_cmd/cluster_distinct_cmd.cpp +++ b/src/mongo/s/commands/query_cmd/cluster_distinct_cmd.cpp @@ -46,6 +46,7 @@ #include "mongo/db/auth/privilege.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/logical_time.h" #include "mongo/db/matcher/extensions_callback_noop.h" @@ -95,7 +96,6 @@ #include "mongo/s/query/planner/cluster_aggregate.h" #include "mongo/s/transaction_router.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decimal_counter.h" #include "mongo/util/decorable.h" #include "mongo/util/str.h" diff --git a/src/mongo/s/commands/query_cmd/cluster_explain_cmd.cpp b/src/mongo/s/commands/query_cmd/cluster_explain_cmd.cpp index e7beeef96bf..5e064208dbb 100644 --- a/src/mongo/s/commands/query_cmd/cluster_explain_cmd.cpp +++ b/src/mongo/s/commands/query_cmd/cluster_explain_cmd.cpp @@ -34,6 +34,7 @@ #include "mongo/db/commands.h" #include "mongo/db/commands/query_cmd/explain_cmd_helpers.h" #include "mongo/db/commands/query_cmd/explain_gen.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/aggregation_request_helper.h" diff --git a/src/mongo/s/commands/query_cmd/cluster_pipeline_cmd_s.cpp b/src/mongo/s/commands/query_cmd/cluster_pipeline_cmd_s.cpp index 1aec4b5cf41..6bac469b4bb 100644 --- a/src/mongo/s/commands/query_cmd/cluster_pipeline_cmd_s.cpp +++ b/src/mongo/s/commands/query_cmd/cluster_pipeline_cmd_s.cpp @@ -32,6 +32,7 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/privilege.h" #include "mongo/db/commands.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/rpc/op_msg.h" diff --git a/src/mongo/s/commands/strategy.cpp b/src/mongo/s/commands/strategy.cpp index 73f734c4563..0423886c98c 100644 --- a/src/mongo/s/commands/strategy.cpp +++ b/src/mongo/s/commands/strategy.cpp @@ -55,6 +55,7 @@ #include "mongo/db/logical_time.h" #include "mongo/db/logical_time_validator.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/not_primary_error_tracker.h" #include "mongo/db/operation_context.h" #include "mongo/db/operation_time_tracker.h" @@ -109,7 +110,6 @@ #include "mongo/util/decorable.h" #include "mongo/util/duration.h" #include "mongo/util/fail_point.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/scopeguard.h" #include diff --git a/src/mongo/s/query/planner/cluster_find.cpp b/src/mongo/s/query/planner/cluster_find.cpp index 8c2e7e5888a..5fb737f2da4 100644 --- a/src/mongo/s/query/planner/cluster_find.cpp +++ b/src/mongo/s/query/planner/cluster_find.cpp @@ -59,6 +59,7 @@ #include "mongo/db/matcher/expression.h" #include "mongo/db/memory_tracking/operation_memory_usage_tracker.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/namespace_string_util.h" #include "mongo/db/pipeline/change_stream_invalidation_info.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/expression_context_builder.h" @@ -122,7 +123,6 @@ #include "mongo/util/duration.h" #include "mongo/util/fail_point.h" #include "mongo/util/intrusive_counter.h" -#include "mongo/util/namespace_string_util.h" #include "mongo/util/scopeguard.h" #include "mongo/util/str.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/s/query_analysis_client.cpp b/src/mongo/s/query_analysis_client.cpp index 4c28d8d4426..af47582bd41 100644 --- a/src/mongo/s/query_analysis_client.cpp +++ b/src/mongo/s/query_analysis_client.cpp @@ -33,6 +33,7 @@ #include "mongo/base/status_with.h" #include "mongo/bson/bsonmisc.h" #include "mongo/bson/bsonobjbuilder.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/repl/intent_guard.h" @@ -42,7 +43,6 @@ #include "mongo/db/write_concern_options.h" #include "mongo/executor/remote_command_request.h" #include "mongo/util/assert_util.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/decorable.h" #include "mongo/util/duration.h" #include "mongo/util/fail_point.h" diff --git a/src/mongo/shell/encrypted_dbclient_base.cpp b/src/mongo/shell/encrypted_dbclient_base.cpp index 77d89683c9a..ae5a5a35404 100644 --- a/src/mongo/shell/encrypted_dbclient_base.cpp +++ b/src/mongo/shell/encrypted_dbclient_base.cpp @@ -49,6 +49,7 @@ #include "mongo/crypto/fle_data_frames.h" #include "mongo/crypto/fle_field_schema_gen.h" #include "mongo/crypto/symmetric_crypto.h" +#include "mongo/db/database_name_util.h" #include "mongo/db/matcher/schema/encrypt_schema_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/client_cursor/cursor_response.h" @@ -78,7 +79,6 @@ #include "mongo/shell/kms_gen.h" #include "mongo/util/assert_util.h" #include "mongo/util/base64.h" -#include "mongo/util/database_name_util.h" #include "mongo/util/duration.h" #include "mongo/util/str.h" diff --git a/src/mongo/util/BUILD.bazel b/src/mongo/util/BUILD.bazel index 2314a44ec2e..0fdce1460a9 100644 --- a/src/mongo/util/BUILD.bazel +++ b/src/mongo/util/BUILD.bazel @@ -34,8 +34,6 @@ filegroup( "safe_num.h", "scoped_unlock.h", "serialization_context.h", - "//src/mongo/util:database_name_util.h", - "//src/mongo/util:namespace_string_util.h", ], )