diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index facbb0e2d36..270f998048d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1882,6 +1882,15 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot /src/mongo/db/**/flow_control_ticketholder* @10gen/server-workload-resilience @svc-auto-approve-bot /src/mongo/db/**/replication_state_transition_lock_guard* @10gen/server-replication-reviewers @svc-auto-approve-bot /src/mongo/db/**/local_executor* @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot +/src/mongo/db/**/collection_compact* @10gen/server-compact @svc-auto-approve-bot +/src/mongo/db/**/import* @10gen/server-catalog-and-routing-shard-catalog @10gen/server-storage-engine-integration @svc-auto-approve-bot +/src/mongo/db/**/index_key_validate* @10gen/server-index-builds @svc-auto-approve-bot +/src/mongo/db/**/index_spec_validate* @10gen/server-index-builds @svc-auto-approve-bot +/src/mongo/db/**/index_repair* @10gen/server-index-builds @svc-auto-approve-bot +/src/mongo/db/**/throttle_cursor* @10gen/server-validate @svc-auto-approve-bot +/src/mongo/db/**/cleanup_structured* @10gen/server-catalog-and-routing-ddl @10gen/server-security @svc-auto-approve-bot +/src/mongo/db/**/compact_structured* @10gen/server-catalog-and-routing-ddl @10gen/server-security @svc-auto-approve-bot +/src/mongo/db/**/partitioned* @10gen/server-programmability @svc-auto-approve-bot # The following patterns are parsed from ./src/mongo/db/admission/OWNERS.yml /src/mongo/db/admission/**/* @10gen/server-workload-resilience @svc-auto-approve-bot @@ -1889,9 +1898,6 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot # The following patterns are parsed from ./src/mongo/db/auth/OWNERS.yml /src/mongo/db/auth/**/* @10gen/server-security @svc-auto-approve-bot -# The following patterns are parsed from ./src/mongo/db/cluster_parameters/OWNERS.yml -/src/mongo/db/cluster_parameters/**/* @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot - # The following patterns are parsed from ./src/mongo/db/collection_crud/OWNERS.yml /src/mongo/db/collection_crud/**/* @10gen/server-collection-write-path @svc-auto-approve-bot @@ -2088,21 +2094,13 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot /src/mongo/db/global_catalog/**/* @10gen/server-catalog-and-routing-ddl @svc-auto-approve-bot /src/mongo/db/global_catalog/**/type_tags* @10gen/server-cluster-scalability @svc-auto-approve-bot -# The following patterns are parsed from ./src/mongo/db/global_catalog/catalog_cache/OWNERS.yml -/src/mongo/db/global_catalog/catalog_cache/**/* @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot - # The following patterns are parsed from ./src/mongo/db/global_catalog/ddl/OWNERS.yml /src/mongo/db/global_catalog/ddl/**/* @10gen/server-catalog-and-routing-ddl @svc-auto-approve-bot /src/mongo/db/global_catalog/ddl/**/*chunk_migration_command* @10gen/server-catalog-and-routing-ddl @10gen/server-cluster-scalability @svc-auto-approve-bot /src/mongo/db/global_catalog/ddl/**/sharding_catalog_manager_assign_key_range_to_zone_test.cpp @10gen/server-catalog-and-routing-ddl @10gen/server-cluster-scalability @svc-auto-approve-bot /src/mongo/db/global_catalog/ddl/**/sharding_catalog_manager_zone_operations.cpp @10gen/server-catalog-and-routing-ddl @10gen/server-cluster-scalability @svc-auto-approve-bot -/src/mongo/db/global_catalog/ddl/**/cleanup_structured* @10gen/server-catalog-and-routing-ddl @10gen/server-security @svc-auto-approve-bot -/src/mongo/db/global_catalog/ddl/**/compact_structured* @10gen/server-catalog-and-routing-ddl @10gen/server-security @svc-auto-approve-bot /src/mongo/db/global_catalog/ddl/**/*refine_collection_shard_key* @10gen/server-cluster-scalability @svc-auto-approve-bot -# The following patterns are parsed from ./src/mongo/db/global_catalog/router_role_api/OWNERS.yml -/src/mongo/db/global_catalog/router_role_api/**/* @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot - # The following patterns are parsed from ./src/mongo/db/index/OWNERS.yml /src/mongo/db/index/**/index_access_method* @10gen/server-index-builds @svc-auto-approve-bot /src/mongo/db/index/**/key_gen_bm.cpp @10gen/query-execution-write-exec @svc-auto-approve-bot @@ -2123,32 +2121,6 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot # The following patterns are parsed from ./src/mongo/db/index_builds/OWNERS.yml /src/mongo/db/index_builds/**/* @10gen/server-index-builds @svc-auto-approve-bot -# The following patterns are parsed from ./src/mongo/db/local_catalog/OWNERS.yml -/src/mongo/db/local_catalog/**/* @10gen/server-catalog-and-routing-shard-catalog @svc-auto-approve-bot -/src/mongo/db/local_catalog/**/collection_compact* @10gen/server-compact @svc-auto-approve-bot -/src/mongo/db/local_catalog/**/import* @10gen/server-catalog-and-routing-shard-catalog @10gen/server-storage-engine-integration @svc-auto-approve-bot -/src/mongo/db/local_catalog/**/index_key_validate* @10gen/server-index-builds @svc-auto-approve-bot -/src/mongo/db/local_catalog/**/index_spec_validate* @10gen/server-index-builds @svc-auto-approve-bot -/src/mongo/db/local_catalog/**/index_repair* @10gen/server-index-builds @svc-auto-approve-bot -/src/mongo/db/local_catalog/**/throttle_cursor* @10gen/server-validate @svc-auto-approve-bot -/src/mongo/db/local_catalog/**/durable_catalog* @10gen/server-catalog-and-routing-shard-catalog @10gen/server-storage-engine-integration @svc-auto-approve-bot -/src/mongo/db/local_catalog/**/index_catalog_entry_helpers* @10gen/query-execution-write-exec @svc-auto-approve-bot -/src/mongo/db/local_catalog/**/local_oplog_info* @10gen/server-oplog @svc-auto-approve-bot -/src/mongo/db/local_catalog/**/document_validation* @10gen/query-execution @svc-auto-approve-bot -/src/mongo/db/local_catalog/**/external_data_source_scope_guard* @10gen/query-integration-features @svc-auto-approve-bot - -# The following patterns are parsed from ./src/mongo/db/local_catalog/ddl/OWNERS.yml -/src/mongo/db/local_catalog/ddl/**/* @10gen/server-catalog-and-routing-ddl @10gen/server-catalog-and-routing-shard-catalog @svc-auto-approve-bot - -# The following patterns are parsed from ./src/mongo/db/local_catalog/lock_manager/OWNERS.yml -/src/mongo/db/local_catalog/lock_manager/**/* @10gen/server-catalog-and-routing-shard-catalog @svc-auto-approve-bot - -# The following patterns are parsed from ./src/mongo/db/local_catalog/shard_role_api/OWNERS.yml -/src/mongo/db/local_catalog/shard_role_api/**/* @10gen/server-catalog-and-routing-shard-catalog @svc-auto-approve-bot - -# The following patterns are parsed from ./src/mongo/db/local_catalog/shard_role_catalog/OWNERS.yml -/src/mongo/db/local_catalog/shard_role_catalog/**/* @10gen/server-catalog-and-routing-shard-catalog @svc-auto-approve-bot - # The following patterns are parsed from ./src/mongo/db/matcher/OWNERS.yml /src/mongo/db/matcher/**/* @10gen/query-optimization @svc-auto-approve-bot /src/mongo/db/matcher/**/OWNERS.yml @10gen/query-execution-staff-leads @10gen/query-integration-staff-leads @10gen/query-optimization-staff-leads @svc-auto-approve-bot @@ -2765,6 +2737,12 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot # The following patterns are parsed from ./src/mongo/db/repl/split_horizon/OWNERS.yml /src/mongo/db/repl/split_horizon/**/* @10gen/server-split-horizon @svc-auto-approve-bot +# The following patterns are parsed from ./src/mongo/db/router_role/OWNERS.yml +/src/mongo/db/router_role/**/* @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot + +# The following patterns are parsed from ./src/mongo/db/router_role/routing_cache/OWNERS.yml +/src/mongo/db/router_role/routing_cache/**/* @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot + # The following patterns are parsed from ./src/mongo/db/rss/OWNERS.yml /src/mongo/db/rss/**/* @10gen/server-rss @svc-auto-approve-bot @@ -2804,6 +2782,22 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot # The following patterns are parsed from ./src/mongo/db/session/OWNERS.yml /src/mongo/db/session/**/* @10gen/server-transactions @svc-auto-approve-bot +# The following patterns are parsed from ./src/mongo/db/shard_role/OWNERS.yml +/src/mongo/db/shard_role/**/* @10gen/server-catalog-and-routing-shard-catalog @svc-auto-approve-bot + +# The following patterns are parsed from ./src/mongo/db/shard_role/ddl/OWNERS.yml +/src/mongo/db/shard_role/ddl/**/* @10gen/server-catalog-and-routing-ddl @10gen/server-catalog-and-routing-shard-catalog @svc-auto-approve-bot + +# The following patterns are parsed from ./src/mongo/db/shard_role/lock_manager/OWNERS.yml +/src/mongo/db/shard_role/lock_manager/**/* @10gen/server-catalog-and-routing-shard-catalog @svc-auto-approve-bot + +# The following patterns are parsed from ./src/mongo/db/shard_role/shard_catalog/OWNERS.yml +/src/mongo/db/shard_role/shard_catalog/**/* @10gen/server-catalog-and-routing-shard-catalog @svc-auto-approve-bot +/src/mongo/db/shard_role/shard_catalog/**/durable_catalog* @10gen/server-catalog-and-routing-shard-catalog @10gen/server-storage-engine-integration @svc-auto-approve-bot +/src/mongo/db/shard_role/shard_catalog/**/index_catalog_entry_helpers* @10gen/query-execution-write-exec @svc-auto-approve-bot +/src/mongo/db/shard_role/shard_catalog/**/document_validation* @10gen/query-execution @svc-auto-approve-bot +/src/mongo/db/shard_role/shard_catalog/**/external_data_source_scope_guard* @10gen/query-integration-features @svc-auto-approve-bot + # The following patterns are parsed from ./src/mongo/db/sharding_environment/OWNERS.yml /src/mongo/db/sharding_environment/**/* @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot /src/mongo/db/sharding_environment/**/*op_observer* @10gen/server-catalog-and-routing @svc-auto-approve-bot @@ -2889,6 +2883,18 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot /src/mongo/db/topology/**/* @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot /src/mongo/db/topology/**/*coordinator* @10gen/server-catalog-and-routing-ddl @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot +# The following patterns are parsed from ./src/mongo/db/topology/cluster_parameters/OWNERS.yml +/src/mongo/db/topology/cluster_parameters/**/* @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot + +# The following patterns are parsed from ./src/mongo/db/topology/user_write_block/OWNERS.yml +/src/mongo/db/topology/user_write_block/**/* @10gen/server-catalog-and-routing-shard-catalog @svc-auto-approve-bot +/src/mongo/db/topology/user_write_block/**/*shardsvr* @10gen/server-catalog-and-routing-ddl @svc-auto-approve-bot +/src/mongo/db/topology/user_write_block/**/*configsvr* @10gen/server-catalog-and-routing-ddl @svc-auto-approve-bot +/src/mongo/db/topology/user_write_block/**/*cluster* @10gen/server-catalog-and-routing-ddl @svc-auto-approve-bot + +# The following patterns are parsed from ./src/mongo/db/topology/vector_clock/OWNERS.yml +/src/mongo/db/topology/vector_clock/**/* @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot + # The following patterns are parsed from ./src/mongo/db/traffic_recorder/OWNERS.yml /src/mongo/db/traffic_recorder/**/* @10gen/query-optimization @svc-auto-approve-bot @@ -2902,18 +2908,9 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot /src/mongo/db/update/**/* @10gen/query-execution-write-exec @svc-auto-approve-bot /src/mongo/db/update/**/OWNERS.yml @10gen/query-execution-staff-leads @svc-auto-approve-bot -# The following patterns are parsed from ./src/mongo/db/user_write_block/OWNERS.yml -/src/mongo/db/user_write_block/**/* @10gen/server-catalog-and-routing-shard-catalog @svc-auto-approve-bot -/src/mongo/db/user_write_block/**/*shardsvr* @10gen/server-catalog-and-routing-ddl @svc-auto-approve-bot -/src/mongo/db/user_write_block/**/*configsvr* @10gen/server-catalog-and-routing-ddl @svc-auto-approve-bot -/src/mongo/db/user_write_block/**/*cluster* @10gen/server-catalog-and-routing-ddl @svc-auto-approve-bot - # The following patterns are parsed from ./src/mongo/db/validate/OWNERS.yml /src/mongo/db/validate/**/* @10gen/server-validate @svc-auto-approve-bot -# The following patterns are parsed from ./src/mongo/db/vector_clock/OWNERS.yml -/src/mongo/db/vector_clock/**/* @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot - # The following patterns are parsed from ./src/mongo/db/versioning_protocol/OWNERS.yml /src/mongo/db/versioning_protocol/**/* @10gen/server-catalog-and-routing-routing-and-topology @svc-auto-approve-bot diff --git a/BUILD.bazel b/BUILD.bazel index fb4ca574e6c..c009706f495 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -300,7 +300,7 @@ mongo_install( }), pretty_printer_tests = { "//src/mongo/util:pretty_printer_test.py": "//src/mongo/util:pretty_printer_test_program", - "//src/mongo/db/local_catalog/lock_manager:lock_gdb_test.py": "//src/mongo/db:mongod", + "//src/mongo/db/shard_role/lock_manager:lock_gdb_test.py": "//src/mongo/db:mongod", "//src/mongo/db/query/stage_builder/sbe/abt:optimizer_gdb_test.py": "//src/mongo/db/query/stage_builder/sbe/abt:optimizer_gdb_test_program", }, try_zstd = True, diff --git a/modules_poc/modules.yaml b/modules_poc/modules.yaml index e6d005977cc..89e71514829 100644 --- a/modules_poc/modules.yaml +++ b/modules_poc/modules.yaml @@ -37,7 +37,7 @@ core: - src/mongo/platform/ - src/mongo/stdx/ - src/mongo/util/ - - src/mongo/db/local_catalog/util/partitioned* + - src/mongo/db/partitioned* - src/mongo/db/crud_bm.cpp - src/mongo/db/field_parser[._]* - src/mongo/db/generic_argument_util.* @@ -260,6 +260,7 @@ catalog_and_routing: jira: Catalog and Routing files: - src/mongo/db/sharding_environment/** + - src/mongo/db/versioning_protocol/** - src/mongo/db/persistent_task_store* - src/mongo/db/local_executor* - src/mongo/db/rs_local_client* @@ -279,19 +280,8 @@ catalog_and_routing.shard_role: slack: server-catalog-and-routing jira: Catalog and Routing files: + - src/mongo/db/shard_role/** - src/mongo/db/service_entry_point_shard_role[._]* - - src/mongo/db/local_catalog/lock_manager/* - - src/mongo/db/local_catalog/shard_role_api/* - - # shard_catalog: Implementation details of the public Shard Role API. Includes the parts of the - # catalog that are projected on the Config Server and the ones that are only shard-local. - - src/mongo/db/local_catalog/shard_role_catalog/* - - src/mongo/db/local_catalog/* - - src/mongo/db/raw_data_operation* - - # shard_ddl: The public DDL API used by other teams to build replica set DDLs, including the - # shard-local primitives required for their construction. - - src/mongo/db/local_catalog/ddl/* catalog_and_routing.global_catalog: meta: @@ -303,11 +293,7 @@ catalog_and_routing.global_catalog: slack: server-catalog-and-routing jira: Catalog and Routing files: - - src/mongo/db/global_catalog/* - - src/mongo/db/global_catalog/metadata_consistency_validation/* - - # global_ddl: The public DDL API that the rest of the teams use to build distributed DDLs. - - src/mongo/db/global_catalog/ddl/* + - src/mongo/db/global_catalog/** catalog_and_routing.router_role: meta: @@ -318,13 +304,9 @@ catalog_and_routing.router_role: slack: server-catalog-and-routing jira: Catalog and Routing files: + - src/mongo/db/router_role/** - src/mongo/s/service_entry_point_router_role[._]* - src/mongo/s/commands/strategy* - - src/mongo/db/global_catalog/router_role_api/* - - # routing_cache: Implementation detail of the public Router Role API that contains the in-memory - # cache of the global catalog. - - src/mongo/db/global_catalog/catalog_cache/* catalog_and_routing.topology: meta: @@ -336,24 +318,12 @@ catalog_and_routing.topology: slack: server-catalog-and-routing jira: Catalog and Routing files: - - src/mongo/db/topology/* - - # TODO (SERVER-112053): The following files are components, not sub-modules. They should be - # placed inside the topology folder. - - # shard versioning protocol: - - src/mongo/db/versioning_protocol/* - - # vector_clock: - - src/mongo/db/vector_clock/* + - src/mongo/db/topology/** # FCV: - src/mongo/db/version_context* - src/mongo/s/commands/cluster_set_feature_compatibility_version_cmd.cpp - # cluster_server_parameters: - - src/mongo/db/cluster_parameters/* - # config shard: - src/mongo/db/catalog_shard_feature_flag.idl - src/mongo/db/s/config/*transition*dedicated_config* @@ -369,9 +339,6 @@ catalog_and_routing.topology: # replica_set_endpoint: will be deleted eventually - src/mongo/db/s/replica_set_endpoint* - # user writes block: - - src/mongo/db/user_write_block/* - # change streams: - src/mongo/s/change_streams* @@ -504,7 +471,7 @@ field_level_encryption: files: - src/mongo/db/commands/fle2_* - src/mongo/db/fle_* - - src/mongo/db/global_catalog/ddl/*_structured_encryption_* + - src/mongo/db/*_structured_encryption_* - src/mongo/s/commands/*fle2* - src/mongo/db/commands/fle_compact_test.cpp @@ -597,7 +564,7 @@ data_movement: - src/mongo/db/cloner* # zones - - src/mongo/db/global_catalog/ddl/remove_tags.idl + - src/mongo/db/s/remove_tags.idl - src/mongo/db/s/config/configsvr_remove_tags_command.cpp - src/mongo/db/s/config/configsvr_update_zone_key_range_command.cpp - src/mongo/s/commands/cluster_update_zone_key_range_cmd.cpp @@ -806,8 +773,8 @@ index_builds: # authoritative: @10gen/server-index-builds files: - src/mongo/db/index_builds - src/mongo/db/index/index_access_method* - - src/mongo/db/local_catalog/index_key_validate* - - src/mongo/db/local_catalog/index_spec_validate* + - src/mongo/db/index_key_validate* + - src/mongo/db/index_spec_validate* - src/mongo/db/commands/create_indexes* - src/mongo/db/commands/set_index_commit_quorum* - src/mongo/db/commands/vote*index_build* @@ -863,8 +830,8 @@ storage_engine_integration: - src/mongo/db/mongod_options_storage* - src/mongo/db/dbhelpers* - src/mongo/db/dbcommands.idl - - src/mongo/db/local_catalog/import* - - src/mongo/db/local_catalog/index_repair* + - src/mongo/db/import* + - src/mongo/db/index_repair* - src/mongo/db/commands/fsync* - src/mongo/db/commands/dbcommands* - src/mongo/db/commands/resize_oplog* @@ -883,7 +850,7 @@ validate: jira: Server Integration fully_marked: true files: - - src/mongo/db/local_catalog/throttle_cursor* + - src/mongo/db/throttle_cursor* - src/mongo/db/commands/validate.cpp - src/mongo/db/validate - src/mongo/dbtests/validate_tests.cpp @@ -903,7 +870,7 @@ compact: jira: Server Integration fully_marked: true files: - - src/mongo/db/local_catalog/collection_compact* + - src/mongo/db/collection_compact* - src/mongo/db/commands/auto_compact* - src/mongo/db/commands/compact* - src/mongo/db/storage/compact_options* @@ -1044,7 +1011,7 @@ replication.oplog: files: - src/mongo/db/op_observer/op_observer* - src/mongo/db/op_observer/operation_logger* - - src/mongo/db/local_catalog/local_oplog_info* + - src/mongo/db/repl/local_oplog_info* - src/mongo/db/commands/oplog* - src/mongo/db/commands/apply_ops* - src/mongo/db/repl/*oplog* diff --git a/src/mongo/bson/BUILD.bazel b/src/mongo/bson/BUILD.bazel index e7a5c31daac..fd32e35a7e7 100644 --- a/src/mongo/bson/BUILD.bazel +++ b/src/mongo/bson/BUILD.bazel @@ -55,7 +55,7 @@ mongo_cc_unit_test( "//src/mongo:base", "//src/mongo/bson:bson_validate", "//src/mongo/bson/column", - "//src/mongo/db/local_catalog:index_catalog", + "//src/mongo/db/shard_role/shard_catalog:index_catalog", ], ) diff --git a/src/mongo/client/sdam/BUILD.bazel b/src/mongo/client/sdam/BUILD.bazel index 0ee3616acb0..d490baa16db 100644 --- a/src/mongo/client/sdam/BUILD.bazel +++ b/src/mongo/client/sdam/BUILD.bazel @@ -104,7 +104,7 @@ mongo_cc_binary( "sdam", "sdam_test_util", "//src/mongo/client:connection_string", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/util:clock_source_mock", ], ) diff --git a/src/mongo/crypto/BUILD.bazel b/src/mongo/crypto/BUILD.bazel index f5514891be3..cd513ca28ee 100644 --- a/src/mongo/crypto/BUILD.bazel +++ b/src/mongo/crypto/BUILD.bazel @@ -121,7 +121,7 @@ idl_generator( name = "fle_options_gen", src = "fle_options.idl", deps = [ - "//src/mongo/db/cluster_parameters:cluster_server_parameter_gen", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_gen", ], ) diff --git a/src/mongo/crypto/fle_options.idl b/src/mongo/crypto/fle_options.idl index f0296485a1e..a4229f70e85 100644 --- a/src/mongo/crypto/fle_options.idl +++ b/src/mongo/crypto/fle_options.idl @@ -30,7 +30,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/db/cluster_parameters/cluster_server_parameter.idl" + - "mongo/db/topology/cluster_parameters/cluster_server_parameter.idl" structs: FLECompactionOptions: diff --git a/src/mongo/db/BUILD.bazel b/src/mongo/db/BUILD.bazel index 402aa0c7dc9..ba3a3b89979 100644 --- a/src/mongo/db/BUILD.bazel +++ b/src/mongo/db/BUILD.bazel @@ -85,7 +85,7 @@ idl_generator( src = ":feature_flag_test.idl", deps = [ ":basic_types_gen", - "//src/mongo/db/cluster_parameters:cluster_server_parameter_gen", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_gen", ], ) @@ -429,7 +429,7 @@ idl_generator( name = "default_max_time_ms_cluster_parameter_gen", src = "default_max_time_ms_cluster_parameter.idl", deps = [ - "//src/mongo/db/cluster_parameters:cluster_server_parameter_gen", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_gen", ], ) @@ -454,7 +454,7 @@ idl_generator( src = "change_stream_options.idl", deps = [ ":basic_types_gen", - "//src/mongo/db/cluster_parameters:cluster_server_parameter_gen", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_gen", ], ) @@ -537,15 +537,15 @@ mongo_cc_library( name = "shard_role_api_stor_ex", srcs = [ "//src/mongo/db:replication_state_transition_lock_guard.cpp", - "//src/mongo/db/local_catalog:collection.cpp", - "//src/mongo/db/local_catalog/lock_manager:d_concurrency.cpp", + "//src/mongo/db/shard_role/lock_manager:d_concurrency.cpp", + "//src/mongo/db/shard_role/shard_catalog:collection.cpp", ], deps = [ ":server_base", - "//src/mongo/db/local_catalog:collection_options", - "//src/mongo/db/local_catalog/lock_manager", "//src/mongo/db/query/collation:collator_factory_interface", "//src/mongo/db/repl:intent_registry", + "//src/mongo/db/shard_role/lock_manager", + "//src/mongo/db/shard_role/shard_catalog:collection_options", "//src/mongo/s:common_s", ], ) @@ -557,25 +557,25 @@ mongo_cc_library( "replica_set_endpoint_util.cpp", "//src/mongo/db/global_catalog/ddl:shard_key_index_util.cpp", "//src/mongo/db/global_catalog/ddl:sharding_migration_critical_section.cpp", - "//src/mongo/db/global_catalog/router_role_api:sharding_write_router.cpp", - "//src/mongo/db/local_catalog:collection_operation_source.cpp", - "//src/mongo/db/local_catalog/ddl:replica_set_ddl_tracker.cpp", - "//src/mongo/db/local_catalog/lock_manager:dump_lock_manager_impl.cpp", - "//src/mongo/db/local_catalog/shard_role_api:direct_shard_client_tracker.cpp", - "//src/mongo/db/local_catalog/shard_role_api:transaction_resources.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:collection_metadata.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:collection_sharding_state.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:database_sharding_state.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:operation_sharding_state.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:scoped_collection_metadata.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:shard_filtering_util.cpp", + "//src/mongo/db/router_role:sharding_write_router.cpp", "//src/mongo/db/s:replica_set_endpoint_feature_flag.cpp", "//src/mongo/db/s:transaction_coordinator_worker_curop_repository.cpp", + "//src/mongo/db/shard_role:direct_shard_client_tracker.cpp", + "//src/mongo/db/shard_role:transaction_resources.cpp", + "//src/mongo/db/shard_role/ddl:replica_set_ddl_tracker.cpp", + "//src/mongo/db/shard_role/lock_manager:dump_lock_manager_impl.cpp", + "//src/mongo/db/shard_role/shard_catalog:collection_metadata.cpp", + "//src/mongo/db/shard_role/shard_catalog:collection_operation_source.cpp", + "//src/mongo/db/shard_role/shard_catalog:collection_sharding_state.cpp", + "//src/mongo/db/shard_role/shard_catalog:database_sharding_state.cpp", + "//src/mongo/db/shard_role/shard_catalog:operation_sharding_state.cpp", + "//src/mongo/db/shard_role/shard_catalog:scoped_collection_metadata.cpp", + "//src/mongo/db/shard_role/shard_catalog:shard_filtering_util.cpp", "//src/mongo/db/sharding_environment:range_arithmetic.cpp", "//src/mongo/db/sharding_environment:sharding_api_d_params_gen", "//src/mongo/db/sharding_environment:sharding_statistics.cpp", "//src/mongo/db/topology:sharding_state.cpp", - "//src/mongo/db/user_write_block:global_user_write_block_state.cpp", + "//src/mongo/db/topology/user_write_block:global_user_write_block_state.cpp", ], deps = [ ":server_base", @@ -583,7 +583,7 @@ mongo_cc_library( ":shard_role_api_stor_ex", ":write_block_bypass", # TODO(SERVER-93876): Remove. "//src/mongo/db/admission:execution_admission_context", # TODO(SERVER-93876): Remove. - "//src/mongo/db/local_catalog:index_catalog", + "//src/mongo/db/shard_role/shard_catalog:index_catalog", "//src/mongo/db/storage:write_unit_of_work", # TODO(SERVER-93876): Remove. "//src/mongo/db/views", # TODO(SERVER-93876): Remove. "//src/mongo/s:grid", @@ -594,27 +594,27 @@ mongo_cc_library( mongo_cc_library( name = "shard_role", srcs = [ - "//src/mongo/db/local_catalog:catalog_helper.cpp", - "//src/mongo/db/local_catalog:catalog_raii.cpp", - "//src/mongo/db/local_catalog:collection_uuid_mismatch.cpp", - "//src/mongo/db/local_catalog:collection_yield_restore.cpp", - "//src/mongo/db/local_catalog:db_raii.cpp", - "//src/mongo/db/local_catalog/ddl:direct_connection_ddl_hook.cpp", - "//src/mongo/db/local_catalog/shard_role_api:direct_connection_util.cpp", - "//src/mongo/db/local_catalog/shard_role_api:post_resharding_placement.cpp", - "//src/mongo/db/local_catalog/shard_role_api:shard_role.cpp", - "//src/mongo/db/local_catalog/shard_role_api:shard_role_loop.cpp", - "//src/mongo/db/local_catalog/shard_role_api:shard_role_mock.cpp", + "//src/mongo/db/shard_role:direct_connection_util.cpp", + "//src/mongo/db/shard_role:post_resharding_placement.cpp", + "//src/mongo/db/shard_role:shard_role.cpp", + "//src/mongo/db/shard_role:shard_role_loop.cpp", + "//src/mongo/db/shard_role:shard_role_mock.cpp", + "//src/mongo/db/shard_role/ddl:direct_connection_ddl_hook.cpp", + "//src/mongo/db/shard_role/shard_catalog:catalog_helper.cpp", + "//src/mongo/db/shard_role/shard_catalog:catalog_raii.cpp", + "//src/mongo/db/shard_role/shard_catalog:collection_uuid_mismatch.cpp", + "//src/mongo/db/shard_role/shard_catalog:collection_yield_restore.cpp", + "//src/mongo/db/shard_role/shard_catalog:db_raii.cpp", ], deps = [ ":multitenancy", # TODO(SERVER-93876): Remove. ":server_base", ":shard_role_api", # TODO(SERVER-93876): Remove. - "//src/mongo/db/local_catalog:collection_catalog", - "//src/mongo/db/local_catalog:collection_uuid_mismatch_info", # TODO(SERVER-93876): Remove. - "//src/mongo/db/local_catalog:database_holder", - "//src/mongo/db/local_catalog:local_oplog_info", # TODO(SERVER-93876): Remove. - "//src/mongo/db/local_catalog:snapshot_helper", + "//src/mongo/db/shard_role/shard_catalog:collection_catalog", + "//src/mongo/db/shard_role/shard_catalog:collection_uuid_mismatch_info", # TODO(SERVER-93876): Remove. + "//src/mongo/db/shard_role/shard_catalog:database_holder", + "//src/mongo/db/shard_role/shard_catalog:local_oplog_info", # TODO(SERVER-93876): Remove. + "//src/mongo/db/shard_role/shard_catalog:snapshot_helper", "//src/mongo/db/sharding_environment:sharding_runtime_d_params_idl", "//src/mongo/db/stats:top", "//src/mongo/db/storage:storage_options", # TODO(SERVER-93876): Remove. @@ -626,10 +626,10 @@ mongo_cc_unit_test( name = "shard_role_test", srcs = [ "//src/mongo/db:database_name_test.cpp", - "//src/mongo/db/local_catalog:catalog_raii_test.cpp", - "//src/mongo/db/local_catalog/lock_manager:d_concurrency_test.cpp", - "//src/mongo/db/local_catalog/shard_role_api:shard_role_loop_test.cpp", - "//src/mongo/db/local_catalog/shard_role_api:shard_role_test.cpp", + "//src/mongo/db/shard_role:shard_role_loop_test.cpp", + "//src/mongo/db/shard_role:shard_role_test.cpp", + "//src/mongo/db/shard_role/lock_manager:d_concurrency_test.cpp", + "//src/mongo/db/shard_role/shard_catalog:catalog_raii_test.cpp", ], tags = ["mongo_unittest_third_group"], deps = [ @@ -637,15 +637,15 @@ mongo_cc_unit_test( ":shard_role", "//src/mongo/db/admission:ticketing_system", "//src/mongo/db/collection_crud", - "//src/mongo/db/local_catalog:catalog_control", - "//src/mongo/db/local_catalog:catalog_test_fixture", - "//src/mongo/db/local_catalog:collection_uuid_mismatch_info", - "//src/mongo/db/local_catalog:database_holder", - "//src/mongo/db/local_catalog:database_holder_mock", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/query/client_cursor", "//src/mongo/db/s:shard_server_test_fixture", "//src/mongo/db/s:sharding_runtime_d", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:catalog_control", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", + "//src/mongo/db/shard_role/shard_catalog:collection_uuid_mismatch_info", + "//src/mongo/db/shard_role/shard_catalog:database_holder", + "//src/mongo/db/shard_role/shard_catalog:database_holder_mock", "//src/mongo/util:progress_meter", "//src/mongo/util/concurrency:ticketholder", ], @@ -660,15 +660,15 @@ mongo_cc_unit_test( ":shard_role", "//src/mongo/db/admission:ticketing_system", "//src/mongo/db/collection_crud", - "//src/mongo/db/local_catalog:catalog_control", - "//src/mongo/db/local_catalog:catalog_test_fixture", - "//src/mongo/db/local_catalog:collection_uuid_mismatch_info", - "//src/mongo/db/local_catalog:database_holder", - "//src/mongo/db/local_catalog:database_holder_mock", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/query/client_cursor", "//src/mongo/db/s:shard_server_test_fixture", "//src/mongo/db/s:sharding_runtime_d", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:catalog_control", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", + "//src/mongo/db/shard_role/shard_catalog:collection_uuid_mismatch_info", + "//src/mongo/db/shard_role/shard_catalog:database_holder", + "//src/mongo/db/shard_role/shard_catalog:database_holder_mock", "//src/mongo/util:progress_meter", "//src/mongo/util/concurrency:ticketholder", ], @@ -681,9 +681,9 @@ mongo_cc_unit_test( "logical_time_test.cpp", "read_write_concern_defaults_test.cpp", "time_proof_service_test.cpp", - "//src/mongo/db/vector_clock:vector_clock_mongod_test.cpp", - "//src/mongo/db/vector_clock:vector_clock_test.cpp", - "//src/mongo/db/vector_clock:vector_clock_test_fixture.cpp", + "//src/mongo/db/topology/vector_clock:vector_clock_mongod_test.cpp", + "//src/mongo/db/topology/vector_clock:vector_clock_test.cpp", + "//src/mongo/db/topology/vector_clock:vector_clock_test_fixture.cpp", ], tags = ["mongo_unittest_fifth_group"], deps = [ @@ -721,7 +721,7 @@ mongo_cc_library( mongo_cc_library( name = "service_context_non_d", srcs = [ - "//src/mongo/db/local_catalog/shard_role_api:transaction_resources_init_non_mongod.cpp", + "//src/mongo/db/shard_role:transaction_resources_init_non_mongod.cpp", ], tags = [ "mongo_crypt", @@ -735,12 +735,12 @@ mongo_cc_library( mongo_cc_library( name = "coll_mod_command_idl", srcs = [ - "//src/mongo/db/local_catalog/ddl:coll_mod_gen", + "//src/mongo/db/shard_role/ddl:coll_mod_gen", ], deps = [ ":server_base", "//src/mongo/db/auth:authprivilege", - "//src/mongo/db/local_catalog:collection_options", + "//src/mongo/db/shard_role/shard_catalog:collection_options", "//src/mongo/db/timeseries:timeseries_options", # TODO(SERVER-93876): Remove. ], ) @@ -750,8 +750,8 @@ idl_generator( src = "dbcommands.idl", deps = [ ":basic_types_gen", - "//src/mongo/db/local_catalog:collection_options_gen", "//src/mongo/db/pipeline:storage_stats_spec_gen", + "//src/mongo/db/shard_role/shard_catalog:collection_options_gen", "//src/mongo/idl:generic_argument_gen", ], ) @@ -763,8 +763,8 @@ mongo_cc_library( ], deps = [ ":server_base", - "//src/mongo/db/local_catalog:collection_options", "//src/mongo/db/pipeline:document_sources_idl", + "//src/mongo/db/shard_role/shard_catalog:collection_options", ], ) @@ -790,11 +790,11 @@ mongo_cc_library( "curop_diagnostic_printer.cpp", "op_debug.cpp", "//src/mongo/db/commands/query_cmd:explain_gen", - "//src/mongo/db/local_catalog/ddl:coll_mod_reply_validation.cpp", - "//src/mongo/db/local_catalog/ddl:drop_database_gen", - "//src/mongo/db/local_catalog/ddl:drop_gen", - "//src/mongo/db/local_catalog/ddl:list_collections_gen", - "//src/mongo/db/local_catalog/ddl:list_indexes_gen", + "//src/mongo/db/shard_role/ddl:coll_mod_reply_validation.cpp", + "//src/mongo/db/shard_role/ddl:drop_database_gen", + "//src/mongo/db/shard_role/ddl:drop_gen", + "//src/mongo/db/shard_role/ddl:list_collections_gen", + "//src/mongo/db/shard_role/ddl:list_indexes_gen", ], deps = [ ":api_parameters", # TODO(SERVER-93876): Remove. @@ -816,12 +816,12 @@ mongo_cc_library( "//src/mongo/db/commands/server_status:server_status_core", # TODO(SERVER-93876): Remove. "//src/mongo/db/exec/mutable_bson", "//src/mongo/db/extension/host:extension_operation_metrics_registry", - "//src/mongo/db/local_catalog:collection_options", # TODO(SERVER-93876): Remove. - "//src/mongo/db/local_catalog:local_oplog_info", "//src/mongo/db/query:common_query_enums_and_helpers", "//src/mongo/db/query/client_cursor:cursor_response_idl", "//src/mongo/db/query/client_cursor:generic_cursor", "//src/mongo/db/repl:read_concern_args", # TODO(SERVER-93876): Remove. + "//src/mongo/db/shard_role/shard_catalog:collection_options", # TODO(SERVER-93876): Remove. + "//src/mongo/db/shard_role/shard_catalog:local_oplog_info", "//src/mongo/db/stats:timer_stats", "//src/mongo/db/storage:execution_context", "//src/mongo/db/storage:prepare_conflict_tracker", @@ -880,8 +880,8 @@ mongo_cc_library( deps = [ ":shard_role", "//src/mongo/db/collection_crud", - "//src/mongo/db/local_catalog:collection_options", - "//src/mongo/db/local_catalog/lock_manager:exception_util", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:collection_options", "//src/mongo/util/concurrency:spin_lock", ], ) @@ -1013,10 +1013,6 @@ mongo_cc_library( "//src/mongo/db/exec/sbe:query_sbe_stages", "//src/mongo/db/exec/sbe:query_sbe_storage", "//src/mongo/db/fts:base_fts", - "//src/mongo/db/local_catalog:collection_query_info", - "//src/mongo/db/local_catalog:database_holder", - "//src/mongo/db/local_catalog:local_oplog_info", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/matcher:expressions_mongod_only", "//src/mongo/db/pipeline", "//src/mongo/db/pipeline:change_stream_pipeline", @@ -1047,6 +1043,10 @@ mongo_cc_library( "//src/mongo/db/repl:wait_for_majority_service", "//src/mongo/db/session:kill_sessions", "//src/mongo/db/session:logical_session_cache", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:collection_query_info", + "//src/mongo/db/shard_role/shard_catalog:database_holder", + "//src/mongo/db/shard_role/shard_catalog:local_oplog_info", "//src/mongo/db/sorter:sorter_base", "//src/mongo/db/sorter:sorter_stats", "//src/mongo/db/stats:latency_server_stats", @@ -1169,8 +1169,8 @@ mongo_cc_library( deps = [ ":server_base", "//src/mongo/bson:bson_validate", - "//src/mongo/db/local_catalog:collection_options", "//src/mongo/db/query/collation:collator_interface", # TODO(SERVER-93876): Remove. + "//src/mongo/db/shard_role/shard_catalog:collection_options", "//src/mongo/db/storage/key_string", # TODO(SERVER-93876): Remove. ], ) @@ -1265,8 +1265,8 @@ mongo_cc_library( "keys_collection_manager_gen", "logical_time_validator.cpp", "time_proof_service.cpp", - "//src/mongo/db/vector_clock:vector_clock.cpp", - "//src/mongo/db/vector_clock:vector_clock_document_gen", + "//src/mongo/db/topology/vector_clock:vector_clock.cpp", + "//src/mongo/db/topology/vector_clock:vector_clock_document_gen", ], deps = [ ":global_settings", # TODO(SERVER-93876): Remove. @@ -1285,7 +1285,7 @@ mongo_cc_library( mongo_cc_library( name = "vector_clock_mutable", srcs = [ - "//src/mongo/db/vector_clock:vector_clock_mutable.cpp", + "//src/mongo/db/topology/vector_clock:vector_clock_mutable.cpp", ], deps = [ ":vector_clock", @@ -1295,7 +1295,7 @@ mongo_cc_library( mongo_cc_library( name = "logical_time_metadata_hook", srcs = [ - "//src/mongo/db/vector_clock:vector_clock_metadata_hook.cpp", + "//src/mongo/db/topology/vector_clock:vector_clock_metadata_hook.cpp", ], deps = [ ":operation_time_tracker", @@ -1433,14 +1433,14 @@ mongo_cc_library( "//src/mongo/db/auth:auth_name.cpp", "//src/mongo/db/auth:auth_types_gen", "//src/mongo/db/auth:validated_tenancy_scope.cpp", - "//src/mongo/db/global_catalog/router_role_api:gossiped_routing_cache_gen", - "//src/mongo/db/local_catalog/lock_manager:dump_lock_manager.cpp", "//src/mongo/db/repl:read_concern_args.cpp", "//src/mongo/db/repl:read_concern_args_gen", "//src/mongo/db/repl:read_concern_gen", + "//src/mongo/db/router_role:gossiped_routing_cache_gen", + "//src/mongo/db/shard_role/lock_manager:dump_lock_manager.cpp", "//src/mongo/db/sharding_environment:shard_id.cpp", "//src/mongo/db/sharding_environment:sharding_types_gen", - "//src/mongo/db/vector_clock:vector_clock_gen", + "//src/mongo/db/topology/vector_clock:vector_clock_gen", "//src/mongo/db/versioning_protocol:chunk_version.cpp", "//src/mongo/db/versioning_protocol:chunk_version_gen", "//src/mongo/db/versioning_protocol:database_version.cpp", @@ -1538,7 +1538,7 @@ mongo_cc_library( mongo_cc_library( name = "write_block_bypass", srcs = [ - "//src/mongo/db/user_write_block:write_block_bypass.cpp", + "//src/mongo/db/topology/user_write_block:write_block_bypass.cpp", ], deps = [ ":service_context", # TODO(SERVER-93876): Remove. @@ -1550,7 +1550,7 @@ mongo_cc_library( mongo_cc_library( name = "raw_data_operation", srcs = [ - "//src/mongo/db:raw_data_operation.cpp", + "//src/mongo/db/shard_role/shard_catalog:raw_data_operation.cpp", ], deps = [ ":service_context", # TODO (SERVER-93876): Remove. @@ -1617,8 +1617,8 @@ mongo_cc_library( ], deps = [ ":server_base", - "//src/mongo/db/local_catalog:cannot_convert_index_to_unique_info", - "//src/mongo/db/local_catalog:collection_uuid_mismatch_info", + "//src/mongo/db/shard_role/shard_catalog:cannot_convert_index_to_unique_info", + "//src/mongo/db/shard_role/shard_catalog:collection_uuid_mismatch_info", ], ) @@ -1637,8 +1637,8 @@ mongo_cc_library( mongo_cc_library( name = "index_commands_idl", srcs = [ - "//src/mongo/db/local_catalog/ddl:create_indexes_gen", - "//src/mongo/db/local_catalog/ddl:drop_indexes_gen", + "//src/mongo/db/shard_role/ddl:create_indexes_gen", + "//src/mongo/db/shard_role/ddl:drop_indexes_gen", ], deps = [ ":server_base", @@ -1757,8 +1757,8 @@ mongo_cc_library( deps = [ "multi_key_path_tracker", "server_base", - "//src/mongo/db/local_catalog/lock_manager", "//src/mongo/db/session:logical_session_id", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/db/storage:recovery_unit_base", "//src/mongo/db/storage:write_unit_of_work", "//src/mongo/util:clock_sources", @@ -1987,7 +1987,7 @@ mongo_cc_library( "//src/mongo/db/pipeline:expression_sharding.cpp", ], deps = [ - "//src/mongo/db/local_catalog:index_key_validate", + "//src/mongo/db/shard_role/shard_catalog:index_key_validate", "//src/mongo/s:grid", ], ) @@ -2082,16 +2082,16 @@ mongo_cc_library( mongo_cc_library( name = "vector_clock_mongod", srcs = [ - "//src/mongo/db/vector_clock:topology_time_ticker.cpp", - "//src/mongo/db/vector_clock:vector_clock_mongod.cpp", + "//src/mongo/db/topology/vector_clock:topology_time_ticker.cpp", + "//src/mongo/db/topology/vector_clock:vector_clock_mongod.cpp", ], deps = [ ":dbdirectclient", ":rw_concern_d", ":server_base", ":vector_clock_mutable", - "//src/mongo/db/local_catalog/lock_manager", "//src/mongo/db/repl:replica_set_aware_service", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/s:grid", ], ) @@ -2181,12 +2181,12 @@ mongo_cc_unit_test( "//src/mongo/crypto:encrypted_field_config", "//src/mongo/crypto:fle_crypto", "//src/mongo/db/exec/document_value:document_value_test_util", - "//src/mongo/db/local_catalog:collection_options", "//src/mongo/db/query:query_test_service_context", "//src/mongo/db/query/write_ops", "//src/mongo/db/repl:repl_coordinator_interface", "//src/mongo/db/repl:replmocks", "//src/mongo/db/repl:storage_interface_impl", + "//src/mongo/db/shard_role/shard_catalog:collection_options", "//src/mongo/shell:kms_idl", ], ) @@ -2201,8 +2201,8 @@ mongo_cc_library( ":query_exec", ":record_id_helpers", ":server_base", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/pipeline:change_stream_preimage", + "//src/mongo/db/shard_role/lock_manager:exception_util", ], ) @@ -2215,7 +2215,7 @@ mongo_cc_library( ":dbhelpers", ":keys_collection_document", ":shard_role", - "//src/mongo/db/local_catalog/lock_manager:exception_util", + "//src/mongo/db/shard_role/lock_manager:exception_util", ], ) @@ -2235,11 +2235,11 @@ mongo_cc_library( ":server_base", ":server_feature_flags", "//src/mongo/db/collection_crud", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:collection_options", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/pipeline:change_stream_preimage", "//src/mongo/db/repl:storage_interface", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:collection_options", "//src/mongo/db/storage:storage_options", ], ) @@ -2253,9 +2253,9 @@ mongo_cc_library( deps = [ ":server_base", ":shard_role", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/repl:repl_coordinator_interface", "//src/mongo/db/repl:speculative_majority_read_info", + "//src/mongo/db/shard_role/lock_manager:exception_util", ], ) @@ -2269,7 +2269,7 @@ mongo_cc_library( "//src/mongo/db/exec:scoped_timer", "//src/mongo/db/index_builds:index_builds_coordinator", "//src/mongo/db/index_builds:multi_index_block", - "//src/mongo/db/local_catalog:index_key_validate", + "//src/mongo/db/shard_role/shard_catalog:index_key_validate", ], ) @@ -2283,11 +2283,11 @@ mongo_cc_library( ":shard_role", "//src/mongo/crypto:fle_crypto", "//src/mongo/db:record_id_helpers", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/query:query_request", "//src/mongo/db/repl:repl_coordinator_interface", "//src/mongo/db/session:logical_session_id", "//src/mongo/db/session:session_catalog_mongod", + "//src/mongo/db/shard_role/lock_manager:exception_util", "//src/mongo/db/transaction", "//src/mongo/executor:inline_executor", "//src/mongo/executor:network_interface_factory", @@ -2356,10 +2356,10 @@ mongo_cc_library( "//src/mongo/db/commands:list_collections_filter", "//src/mongo/db/index_builds:index_builds_coordinator", "//src/mongo/db/index_builds:multi_index_block", - "//src/mongo/db/local_catalog:collection_options", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/query/write_ops", "//src/mongo/db/repl:isself", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:collection_options", ], ) @@ -2397,7 +2397,7 @@ mongo_cc_library( "service_entry_point_shard_role.cpp", "service_entry_point_shard_role_helpers.cpp", "//src/mongo/db/admission:execution_control_init.cpp", - "//src/mongo/db/local_catalog/shard_role_api:transaction_resources_init_mongod.cpp", + "//src/mongo/db/shard_role:transaction_resources_init_mongod.cpp", ], deps = [ "audit", @@ -2476,14 +2476,14 @@ mongo_cc_library( "rw_concern_d", "server_feature_flags", "vector_clock", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:catalog_repair", - "//src/mongo/db/local_catalog:collection_catalog", - "//src/mongo/db/local_catalog:database_holder", - "//src/mongo/db/local_catalog:document_validation", - "//src/mongo/db/local_catalog:index_key_validate", - "//src/mongo/db/local_catalog:local_oplog_info", - "//src/mongo/db/local_catalog/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:catalog_repair", + "//src/mongo/db/shard_role/shard_catalog:collection_catalog", + "//src/mongo/db/shard_role/shard_catalog:database_holder", + "//src/mongo/db/shard_role/shard_catalog:document_validation", + "//src/mongo/db/shard_role/shard_catalog:index_key_validate", + "//src/mongo/db/shard_role/shard_catalog:local_oplog_info", + "//src/mongo/db/shard_role/lock_manager:exception_util", "//src/mongo/db/validate:collection_validation", "//src/mongo/db/commands:mongod_fcv", "//src/mongo/db/repl:oplog", @@ -2536,17 +2536,17 @@ mongo_cc_library( "//src/mongo/db/admission:queues_server_status_section", "//src/mongo/db/auth:auth_op_observer", "//src/mongo/db/auth:authserver", - "//src/mongo/db/local_catalog:catalog_impl", - "//src/mongo/db/local_catalog:collection_options", - "//src/mongo/db/local_catalog:document_validation", + "//src/mongo/db/shard_role/shard_catalog:catalog_impl", + "//src/mongo/db/shard_role/shard_catalog:collection_options", + "//src/mongo/db/shard_role/shard_catalog:document_validation", "//src/mongo/db/repl/dbcheck:health_log_interface", - "//src/mongo/db/local_catalog:index_key_validate", + "//src/mongo/db/shard_role/shard_catalog:index_key_validate", "collection_index_usage_tracker", "//src/mongo/db/commands:mongod", "//src/mongo/db/commands:mongod_fcv", "//src/mongo/db/commands/server_status:server_status_servers", "common", - "//src/mongo/db/local_catalog/lock_manager:flow_control_ticketholder", + "//src/mongo/db/shard_role/lock_manager:flow_control_ticketholder", "curop_metrics", "dbdirectclient", "dbhelpers", @@ -2746,18 +2746,18 @@ mongo_cc_library( "//src/mongo/db/admission:flow_control", "//src/mongo/db/admission:flow_control_parameters", "//src/mongo/db/auth:auth_op_observer", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:catalog_impl", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:catalog_impl", "//src/mongo/db/collection_crud", "//src/mongo/db/repl/dbcheck:health_log", "//src/mongo/db/repl/dbcheck:health_log_interface", - "//src/mongo/db/local_catalog/shard_role_api:resource_yielders", + "//src/mongo/db/shard_role:resource_yielders", "change_stream_options_manager", "//src/mongo/db/commands:mongod", "//src/mongo/db/commands:mongod_fsync", "//src/mongo/db/commands:profile_common", "//src/mongo/db/commands:test_commands", - "//src/mongo/db/local_catalog/lock_manager:flow_control_ticketholder", + "//src/mongo/db/shard_role/lock_manager:flow_control_ticketholder", "//src/mongo/db/extension/host:extension_loader", "fle_crud_mongod", "//src/mongo/db/ftdc:ftdc_mongod", @@ -2859,7 +2859,7 @@ mongo_cc_binary( deps = [ ":traffic_reader", "//src/mongo:base", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/rpc:message", "//src/mongo/util:signal_handlers", ], @@ -2939,20 +2939,20 @@ mongo_cc_library( name = "service_context_d_test_fixture", srcs = [ "service_context_d_test_fixture.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:database_sharding_state_factory_mock.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:database_sharding_state_mock.cpp", + "//src/mongo/db/shard_role/shard_catalog:database_sharding_state_factory_mock.cpp", + "//src/mongo/db/shard_role/shard_catalog:database_sharding_state_mock.cpp", ], deps = [ ":service_context_d", ":service_context_test_fixture", "//src/mongo/db/commands:mongod", "//src/mongo/db/index_builds:index_builds_coordinator_mongod", - "//src/mongo/db/local_catalog:catalog_impl", "//src/mongo/db/op_observer", "//src/mongo/db/repl:replmocks", "//src/mongo/db/rss:persistence_provider_impl", "//src/mongo/db/rss:service_lifecycle_impl", "//src/mongo/db/s:sharding_runtime_d", + "//src/mongo/db/shard_role/shard_catalog:catalog_impl", "//src/mongo/db/storage:storage_control", "//src/mongo/db/storage:storage_options", "//src/mongo/db/storage/devnull:storage_devnull", @@ -2965,7 +2965,7 @@ mongo_cc_library( mongo_cc_library( name = "vector_clock_trivial", srcs = [ - "//src/mongo/db/vector_clock:vector_clock_trivial.cpp", + "//src/mongo/db/topology/vector_clock:vector_clock_trivial.cpp", ], deps = [ "vector_clock_mutable", @@ -2983,7 +2983,7 @@ mongo_cc_unit_test( ], deps = [ ":client_out_of_line_executor", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/transport:transport_layer_common", ], ) @@ -3077,12 +3077,12 @@ mongo_cc_unit_test( ":change_stream_pre_images_collection_manager", ":shard_role", "//src/mongo/db/collection_crud", - "//src/mongo/db/local_catalog:catalog_test_fixture", - "//src/mongo/db/local_catalog:collection_catalog", "//src/mongo/db/op_observer", "//src/mongo/db/op_observer:op_observer_impl", "//src/mongo/db/op_observer:operation_logger_impl", "//src/mongo/db/pipeline:change_stream_expired_pre_image_remover", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", + "//src/mongo/db/shard_role/shard_catalog:collection_catalog", "//src/mongo/db/storage:record_store_base", ], ) @@ -3099,7 +3099,7 @@ mongo_cc_unit_test( deps = [ ":mongod_options", ":server_base", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/util/options_parser", ], ) @@ -3214,10 +3214,10 @@ mongo_cc_unit_test( "//src/mongo/db/auth:authmocks", "//src/mongo/db/commands/query_cmd:bulk_write_command", "//src/mongo/db/commands/query_cmd:bulk_write_parser", - "//src/mongo/db/local_catalog:catalog_helpers", "//src/mongo/db/pipeline:expression_context_for_test", "//src/mongo/db/query:query_test_service_context", "//src/mongo/db/s:shard_server_test_fixture", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", "//src/mongo/db/storage:prepare_conflict_tracker", "//src/mongo/db/storage/wiredtiger:storage_wiredtiger", "//src/mongo/transport:transport_layer_mock", @@ -3321,7 +3321,7 @@ mongo_cc_unit_test( "version_context_test.cpp", "wire_version_test.cpp", "//src/mongo/db:persistent_task_store_test.cpp", - "//src/mongo/db/local_catalog/shard_role_api:resource_yielder_test.cpp", + "//src/mongo/db/shard_role:resource_yielder_test.cpp", ], tags = [ "mongo_unittest_fourth_group", @@ -3341,8 +3341,8 @@ mongo_cc_unit_test( ":service_context_d_test_fixture", ":service_context_test_fixture", ":shard_role", - "//src/mongo/db/local_catalog:catalog_test_fixture", "//src/mongo/db/repl:replmocks", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", "//src/mongo/db/stats:counters", "//src/mongo/db/storage/wiredtiger:storage_wiredtiger", "//src/mongo/transport:transport_layer_mock", @@ -3362,13 +3362,13 @@ mongo_cc_library( ":service_context_d", "//src/mongo/db/auth", "//src/mongo/db/auth:authmocks", - "//src/mongo/db/local_catalog:catalog_impl", - "//src/mongo/db/local_catalog:database_holder", "//src/mongo/db/op_observer", "//src/mongo/db/repl:replmocks", "//src/mongo/db/rss:persistence_provider_impl", "//src/mongo/db/rss:service_lifecycle_impl", "//src/mongo/db/s:sharding_runtime_d", + "//src/mongo/db/shard_role/shard_catalog:catalog_impl", + "//src/mongo/db/shard_role/shard_catalog:database_holder", "//src/mongo/db/stats:top", "//src/mongo/db/storage:storage_control", "//src/mongo/db/storage:storage_options", @@ -3485,7 +3485,7 @@ mongo_cc_unit_test( mongo_cc_unit_test( name = "direct_shard_client_tracker_test", srcs = [ - "//src/mongo/db/local_catalog/shard_role_api:direct_shard_client_tracker_test.cpp", + "//src/mongo/db/shard_role:direct_shard_client_tracker_test.cpp", ], tags = ["mongo_unittest_fourth_group"], deps = [ @@ -3532,7 +3532,7 @@ mongo_cc_benchmark( mongo_cc_benchmark( name = "d_concurrency_bm", srcs = [ - "//src/mongo/db/local_catalog/lock_manager:d_concurrency_bm.cpp", + "//src/mongo/db/shard_role/lock_manager:d_concurrency_bm.cpp", ], deps = [ ":service_context_non_d", @@ -3554,11 +3554,11 @@ mongo_cc_benchmark( "//src/mongo/db/auth:authserver", "//src/mongo/db/commands:standalone", "//src/mongo/db/index_builds:index_builds_coordinator_mongod", - "//src/mongo/db/local_catalog:catalog_impl", "//src/mongo/db/op_observer", "//src/mongo/db/repl:replmocks", "//src/mongo/db/repl:storage_interface_impl", "//src/mongo/db/s:sharding_runtime_d", + "//src/mongo/db/shard_role/shard_catalog:catalog_impl", "//src/mongo/db/storage:storage_control", "//src/mongo/db/storage/wiredtiger:storage_wiredtiger", "//src/mongo/unittest:benchmark_util", @@ -3580,8 +3580,6 @@ mongo_cc_benchmark( "//src/mongo/db/auth:authserver", "//src/mongo/db/commands:standalone", "//src/mongo/db/index_builds:index_builds_coordinator_mongod", - "//src/mongo/db/local_catalog:catalog_impl", - "//src/mongo/db/local_catalog:database_holder", "//src/mongo/db/op_observer", "//src/mongo/db/repl:repl_coordinator_impl", "//src/mongo/db/repl:serveronly_repl", @@ -3589,6 +3587,8 @@ mongo_cc_benchmark( "//src/mongo/db/rss:persistence_provider_impl", "//src/mongo/db/rss:service_lifecycle_impl", "//src/mongo/db/s:sharding_runtime_d", + "//src/mongo/db/shard_role/shard_catalog:catalog_impl", + "//src/mongo/db/shard_role/shard_catalog:database_holder", "//src/mongo/db/storage:storage_control", "//src/mongo/db/storage/wiredtiger:storage_wiredtiger", "//src/mongo/executor:network_interface_mock", @@ -3599,7 +3599,7 @@ mongo_cc_benchmark( mongo_cc_benchmark( name = "collection_acquisition_bm", - srcs = ["//src/mongo/db/local_catalog/shard_role_api:collection_acquisition_bm.cpp"], + srcs = ["//src/mongo/db/shard_role:collection_acquisition_bm.cpp"], deps = [ ":service_context_d_test_fixture", ":shard_role", @@ -3725,3 +3725,41 @@ mongo_cc_fuzzer_test( "server_base", ], ) + +idl_generator( + name = "import_collection_oplog_entry_gen", + src = "//src/mongo/db:import_collection_oplog_entry.idl", + deps = [ + "//src/mongo/db:basic_types_gen", + ], +) + +idl_generator( + name = "cleanup_structured_encryption_data_coordinator_gen", + src = "//src/mongo/db:cleanup_structured_encryption_data_coordinator.idl", + deps = [ + "//src/mongo/db:basic_types_gen", + "//src/mongo/db/commands:fle2_cleanup_gen", + "//src/mongo/db/global_catalog/ddl:sharding_ddl_coordinator_gen", + ], +) + +idl_generator( + name = "compact_structured_encryption_data_coordinator_gen", + src = "//src/mongo/db:compact_structured_encryption_data_coordinator.idl", + deps = [ + "//src/mongo/crypto:fle_field_schema_gen", + "//src/mongo/db:basic_types_gen", + "//src/mongo/db/commands:fle2_compact_gen", + "//src/mongo/db/global_catalog/ddl:sharding_ddl_coordinator_gen", + ], +) + +mongo_cc_unit_test( + name = "db_catalog_util_test", + srcs = [ + "//src/mongo/db:partitioned_test.cpp", + ], + tags = ["mongo_unittest_first_group"], + deps = [], +) diff --git a/src/mongo/db/OWNERS.yml b/src/mongo/db/OWNERS.yml index 16d996d5c8b..4deb9572c2a 100644 --- a/src/mongo/db/OWNERS.yml +++ b/src/mongo/db/OWNERS.yml @@ -309,3 +309,33 @@ filters: - "local_executor*": approvers: - 10gen/server-catalog-and-routing-routing-and-topology + - "collection_compact*": + approvers: + - 10gen/server-compact + - "import*": + approvers: + - 10gen/server-storage-engine-integration + - 10gen/server-catalog-and-routing-shard-catalog + - "index_key_validate*": + approvers: + - 10gen/server-index-builds + - "index_spec_validate*": + approvers: + - 10gen/server-index-builds + - "index_repair*": + approvers: + - 10gen/server-index-builds + - "throttle_cursor*": + approvers: + - 10gen/server-validate + - "cleanup_structured*": + approvers: + - 10gen/server-catalog-and-routing-ddl + - 10gen/server-security + - "compact_structured*": + approvers: + - 10gen/server-catalog-and-routing-ddl + - 10gen/server-security + - "partitioned*": + approvers: + - 10gen/server-programmability diff --git a/src/mongo/db/admission/BUILD.bazel b/src/mongo/db/admission/BUILD.bazel index bdd40581e7e..ac655d97487 100644 --- a/src/mongo/db/admission/BUILD.bazel +++ b/src/mongo/db/admission/BUILD.bazel @@ -158,7 +158,7 @@ mongo_cc_library( "//src/mongo/db:server_base", "//src/mongo/db:service_context", # TODO(SERVER-93876): Remove. "//src/mongo/db/commands/server_status:server_status_core", - "//src/mongo/db/local_catalog/lock_manager:flow_control_ticketholder", + "//src/mongo/db/shard_role/lock_manager:flow_control_ticketholder", "//src/mongo/util:background_job", ], ) @@ -201,7 +201,7 @@ mongo_cc_unit_test( "//src/mongo/db:service_context", "//src/mongo/db:service_context_test_fixture", "//src/mongo/db:shard_role_api", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/transport:transport_layer_common", "//src/mongo/unittest", "//src/mongo/util:mock_periodic_runner", diff --git a/src/mongo/db/admission/flow_control.cpp b/src/mongo/db/admission/flow_control.cpp index 28a653647c8..af7ca983f0c 100644 --- a/src/mongo/db/admission/flow_control.cpp +++ b/src/mongo/db/admission/flow_control.cpp @@ -37,11 +37,11 @@ #include "mongo/db/client.h" #include "mongo/db/commands/server_status/server_status.h" #include "mongo/db/flow_control_ticketholder.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/lock_manager/lock_stats.h" #include "mongo/db/repl/member_data.h" #include "mongo/db/repl/optime.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/lock_stats.h" #include "mongo/logv2/log.h" #include "mongo/platform/compiler.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/admission/flow_control_test.cpp b/src/mongo/db/admission/flow_control_test.cpp index 2aba8d6f877..3128a4a9d79 100644 --- a/src/mongo/db/admission/flow_control_test.cpp +++ b/src/mongo/db/admission/flow_control_test.cpp @@ -34,10 +34,10 @@ #include "mongo/db/admission/flow_control_parameters_gen.h" #include "mongo/db/client.h" #include "mongo/db/flow_control_ticketholder.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/unittest/unittest.h" #include "mongo/util/fail_point.h" diff --git a/src/mongo/db/admission/throughput_probing.cpp b/src/mongo/db/admission/throughput_probing.cpp index 8e69f911070..a396c31e30d 100644 --- a/src/mongo/db/admission/throughput_probing.cpp +++ b/src/mongo/db/admission/throughput_probing.cpp @@ -32,8 +32,8 @@ #include "mongo/base/error_codes.h" #include "mongo/db/admission/execution_admission_context.h" #include "mongo/db/admission/throughput_probing_gen.h" -#include "mongo/db/local_catalog/lock_manager/dump_lock_manager.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/lock_manager/dump_lock_manager.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" #include "mongo/util/processinfo.h" diff --git a/src/mongo/db/admission/ticketing_system.h b/src/mongo/db/admission/ticketing_system.h index 37c30309dae..e4ce7e9fb6d 100644 --- a/src/mongo/db/admission/ticketing_system.h +++ b/src/mongo/db/admission/ticketing_system.h @@ -32,9 +32,9 @@ #include "mongo/base/status.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/admission/throughput_probing.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/db/tenant_id.h" #include "mongo/util/concurrency/ticketholder.h" diff --git a/src/mongo/db/aggregated_index_usage_tracker.cpp b/src/mongo/db/aggregated_index_usage_tracker.cpp index e6318f010b6..da7fc0e160b 100644 --- a/src/mongo/db/aggregated_index_usage_tracker.cpp +++ b/src/mongo/db/aggregated_index_usage_tracker.cpp @@ -34,9 +34,9 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/commands/server_status/server_status.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" diff --git a/src/mongo/db/auth/BUILD.bazel b/src/mongo/db/auth/BUILD.bazel index e535b3cf636..4abe9e14121 100644 --- a/src/mongo/db/auth/BUILD.bazel +++ b/src/mongo/db/auth/BUILD.bazel @@ -468,8 +468,8 @@ mongo_cc_library( "//src/mongo/db:commands", "//src/mongo/db:common", "//src/mongo/db:server_base", - "//src/mongo/db/local_catalog:document_validation", "//src/mongo/db/pipeline:lite_parsed_document_source", + "//src/mongo/db/shard_role/shard_catalog:document_validation", ], ) @@ -678,10 +678,10 @@ mongo_cc_library( "//src/mongo:base", "//src/mongo/db:audit", "//src/mongo/db/index:index_access_method", - "//src/mongo/db/local_catalog:collection_options", "//src/mongo/db/op_observer", "//src/mongo/db/op_observer:op_observer_util", "//src/mongo/db/repl:oplog_entry", + "//src/mongo/db/shard_role/shard_catalog:collection_options", ], ) diff --git a/src/mongo/db/auth/auth_op_observer.cpp b/src/mongo/db/auth/auth_op_observer.cpp index 3b285446535..1922a9b4f55 100644 --- a/src/mongo/db/auth/auth_op_observer.cpp +++ b/src/mongo/db/auth/auth_op_observer.cpp @@ -35,11 +35,11 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/audit.h" #include "mongo/db/auth/authorization_manager.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/op_observer/op_observer_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog_entry.h" #include "mongo/db/rss/replicated_storage_service.h" +#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" diff --git a/src/mongo/db/auth/auth_op_observer.h b/src/mongo/db/auth/auth_op_observer.h index 7b48e29f336..774984abd90 100644 --- a/src/mongo/db/auth/auth_op_observer.h +++ b/src/mongo/db/auth/auth_op_observer.h @@ -31,8 +31,6 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_noop.h" @@ -40,6 +38,8 @@ #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/optime.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/util/uuid.h" #include diff --git a/src/mongo/db/auth/auth_op_observer_test.cpp b/src/mongo/db/auth/auth_op_observer_test.cpp index 1196654cb6d..6c35a72e9ca 100644 --- a/src/mongo/db/auth/auth_op_observer_test.cpp +++ b/src/mongo/db/auth/auth_op_observer_test.cpp @@ -41,12 +41,6 @@ #include "mongo/db/auth/authorization_manager_impl.h" #include "mongo/db/auth/authorization_router_impl_for_test.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/op_observer/op_observer_util.h" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/oplog.h" @@ -57,6 +51,12 @@ #include "mongo/db/repl/storage_interface.h" #include "mongo/db/repl/storage_interface_mock.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/timeseries/timeseries_gen.h" diff --git a/src/mongo/db/auth/authorization_backend_local.cpp b/src/mongo/db/auth/authorization_backend_local.cpp index defbde66e86..b8bb43bae8e 100644 --- a/src/mongo/db/auth/authorization_backend_local.cpp +++ b/src/mongo/db/auth/authorization_backend_local.cpp @@ -48,11 +48,11 @@ #include "mongo/db/curop.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/dbhelpers.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/aggregation_request_helper.h" #include "mongo/db/query/client_cursor/cursor_response.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/db/storage/storage_options.h" #include "mongo/db/tenant_id.h" #include "mongo/idl/idl_parser.h" diff --git a/src/mongo/db/auth/authorization_backend_local.h b/src/mongo/db/auth/authorization_backend_local.h index 6c65889914a..0160667f4bc 100644 --- a/src/mongo/db/auth/authorization_backend_local.h +++ b/src/mongo/db/auth/authorization_backend_local.h @@ -30,7 +30,7 @@ #include "mongo/db/auth/authorization_backend_interface.h" #include "mongo/db/auth/authorization_manager.h" -#include "mongo/db/local_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" namespace mongo::auth { diff --git a/src/mongo/db/auth/authorization_checks.cpp b/src/mongo/db/auth/authorization_checks.cpp index dddf0234049..d0e8b07a6f4 100644 --- a/src/mongo/db/auth/authorization_checks.cpp +++ b/src/mongo/db/auth/authorization_checks.cpp @@ -39,12 +39,12 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/auth/validated_tenancy_scope.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/ddl/coll_mod_gen.h" -#include "mongo/db/local_catalog/ddl/create_gen.h" -#include "mongo/db/local_catalog/document_validation.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" +#include "mongo/db/shard_role/ddl/coll_mod_gen.h" +#include "mongo/db/shard_role/ddl/create_gen.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" #include "mongo/platform/compiler.h" #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" diff --git a/src/mongo/db/auth/authorization_checks.h b/src/mongo/db/auth/authorization_checks.h index 51d5489cd39..7758fe3780e 100644 --- a/src/mongo/db/auth/authorization_checks.h +++ b/src/mongo/db/auth/authorization_checks.h @@ -36,12 +36,12 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/privilege.h" #include "mongo/db/auth/user_name.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/query/write_ops/write_ops.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include diff --git a/src/mongo/db/auth/authorization_client_handle_shard.cpp b/src/mongo/db/auth/authorization_client_handle_shard.cpp index 1437bda8fdc..34da34ee280 100644 --- a/src/mongo/db/auth/authorization_client_handle_shard.cpp +++ b/src/mongo/db/auth/authorization_client_handle_shard.cpp @@ -32,7 +32,7 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/auth/authorization_router.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" +#include "mongo/db/shard_role/transaction_resources.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kAccessControl namespace mongo { diff --git a/src/mongo/db/auth/authorization_session_impl.cpp b/src/mongo/db/auth/authorization_session_impl.cpp index 9ea37c76042..1a92e648343 100644 --- a/src/mongo/db/auth/authorization_session_impl.cpp +++ b/src/mongo/db/auth/authorization_session_impl.cpp @@ -52,11 +52,11 @@ #include "mongo/db/auth/resource_pattern_search_list.h" #include "mongo/db/auth/validated_tenancy_scope.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/ddl/list_collections_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/ddl/list_collections_gen.h" #include "mongo/db/tenant_id.h" #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/auth/authorization_session_test.cpp b/src/mongo/db/auth/authorization_session_test.cpp index 507bdcefd90..4bd9a0af0e2 100644 --- a/src/mongo/db/auth/authorization_session_test.cpp +++ b/src/mongo/db/auth/authorization_session_test.cpp @@ -50,7 +50,6 @@ #include "mongo/db/commands/query_cmd/release_memory_cmd.h" #include "mongo/db/database_name.h" #include "mongo/db/exec/classic/queued_data_stage.h" -#include "mongo/db/local_catalog/ddl/list_collections_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context_builder.h" @@ -58,6 +57,7 @@ #include "mongo/db/query/plan_executor_factory.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/list_collections_gen.h" #include "mongo/db/tenant_id.h" #include "mongo/idl/idl_parser.h" #include "mongo/idl/server_parameter_test_controller.h" diff --git a/src/mongo/db/auth/authz_session_external_state_shard.cpp b/src/mongo/db/auth/authz_session_external_state_shard.cpp index 496370e354a..b283ed4601e 100644 --- a/src/mongo/db/auth/authz_session_external_state_shard.cpp +++ b/src/mongo/db/auth/authz_session_external_state_shard.cpp @@ -32,11 +32,11 @@ #include "mongo/base/shim.h" #include "mongo/db/auth/authz_session_external_state.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/util/assert_util.h" #include diff --git a/src/mongo/db/bulk_write_shard_test.cpp b/src/mongo/db/bulk_write_shard_test.cpp index dbef70cbf7c..ed399e52771 100644 --- a/src/mongo/db/bulk_write_shard_test.cpp +++ b/src/mongo/db/bulk_write_shard_test.cpp @@ -42,18 +42,18 @@ #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_collection_common_types_gen.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state_mock.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/collation/collator_interface.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state_mock.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/tenant_id.h" diff --git a/src/mongo/db/change_stream_options.idl b/src/mongo/db/change_stream_options.idl index c1143619cdb..df81a590614 100644 --- a/src/mongo/db/change_stream_options.idl +++ b/src/mongo/db/change_stream_options.idl @@ -34,7 +34,7 @@ global: imports: - "mongo/db/basic_types.idl" - - "mongo/db/cluster_parameters/cluster_server_parameter.idl" + - "mongo/db/topology/cluster_parameters/cluster_server_parameter.idl" structs: PreAndPostImagesOptions: diff --git a/src/mongo/db/change_stream_pre_image_util.cpp b/src/mongo/db/change_stream_pre_image_util.cpp index e43e75b0b4a..799818aca3c 100644 --- a/src/mongo/db/change_stream_pre_image_util.cpp +++ b/src/mongo/db/change_stream_pre_image_util.cpp @@ -39,12 +39,12 @@ #include "mongo/db/change_stream_options_manager.h" #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/query/internal_plans.h" #include "mongo/db/query/plan_executor.h" #include "mongo/db/query/plan_yield_policy.h" #include "mongo/db/record_id_helpers.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" #include "mongo/util/clock_source.h" diff --git a/src/mongo/db/change_stream_pre_image_util.h b/src/mongo/db/change_stream_pre_image_util.h index dacf3026d80..00ac871c95b 100644 --- a/src/mongo/db/change_stream_pre_image_util.h +++ b/src/mongo/db/change_stream_pre_image_util.h @@ -30,11 +30,11 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/change_stream_preimage_gen.h" #include "mongo/db/query/record_id_bound.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/time_support.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/change_stream_pre_images_collection_manager.cpp b/src/mongo/db/change_stream_pre_images_collection_manager.cpp index 82366b49690..7fdcab290cb 100644 --- a/src/mongo/db/change_stream_pre_images_collection_manager.cpp +++ b/src/mongo/db/change_stream_pre_images_collection_manager.cpp @@ -36,16 +36,16 @@ #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/curop.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/read_concern_args.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/version_context.h" #include "mongo/db/versioning_protocol/shard_version.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/change_stream_pre_images_remover_test.cpp b/src/mongo/db/change_stream_pre_images_remover_test.cpp index 1279bd507a8..0776f957d6f 100644 --- a/src/mongo/db/change_stream_pre_images_remover_test.cpp +++ b/src/mongo/db/change_stream_pre_images_remover_test.cpp @@ -39,13 +39,6 @@ #include "mongo/db/change_stream_pre_images_collection_manager.h" #include "mongo/db/client.h" #include "mongo/db/collection_crud/collection_write_path.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_impl.h" @@ -61,6 +54,13 @@ #include "mongo/db/server_parameter.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/storage/collection_truncate_markers.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/change_stream_pre_images_tenant_truncate_markers.cpp b/src/mongo/db/change_stream_pre_images_tenant_truncate_markers.cpp index ee68b6ae6fb..a19bc500a0a 100644 --- a/src/mongo/db/change_stream_pre_images_tenant_truncate_markers.cpp +++ b/src/mongo/db/change_stream_pre_images_tenant_truncate_markers.cpp @@ -32,10 +32,10 @@ #include "mongo/db/change_stream_pre_image_util.h" #include "mongo/db/change_stream_pre_images_truncate_markers_per_nsUUID.h" #include "mongo/db/collection_crud/collection_write_path.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/internal_plans.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/storage/collection_truncate_markers.h" #include "mongo/db/storage/storage_parameters_gen.h" #include "mongo/util/concurrent_shared_values_map.h" diff --git a/src/mongo/db/change_stream_pre_images_tenant_truncate_markers.h b/src/mongo/db/change_stream_pre_images_tenant_truncate_markers.h index 7f5aae2ebfa..338a44be0cd 100644 --- a/src/mongo/db/change_stream_pre_images_tenant_truncate_markers.h +++ b/src/mongo/db/change_stream_pre_images_tenant_truncate_markers.h @@ -30,8 +30,8 @@ #pragma once #include "mongo/db/change_stream_pre_images_truncate_markers_per_nsUUID.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/storage/collection_truncate_markers.h" #include "mongo/util/concurrent_shared_values_map.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/change_stream_pre_images_tenant_truncate_markers_test.cpp b/src/mongo/db/change_stream_pre_images_tenant_truncate_markers_test.cpp index 57b9b980539..52a364a2292 100644 --- a/src/mongo/db/change_stream_pre_images_tenant_truncate_markers_test.cpp +++ b/src/mongo/db/change_stream_pre_images_tenant_truncate_markers_test.cpp @@ -29,7 +29,7 @@ #include "mongo/db/change_stream_pre_images_tenant_truncate_markers.h" #include "mongo/db/change_stream_pre_image_test_helpers.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" #include "mongo/logv2/log.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kTest diff --git a/src/mongo/db/change_stream_pre_images_truncate_manager.cpp b/src/mongo/db/change_stream_pre_images_truncate_manager.cpp index 91065e208be..e2b0c83d977 100644 --- a/src/mongo/db/change_stream_pre_images_truncate_manager.cpp +++ b/src/mongo/db/change_stream_pre_images_truncate_manager.cpp @@ -32,8 +32,8 @@ #include "mongo/db/admission/execution_admission_context.h" #include "mongo/db/change_stream_pre_image_util.h" #include "mongo/db/change_stream_pre_images_tenant_truncate_markers.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/collection_truncate_markers.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/change_stream_pre_images_truncate_manager_test.cpp b/src/mongo/db/change_stream_pre_images_truncate_manager_test.cpp index de4a7a776de..b40036baad7 100644 --- a/src/mongo/db/change_stream_pre_images_truncate_manager_test.cpp +++ b/src/mongo/db/change_stream_pre_images_truncate_manager_test.cpp @@ -35,10 +35,6 @@ #include "mongo/db/change_stream_options_manager.h" #include "mongo/db/change_stream_pre_images_collection_manager.h" #include "mongo/db/collection_crud/collection_write_path.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer_impl.h" #include "mongo/db/op_observer/op_observer_registry.h" @@ -46,6 +42,10 @@ #include "mongo/db/pipeline/change_stream_preimage_gen.h" #include "mongo/db/record_id.h" #include "mongo/db/repl/oplog.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/storage/collection_truncate_markers.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/change_stream_pre_images_truncate_markers_per_nsUUID.h b/src/mongo/db/change_stream_pre_images_truncate_markers_per_nsUUID.h index 99842dbb0b0..62544429473 100644 --- a/src/mongo/db/change_stream_pre_images_truncate_markers_per_nsUUID.h +++ b/src/mongo/db/change_stream_pre_images_truncate_markers_per_nsUUID.h @@ -30,9 +30,9 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/storage/collection_truncate_markers.h" #include "mongo/db/storage/record_store.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/change_stream_pre_images_truncate_markers_per_nsUUID_test.cpp b/src/mongo/db/change_stream_pre_images_truncate_markers_per_nsUUID_test.cpp index 5388828f574..ae1804171b5 100644 --- a/src/mongo/db/change_stream_pre_images_truncate_markers_per_nsUUID_test.cpp +++ b/src/mongo/db/change_stream_pre_images_truncate_markers_per_nsUUID_test.cpp @@ -32,10 +32,10 @@ #include "mongo/db/change_stream_options_manager.h" #include "mongo/db/change_stream_pre_image_test_helpers.h" #include "mongo/db/change_stream_pre_image_util.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/repl/storage_interface_mock.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" #include "mongo/logv2/log.h" #include "mongo/util/clock_source_mock.h" diff --git a/src/mongo/db/global_catalog/ddl/cleanup_structured_encryption_data_coordinator.cpp b/src/mongo/db/cleanup_structured_encryption_data_coordinator.cpp similarity index 96% rename from src/mongo/db/global_catalog/ddl/cleanup_structured_encryption_data_coordinator.cpp rename to src/mongo/db/cleanup_structured_encryption_data_coordinator.cpp index d85f9029a2c..ce5fe7f7d6a 100644 --- a/src/mongo/db/global_catalog/ddl/cleanup_structured_encryption_data_coordinator.cpp +++ b/src/mongo/db/cleanup_structured_encryption_data_coordinator.cpp @@ -28,7 +28,7 @@ */ -#include "mongo/db/global_catalog/ddl/cleanup_structured_encryption_data_coordinator.h" +#include "mongo/db/cleanup_structured_encryption_data_coordinator.h" #include "mongo/base/error_codes.h" #include "mongo/bson/bsonmisc.h" @@ -40,20 +40,20 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/fle_crud.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_gen.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/ddl/create_gen.h" -#include "mongo/db/local_catalog/ddl/drop_gen.h" -#include "mongo/db/local_catalog/ddl/rename_collection_gen.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.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" #include "mongo/db/server_parameter_with_storage.h" +#include "mongo/db/shard_role/ddl/create_gen.h" +#include "mongo/db/shard_role/ddl/drop_gen.h" +#include "mongo/db/shard_role/ddl/rename_collection_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/tenant_id.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/db/versioning_protocol/database_version.h" diff --git a/src/mongo/db/global_catalog/ddl/cleanup_structured_encryption_data_coordinator.h b/src/mongo/db/cleanup_structured_encryption_data_coordinator.h similarity index 98% rename from src/mongo/db/global_catalog/ddl/cleanup_structured_encryption_data_coordinator.h rename to src/mongo/db/cleanup_structured_encryption_data_coordinator.h index 5e3df1f643c..143c08dbbf1 100644 --- a/src/mongo/db/global_catalog/ddl/cleanup_structured_encryption_data_coordinator.h +++ b/src/mongo/db/cleanup_structured_encryption_data_coordinator.h @@ -33,9 +33,9 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" #include "mongo/crypto/fle_stats_gen.h" +#include "mongo/db/cleanup_structured_encryption_data_coordinator_gen.h" #include "mongo/db/commands/fle2_cleanup_gen.h" #include "mongo/db/commands/fle2_compact.h" -#include "mongo/db/global_catalog/ddl/cleanup_structured_encryption_data_coordinator_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_service.h" #include "mongo/db/namespace_string.h" diff --git a/src/mongo/db/global_catalog/ddl/cleanup_structured_encryption_data_coordinator.idl b/src/mongo/db/cleanup_structured_encryption_data_coordinator.idl similarity index 100% rename from src/mongo/db/global_catalog/ddl/cleanup_structured_encryption_data_coordinator.idl rename to src/mongo/db/cleanup_structured_encryption_data_coordinator.idl diff --git a/src/mongo/db/cloner.cpp b/src/mongo/db/cloner.cpp index 355dee3490e..e30259d1d42 100644 --- a/src/mongo/db/cloner.cpp +++ b/src/mongo/db/cloner.cpp @@ -48,23 +48,6 @@ #include "mongo/db/database_name.h" #include "mongo/db/index/index_constants.h" #include "mongo/db/index_builds/index_builds_coordinator.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/ddl/list_collections_filter.h" -#include "mongo/db/local_catalog/ddl/list_collections_gen.h" -#include "mongo/db/local_catalog/ddl/list_indexes_gen.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/find_command.h" #include "mongo/db/query/write_ops/insert.h" @@ -74,6 +57,23 @@ #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/ddl/list_collections_filter.h" +#include "mongo/db/shard_role/ddl/list_collections_gen.h" +#include "mongo/db/shard_role/ddl/list_indexes_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/tenant_id.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/local_catalog/collection_compact.cpp b/src/mongo/db/collection_compact.cpp similarity index 88% rename from src/mongo/db/local_catalog/collection_compact.cpp rename to src/mongo/db/collection_compact.cpp index eca56d0ce1a..e4e795b0a70 100644 --- a/src/mongo/db/local_catalog/collection_compact.cpp +++ b/src/mongo/db/collection_compact.cpp @@ -28,21 +28,21 @@ */ -#include "mongo/db/local_catalog/collection_compact.h" +#include "mongo/db/collection_compact.h" #include "mongo/base/error_codes.h" #include "mongo/base/status.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/timeseries/catalog_helper.h" #include "mongo/db/views/view.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/local_catalog/collection_compact.h b/src/mongo/db/collection_compact.h similarity index 97% rename from src/mongo/db/local_catalog/collection_compact.h rename to src/mongo/db/collection_compact.h index 11f9d3ec3e5..8398d6a1e79 100644 --- a/src/mongo/db/local_catalog/collection_compact.h +++ b/src/mongo/db/collection_compact.h @@ -30,8 +30,8 @@ #pragma once #include "mongo/base/status_with.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/storage/compact_options.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/collection_crud/BUILD.bazel b/src/mongo/db/collection_crud/BUILD.bazel index 345b9765d1c..9417069a198 100644 --- a/src/mongo/db/collection_crud/BUILD.bazel +++ b/src/mongo/db/collection_crud/BUILD.bazel @@ -19,11 +19,11 @@ mongo_cc_library( "//src/mongo/db:record_id_helpers", # TODO(SERVER-93876): Remove. "//src/mongo/db:shard_role_api", # TODO(SERVER-93876): Remove. "//src/mongo/db:write_stage_common", - "//src/mongo/db/local_catalog:document_validation", - "//src/mongo/db/local_catalog:local_oplog_info", "//src/mongo/db/op_observer:op_observer_util", "//src/mongo/db/query/query_stats", # TODO(SERVER-93876): Remove. "//src/mongo/db/repl:repl_coordinator_interface", # TODO(SERVER-93876): Remove. + "//src/mongo/db/shard_role/shard_catalog:document_validation", + "//src/mongo/db/shard_role/shard_catalog:local_oplog_info", "//src/mongo/db/storage:index_entry_comparison", # TODO(SERVER-93876): Remove. "//src/mongo/db/storage:record_store_base", # TODO(SERVER-93876): Remove. "//src/mongo/db/storage:storage_options", # TODO(SERVER-93876): Remove. @@ -55,9 +55,9 @@ mongo_cc_unit_test( ], deps = [ "//src/mongo/db:service_context_d_test_fixture", - "//src/mongo/db/local_catalog:catalog_control", "//src/mongo/db/repl:oplog", "//src/mongo/db/repl:replmocks", "//src/mongo/db/repl:storage_interface_impl", + "//src/mongo/db/shard_role/shard_catalog:catalog_control", ], ) diff --git a/src/mongo/db/collection_crud/capped_collection_maintenance.cpp b/src/mongo/db/collection_crud/capped_collection_maintenance.cpp index c1f51d7ebaf..f601f363ab2 100644 --- a/src/mongo/db/collection_crud/capped_collection_maintenance.cpp +++ b/src/mongo/db/collection_crud/capped_collection_maintenance.cpp @@ -32,15 +32,15 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/timestamp.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_util.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/stats/counters.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" diff --git a/src/mongo/db/collection_crud/capped_collection_maintenance.h b/src/mongo/db/collection_crud/capped_collection_maintenance.h index 021621cf946..0e81f4d1575 100644 --- a/src/mongo/db/collection_crud/capped_collection_maintenance.h +++ b/src/mongo/db/collection_crud/capped_collection_maintenance.h @@ -29,9 +29,9 @@ #pragma once -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" namespace mongo { namespace collection_internal { diff --git a/src/mongo/db/collection_crud/capped_collection_test.cpp b/src/mongo/db/collection_crud/capped_collection_test.cpp index a2c7feab2c5..adcca3ca844 100644 --- a/src/mongo/db/collection_crud/capped_collection_test.cpp +++ b/src/mongo/db/collection_crud/capped_collection_test.cpp @@ -34,12 +34,6 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/client.h" #include "mongo/db/collection_crud/collection_write_path.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/lock_manager/locker.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" @@ -52,6 +46,12 @@ #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/locker.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/collection_crud/capped_utils.cpp b/src/mongo/db/collection_crud/capped_utils.cpp index c2c8d1fd36d..4461ad16206 100644 --- a/src/mongo/db/collection_crud/capped_utils.cpp +++ b/src/mongo/db/collection_crud/capped_utils.cpp @@ -37,21 +37,6 @@ #include "mongo/db/curop.h" #include "mongo/db/database_name.h" #include "mongo/db/index_builds/index_builds_coordinator.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/drop_collection.h" -#include "mongo/db/local_catalog/local_oplog_info.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/rename_collection.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/unique_collection_name.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" @@ -59,9 +44,24 @@ #include "mongo/db/query/plan_executor.h" #include "mongo/db/query/plan_yield_policy.h" #include "mongo/db/record_id.h" +#include "mongo/db/repl/local_oplog_info.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_catalog/drop_collection.h" +#include "mongo/db/shard_role/shard_catalog/rename_collection.h" +#include "mongo/db/shard_role/shard_catalog/unique_collection_name.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/snapshot.h" diff --git a/src/mongo/db/collection_crud/capped_utils.h b/src/mongo/db/collection_crud/capped_utils.h index 902b1136f1a..2fae3c426bf 100644 --- a/src/mongo/db/collection_crud/capped_utils.h +++ b/src/mongo/db/collection_crud/capped_utils.h @@ -29,7 +29,7 @@ #pragma once -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/util/uuid.h" #include diff --git a/src/mongo/db/collection_crud/capped_utils_test.cpp b/src/mongo/db/collection_crud/capped_utils_test.cpp index 82ba4ae1438..61e0f42a785 100644 --- a/src/mongo/db/collection_crud/capped_utils_test.cpp +++ b/src/mongo/db/collection_crud/capped_utils_test.cpp @@ -35,9 +35,6 @@ #include "mongo/bson/timestamp.h" #include "mongo/crypto/encryption_fields_gen.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/member_state.h" @@ -49,6 +46,9 @@ #include "mongo/db/repl/storage_interface_impl.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/stdx/type_traits.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/collection_crud/collection_write_path.cpp b/src/mongo/db/collection_crud/collection_write_path.cpp index b5d01794a2d..eccc858b26e 100644 --- a/src/mongo/db/collection_crud/collection_write_path.cpp +++ b/src/mongo/db/collection_crud/collection_write_path.cpp @@ -42,21 +42,21 @@ #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/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/collection_options_gen.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/local_oplog_info.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.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" +#include "mongo/db/repl/local_oplog_info.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/damage_vector.h" #include "mongo/db/storage/duplicate_key_error_info.h" #include "mongo/db/storage/exceptions.h" diff --git a/src/mongo/db/collection_crud/collection_write_path.h b/src/mongo/db/collection_crud/collection_write_path.h index 21ab137aa0a..54024f0b4e3 100644 --- a/src/mongo/db/collection_crud/collection_write_path.h +++ b/src/mongo/db/collection_crud/collection_write_path.h @@ -33,13 +33,13 @@ #include "mongo/base/status_with.h" #include "mongo/bson/bsonobj.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" #include "mongo/db/storage/damage_vector.h" #include "mongo/db/storage/snapshot.h" diff --git a/src/mongo/db/collection_crud/container_write.h b/src/mongo/db/collection_crud/container_write.h index ff554520608..6a690bfed6d 100644 --- a/src/mongo/db/collection_crud/container_write.h +++ b/src/mongo/db/collection_crud/container_write.h @@ -30,8 +30,8 @@ #pragma once #include "mongo/base/status.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/storage/container.h" #include "mongo/db/storage/recovery_unit.h" diff --git a/src/mongo/db/collection_index_usage_tracker_test.cpp b/src/mongo/db/collection_index_usage_tracker_test.cpp index 3945606bc95..fcdbe88bdc4 100644 --- a/src/mongo/db/collection_index_usage_tracker_test.cpp +++ b/src/mongo/db/collection_index_usage_tracker_test.cpp @@ -31,7 +31,7 @@ #include "mongo/bson/bsonmisc.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/local_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/unittest/unittest.h" #include "mongo/util/clock_source_mock.h" #include "mongo/util/duration.h" diff --git a/src/mongo/db/commands/BUILD.bazel b/src/mongo/db/commands/BUILD.bazel index d18d01f4c2b..5c396582bce 100644 --- a/src/mongo/db/commands/BUILD.bazel +++ b/src/mongo/db/commands/BUILD.bazel @@ -111,9 +111,9 @@ mongo_cc_library( ], deps = [ "//src/mongo:base", - "//src/mongo/db/local_catalog/lock_manager:flow_control_ticketholder", "//src/mongo/db/query/search:search_index_common", "//src/mongo/db/repl:read_concern_args", + "//src/mongo/db/shard_role/lock_manager:flow_control_ticketholder", "//src/mongo/idl:idl_parser", ], ) @@ -277,15 +277,15 @@ idl_generator( mongo_cc_library( name = "create_command", srcs = [ - "//src/mongo/db/local_catalog/ddl:create_gen", + "//src/mongo/db/shard_role/ddl:create_gen", ], deps = [ "//src/mongo/crypto:encrypted_field_config", "//src/mongo/db:server_base", "//src/mongo/db:server_options", # TODO(SERVER-93876): Remove. "//src/mongo/db/auth:authprivilege", - "//src/mongo/db/local_catalog:collection_options", "//src/mongo/db/query:query_knobs", # TODO(SERVER-93876): Remove. + "//src/mongo/db/shard_role/shard_catalog:collection_options", "//src/mongo/db/timeseries:timeseries_options", # TODO(SERVER-93876): Remove. ], ) @@ -416,7 +416,7 @@ idl_generator( mongo_cc_library( name = "list_collections_filter", srcs = [ - "//src/mongo/db/local_catalog/ddl:list_collections_filter.cpp", + "//src/mongo/db/shard_role/ddl:list_collections_filter.cpp", ], deps = [ "//src/mongo:base", @@ -450,7 +450,7 @@ mongo_cc_library( mongo_cc_library( name = "list_databases_command", srcs = [ - "//src/mongo/db/local_catalog/ddl:list_databases_gen", + "//src/mongo/db/shard_role/ddl:list_databases_gen", ], deps = [ "//src/mongo/db:commands", @@ -462,7 +462,7 @@ mongo_cc_library( mongo_cc_library( name = "list_databases_for_all_tenants_command", srcs = [ - "//src/mongo/db/local_catalog/ddl:list_databases_for_all_tenants_gen", + "//src/mongo/db/shard_role/ddl:list_databases_for_all_tenants_gen", ], deps = [ "//src/mongo/db:server_base", @@ -540,10 +540,10 @@ mongo_cc_library( "//src/mongo/db:dbdirectclient", "//src/mongo/db:server_base", "//src/mongo/db:shard_role", - "//src/mongo/db/local_catalog:collection_options", "//src/mongo/db/repl:repl_coordinator_interface", "//src/mongo/db/repl:repl_server_parameters", "//src/mongo/db/repl:repl_settings", + "//src/mongo/db/shard_role/shard_catalog:collection_options", "//src/mongo/db/storage:storage_options", ], ) @@ -559,9 +559,9 @@ mongo_cc_library( "//src/mongo/db:dbdirectclient", "//src/mongo/db/auth", "//src/mongo/db/auth:authprivilege", - "//src/mongo/db/local_catalog/lock_manager", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/query/query_stats", + "//src/mongo/db/shard_role/lock_manager", + "//src/mongo/db/shard_role/lock_manager:exception_util", "//src/mongo/db/storage:backup_cursor_hooks", "//src/mongo/util:background_job", "//src/mongo/util/concurrency:spin_lock", @@ -606,7 +606,7 @@ mongo_cc_library( ":sessions_commands_gen", ":shardsvr_resolve_view_command_gen", "//src/mongo/db/commands/server_status:server_status_command.cpp", - "//src/mongo/db/local_catalog/ddl:rename_collection_common.cpp", + "//src/mongo/db/shard_role/ddl:rename_collection_common.cpp", ], deps = [ ":shardsvr_run_search_index_command_idl", @@ -644,15 +644,15 @@ mongo_cc_library( mongo_cc_library( name = "cluster_server_parameter_commands_invocation", srcs = [ - "//src/mongo/db/cluster_parameters:get_cluster_parameter_invocation.cpp", - "//src/mongo/db/cluster_parameters:set_cluster_parameter_invocation.cpp", + "//src/mongo/db/topology/cluster_parameters:get_cluster_parameter_invocation.cpp", + "//src/mongo/db/topology/cluster_parameters:set_cluster_parameter_invocation.cpp", ], deps = [ "//src/mongo:base", "//src/mongo/db:audit", "//src/mongo/db:server_base", - "//src/mongo/db/cluster_parameters:cluster_server_parameter_cmds_idl", "//src/mongo/db/query/query_settings:query_settings_service", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_cmds_idl", "//src/mongo/s:sharding_api", ], ) @@ -660,7 +660,7 @@ mongo_cc_library( mongo_cc_library( name = "set_cluster_parameter_impl", srcs = [ - "//src/mongo/db/cluster_parameters:set_cluster_parameter_replset_impl.cpp", + "//src/mongo/db/topology/cluster_parameters:set_cluster_parameter_replset_impl.cpp", ], deps = [ ":cluster_server_parameter_commands_invocation", @@ -682,15 +682,15 @@ mongo_cc_library( "//src/mongo/db:record_id_helpers", "//src/mongo/db:rw_concern_d", "//src/mongo/db:server_base", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:collection_options", - "//src/mongo/db/local_catalog:throttle_cursor", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/repl:oplog", "//src/mongo/db/repl:repl_server_parameters", "//src/mongo/db/repl/dbcheck", "//src/mongo/db/repl/dbcheck:health_log_interface", "//src/mongo/db/rss:replicated_storage_service", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:collection_options", + "//src/mongo/db/shard_role/shard_catalog:throttle_cursor", "//src/mongo/util:md5", "//src/mongo/util:progress_meter", ], @@ -713,9 +713,9 @@ mongo_cc_library( "//src/mongo/db:shard_role", "//src/mongo/db/collection_crud", "//src/mongo/db/index_builds:index_builds_coordinator", - "//src/mongo/db/local_catalog:catalog_helpers", "//src/mongo/db/query/write_ops", "//src/mongo/db/query/write_ops:write_ops_exec", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", ], ) @@ -843,16 +843,16 @@ mongo_cc_library( "//src/mongo/db/commands/query_cmd:run_aggregate.cpp", "//src/mongo/db/commands/query_cmd:write_commands.cpp", "//src/mongo/db/global_catalog/ddl:shuffle_list_command_results.cpp", - "//src/mongo/db/local_catalog:validate_db_metadata_cmd.cpp", - "//src/mongo/db/local_catalog/ddl:collmod_cmd.cpp", - "//src/mongo/db/local_catalog/ddl:create_command.cpp", - "//src/mongo/db/local_catalog/ddl:drop_indexes_cmd.cpp", - "//src/mongo/db/local_catalog/ddl:list_collections.cpp", - "//src/mongo/db/local_catalog/ddl:list_databases.cpp", - "//src/mongo/db/local_catalog/ddl:list_databases_for_all_tenants.cpp", - "//src/mongo/db/local_catalog/ddl:list_indexes.cpp", - "//src/mongo/db/local_catalog/ddl:rename_collection_cmd.cpp", - "//src/mongo/db/local_catalog/lock_manager:lock_info.cpp", + "//src/mongo/db/shard_role/ddl:collmod_cmd.cpp", + "//src/mongo/db/shard_role/ddl:create_command.cpp", + "//src/mongo/db/shard_role/ddl:drop_indexes_cmd.cpp", + "//src/mongo/db/shard_role/ddl:list_collections.cpp", + "//src/mongo/db/shard_role/ddl:list_databases.cpp", + "//src/mongo/db/shard_role/ddl:list_databases_for_all_tenants.cpp", + "//src/mongo/db/shard_role/ddl:list_indexes.cpp", + "//src/mongo/db/shard_role/ddl:rename_collection_cmd.cpp", + "//src/mongo/db/shard_role/lock_manager:lock_info.cpp", + "//src/mongo/db/shard_role/shard_catalog:validate_db_metadata_cmd.cpp", ], no_undefined_ref_DO_NOT_USE = False, deps = [ @@ -890,16 +890,6 @@ mongo_cc_library( "//src/mongo/db/index_builds:index_builds_coordinator", "//src/mongo/db/index_builds:multi_index_block", "//src/mongo/db/index_builds:two_phase_index_build_knobs_idl", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:collection_query_info", - "//src/mongo/db/local_catalog:database_holder", - "//src/mongo/db/local_catalog:index_key_validate", - "//src/mongo/db/local_catalog:validate_db_metadata_command", - "//src/mongo/db/local_catalog/ddl:rename_collection_idl", - "//src/mongo/db/local_catalog/lock_manager", - "//src/mongo/db/local_catalog/lock_manager:exception_util", - "//src/mongo/db/local_catalog/lock_manager:lock_info_command", - "//src/mongo/db/local_catalog/shard_role_api:resource_yielders", "//src/mongo/db/memory_tracking", "//src/mongo/db/pipeline", "//src/mongo/db/pipeline:aggregation_request_helper", @@ -924,6 +914,16 @@ mongo_cc_library( "//src/mongo/db/repl:replica_set_messages", "//src/mongo/db/s:query_analysis_writer", "//src/mongo/db/session:session_catalog_mongod", + "//src/mongo/db/shard_role:resource_yielders", + "//src/mongo/db/shard_role/ddl:rename_collection_idl", + "//src/mongo/db/shard_role/lock_manager", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/lock_manager:lock_info_command", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:collection_query_info", + "//src/mongo/db/shard_role/shard_catalog:database_holder", + "//src/mongo/db/shard_role/shard_catalog:index_key_validate", + "//src/mongo/db/shard_role/shard_catalog:validate_db_metadata_command", "//src/mongo/db/stats:counters", "//src/mongo/db/stats:server_read_concern_write_concern_metrics", "//src/mongo/db/stats:top", @@ -978,13 +978,13 @@ mongo_cc_library( "vote_abort_index_build_command.cpp", "vote_commit_index_build_command.cpp", "vote_index_build_gen", - "//src/mongo/db/cluster_parameters:get_cluster_parameter_command.cpp", - "//src/mongo/db/cluster_parameters:set_cluster_parameter_command.cpp", "//src/mongo/db/commands/query_cmd:map_reduce_command.cpp", "//src/mongo/db/commands/server_status:read_write_concern_defaults_server_status.cpp", - "//src/mongo/db/local_catalog/ddl:internal_rename_if_options_and_indexes_match_cmd.cpp", - "//src/mongo/db/local_catalog/ddl:internal_rename_if_options_and_indexes_match_gen", - "//src/mongo/db/user_write_block:set_user_write_block_mode_command.cpp", + "//src/mongo/db/shard_role/ddl:internal_rename_if_options_and_indexes_match_cmd.cpp", + "//src/mongo/db/shard_role/ddl:internal_rename_if_options_and_indexes_match_gen", + "//src/mongo/db/topology/cluster_parameters:get_cluster_parameter_command.cpp", + "//src/mongo/db/topology/cluster_parameters:set_cluster_parameter_command.cpp", + "//src/mongo/db/topology/user_write_block:set_user_write_block_mode_command.cpp", ], deps = [ "cluster_server_parameter_commands_invocation", @@ -1033,11 +1033,6 @@ mongo_cc_library( "//src/mongo/db/auth:user_document_parser", "//src/mongo/db/commands/query_cmd:map_reduce_agg", "//src/mongo/db/index_builds:index_builds_coordinator", - "//src/mongo/db/local_catalog:catalog_control", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:catalog_impl", - "//src/mongo/db/local_catalog:database_holder", - "//src/mongo/db/local_catalog:index_key_validate", "//src/mongo/db/pipeline", "//src/mongo/db/pipeline/process_interface:mongo_process_interface", "//src/mongo/db/repl:oplog", @@ -1050,10 +1045,15 @@ mongo_cc_library( "//src/mongo/db/s:sharding_commands_d", "//src/mongo/db/s:transaction_coordinator", "//src/mongo/db/s:user_writes_recoverable_critical_section", + "//src/mongo/db/shard_role/shard_catalog:catalog_control", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:catalog_impl", + "//src/mongo/db/shard_role/shard_catalog:database_holder", + "//src/mongo/db/shard_role/shard_catalog:index_key_validate", "//src/mongo/db/stats:top", "//src/mongo/db/timeseries:timeseries_conversion_util", + "//src/mongo/db/topology/user_write_block:set_user_write_block_mode_idl", "//src/mongo/db/transaction:transaction_api", - "//src/mongo/db/user_write_block:set_user_write_block_mode_idl", "//src/mongo/executor:inline_executor", "//src/mongo/util:progress_meter", "//src/mongo/util/net:ssl_manager", @@ -1108,7 +1108,6 @@ mongo_cc_unit_test( "parse_log_component_settings_test.cpp", "profile_cmd_test.cpp", "set_profiling_filter_globally_cmd_test.cpp", - "//src/mongo/db/cluster_parameters:set_cluster_parameter_invocation_test.cpp", "//src/mongo/db/commands/query_cmd:aggregation_execution_state_test.cpp", "//src/mongo/db/commands/query_cmd:explain_test.cpp", "//src/mongo/db/commands/query_cmd:external_data_source_commands_test.cpp", @@ -1117,8 +1116,9 @@ mongo_cc_unit_test( "//src/mongo/db/commands/query_cmd:run_aggregate_test.cpp", "//src/mongo/db/commands/server_status:server_status_command_test.cpp", "//src/mongo/db/commands/server_status:server_status_metric_test.cpp", - "//src/mongo/db/local_catalog/ddl:create_command_test.cpp", - "//src/mongo/db/local_catalog/ddl:list_collections_filter_test.cpp", + "//src/mongo/db/shard_role/ddl:create_command_test.cpp", + "//src/mongo/db/shard_role/ddl:list_collections_filter_test.cpp", + "//src/mongo/db/topology/cluster_parameters:set_cluster_parameter_invocation_test.cpp", ], srcs_select = [{ "//bazel/config:js_engine_none": [], @@ -1152,8 +1152,6 @@ mongo_cc_unit_test( "//src/mongo/db/collection_crud", "//src/mongo/db/commands/server_status:server_status_core", "//src/mongo/db/index_builds:index_builds_coordinator", - "//src/mongo/db/local_catalog:catalog_test_fixture", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/memory_tracking", "//src/mongo/db/op_observer", "//src/mongo/db/pipeline:document_source_mock", @@ -1166,6 +1164,8 @@ mongo_cc_unit_test( "//src/mongo/db/repl/dbcheck:dbcheck_test_fixture", "//src/mongo/db/repl/dbcheck:health_log", "//src/mongo/db/s:shard_server_test_fixture", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", "//src/mongo/db/storage:record_store_base", "//src/mongo/idl:idl_parser", "//src/mongo/shell:kms_idl", @@ -1184,8 +1184,8 @@ mongo_cc_unit_test( ], deps = [ "//src/mongo/db:dbdirectclient", - "//src/mongo/db/local_catalog:catalog_test_fixture", "//src/mongo/db/repl:storage_interface_impl", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", ], ) @@ -1223,13 +1223,13 @@ mongo_cc_unit_test( "//src/mongo/db/auth:authmocks", "//src/mongo/db/collection_crud", "//src/mongo/db/commands/server_status:server_status_core", - "//src/mongo/db/local_catalog:catalog_test_fixture", "//src/mongo/db/memory_tracking", "//src/mongo/db/op_observer", "//src/mongo/db/repl:replmocks", "//src/mongo/db/repl:storage_interface_impl", "//src/mongo/db/repl/dbcheck:dbcheck_test_fixture", "//src/mongo/db/repl/dbcheck:health_log", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", "//src/mongo/shell:kms_idl", "//src/mongo/util:version_impl", ], diff --git a/src/mongo/db/commands/apply_ops_cmd.cpp b/src/mongo/db/commands/apply_ops_cmd.cpp index 9e685aae86b..b6a13a64f44 100644 --- a/src/mongo/db/commands/apply_ops_cmd.cpp +++ b/src/mongo/db/commands/apply_ops_cmd.cpp @@ -41,13 +41,13 @@ #include "mongo/db/commands.h" #include "mongo/db/commands/oplog_application_checks.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/apply_ops.h" #include "mongo/db/repl/apply_ops_command_info.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/versioning_protocol/stale_exception.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/commands/auto_compact.cpp b/src/mongo/db/commands/auto_compact.cpp index 6211823e040..bfa9cc54d72 100644 --- a/src/mongo/db/commands/auto_compact.cpp +++ b/src/mongo/db/commands/auto_compact.cpp @@ -33,11 +33,11 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/commands.h" #include "mongo/db/commands/compact_gen.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_feature_flags_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/logv2/log.h" #include diff --git a/src/mongo/db/commands/collection_to_capped.cpp b/src/mongo/db/commands/collection_to_capped.cpp index 5ef29e6a640..21a7683acd9 100644 --- a/src/mongo/db/commands/collection_to_capped.cpp +++ b/src/mongo/db/commands/collection_to_capped.cpp @@ -40,14 +40,14 @@ #include "mongo/db/collection_crud/capped_utils.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/ddl/replica_set_ddl_tracker.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/replica_set_ddl_tracker.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.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" diff --git a/src/mongo/db/commands/compact.cpp b/src/mongo/db/commands/compact.cpp index 1efe55504d7..b380310c3f9 100644 --- a/src/mongo/db/commands/compact.cpp +++ b/src/mongo/db/commands/compact.cpp @@ -36,13 +36,11 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/authorization_session.h" +#include "mongo/db/collection_compact.h" #include "mongo/db/commands.h" #include "mongo/db/commands/compact_gen.h" #include "mongo/db/curop.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_compact.h" -#include "mongo/db/local_catalog/db_raii.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/profile_settings.h" @@ -50,6 +48,8 @@ #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" #include "mongo/util/assert_util.h" #include diff --git a/src/mongo/db/commands/conn_pool_stats.cpp b/src/mongo/db/commands/conn_pool_stats.cpp index a0da8326ff6..20e4555163b 100644 --- a/src/mongo/db/commands/conn_pool_stats.cpp +++ b/src/mongo/db/commands/conn_pool_stats.cpp @@ -42,10 +42,10 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/executor/connection_pool_stats.h" #include "mongo/executor/task_executor_pool.h" diff --git a/src/mongo/db/commands/create_indexes_cmd.cpp b/src/mongo/db/commands/create_indexes_cmd.cpp index 7c297909baa..e9c63a56df2 100644 --- a/src/mongo/db/commands/create_indexes_cmd.cpp +++ b/src/mongo/db/commands/create_indexes_cmd.cpp @@ -55,27 +55,8 @@ #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/index_builds/repl_index_build_state.h" #include "mongo/db/index_builds/two_phase_index_build_knobs_gen.h" +#include "mongo/db/index_key_validate.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/ddl/create_indexes_gen.h" -#include "mongo/db/local_catalog/ddl/replica_set_ddl_tracker.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/index_key_validate.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" -#include "mongo/db/local_catalog/uncommitted_catalog_updates.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/profile_settings.h" @@ -85,6 +66,25 @@ #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/ddl/create_indexes_gen.h" +#include "mongo/db/shard_role/ddl/replica_set_ddl_tracker.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/uncommitted_catalog_updates.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/stats/top.h" #include "mongo/db/storage/exceptions.h" diff --git a/src/mongo/db/commands/create_indexes_test.cpp b/src/mongo/db/commands/create_indexes_test.cpp index 0af1f94cba4..91942c9387c 100644 --- a/src/mongo/db/commands/create_indexes_test.cpp +++ b/src/mongo/db/commands/create_indexes_test.cpp @@ -33,13 +33,13 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/storage_interface.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/commands/dbcheck_command.cpp b/src/mongo/db/commands/dbcheck_command.cpp index bede4fb460e..c2cd5e65adc 100644 --- a/src/mongo/db/commands/dbcheck_command.cpp +++ b/src/mongo/db/commands/dbcheck_command.cpp @@ -49,14 +49,6 @@ #include "mongo/db/feature_flag.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/index/index_constants.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog_helper.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/read_write_concern_defaults.h" @@ -71,6 +63,14 @@ #include "mongo/db/rss/replicated_storage_service.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/sorted_data_interface.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/commands/dbcheck_command.h b/src/mongo/db/commands/dbcheck_command.h index c13efc2f168..f110cebc0fc 100644 --- a/src/mongo/db/commands/dbcheck_command.h +++ b/src/mongo/db/commands/dbcheck_command.h @@ -29,10 +29,10 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/throttle_cursor.h" #include "mongo/db/repl/dbcheck/dbcheck.h" #include "mongo/db/repl/dbcheck/dbcheck_gen.h" #include "mongo/db/repl/dbcheck/dbcheck_idl.h" +#include "mongo/db/throttle_cursor.h" #include "mongo/db/write_concern.h" #include "mongo/db/write_concern_options.h" #include "mongo/util/background.h" diff --git a/src/mongo/db/commands/dbcommands.cpp b/src/mongo/db/commands/dbcommands.cpp index cdaf949bf57..82fa32b55be 100644 --- a/src/mongo/db/commands/dbcommands.cpp +++ b/src/mongo/db/commands/dbcommands.cpp @@ -51,18 +51,6 @@ #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/coll_mod.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/ddl/coll_mod_gen.h" -#include "mongo/db/local_catalog/ddl/coll_mod_reply_validation.h" -#include "mongo/db/local_catalog/ddl/drop_database_gen.h" -#include "mongo/db/local_catalog/ddl/drop_gen.h" -#include "mongo/db/local_catalog/ddl/replica_set_ddl_tracker.h" -#include "mongo/db/local_catalog/drop_collection.h" -#include "mongo/db/local_catalog/drop_database.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/profile_settings.h" @@ -76,6 +64,18 @@ #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/coll_mod_gen.h" +#include "mongo/db/shard_role/ddl/coll_mod_reply_validation.h" +#include "mongo/db/shard_role/ddl/drop_database_gen.h" +#include "mongo/db/shard_role/ddl/drop_gen.h" +#include "mongo/db/shard_role/ddl/replica_set_ddl_tracker.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/coll_mod.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/drop_collection.h" +#include "mongo/db/shard_role/shard_catalog/drop_database.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/stats/storage_stats.h" #include "mongo/db/storage/record_data.h" diff --git a/src/mongo/db/commands/dbhash.cpp b/src/mongo/db/commands/dbhash.cpp index 1f9b7cb00a0..0724ac3176b 100644 --- a/src/mongo/db/commands/dbhash.cpp +++ b/src/mongo/db/commands/dbhash.cpp @@ -42,15 +42,6 @@ #include "mongo/db/commands.h" #include "mongo/db/commands/test_commands_enabled.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/internal_plans.h" @@ -61,6 +52,15 @@ #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/commands/feature_compatibility_version.cpp b/src/mongo/db/commands/feature_compatibility_version.cpp index ffb8361e54c..b29744b76e4 100644 --- a/src/mongo/db/commands/feature_compatibility_version.cpp +++ b/src/mongo/db/commands/feature_compatibility_version.cpp @@ -42,11 +42,6 @@ #include "mongo/db/feature_compatibility_version_document_gen.h" #include "mongo/db/feature_compatibility_version_documentation.h" #include "mongo/db/feature_compatibility_version_parser.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/intent_registry.h" @@ -57,6 +52,11 @@ #include "mongo/db/repl/storage_interface.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/db/storage/storage_options.h" #include "mongo/db/tenant_id.h" diff --git a/src/mongo/db/commands/feature_compatibility_version.h b/src/mongo/db/commands/feature_compatibility_version.h index 99c974858fa..8d419175915 100644 --- a/src/mongo/db/commands/feature_compatibility_version.h +++ b/src/mongo/db/commands/feature_compatibility_version.h @@ -34,10 +34,10 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/commands/set_feature_compatibility_version_gen.h" #include "mongo/db/feature_compatibility_version_document_gen.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/storage_interface.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" #include "mongo/util/modules.h" #include "mongo/util/version/releases.h" diff --git a/src/mongo/db/commands/filemd5_cmd.cpp b/src/mongo/db/commands/filemd5_cmd.cpp index cc34eecfd93..25376fef230 100644 --- a/src/mongo/db/commands/filemd5_cmd.cpp +++ b/src/mongo/db/commands/filemd5_cmd.cpp @@ -39,9 +39,6 @@ #include "mongo/db/curop_failpoint_helpers.h" #include "mongo/db/database_name.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context_builder.h" @@ -54,6 +51,9 @@ #include "mongo/db/query/plan_yield_policy.h" #include "mongo/db/query/query_planner_params.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" #include "mongo/util/fail_point.h" diff --git a/src/mongo/db/commands/fle2_cleanup_cmd.cpp b/src/mongo/db/commands/fle2_cleanup_cmd.cpp index 4ec664a8f35..cac660f5aa9 100644 --- a/src/mongo/db/commands/fle2_cleanup_cmd.cpp +++ b/src/mongo/db/commands/fle2_cleanup_cmd.cpp @@ -48,24 +48,24 @@ #include "mongo/db/database_name.h" #include "mongo/db/feature_flag.h" #include "mongo/db/fle_crud.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/ddl/create_gen.h" -#include "mongo/db/local_catalog/ddl/drop_gen.h" -#include "mongo/db/local_catalog/ddl/replica_set_ddl_tracker.h" -#include "mongo/db/local_catalog/drop_collection.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/rename_collection.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/server_options.h" #include "mongo/db/server_parameter.h" #include "mongo/db/server_parameter_with_storage.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/create_gen.h" +#include "mongo/db/shard_role/ddl/drop_gen.h" +#include "mongo/db/shard_role/ddl/replica_set_ddl_tracker.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/drop_collection.h" +#include "mongo/db/shard_role/shard_catalog/rename_collection.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/tenant_id.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/commands/fle2_compact.cpp b/src/mongo/db/commands/fle2_compact.cpp index 78487667726..fabb15fdd27 100644 --- a/src/mongo/db/commands/fle2_compact.cpp +++ b/src/mongo/db/commands/fle2_compact.cpp @@ -55,7 +55,6 @@ #include "mongo/db/commands/fle2_compact.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/fle_crud.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/query/find_command.h" #include "mongo/db/query/write_ops/write_ops.h" @@ -63,6 +62,7 @@ #include "mongo/db/query/write_ops/write_ops_parsers.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/transaction/transaction_api.h" #include "mongo/logv2/log.h" #include "mongo/platform/compiler.h" diff --git a/src/mongo/db/commands/fle2_compact.h b/src/mongo/db/commands/fle2_compact.h index cfb88280598..feb2a227232 100644 --- a/src/mongo/db/commands/fle2_compact.h +++ b/src/mongo/db/commands/fle2_compact.h @@ -37,9 +37,9 @@ #include "mongo/db/commands/fle2_cleanup_gen.h" #include "mongo/db/commands/fle2_compact_gen.h" #include "mongo/db/fle_crud.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/stdx/unordered_set.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/commands/fle2_compact_cmd.cpp b/src/mongo/db/commands/fle2_compact_cmd.cpp index 7379dd293e8..a3340de1c7e 100644 --- a/src/mongo/db/commands/fle2_compact_cmd.cpp +++ b/src/mongo/db/commands/fle2_compact_cmd.cpp @@ -46,22 +46,22 @@ #include "mongo/db/curop.h" #include "mongo/db/database_name.h" #include "mongo/db/fle_crud.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/ddl/create_gen.h" -#include "mongo/db/local_catalog/ddl/drop_gen.h" -#include "mongo/db/local_catalog/ddl/replica_set_ddl_tracker.h" -#include "mongo/db/local_catalog/drop_collection.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/rename_collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/server_parameter.h" #include "mongo/db/server_parameter_with_storage.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/create_gen.h" +#include "mongo/db/shard_role/ddl/drop_gen.h" +#include "mongo/db/shard_role/ddl/replica_set_ddl_tracker.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/drop_collection.h" +#include "mongo/db/shard_role/shard_catalog/rename_collection.h" #include "mongo/db/tenant_id.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/commands/fle_compact_test.cpp b/src/mongo/db/commands/fle_compact_test.cpp index a528200f074..0685d20fd5f 100644 --- a/src/mongo/db/commands/fle_compact_test.cpp +++ b/src/mongo/db/commands/fle_compact_test.cpp @@ -47,7 +47,6 @@ #include "mongo/db/commands/fle2_compact.h" #include "mongo/db/fle_crud.h" #include "mongo/db/fle_query_interface_mock.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/member_state.h" @@ -57,6 +56,7 @@ #include "mongo/db/repl/storage_interface_impl.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/logv2/log.h" #include "mongo/platform/random.h" #include "mongo/shell/kms_gen.h" diff --git a/src/mongo/db/commands/fsync.cpp b/src/mongo/db/commands/fsync.cpp index 47e59489429..5c8c88475df 100644 --- a/src/mongo/db/commands/fsync.cpp +++ b/src/mongo/db/commands/fsync.cpp @@ -44,12 +44,12 @@ #include "mongo/db/commands/test_commands_enabled.h" #include "mongo/db/database_name.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/backup_cursor_hooks.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/commands/generic_servers.cpp b/src/mongo/db/commands/generic_servers.cpp index fe26a0626f8..8d90726370b 100644 --- a/src/mongo/db/commands/generic_servers.cpp +++ b/src/mongo/db/commands/generic_servers.cpp @@ -43,12 +43,12 @@ #include "mongo/db/commands/generic_servers_gen.h" #include "mongo/db/commands/test_commands_enabled.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/log_process_details.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" #include "mongo/logv2/log_util.h" diff --git a/src/mongo/db/commands/internal_transactions_test_command_d.cpp b/src/mongo/db/commands/internal_transactions_test_command_d.cpp index 7789273ddd0..4e134c5a449 100644 --- a/src/mongo/db/commands/internal_transactions_test_command_d.cpp +++ b/src/mongo/db/commands/internal_transactions_test_command_d.cpp @@ -31,8 +31,8 @@ #include "mongo/base/string_data.h" #include "mongo/db/cluster_transaction_api.h" #include "mongo/db/commands.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielder.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/resource_yielder.h" #include "mongo/db/transaction/transaction_api.h" #include "mongo/db/transaction/transaction_participant_resource_yielder.h" #include "mongo/executor/inline_executor.h" diff --git a/src/mongo/db/commands/isself.cpp b/src/mongo/db/commands/isself.cpp index 49d84aa7ed7..c80bf28fc3c 100644 --- a/src/mongo/db/commands/isself.cpp +++ b/src/mongo/db/commands/isself.cpp @@ -38,9 +38,9 @@ #include "mongo/db/admission/execution_admission_context.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include #include diff --git a/src/mongo/db/commands/oplog_application_checks.cpp b/src/mongo/db/commands/oplog_application_checks.cpp index a85ca16eff1..29778677846 100644 --- a/src/mongo/db/commands/oplog_application_checks.cpp +++ b/src/mongo/db/commands/oplog_application_checks.cpp @@ -42,12 +42,12 @@ #include "mongo/db/auth/validated_tenancy_scope_factory.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.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" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/tenant_id.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/commands/oplog_note.cpp b/src/mongo/db/commands/oplog_note.cpp index a75532f6a29..8f56cab3ef0 100644 --- a/src/mongo/db/commands/oplog_note.cpp +++ b/src/mongo/db/commands/oplog_note.cpp @@ -45,9 +45,6 @@ #include "mongo/db/client.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" @@ -55,6 +52,9 @@ #include "mongo/db/repl/optime.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/commands/profile_cmd.cpp b/src/mongo/db/commands/profile_cmd.cpp index bb08f89c467..1644005211a 100644 --- a/src/mongo/db/commands/profile_cmd.cpp +++ b/src/mongo/db/commands/profile_cmd.cpp @@ -32,15 +32,15 @@ #include "mongo/db/commands/profile_common.h" #include "mongo/db/commands/profile_gen.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/db_raii.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/profile_collection.h" #include "mongo/db/profile_filter_impl.h" #include "mongo/db/profile_settings.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" namespace mongo { namespace { diff --git a/src/mongo/db/commands/query_cmd/BUILD.bazel b/src/mongo/db/commands/query_cmd/BUILD.bazel index 522f6e48a8d..b50439f98fd 100644 --- a/src/mongo/db/commands/query_cmd/BUILD.bazel +++ b/src/mongo/db/commands/query_cmd/BUILD.bazel @@ -191,13 +191,13 @@ mongo_cc_library( "//src/mongo/client:clientdriver_minimal", "//src/mongo/db:commands", "//src/mongo/db:dbdirectclient", - "//src/mongo/db/cluster_parameters:cluster_server_parameter_cmds_idl", "//src/mongo/db/commands:set_cluster_parameter_impl", - "//src/mongo/db/local_catalog:catalog_helpers", "//src/mongo/db/query/plan_cache:query_plan_cache", "//src/mongo/db/query/query_settings:query_settings_service", "//src/mongo/db/query/query_shape", "//src/mongo/db/repl:repl_settings", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_cmds_idl", "//src/mongo/s:grid", ], ) @@ -225,8 +225,6 @@ mongo_cc_library( "//src/mongo/db:service_context", "//src/mongo/db/auth", "//src/mongo/db/auth:authprivilege", - "//src/mongo/db/local_catalog:document_validation", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/pipeline/process_interface:mongod_process_interfaces", "//src/mongo/db/query/client_cursor", "//src/mongo/db/query/write_ops", @@ -235,6 +233,8 @@ mongo_cc_library( "//src/mongo/db/s:analyze_shard_key_util", "//src/mongo/db/s:query_analysis_writer", "//src/mongo/db/session:logical_session_id_helpers", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:document_validation", "//src/mongo/db/stats:server_read_concern_write_concern_metrics", "//src/mongo/db/stats:top", "//src/mongo/db/storage:storage_options", diff --git a/src/mongo/db/commands/query_cmd/acquire_locks.h b/src/mongo/db/commands/query_cmd/acquire_locks.h index 2251a94bc64..9fdd20e5601 100644 --- a/src/mongo/db/commands/query_cmd/acquire_locks.h +++ b/src/mongo/db/commands/query_cmd/acquire_locks.h @@ -29,10 +29,10 @@ #pragma once -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/external_data_source_scope_guard.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/external_data_source_scope_guard.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/commands/query_cmd/aggregation_execution_state.cpp b/src/mongo/db/commands/query_cmd/aggregation_execution_state.cpp index e22f0df00e5..6200096f860 100644 --- a/src/mongo/db/commands/query_cmd/aggregation_execution_state.cpp +++ b/src/mongo/db/commands/query_cmd/aggregation_execution_state.cpp @@ -30,8 +30,6 @@ #include "mongo/db/commands/query_cmd/aggregation_execution_state.h" #include "mongo/db/exec/disk_use_options_gen.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/pipeline/initialize_auto_get_helper.h" #include "mongo/db/pipeline/search/search_helper.h" @@ -39,7 +37,9 @@ #include "mongo/db/query/multiple_collection_accessor.h" #include "mongo/db/query/query_request_helper.h" #include "mongo/db/query/query_settings/query_settings_service.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/storage/storage_options.h" #include "mongo/db/timeseries/timeseries_request_util.h" #include "mongo/db/version_context.h" diff --git a/src/mongo/db/commands/query_cmd/aggregation_execution_state.h b/src/mongo/db/commands/query_cmd/aggregation_execution_state.h index 613153a2afe..324d12f7c63 100644 --- a/src/mongo/db/commands/query_cmd/aggregation_execution_state.h +++ b/src/mongo/db/commands/query_cmd/aggregation_execution_state.h @@ -28,9 +28,6 @@ */ #pragma once -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/external_data_source_scope_guard.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/aggregate_command_gen.h" @@ -40,6 +37,9 @@ #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/query/multiple_collection_accessor.h" #include "mongo/db/read_concern.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/external_data_source_scope_guard.h" #include "mongo/db/views/resolved_view.h" #include "mongo/db/views/view.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/commands/query_cmd/aggregation_execution_state_test.cpp b/src/mongo/db/commands/query_cmd/aggregation_execution_state_test.cpp index 3f809b86fa1..75c6bd0bc42 100644 --- a/src/mongo/db/commands/query_cmd/aggregation_execution_state_test.cpp +++ b/src/mongo/db/commands/query_cmd/aggregation_execution_state_test.cpp @@ -33,12 +33,12 @@ #include "mongo/bson/json.h" #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/collection_type.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" -#include "mongo/db/raw_data_operation.h" #include "mongo/db/repl/read_concern_level.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/collection_type.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/db/versioning_protocol/shard_version_factory.h" diff --git a/src/mongo/db/commands/query_cmd/analyze_cmd.cpp b/src/mongo/db/commands/query_cmd/analyze_cmd.cpp index cd71e4ecda5..e626725928e 100644 --- a/src/mongo/db/commands/query_cmd/analyze_cmd.cpp +++ b/src/mongo/db/commands/query_cmd/analyze_cmd.cpp @@ -42,9 +42,6 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/feature_flag.h" #include "mongo/db/field_ref.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/field_path.h" @@ -57,6 +54,9 @@ #include "mongo/db/query/query_feature_flags_gen.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/rpc/get_status_from_command_result.h" #include "mongo/rpc/op_msg.h" #include "mongo/transport/session.h" diff --git a/src/mongo/db/commands/query_cmd/bulk_write.cpp b/src/mongo/db/commands/query_cmd/bulk_write.cpp index 6f9ca80b654..b9950c4f76a 100644 --- a/src/mongo/db/commands/query_cmd/bulk_write.cpp +++ b/src/mongo/db/commands/query_cmd/bulk_write.cpp @@ -61,13 +61,6 @@ #include "mongo/db/feature_flag.h" #include "mongo/db/fle_crud.h" #include "mongo/db/initialize_operation_session_info.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_operation_source.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/local_executor.h" #include "mongo/db/namespace_string.h" #include "mongo/db/not_primary_error_tracker.h" @@ -96,7 +89,6 @@ #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" #include "mongo/db/query/write_ops/write_ops_retryability.h" -#include "mongo/db/raw_data_operation.h" #include "mongo/db/record_id.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/oplog_entry.h" @@ -110,6 +102,14 @@ #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_operation_source.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/stats/counters.h" #include "mongo/db/stats/server_write_concern_metrics.h" diff --git a/src/mongo/db/commands/query_cmd/bulk_write_common.cpp b/src/mongo/db/commands/query_cmd/bulk_write_common.cpp index da476b3c7c5..d9bc95efafb 100644 --- a/src/mongo/db/commands/query_cmd/bulk_write_common.cpp +++ b/src/mongo/db/commands/query_cmd/bulk_write_common.cpp @@ -45,8 +45,8 @@ #include "mongo/db/query/write_ops/delete_request_gen.h" #include "mongo/db/query/write_ops/update_request.h" #include "mongo/db/query/write_ops/write_ops.h" -#include "mongo/db/raw_data_operation.h" #include "mongo/db/repl/oplog.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/idl/idl_parser.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/commands/query_cmd/count_cmd.cpp b/src/mongo/db/commands/query_cmd/count_cmd.cpp index 8214192e58d..6d5b4dfcd27 100644 --- a/src/mongo/db/commands/query_cmd/count_cmd.cpp +++ b/src/mongo/db/commands/query_cmd/count_cmd.cpp @@ -48,11 +48,6 @@ #include "mongo/db/database_name.h" #include "mongo/db/feature_flag.h" #include "mongo/db/fle_crud.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/aggregation_request_helper.h" @@ -75,13 +70,18 @@ #include "mongo/db/query/shard_key_diagnostic_printer.h" #include "mongo/db/query/timeseries/timeseries_translation.h" #include "mongo/db/query/view_response_formatter.h" -#include "mongo/db/raw_data_operation.h" #include "mongo/db/read_concern_support_result.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/s/query_analysis_writer.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" #include "mongo/db/tenant_id.h" #include "mongo/db/timeseries/timeseries_request_util.h" #include "mongo/db/version_context.h" diff --git a/src/mongo/db/commands/query_cmd/distinct.cpp b/src/mongo/db/commands/query_cmd/distinct.cpp index 1e84ab0602e..ea36a68239d 100644 --- a/src/mongo/db/commands/query_cmd/distinct.cpp +++ b/src/mongo/db/commands/query_cmd/distinct.cpp @@ -47,11 +47,6 @@ #include "mongo/db/commands/query_cmd/run_aggregate.h" #include "mongo/db/curop.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/logical_time.h" #include "mongo/db/matcher/extensions_callback_real.h" #include "mongo/db/namespace_string.h" @@ -83,7 +78,6 @@ #include "mongo/db/query/shard_key_diagnostic_printer.h" #include "mongo/db/query/timeseries/timeseries_translation.h" #include "mongo/db/query/view_response_formatter.h" -#include "mongo/db/raw_data_operation.h" #include "mongo/db/read_concern_support_result.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/read_concern_level.h" @@ -91,6 +85,12 @@ #include "mongo/db/s/query_analysis_writer.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/stats/top.h" #include "mongo/db/tenant_id.h" #include "mongo/db/timeseries/timeseries_request_util.h" diff --git a/src/mongo/db/commands/query_cmd/explain_cmd.cpp b/src/mongo/db/commands/query_cmd/explain_cmd.cpp index 5501e6b2f90..e7db90e72bf 100644 --- a/src/mongo/db/commands/query_cmd/explain_cmd.cpp +++ b/src/mongo/db/commands/query_cmd/explain_cmd.cpp @@ -41,9 +41,9 @@ #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/explain_options.h" -#include "mongo/db/raw_data_operation.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/idl/idl_parser.h" #include "mongo/rpc/op_msg.h" #include "mongo/rpc/reply_builder_interface.h" diff --git a/src/mongo/db/commands/query_cmd/find_and_modify.cpp b/src/mongo/db/commands/query_cmd/find_and_modify.cpp index d8894f91cd6..9ed69b7ef4d 100644 --- a/src/mongo/db/commands/query_cmd/find_and_modify.cpp +++ b/src/mongo/db/commands/query_cmd/find_and_modify.cpp @@ -46,14 +46,6 @@ #include "mongo/db/curop_failpoint_helpers.h" #include "mongo/db/database_name.h" #include "mongo/db/fle_crud.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/legacy_runtime_constants_gen.h" @@ -76,12 +68,20 @@ #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" #include "mongo/db/query/write_ops/write_ops_retryability.h" -#include "mongo/db/raw_data_operation.h" #include "mongo/db/repl/repl_client_info.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/s/query_analysis_writer.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/stats/top.h" #include "mongo/db/storage/duplicate_key_error_info.h" #include "mongo/db/timeseries/timeseries_index_schema_conversion_functions.h" diff --git a/src/mongo/db/commands/query_cmd/find_cmd.cpp b/src/mongo/db/commands/query_cmd/find_cmd.cpp index 1cece062bf7..b89da1e8a46 100644 --- a/src/mongo/db/commands/query_cmd/find_cmd.cpp +++ b/src/mongo/db/commands/query_cmd/find_cmd.cpp @@ -55,12 +55,6 @@ #include "mongo/db/exec/disk_use_options_gen.h" #include "mongo/db/exec/shard_filterer_impl.h" #include "mongo/db/fle_crud.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/collection_type.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/logical_time.h" #include "mongo/db/matcher/extensions_callback_real.h" #include "mongo/db/namespace_string.h" @@ -100,7 +94,6 @@ #include "mongo/db/query/query_utils.h" #include "mongo/db/query/shard_key_diagnostic_printer.h" #include "mongo/db/query/timeseries/timeseries_translation.h" -#include "mongo/db/raw_data_operation.h" #include "mongo/db/read_concern_support_result.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/read_concern_level.h" @@ -108,6 +101,13 @@ #include "mongo/db/s/query_analysis_writer.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_type.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/stats/counters.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_options.h" diff --git a/src/mongo/db/commands/query_cmd/getmore_cmd.cpp b/src/mongo/db/commands/query_cmd/getmore_cmd.cpp index 0039032507a..0ce5c8cd4a2 100644 --- a/src/mongo/db/commands/query_cmd/getmore_cmd.cpp +++ b/src/mongo/db/commands/query_cmd/getmore_cmd.cpp @@ -47,7 +47,6 @@ #include "mongo/db/curop.h" #include "mongo/db/curop_failpoint_helpers.h" #include "mongo/db/cursor_in_use_info.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/logical_time.h" #include "mongo/db/memory_tracking/operation_memory_usage_tracker.h" #include "mongo/db/namespace_string.h" @@ -79,6 +78,7 @@ #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/stats/counters.h" #include "mongo/db/stats/top.h" #include "mongo/db/storage/recovery_unit.h" diff --git a/src/mongo/db/commands/query_cmd/index_filter_commands.cpp b/src/mongo/db/commands/query_cmd/index_filter_commands.cpp index 6a0e465877e..7b50402e683 100644 --- a/src/mongo/db/commands/query_cmd/index_filter_commands.cpp +++ b/src/mongo/db/commands/query_cmd/index_filter_commands.cpp @@ -44,8 +44,6 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands/query_cmd/plan_cache_commands.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/db_raii.h" #include "mongo/db/matcher/extensions_callback_real.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/expression_context.h" @@ -57,6 +55,8 @@ #include "mongo/db/query/compiler/parsers/matcher/expression_parser.h" #include "mongo/db/query/find_command.h" #include "mongo/db/query/query_settings_decoration.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" #include "mongo/logv2/log.h" #include "mongo/stdx/type_traits.h" #include "mongo/stdx/unordered_set.h" diff --git a/src/mongo/db/commands/query_cmd/index_filter_commands.h b/src/mongo/db/commands/query_cmd/index_filter_commands.h index 610a650b2ee..7daf356e169 100644 --- a/src/mongo/db/commands/query_cmd/index_filter_commands.h +++ b/src/mongo/db/commands/query_cmd/index_filter_commands.h @@ -34,12 +34,12 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/plan_cache/classic_plan_cache.h" #include "mongo/db/query/plan_cache/sbe_plan_cache.h" #include "mongo/db/query/query_settings.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include diff --git a/src/mongo/db/commands/query_cmd/index_filter_commands_test.cpp b/src/mongo/db/commands/query_cmd/index_filter_commands_test.cpp index b0334d3d5d4..e958b0dd9c5 100644 --- a/src/mongo/db/commands/query_cmd/index_filter_commands_test.cpp +++ b/src/mongo/db/commands/query_cmd/index_filter_commands_test.cpp @@ -43,8 +43,6 @@ #include "mongo/db/exec/plan_stats.h" #include "mongo/db/exec/sbe/expressions/runtime_environment.h" #include "mongo/db/exec/sbe/stages/co_scan.h" -#include "mongo/db/local_catalog/collection_mock.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role_mock.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/query/canonical_query.h" @@ -58,6 +56,8 @@ #include "mongo/db/query/plan_ranking_decision.h" #include "mongo/db/query/query_test_service_context.h" #include "mongo/db/query/stage_builder/sbe/builder.h" +#include "mongo/db/shard_role/shard_catalog/collection_mock.h" +#include "mongo/db/shard_role/shard_role_mock.h" #include "mongo/unittest/unittest.h" #include "mongo/util/clock_source.h" diff --git a/src/mongo/db/commands/query_cmd/killcursors_cmd.cpp b/src/mongo/db/commands/query_cmd/killcursors_cmd.cpp index 6dea6f5816c..b1b74671b4c 100644 --- a/src/mongo/db/commands/query_cmd/killcursors_cmd.cpp +++ b/src/mongo/db/commands/query_cmd/killcursors_cmd.cpp @@ -31,13 +31,13 @@ #include "mongo/db/auth/authorization_checks.h" #include "mongo/db/commands.h" #include "mongo/db/commands/query_cmd/killcursors_common.h" -#include "mongo/db/local_catalog/db_raii.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/profile_settings.h" #include "mongo/db/query/client_cursor/cursor_id.h" #include "mongo/db/query/client_cursor/cursor_manager.h" #include "mongo/db/query/client_cursor/kill_cursors_gen.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" #include "mongo/db/stats/top.h" #include diff --git a/src/mongo/db/commands/query_cmd/map_reduce_agg.cpp b/src/mongo/db/commands/query_cmd/map_reduce_agg.cpp index f92469650ef..45c970a7b49 100644 --- a/src/mongo/db/commands/query_cmd/map_reduce_agg.cpp +++ b/src/mongo/db/commands/query_cmd/map_reduce_agg.cpp @@ -38,8 +38,6 @@ #include "mongo/db/commands/query_cmd/mr_common.h" #include "mongo/db/curop.h" #include "mongo/db/exec/disk_use_options_gen.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/expression_context_builder.h" @@ -56,6 +54,8 @@ #include "mongo/db/query/plan_executor_factory.h" #include "mongo/db/query/plan_explainer.h" #include "mongo/db/query/plan_summary_stats.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/storage/storage_options.h" #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/commands/query_cmd/mr_common.cpp b/src/mongo/db/commands/query_cmd/mr_common.cpp index 163d02ef935..b1687f9a1ed 100644 --- a/src/mongo/db/commands/query_cmd/mr_common.cpp +++ b/src/mongo/db/commands/query_cmd/mr_common.cpp @@ -41,7 +41,6 @@ #include "mongo/db/commands.h" #include "mongo/db/commands/query_cmd/map_reduce_javascript_code.h" #include "mongo/db/exec/inclusion_projection_executor.h" -#include "mongo/db/local_catalog/document_validation.h" #include "mongo/db/pipeline/accumulation_statement.h" #include "mongo/db/pipeline/accumulator.h" #include "mongo/db/pipeline/accumulator_js_reduce.h" @@ -65,6 +64,7 @@ #include "mongo/db/pipeline/transformer_interface.h" #include "mongo/db/query/compiler/logical_model/projection/projection_policies.h" #include "mongo/db/query/util/make_data_structure.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/util/assert_util.h" #include "mongo/util/intrusive_counter.h" diff --git a/src/mongo/db/commands/query_cmd/mr_test.cpp b/src/mongo/db/commands/query_cmd/mr_test.cpp index df4f6ce582d..a73b2b392b4 100644 --- a/src/mongo/db/commands/query_cmd/mr_test.cpp +++ b/src/mongo/db/commands/query_cmd/mr_test.cpp @@ -41,14 +41,6 @@ #include "mongo/db/commands/query_cmd/map_reduce_out_options.h" #include "mongo/db/commands/query_cmd/mr_common.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_noop.h" @@ -63,6 +55,14 @@ #include "mongo/db/repl/storage_interface_impl.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/rpc/factory.h" diff --git a/src/mongo/db/commands/query_cmd/plan_cache_clear_command.cpp b/src/mongo/db/commands/query_cmd/plan_cache_clear_command.cpp index 916d85a7ab3..01bac8e819a 100644 --- a/src/mongo/db/commands/query_cmd/plan_cache_clear_command.cpp +++ b/src/mongo/db/commands/query_cmd/plan_cache_clear_command.cpp @@ -40,8 +40,6 @@ #include "mongo/db/commands.h" #include "mongo/db/commands/query_cmd/plan_cache_commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/db_raii.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/profile_settings.h" @@ -50,6 +48,8 @@ #include "mongo/db/query/plan_cache/classic_plan_cache.h" #include "mongo/db/query/plan_cache/sbe_plan_cache.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" #include "mongo/logv2/log.h" #include "mongo/stdx/unordered_set.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/commands/query_cmd/plan_cache_commands_test.cpp b/src/mongo/db/commands/query_cmd/plan_cache_commands_test.cpp index fea72d0db40..995b2124311 100644 --- a/src/mongo/db/commands/query_cmd/plan_cache_commands_test.cpp +++ b/src/mongo/db/commands/query_cmd/plan_cache_commands_test.cpp @@ -31,14 +31,14 @@ #include "mongo/base/string_data.h" #include "mongo/bson/json.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_mock.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role_mock.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/plan_cache/classic_plan_cache.h" #include "mongo/db/query/plan_cache/plan_cache_key_factory.h" #include "mongo/db/query/query_test_service_context.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_mock.h" +#include "mongo/db/shard_role/shard_role_mock.h" #include "mongo/unittest/unittest.h" #include diff --git a/src/mongo/db/commands/query_cmd/query_settings_cmds.cpp b/src/mongo/db/commands/query_cmd/query_settings_cmds.cpp index fd627b24cb6..587134f69e8 100644 --- a/src/mongo/db/commands/query_cmd/query_settings_cmds.cpp +++ b/src/mongo/db/commands/query_cmd/query_settings_cmds.cpp @@ -36,7 +36,7 @@ #include "mongo/db/operation_context.h" #include "mongo/db/query/plan_cache/sbe_plan_cache.h" #include "mongo/db/query/query_settings/query_settings_service.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" #include "mongo/util/version/releases.h" diff --git a/src/mongo/db/commands/query_cmd/run_aggregate.cpp b/src/mongo/db/commands/query_cmd/run_aggregate.cpp index e7751d4c03c..1db6fdea50f 100644 --- a/src/mongo/db/commands/query_cmd/run_aggregate.cpp +++ b/src/mongo/db/commands/query_cmd/run_aggregate.cpp @@ -51,15 +51,6 @@ #include "mongo/db/exec/agg/exchange_stage.h" #include "mongo/db/exec/disk_use_options_gen.h" #include "mongo/db/fle_crud.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/external_data_source_scope_guard.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielders.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role_loop.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/logical_time.h" #include "mongo/db/memory_tracking/operation_memory_usage_tracker.h" #include "mongo/db/namespace_string.h" @@ -103,13 +94,22 @@ #include "mongo/db/query/query_stats/agg_key.h" #include "mongo/db/query/query_stats/query_stats.h" #include "mongo/db/query/shard_key_diagnostic_printer.h" -#include "mongo/db/raw_data_operation.h" #include "mongo/db/read_concern.h" #include "mongo/db/repl/read_concern_args.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/s/query_analysis_writer.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" #include "mongo/db/server_parameter.h" +#include "mongo/db/shard_role/resource_yielders.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/external_data_source_scope_guard.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" +#include "mongo/db/shard_role/shard_role_loop.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_options.h" #include "mongo/db/tenant_id.h" diff --git a/src/mongo/db/commands/query_cmd/run_aggregate.h b/src/mongo/db/commands/query_cmd/run_aggregate.h index 107d8f53711..33dd14c3fbd 100644 --- a/src/mongo/db/commands/query_cmd/run_aggregate.h +++ b/src/mongo/db/commands/query_cmd/run_aggregate.h @@ -34,11 +34,11 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/auth/privilege.h" #include "mongo/db/commands/server_status/server_status_metric.h" -#include "mongo/db/local_catalog/external_data_source_scope_guard.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/lite_parsed_pipeline.h" +#include "mongo/db/shard_role/shard_catalog/external_data_source_scope_guard.h" #include "mongo/rpc/op_msg_rpc_impls.h" #include "mongo/rpc/reply_builder_interface.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/commands/query_cmd/write_commands.cpp b/src/mongo/db/commands/query_cmd/write_commands.cpp index e86855c0940..a31bf400894 100644 --- a/src/mongo/db/commands/query_cmd/write_commands.cpp +++ b/src/mongo/db/commands/query_cmd/write_commands.cpp @@ -46,9 +46,6 @@ #include "mongo/db/exec/mutable_bson/document.h" #include "mongo/db/exec/mutable_bson/element.h" #include "mongo/db/fle_crud.h" -#include "mongo/db/local_catalog/collection_operation_source.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/local_executor.h" #include "mongo/db/namespace_string.h" #include "mongo/db/not_primary_error_tracker.h" @@ -67,12 +64,15 @@ #include "mongo/db/query/write_ops/write_ops_exec.h" #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" -#include "mongo/db/raw_data_operation.h" #include "mongo/db/repl/repl_client_info.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection_operation_source.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/timeseries/collection_pre_conditions_util.h" #include "mongo/db/timeseries/timeseries_index_schema_conversion_functions.h" diff --git a/src/mongo/db/commands/resize_oplog.cpp b/src/mongo/db/commands/resize_oplog.cpp index 06d59f68eac..8ebae812f13 100644 --- a/src/mongo/db/commands/resize_oplog.cpp +++ b/src/mongo/db/commands/resize_oplog.cpp @@ -38,14 +38,14 @@ #include "mongo/db/commands.h" #include "mongo/db/commands/resize_oplog_gen.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/storage/storage_options.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/idl/idl_parser.h" diff --git a/src/mongo/db/commands/server_status/server_status_command.cpp b/src/mongo/db/commands/server_status/server_status_command.cpp index 3c60cdf455e..d97b82e4d16 100644 --- a/src/mongo/db/commands/server_status/server_status_command.cpp +++ b/src/mongo/db/commands/server_status/server_status_command.cpp @@ -47,10 +47,10 @@ #include "mongo/db/commands/server_status/server_status.h" #include "mongo/db/commands/server_status/server_status_metric.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/stats/counters.h" #include "mongo/logv2/log.h" #include "mongo/platform/atomic_word.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 27521e9ccc2..0c3ebe2f10f 100644 --- a/src/mongo/db/commands/set_feature_compatibility_version_command.cpp +++ b/src/mongo/db/commands/set_feature_compatibility_version_command.cpp @@ -52,7 +52,6 @@ #include "mongo/db/feature_compatibility_version_documentation.h" #include "mongo/db/feature_flag.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/routing_information_cache.h" #include "mongo/db/global_catalog/ddl/cluster_ddl.h" #include "mongo/db/global_catalog/ddl/configsvr_coordinator_service.h" #include "mongo/db/global_catalog/ddl/drop_collection_coordinator.h" @@ -64,17 +63,6 @@ #include "mongo/db/global_catalog/ddl/shardsvr_join_ddl_coordinators_request_gen.h" #include "mongo/db/global_catalog/type_shard_identity.h" #include "mongo/db/index_builds/index_builds_coordinator.h" -#include "mongo/db/local_catalog/coll_mod.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog_helper.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/ddl/coll_mod_gen.h" -#include "mongo/db/local_catalog/ddl/list_collections_gen.h" -#include "mongo/db/local_catalog/drop_collection.h" -#include "mongo/db/local_catalog/drop_indexes.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -89,6 +77,7 @@ #include "mongo/db/repl/repl_client_info.h" #include "mongo/db/repl/repl_set_config.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/router_role/routing_cache/routing_information_cache.h" #include "mongo/db/s/active_migrations_registry.h" #include "mongo/db/s/migration_blocking_operation/multi_update_coordinator.h" #include "mongo/db/s/migration_util.h" @@ -99,14 +88,25 @@ #include "mongo/db/server_options.h" #include "mongo/db/server_parameter.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/coll_mod_gen.h" +#include "mongo/db/shard_role/ddl/list_collections_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/coll_mod.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/drop_collection.h" +#include "mongo/db/shard_role/shard_catalog/drop_indexes.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/storage/storage_parameters_gen.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/topology/sharding_state.h" -#include "mongo/db/user_write_block/write_block_bypass.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/user_write_block/write_block_bypass.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/write_concern.h" #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/commands/set_profiling_filter_globally_cmd.h b/src/mongo/db/commands/set_profiling_filter_globally_cmd.h index 5d43e76904e..a2cff7cc82b 100644 --- a/src/mongo/db/commands/set_profiling_filter_globally_cmd.h +++ b/src/mongo/db/commands/set_profiling_filter_globally_cmd.h @@ -35,9 +35,9 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection_catalog.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/commands/shardsvr_resolve_view_command.cpp b/src/mongo/db/commands/shardsvr_resolve_view_command.cpp index 9034499aa61..9574af46c59 100644 --- a/src/mongo/db/commands/shardsvr_resolve_view_command.cpp +++ b/src/mongo/db/commands/shardsvr_resolve_view_command.cpp @@ -39,11 +39,11 @@ #include "mongo/db/commands/shardsvr_resolve_view_command_gen.h" #include "mongo/db/database_name.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/db_raii.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" #include "mongo/db/views/view_catalog_helpers.h" #include "mongo/idl/idl_parser.h" #include "mongo/rpc/op_msg.h" diff --git a/src/mongo/db/commands/shardsvr_run_search_index_command.cpp b/src/mongo/db/commands/shardsvr_run_search_index_command.cpp index 5716b046577..dc2c29c8031 100644 --- a/src/mongo/db/commands/shardsvr_run_search_index_command.cpp +++ b/src/mongo/db/commands/shardsvr_run_search_index_command.cpp @@ -38,12 +38,12 @@ #include "mongo/db/commands/shardsvr_run_search_index_command_gen.h" #include "mongo/db/database_name.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/local_catalog/collection_catalog.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/search/search_index_common.h" #include "mongo/db/query/search/search_index_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" #include "mongo/idl/idl_parser.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/commands/sleep_command.cpp b/src/mongo/db/commands/sleep_command.cpp index 3178c93df34..35518e01217 100644 --- a/src/mongo/db/commands/sleep_command.cpp +++ b/src/mongo/db/commands/sleep_command.cpp @@ -34,12 +34,12 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" #include "mongo/util/clock_source.h" diff --git a/src/mongo/db/commands/snapshot_management.cpp b/src/mongo/db/commands/snapshot_management.cpp index 5d1ebc9d868..d2dae25c535 100644 --- a/src/mongo/db/commands/snapshot_management.cpp +++ b/src/mongo/db/commands/snapshot_management.cpp @@ -37,12 +37,12 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/logical_time.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/storage_interface.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/db/storage/snapshot_manager.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/commands/test_commands.cpp b/src/mongo/db/commands/test_commands.cpp index 328f04a10c9..cd83cec40de 100644 --- a/src/mongo/db/commands/test_commands.cpp +++ b/src/mongo/db/commands/test_commands.cpp @@ -45,16 +45,6 @@ #include "mongo/db/dbhelpers.h" #include "mongo/db/feature_flag_test_gen.h" #include "mongo/db/index_builds/index_builds_coordinator.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/profile_settings.h" #include "mongo/db/query/internal_plans.h" @@ -64,6 +54,16 @@ #include "mongo/db/record_id.h" #include "mongo/db/repl/intent_registry.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/storage_engine.h" diff --git a/src/mongo/db/commands/validate.cpp b/src/mongo/db/commands/validate.cpp index 6afc5e45c4a..26b0753102a 100644 --- a/src/mongo/db/commands/validate.cpp +++ b/src/mongo/db/commands/validate.cpp @@ -41,12 +41,12 @@ #include "mongo/db/commands/test_commands_enabled.h" #include "mongo/db/database_name.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/validate/collection_validation.h" #include "mongo/db/validate/validate_options.h" diff --git a/src/mongo/db/global_catalog/ddl/compact_structured_encryption_data_coordinator.cpp b/src/mongo/db/compact_structured_encryption_data_coordinator.cpp similarity index 97% rename from src/mongo/db/global_catalog/ddl/compact_structured_encryption_data_coordinator.cpp rename to src/mongo/db/compact_structured_encryption_data_coordinator.cpp index c445c691f3f..112539f46cd 100644 --- a/src/mongo/db/global_catalog/ddl/compact_structured_encryption_data_coordinator.cpp +++ b/src/mongo/db/compact_structured_encryption_data_coordinator.cpp @@ -28,7 +28,7 @@ */ -#include "mongo/db/global_catalog/ddl/compact_structured_encryption_data_coordinator.h" +#include "mongo/db/compact_structured_encryption_data_coordinator.h" #include "mongo/base/error_codes.h" #include "mongo/bson/bsonmisc.h" @@ -41,13 +41,13 @@ #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_gen.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/ddl/create_gen.h" -#include "mongo/db/local_catalog/ddl/drop_gen.h" -#include "mongo/db/local_catalog/ddl/rename_collection_gen.h" #include "mongo/db/server_parameter.h" #include "mongo/db/server_parameter_with_storage.h" +#include "mongo/db/shard_role/ddl/create_gen.h" +#include "mongo/db/shard_role/ddl/drop_gen.h" +#include "mongo/db/shard_role/ddl/rename_collection_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" #include "mongo/db/tenant_id.h" #include "mongo/db/write_concern_options.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/global_catalog/ddl/compact_structured_encryption_data_coordinator.h b/src/mongo/db/compact_structured_encryption_data_coordinator.h similarity index 98% rename from src/mongo/db/global_catalog/ddl/compact_structured_encryption_data_coordinator.h rename to src/mongo/db/compact_structured_encryption_data_coordinator.h index 42bdaa49ce4..628c4addd7a 100644 --- a/src/mongo/db/global_catalog/ddl/compact_structured_encryption_data_coordinator.h +++ b/src/mongo/db/compact_structured_encryption_data_coordinator.h @@ -35,7 +35,7 @@ #include "mongo/crypto/fle_stats_gen.h" #include "mongo/db/commands/fle2_compact.h" #include "mongo/db/commands/fle2_compact_gen.h" -#include "mongo/db/global_catalog/ddl/compact_structured_encryption_data_coordinator_gen.h" +#include "mongo/db/compact_structured_encryption_data_coordinator_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_service.h" #include "mongo/db/namespace_string.h" diff --git a/src/mongo/db/global_catalog/ddl/compact_structured_encryption_data_coordinator.idl b/src/mongo/db/compact_structured_encryption_data_coordinator.idl similarity index 100% rename from src/mongo/db/global_catalog/ddl/compact_structured_encryption_data_coordinator.idl rename to src/mongo/db/compact_structured_encryption_data_coordinator.idl diff --git a/src/mongo/db/crud_bm.cpp b/src/mongo/db/crud_bm.cpp index d6dc1984fcf..4a6023eb7a2 100644 --- a/src/mongo/db/crud_bm.cpp +++ b/src/mongo/db/crud_bm.cpp @@ -30,13 +30,6 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/global_settings.h" #include "mongo/db/index_builds/index_builds_coordinator_mongod.h" -#include "mongo/db/local_catalog/collection_catalog_helper.h" -#include "mongo/db/local_catalog/collection_impl.h" -#include "mongo/db/local_catalog/database_holder_impl.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state_factory_shard.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_shard.h" #include "mongo/db/op_observer/op_observer_registry.h" #include "mongo/db/operation_id.h" #include "mongo/db/repl/replication_consistency_markers_impl.h" @@ -50,6 +43,13 @@ #include "mongo/db/service_entry_point_bm_fixture.h" #include "mongo/db/service_entry_point_shard_role.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/collection_impl.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state_factory_shard.h" +#include "mongo/db/shard_role/shard_catalog/database_holder_impl.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state_factory_shard.h" #include "mongo/db/storage/control/storage_control.h" #include "mongo/db/storage/storage_options.h" #include "mongo/db/topology/cluster_role.h" diff --git a/src/mongo/db/curop.cpp b/src/mongo/db/curop.cpp index 6620421a351..d0f89e6c81e 100644 --- a/src/mongo/db/curop.cpp +++ b/src/mongo/db/curop.cpp @@ -43,15 +43,15 @@ #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/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context_options_gen.h" #include "mongo/db/profile_filter.h" #include "mongo/db/profile_settings.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/stats/timer_stats.h" #include "mongo/db/storage/execution_context.h" #include "mongo/db/storage/prepare_conflict_tracker.h" diff --git a/src/mongo/db/curop.h b/src/mongo/db/curop.h index 28e5fad8b56..d7bcc34571c 100644 --- a/src/mongo/db/curop.h +++ b/src/mongo/db/curop.h @@ -40,7 +40,6 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/flow_control_ticketholder.h" -#include "mongo/db/local_catalog/lock_manager/lock_stats.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_debug.h" #include "mongo/db/operation_context.h" @@ -53,6 +52,7 @@ #include "mongo/db/query/plan_summary_stats.h" #include "mongo/db/query/query_stats/data_bearing_node_metrics.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/lock_manager/lock_stats.h" #include "mongo/db/storage/storage_stats.h" #include "mongo/db/tenant_id.h" #include "mongo/db/write_concern_options.h" diff --git a/src/mongo/db/dbcommands.idl b/src/mongo/db/dbcommands.idl index da5f2afd7dd..87e70954451 100644 --- a/src/mongo/db/dbcommands.idl +++ b/src/mongo/db/dbcommands.idl @@ -29,7 +29,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/db/local_catalog/collection_options.idl" + - "mongo/db/shard_role/shard_catalog/collection_options.idl" - "mongo/db/pipeline/storage_stats_spec.idl" - "mongo/db/basic_types.idl" diff --git a/src/mongo/db/dbhelpers.cpp b/src/mongo/db/dbhelpers.cpp index dfd7c351798..27f77ee91f3 100644 --- a/src/mongo/db/dbhelpers.cpp +++ b/src/mongo/db/dbhelpers.cpp @@ -35,15 +35,6 @@ #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/curop.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_operation_source.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/matcher/extensions_callback_real.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" @@ -63,6 +54,15 @@ #include "mongo/db/query/write_ops/write_ops_parsers.h" #include "mongo/db/record_id_helpers.h" #include "mongo/db/repl/oplog.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_operation_source.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/snapshot.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/dbhelpers.h b/src/mongo/db/dbhelpers.h index 02d1aafcc48..96ceaceffdf 100644 --- a/src/mongo/db/dbhelpers.h +++ b/src/mongo/db/dbhelpers.h @@ -31,11 +31,11 @@ #include "mongo/base/status.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/update_result.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/default_max_time_ms_cluster_parameter.idl b/src/mongo/db/default_max_time_ms_cluster_parameter.idl index a5a936781ca..c867a665442 100644 --- a/src/mongo/db/default_max_time_ms_cluster_parameter.idl +++ b/src/mongo/db/default_max_time_ms_cluster_parameter.idl @@ -26,7 +26,7 @@ # it in the license file. imports: - - "mongo/db/cluster_parameters/cluster_server_parameter.idl" + - "mongo/db/topology/cluster_parameters/cluster_server_parameter.idl" global: cpp_namespace: mongo diff --git a/src/mongo/db/exec/BUILD.bazel b/src/mongo/db/exec/BUILD.bazel index ac90a05b84c..dca9474a7a0 100644 --- a/src/mongo/db/exec/BUILD.bazel +++ b/src/mongo/db/exec/BUILD.bazel @@ -193,12 +193,12 @@ mongo_cc_unit_test( "//src/mongo/db/exec/classic:query_shard_server_test_fixture", "//src/mongo/db/exec/document_value", "//src/mongo/db/exec/document_value:document_value_test_util", - "//src/mongo/db/local_catalog:catalog_test_fixture", "//src/mongo/db/pipeline:aggregation_context_fixture", "//src/mongo/db/pipeline/spilling:spilling_test_utils", "//src/mongo/db/query:query_test_service_context", "//src/mongo/db/query/collation:collator_factory_mock", "//src/mongo/db/query/collation:collator_interface_mock", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", "//src/mongo/db/timeseries:bucket_compression", "//src/mongo/dbtests:mocklib", "//src/mongo/util:clock_source_mock", diff --git a/src/mongo/db/exec/README.md b/src/mongo/db/exec/README.md index 42edda660a3..21ea3bc2142 100644 --- a/src/mongo/db/exec/README.md +++ b/src/mongo/db/exec/README.md @@ -24,7 +24,7 @@ acts as an adapter from [`mongo::PlanExecutor`](https://github.com/mongodb/mongo is responsible for acquiring and releasing the storage resources (snapshots, locks, etc.), so that they don't leave the `mongo::exec::agg::CursorStage` scope. Some of the storage resources are acquired and released by `mongo::PlanExecutor` via `mongo::PlanExecutor::restoreState` and `mongo::PlanExecutor::saveState`. -Before executing the `PlanExecutor`, `CursorStage` must first [restore the ShardRole resources](/src/mongo/db/local_catalog/shard_role_api/README_shard_role_api.md#yielding-and-restoring) associated with the enclosed `PlanExecutor`. `CursorStage` owns a reference to a `ShardRoleTransactionResourcesStasherForPipeline` object from which the ShardRole resources can be obtained. `CursorStage` must stash back the ShardRole resources before handing control to the next pipeline stage. +Before executing the `PlanExecutor`, `CursorStage` must first [restore the ShardRole resources](../shard_role/README_shard_role_api.md#yielding-and-restoring) associated with the enclosed `PlanExecutor`. `CursorStage` owns a reference to a `ShardRoleTransactionResourcesStasherForPipeline` object from which the ShardRole resources can be obtained. `CursorStage` must stash back the ShardRole resources before handing control to the next pipeline stage. In order to avoid acquiring and releasing resources for every call to `mongo::PlanExecutor:getNextDocument`, `mongo::exec::agg::CursorStage` diff --git a/src/mongo/db/exec/agg/change_stream_handle_topology_change_v2_stage.cpp b/src/mongo/db/exec/agg/change_stream_handle_topology_change_v2_stage.cpp index d33312a153d..12f56c4541d 100644 --- a/src/mongo/db/exec/agg/change_stream_handle_topology_change_v2_stage.cpp +++ b/src/mongo/db/exec/agg/change_stream_handle_topology_change_v2_stage.cpp @@ -32,7 +32,6 @@ #include "mongo/base/error_codes.h" #include "mongo/base/status.h" #include "mongo/db/exec/agg/document_source_to_stage_registry.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/global_catalog/type_shard.h" #include "mongo/db/pipeline/change_stream_helpers.h" #include "mongo/db/pipeline/change_stream_pipeline_helpers.h" @@ -47,6 +46,7 @@ #include "mongo/db/pipeline/resume_token.h" #include "mongo/db/query/compiler/parsers/matcher/expression_parser.h" #include "mongo/db/query/query_knobs_gen.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/db/sharding_environment/grid.h" diff --git a/src/mongo/db/exec/agg/exchange_stage.h b/src/mongo/db/exec/agg/exchange_stage.h index ca283895fe4..4880acd3742 100644 --- a/src/mongo/db/exec/agg/exchange_stage.h +++ b/src/mongo/db/exec/agg/exchange_stage.h @@ -36,7 +36,6 @@ #include "mongo/db/exec/agg/exec_pipeline.h" #include "mongo/db/exec/agg/stage.h" #include "mongo/db/exec/document_value/document.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielder.h" #include "mongo/db/memory_tracking/operation_memory_usage_tracker.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/document_source.h" @@ -44,6 +43,7 @@ #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/field_path.h" #include "mongo/db/pipeline/pipeline.h" +#include "mongo/db/shard_role/resource_yielder.h" #include "mongo/stdx/condition_variable.h" #include "mongo/stdx/mutex.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/exec/agg/graph_lookup_stage.cpp b/src/mongo/db/exec/agg/graph_lookup_stage.cpp index d5d78d22ba8..a9aa8dba9a2 100644 --- a/src/mongo/db/exec/agg/graph_lookup_stage.cpp +++ b/src/mongo/db/exec/agg/graph_lookup_stage.cpp @@ -39,7 +39,7 @@ #include "mongo/db/pipeline/pipeline.h" #include "mongo/db/pipeline/pipeline_factory.h" #include "mongo/db/query/stage_memory_limit_knobs/knobs.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/stats/counters.h" #include "mongo/db/views/resolved_view.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/exec/agg/internal_convert_bucket_index_stats_stage.cpp b/src/mongo/db/exec/agg/internal_convert_bucket_index_stats_stage.cpp index 7a27797b665..de7e2c548bb 100644 --- a/src/mongo/db/exec/agg/internal_convert_bucket_index_stats_stage.cpp +++ b/src/mongo/db/exec/agg/internal_convert_bucket_index_stats_stage.cpp @@ -31,9 +31,9 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/exec/agg/document_source_to_stage_registry.h" -#include "mongo/db/local_catalog/ddl/list_indexes_gen.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/pipeline/document_source_internal_convert_bucket_index_stats.h" +#include "mongo/db/shard_role/ddl/list_indexes_gen.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/timeseries/timeseries_index_schema_conversion_functions.h" namespace mongo { diff --git a/src/mongo/db/exec/agg/internal_list_collections_stage.cpp b/src/mongo/db/exec/agg/internal_list_collections_stage.cpp index e7719665bd2..20476982c97 100644 --- a/src/mongo/db/exec/agg/internal_list_collections_stage.cpp +++ b/src/mongo/db/exec/agg/internal_list_collections_stage.cpp @@ -34,8 +34,8 @@ #include "mongo/db/exec/agg/document_source_to_stage_registry.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/matcher/matcher.h" -#include "mongo/db/local_catalog/ddl/list_collections_gen.h" #include "mongo/db/pipeline/document_source_internal_list_collections.h" +#include "mongo/db/shard_role/ddl/list_collections_gen.h" #include "mongo/util/assert_util.h" #include diff --git a/src/mongo/db/exec/agg/lookup_stage.cpp b/src/mongo/db/exec/agg/lookup_stage.cpp index 643a7cdabc8..a91285f9096 100644 --- a/src/mongo/db/exec/agg/lookup_stage.cpp +++ b/src/mongo/db/exec/agg/lookup_stage.cpp @@ -36,7 +36,7 @@ #include "mongo/db/pipeline/optimization/optimize.h" #include "mongo/db/pipeline/pipeline_factory.h" #include "mongo/db/query/stage_memory_limit_knobs/knobs.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/views/resolved_view.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/exec/agg/out_stage.cpp b/src/mongo/db/exec/agg/out_stage.cpp index 83bcb76b3ca..c5a52f66d84 100644 --- a/src/mongo/db/exec/agg/out_stage.cpp +++ b/src/mongo/db/exec/agg/out_stage.cpp @@ -31,11 +31,11 @@ #include "mongo/db/curop_failpoint_helpers.h" #include "mongo/db/exec/agg/document_source_to_stage_registry.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch_info.h" #include "mongo/db/pipeline/document_source_out.h" #include "mongo/db/pipeline/writer_util.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/timeseries/timeseries_options.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/exec/agg/query_settings_stage.cpp b/src/mongo/db/exec/agg/query_settings_stage.cpp index 2f06ac252e4..115d75a65e9 100644 --- a/src/mongo/db/exec/agg/query_settings_stage.cpp +++ b/src/mongo/db/exec/agg/query_settings_stage.cpp @@ -38,9 +38,6 @@ #include "mongo/db/exec/agg/document_source_to_stage_registry.h" #include "mongo/db/exec/agg/stage.h" #include "mongo/db/exec/document_value/document.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/document_source.h" #include "mongo/db/pipeline/document_source_cursor.h" @@ -57,6 +54,9 @@ #include "mongo/db/query/query_settings/query_settings_gen.h" #include "mongo/db/query/query_settings/query_settings_service.h" #include "mongo/db/repl/read_concern_args.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/tenant_id.h" diff --git a/src/mongo/db/exec/classic/batched_delete_stage.cpp b/src/mongo/db/exec/classic/batched_delete_stage.cpp index b6991dfff3d..0e435f1a12d 100644 --- a/src/mongo/db/exec/classic/batched_delete_stage.cpp +++ b/src/mongo/db/exec/classic/batched_delete_stage.cpp @@ -41,15 +41,15 @@ #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/write_stage_common.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/canonical_query.h" #include "mongo/db/query/plan_executor.h" #include "mongo/db/query/plan_executor_impl.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/exceptions.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/snapshot.h" diff --git a/src/mongo/db/exec/classic/batched_delete_stage.h b/src/mongo/db/exec/classic/batched_delete_stage.h index 7fb5020edcf..9b6d0e1cda1 100644 --- a/src/mongo/db/exec/classic/batched_delete_stage.h +++ b/src/mongo/db/exec/classic/batched_delete_stage.h @@ -36,9 +36,9 @@ #include "mongo/db/exec/classic/plan_stage.h" #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/plan_stats.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/platform/atomic_word.h" #include "mongo/util/duration.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/exec/classic/collection_scan.cpp b/src/mongo/db/exec/classic/collection_scan.cpp index c1c62288ea6..965e025c39f 100644 --- a/src/mongo/db/exec/classic/collection_scan.cpp +++ b/src/mongo/db/exec/classic/collection_scan.cpp @@ -38,8 +38,6 @@ #include "mongo/db/exec/classic/filter.h" #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/collection_scan_common.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/plan_executor_impl.h" @@ -47,6 +45,8 @@ #include "mongo/db/repl/oplog_entry.h" #include "mongo/db/repl/oplog_entry_gen.h" #include "mongo/db/repl/optime.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/exec/classic/count_scan.h b/src/mongo/db/exec/classic/count_scan.h index 15664044570..9fe58c84e5b 100644 --- a/src/mongo/db/exec/classic/count_scan.h +++ b/src/mongo/db/exec/classic/count_scan.h @@ -35,14 +35,14 @@ #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/plan_stats.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h" #include "mongo/db/query/plan_executor.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/sorted_data_interface.h" #include "mongo/stdx/unordered_set.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/exec/classic/delete_stage.cpp b/src/mongo/db/exec/classic/delete_stage.cpp index c3f20b1c8e6..aedc405d62f 100644 --- a/src/mongo/db/exec/classic/delete_stage.cpp +++ b/src/mongo/db/exec/classic/delete_stage.cpp @@ -34,15 +34,15 @@ #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/write_stage_common.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/plan_executor.h" #include "mongo/db/query/plan_executor_impl.h" #include "mongo/db/record_id.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/storage/exceptions.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/exec/classic/delete_stage.h b/src/mongo/db/exec/classic/delete_stage.h index fced07fd38c..1eaa35a4896 100644 --- a/src/mongo/db/exec/classic/delete_stage.h +++ b/src/mongo/db/exec/classic/delete_stage.h @@ -36,12 +36,12 @@ #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/plan_stats.h" #include "mongo/db/exec/write_stage_common.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/profile_filter.h" #include "mongo/db/query/canonical_query.h" #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/exec/classic/distinct_scan.cpp b/src/mongo/db/exec/classic/distinct_scan.cpp index 64623a4e701..146811c97bb 100644 --- a/src/mongo/db/exec/classic/distinct_scan.cpp +++ b/src/mongo/db/exec/classic/distinct_scan.cpp @@ -41,11 +41,11 @@ #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/classic/working_set_common.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/query/plan_executor_impl.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/exec/classic/distinct_scan.h b/src/mongo/db/exec/classic/distinct_scan.h index 335f630b1bc..a3c7f0204fa 100644 --- a/src/mongo/db/exec/classic/distinct_scan.h +++ b/src/mongo/db/exec/classic/distinct_scan.h @@ -37,14 +37,14 @@ #include "mongo/db/exec/plan_stats.h" #include "mongo/db/exec/shard_filterer_impl.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/query/compiler/physical_model/index_bounds/index_bounds.h" #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h" #include "mongo/db/query/plan_executor.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/index_entry_comparison.h" #include "mongo/db/storage/sorted_data_interface.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/exec/classic/distinct_scan_bm.cpp b/src/mongo/db/exec/classic/distinct_scan_bm.cpp index fb14152c083..28098b3312d 100644 --- a/src/mongo/db/exec/classic/distinct_scan_bm.cpp +++ b/src/mongo/db/exec/classic/distinct_scan_bm.cpp @@ -37,9 +37,9 @@ #include "mongo/db/exec/classic/query_shard_server_test_fixture.h" #include "mongo/db/exec/shard_filterer_impl.h" #include "mongo/db/global_catalog/type_chunk.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" #include "mongo/db/query/compiler/optimizer/index_bounds_builder/index_bounds_builder.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/versioning_protocol/shard_version_factory.h" #include "mongo/unittest/benchmark_util.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/exec/classic/fetch.cpp b/src/mongo/db/exec/classic/fetch.cpp index 5232b26f7ef..312355c8a7e 100644 --- a/src/mongo/db/exec/classic/fetch.cpp +++ b/src/mongo/db/exec/classic/fetch.cpp @@ -32,8 +32,8 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/exec/classic/filter.h" #include "mongo/db/exec/classic/working_set_common.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/query/plan_executor_impl.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/assert_util.h" #include diff --git a/src/mongo/db/exec/classic/geo_near.h b/src/mongo/db/exec/classic/geo_near.h index 292f2f94034..50fccd2bb1c 100644 --- a/src/mongo/db/exec/classic/geo_near.h +++ b/src/mongo/db/exec/classic/geo_near.h @@ -39,13 +39,13 @@ #include "mongo/db/geo/r2_region_coverer.h" #include "mongo/db/geo/shapes.h" #include "mongo/db/index/s2_common.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/matcher/expression_geo.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/query/compiler/physical_model/index_bounds/index_bounds.h" #include "mongo/db/query/plan_executor.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/exec/classic/idhack.cpp b/src/mongo/db/exec/classic/idhack.cpp index a5a9eb234a0..66a81368dc0 100644 --- a/src/mongo/db/exec/classic/idhack.cpp +++ b/src/mongo/db/exec/classic/idhack.cpp @@ -34,9 +34,9 @@ #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/document_value/document_metadata_fields.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/query/plan_executor_impl.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/storage/index_entry_comparison.h" #include "mongo/db/storage/snapshot.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/exec/classic/idhack.h b/src/mongo/db/exec/classic/idhack.h index b2dce5a8d9b..62f3c196bd6 100644 --- a/src/mongo/db/exec/classic/idhack.h +++ b/src/mongo/db/exec/classic/idhack.h @@ -34,11 +34,11 @@ #include "mongo/db/exec/classic/requires_index_stage.h" #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/plan_stats.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/query/canonical_query.h" #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h" #include "mongo/db/query/plan_executor.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/record_store.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/exec/classic/index_scan.cpp b/src/mongo/db/exec/classic/index_scan.cpp index 3d9338a4999..a0e12842744 100644 --- a/src/mongo/db/exec/classic/index_scan.cpp +++ b/src/mongo/db/exec/classic/index_scan.cpp @@ -33,10 +33,10 @@ #include "mongo/db/exec/classic/filter.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/query/compiler/optimizer/index_bounds_builder/index_bounds_builder.h" #include "mongo/db/query/plan_executor_impl.h" #include "mongo/db/query/stage_memory_limit_knobs/knobs.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/exceptions.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/exec/classic/index_scan.h b/src/mongo/db/exec/classic/index_scan.h index 8edebf78848..f27f31b3067 100644 --- a/src/mongo/db/exec/classic/index_scan.h +++ b/src/mongo/db/exec/classic/index_scan.h @@ -36,14 +36,14 @@ #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/plan_stats.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/memory_tracking/memory_usage_tracker.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/query/compiler/physical_model/index_bounds/index_bounds.h" #include "mongo/db/query/plan_executor.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/index_entry_comparison.h" #include "mongo/db/storage/sorted_data_interface.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/exec/classic/multi_iterator.cpp b/src/mongo/db/exec/classic/multi_iterator.cpp index f532ec04a17..c743ce6b918 100644 --- a/src/mongo/db/exec/classic/multi_iterator.cpp +++ b/src/mongo/db/exec/classic/multi_iterator.cpp @@ -29,9 +29,9 @@ #include "mongo/db/exec/classic/multi_iterator.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/query/plan_executor_impl.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/exec/classic/multi_plan_rate_limiter.cpp b/src/mongo/db/exec/classic/multi_plan_rate_limiter.cpp index 8ac2289ad01..051ee837d77 100644 --- a/src/mongo/db/exec/classic/multi_plan_rate_limiter.cpp +++ b/src/mongo/db/exec/classic/multi_plan_rate_limiter.cpp @@ -30,8 +30,8 @@ #include "mongo/db/exec/classic/multi_plan_rate_limiter.h" #include "mongo/db/exec/classic/multi_plan_admission_context.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/query/plan_cache/plan_cache_key_factory.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" namespace mongo { namespace { diff --git a/src/mongo/db/exec/classic/query_shard_server_test_fixture.cpp b/src/mongo/db/exec/classic/query_shard_server_test_fixture.cpp index e538f133f20..1c14ca80483 100644 --- a/src/mongo/db/exec/classic/query_shard_server_test_fixture.cpp +++ b/src/mongo/db/exec/classic/query_shard_server_test_fixture.cpp @@ -29,7 +29,7 @@ #include "mongo/db/exec/classic/query_shard_server_test_fixture.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" namespace mongo { namespace { diff --git a/src/mongo/db/exec/classic/query_shard_server_test_fixture.h b/src/mongo/db/exec/classic/query_shard_server_test_fixture.h index 30857eb04aa..4dbd92e8664 100644 --- a/src/mongo/db/exec/classic/query_shard_server_test_fixture.h +++ b/src/mongo/db/exec/classic/query_shard_server_test_fixture.h @@ -33,9 +33,9 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/exec/classic/plan_stage.h" #include "mongo/db/global_catalog/type_chunk.h" -#include "mongo/db/local_catalog/shard_role_catalog/metadata_manager.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/expression_context_for_test.h" +#include "mongo/db/shard_role/shard_catalog/metadata_manager.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/exec/classic/record_store_fast_count.cpp b/src/mongo/db/exec/classic/record_store_fast_count.cpp index 926520e966a..f6707466f06 100644 --- a/src/mongo/db/exec/classic/record_store_fast_count.cpp +++ b/src/mongo/db/exec/classic/record_store_fast_count.cpp @@ -30,7 +30,7 @@ #include "mongo/db/exec/classic/record_store_fast_count.h" -#include "mongo/db/local_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/assert_util.h" namespace mongo { diff --git a/src/mongo/db/exec/classic/recordid_deduplicator.cpp b/src/mongo/db/exec/classic/recordid_deduplicator.cpp index f2e4b5c0895..4495baebf4a 100644 --- a/src/mongo/db/exec/classic/recordid_deduplicator.cpp +++ b/src/mongo/db/exec/classic/recordid_deduplicator.cpp @@ -31,9 +31,9 @@ #include "mongo/db/commands/server_status/server_status_metric.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/pipeline/spilling/spill_table_batch_writer.h" #include "mongo/db/query/util/spill_util.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/storage_options.h" #include "mongo/db/storage/storage_parameters_gen.h" diff --git a/src/mongo/db/exec/classic/recordid_deduplicator_test.cpp b/src/mongo/db/exec/classic/recordid_deduplicator_test.cpp index c0e26f4c827..adbbd33069f 100644 --- a/src/mongo/db/exec/classic/recordid_deduplicator_test.cpp +++ b/src/mongo/db/exec/classic/recordid_deduplicator_test.cpp @@ -33,10 +33,10 @@ #include "mongo/db/exec/classic/recordid_deduplicator.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" #include "mongo/db/pipeline/expression_context_for_test.h" #include "mongo/db/pipeline/process_interface/standalone_process_interface.h" #include "mongo/db/pipeline/spilling/spilling_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" #include "mongo/unittest/unittest.h" using namespace mongo; diff --git a/src/mongo/db/exec/classic/requires_collection_stage.h b/src/mongo/db/exec/classic/requires_collection_stage.h index 9f06d2b4b62..58c8293172f 100644 --- a/src/mongo/db/exec/classic/requires_collection_stage.h +++ b/src/mongo/db/exec/classic/requires_collection_stage.h @@ -30,13 +30,13 @@ #pragma once #include "mongo/db/exec/classic/plan_stage.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/query/plan_executor.h" #include "mongo/db/query/restore_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/util/modules.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/exec/classic/requires_index_stage.cpp b/src/mongo/db/exec/classic/requires_index_stage.cpp index c95505cde20..71a0896a038 100644 --- a/src/mongo/db/exec/classic/requires_index_stage.cpp +++ b/src/mongo/db/exec/classic/requires_index_stage.cpp @@ -30,8 +30,8 @@ #include "mongo/db/exec/classic/requires_index_stage.h" #include "mongo/base/error_codes.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/exec/classic/requires_index_stage.h b/src/mongo/db/exec/classic/requires_index_stage.h index a1b5ed8fad3..671b9d9911c 100644 --- a/src/mongo/db/exec/classic/requires_index_stage.h +++ b/src/mongo/db/exec/classic/requires_index_stage.h @@ -32,10 +32,10 @@ #include "mongo/db/exec/classic/requires_collection_stage.h" #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/query/plan_executor.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/exec/classic/shard_filter.h b/src/mongo/db/exec/classic/shard_filter.h index 808509d53cd..46b7655c227 100644 --- a/src/mongo/db/exec/classic/shard_filter.h +++ b/src/mongo/db/exec/classic/shard_filter.h @@ -33,9 +33,9 @@ #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/plan_stats.h" #include "mongo/db/exec/shard_filterer_impl.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/exec/classic/subplan.cpp b/src/mongo/db/exec/classic/subplan.cpp index 74e8e73067d..014e754c591 100644 --- a/src/mongo/db/exec/classic/subplan.cpp +++ b/src/mongo/db/exec/classic/subplan.cpp @@ -33,7 +33,6 @@ #include "mongo/base/status_with.h" #include "mongo/bson/bsonobj.h" #include "mongo/db/exec/plan_cache_util.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/query/collection_query_info.h" #include "mongo/db/query/compiler/ce/exact/exact_cardinality_impl.h" @@ -45,6 +44,7 @@ #include "mongo/db/query/plan_executor.h" #include "mongo/db/query/query_planner.h" #include "mongo/db/query/stage_builder/stage_builder_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/assert_util.h" #include "mongo/util/scopeguard.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/exec/classic/text_match.h b/src/mongo/db/exec/classic/text_match.h index b10fc65667c..e16aee0f0ae 100644 --- a/src/mongo/db/exec/classic/text_match.h +++ b/src/mongo/db/exec/classic/text_match.h @@ -36,9 +36,9 @@ #include "mongo/db/fts/fts_matcher.h" #include "mongo/db/fts/fts_query_impl.h" #include "mongo/db/fts/fts_spec.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/exec/classic/text_or.cpp b/src/mongo/db/exec/classic/text_or.cpp index 934026c88bd..6f7bebc8a38 100644 --- a/src/mongo/db/exec/classic/text_or.cpp +++ b/src/mongo/db/exec/classic/text_or.cpp @@ -35,13 +35,13 @@ #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/classic/working_set_common.h" #include "mongo/db/exec/document_value/document_metadata_fields.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/memory_tracking/operation_memory_usage_tracker.h" #include "mongo/db/query/plan_executor_impl.h" #include "mongo/db/query/query_feature_flags_gen.h" #include "mongo/db/query/stage_memory_limit_knobs/knobs.h" #include "mongo/db/query/util/spill_util.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/sorter/sorter_template_defs.h" #include "mongo/db/stats/counters.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/exec/classic/text_or_test.cpp b/src/mongo/db/exec/classic/text_or_test.cpp index b9badc86ff4..0c4c5c8b33b 100644 --- a/src/mongo/db/exec/classic/text_or_test.cpp +++ b/src/mongo/db/exec/classic/text_or_test.cpp @@ -39,13 +39,13 @@ #include "mongo/db/exec/classic/mock_stage.h" #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/classic/working_set_common.h" -#include "mongo/db/local_catalog/create_collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/query/query_knobs_gen.h" #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/exec/classic/timeseries_modify.cpp b/src/mongo/db/exec/classic/timeseries_modify.cpp index 8d9e233cd51..53bdb308bfb 100644 --- a/src/mongo/db/exec/classic/timeseries_modify.cpp +++ b/src/mongo/db/exec/classic/timeseries_modify.cpp @@ -41,9 +41,6 @@ #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/global_catalog/type_collection_common_types_gen.h" #include "mongo/db/internal_transactions_feature_flag_gen.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/plan_executor.h" @@ -51,6 +48,9 @@ #include "mongo/db/record_id.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/stats/counters.h" #include "mongo/db/storage/snapshot.h" diff --git a/src/mongo/db/exec/classic/timeseries_modify.h b/src/mongo/db/exec/classic/timeseries_modify.h index 239aaf1094a..5491c2e632c 100644 --- a/src/mongo/db/exec/classic/timeseries_modify.h +++ b/src/mongo/db/exec/classic/timeseries_modify.h @@ -42,16 +42,16 @@ #include "mongo/db/exec/write_stage_common.h" #include "mongo/db/field_ref.h" #include "mongo/db/field_ref_set.h" -#include "mongo/db/global_catalog/router_role_api/sharding_write_router.h" -#include "mongo/db/local_catalog/collection_operation_source.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/query/canonical_query.h" #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h" #include "mongo/db/query/write_ops/update_request.h" +#include "mongo/db/router_role/sharding_write_router.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection_operation_source.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/timeseries/bucket_catalog/bucket_catalog.h" #include "mongo/db/update/update_driver.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/exec/classic/timeseries_upsert.cpp b/src/mongo/db/exec/classic/timeseries_upsert.cpp index a581d93f104..83e99c22b60 100644 --- a/src/mongo/db/exec/classic/timeseries_upsert.cpp +++ b/src/mongo/db/exec/classic/timeseries_upsert.cpp @@ -38,14 +38,14 @@ #include "mongo/db/field_ref.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/internal_transactions_feature_flag_gen.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" #include "mongo/db/timeseries/timeseries_write_util.h" #include "mongo/db/timeseries/write_ops/timeseries_write_ops_utils.h" #include "mongo/db/update/update_driver.h" diff --git a/src/mongo/db/exec/classic/timeseries_upsert.h b/src/mongo/db/exec/classic/timeseries_upsert.h index cd7754937ab..6ea2d887169 100644 --- a/src/mongo/db/exec/classic/timeseries_upsert.h +++ b/src/mongo/db/exec/classic/timeseries_upsert.h @@ -35,10 +35,10 @@ #include "mongo/db/exec/classic/timeseries_modify.h" #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/timeseries/bucket_unpacker.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/query/write_ops/update_request.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/exec/classic/update_stage.cpp b/src/mongo/db/exec/classic/update_stage.cpp index 55289ac2e59..522a147474a 100644 --- a/src/mongo/db/exec/classic/update_stage.cpp +++ b/src/mongo/db/exec/classic/update_stage.cpp @@ -43,11 +43,6 @@ #include "mongo/db/field_ref.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/internal_transactions_feature_flag_gen.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_operation_source.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h" @@ -56,6 +51,11 @@ #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_options.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_operation_source.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/storage/exceptions.h" #include "mongo/db/storage/record_data.h" diff --git a/src/mongo/db/exec/classic/update_stage.h b/src/mongo/db/exec/classic/update_stage.h index 4e00f57a629..d783b47d15e 100644 --- a/src/mongo/db/exec/classic/update_stage.h +++ b/src/mongo/db/exec/classic/update_stage.h @@ -39,14 +39,14 @@ #include "mongo/db/exec/plan_stats.h" #include "mongo/db/exec/write_stage_common.h" #include "mongo/db/field_ref_set.h" -#include "mongo/db/global_catalog/router_role_api/sharding_write_router.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/query/canonical_query.h" #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h" #include "mongo/db/query/write_ops/update_request.h" #include "mongo/db/record_id.h" +#include "mongo/db/router_role/sharding_write_router.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/storage/damage_vector.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/update/update_driver.h" diff --git a/src/mongo/db/exec/classic/upsert_stage.cpp b/src/mongo/db/exec/classic/upsert_stage.cpp index 33eabf00c41..d5979c13976 100644 --- a/src/mongo/db/exec/classic/upsert_stage.cpp +++ b/src/mongo/db/exec/classic/upsert_stage.cpp @@ -40,21 +40,21 @@ #include "mongo/db/field_ref.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/internal_transactions_feature_flag_gen.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_operation_source.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/local_oplog_info.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/update_request.h" +#include "mongo/db/repl/local_oplog_info.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_options.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_operation_source.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/update/storage_validation.h" diff --git a/src/mongo/db/exec/classic/upsert_stage.h b/src/mongo/db/exec/classic/upsert_stage.h index a0d46a0ba90..9c53f16b5fb 100644 --- a/src/mongo/db/exec/classic/upsert_stage.h +++ b/src/mongo/db/exec/classic/upsert_stage.h @@ -35,8 +35,8 @@ #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/mutable_bson/document.h" #include "mongo/db/field_ref_set.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/pipeline/expression_context.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/util/modules.h" namespace mongo { diff --git a/src/mongo/db/exec/classic/working_set_common.cpp b/src/mongo/db/exec/classic/working_set_common.cpp index 463d92443b9..cede6bc85cb 100644 --- a/src/mongo/db/exec/classic/working_set_common.cpp +++ b/src/mongo/db/exec/classic/working_set_common.cpp @@ -41,13 +41,13 @@ #include "mongo/db/index/index_access_method.h" #include "mongo/db/index/multikey_paths.h" #include "mongo/db/index/preallocated_container_pool.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/index_entry_comparison.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/record_data.h" diff --git a/src/mongo/db/exec/document_value/BUILD.bazel b/src/mongo/db/exec/document_value/BUILD.bazel index 07c277db7b1..cb6a2cdf4c7 100644 --- a/src/mongo/db/exec/document_value/BUILD.bazel +++ b/src/mongo/db/exec/document_value/BUILD.bazel @@ -49,6 +49,6 @@ mongo_cc_benchmark( deps = [ ":document_value", "//src/mongo/db:server_base", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", ], ) diff --git a/src/mongo/db/exec/express/BUILD.bazel b/src/mongo/db/exec/express/BUILD.bazel index 5e3ff0cfe3e..b41d83518a7 100644 --- a/src/mongo/db/exec/express/BUILD.bazel +++ b/src/mongo/db/exec/express/BUILD.bazel @@ -22,10 +22,10 @@ mongo_cc_unit_test( "//src/mongo/db:shard_role", "//src/mongo/db:write_stage_common", "//src/mongo/db/collection_crud", - "//src/mongo/db/local_catalog:catalog_test_fixture", "//src/mongo/db/pipeline:expression_context_for_test", "//src/mongo/db/query:query_planner", "//src/mongo/db/query/collation:collator_interface_mock", "//src/mongo/db/query/compiler/logical_model/projection:projection_ast", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", ], ) diff --git a/src/mongo/db/exec/express/express_plan.cpp b/src/mongo/db/exec/express/express_plan.cpp index 211c58e02ad..f0861af5080 100644 --- a/src/mongo/db/exec/express/express_plan.cpp +++ b/src/mongo/db/exec/express/express_plan.cpp @@ -29,7 +29,7 @@ #include "mongo/db/exec/express/express_plan.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/util/stacktrace.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kQuery diff --git a/src/mongo/db/exec/express/express_plan.h b/src/mongo/db/exec/express/express_plan.h index bf705cacd33..843c8c0702e 100644 --- a/src/mongo/db/exec/express/express_plan.h +++ b/src/mongo/db/exec/express/express_plan.h @@ -39,12 +39,6 @@ #include "mongo/db/exec/write_stage_common.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/index/index_constants.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/collation/collation_index_key.h" @@ -56,6 +50,12 @@ #include "mongo/db/record_id.h" #include "mongo/db/record_id_helpers.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/storage/damage_vector.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/snapshot.h" diff --git a/src/mongo/db/exec/express/express_plan_test.cpp b/src/mongo/db/exec/express/express_plan_test.cpp index b73d9bbcce9..839c989dc92 100644 --- a/src/mongo/db/exec/express/express_plan_test.cpp +++ b/src/mongo/db/exec/express/express_plan_test.cpp @@ -35,13 +35,6 @@ #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/curop.h" #include "mongo/db/index/index_constants.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context_for_test.h" @@ -49,6 +42,13 @@ #include "mongo/db/query/compiler/logical_model/projection/projection_parser.h" #include "mongo/db/record_id.h" #include "mongo/db/repl/oplog.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/exec/express/plan_executor_express.cpp b/src/mongo/db/exec/express/plan_executor_express.cpp index 6bd59d808d6..f313871ed8b 100644 --- a/src/mongo/db/exec/express/plan_executor_express.cpp +++ b/src/mongo/db/exec/express/plan_executor_express.cpp @@ -37,11 +37,6 @@ #include "mongo/db/exec/plan_stats.h" #include "mongo/db/exec/write_stage_common.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_util.h" #include "mongo/db/matcher/expression_algo.h" #include "mongo/db/matcher/expression_leaf.h" #include "mongo/db/namespace_string.h" @@ -59,6 +54,11 @@ #include "mongo/db/query/write_ops/parsed_delete.h" #include "mongo/db/query/write_ops/parsed_update.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_util.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/stats/counters.h" #include "mongo/db/storage/exceptions.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/exec/express/plan_executor_express.h b/src/mongo/db/exec/express/plan_executor_express.h index e363e78deaa..d3181e143ca 100644 --- a/src/mongo/db/exec/express/plan_executor_express.h +++ b/src/mongo/db/exec/express/plan_executor_express.h @@ -28,7 +28,6 @@ */ #pragma once -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/compiler/metadata/index_entry.h" #include "mongo/db/query/plan_executor.h" @@ -36,6 +35,7 @@ #include "mongo/db/query/write_ops/parsed_delete.h" #include "mongo/db/query/write_ops/parsed_update.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/exec/expression/evaluate_sharding.cpp b/src/mongo/db/exec/expression/evaluate_sharding.cpp index 73bac463fe3..453b9ffa1bb 100644 --- a/src/mongo/db/exec/expression/evaluate_sharding.cpp +++ b/src/mongo/db/exec/expression/evaluate_sharding.cpp @@ -31,8 +31,6 @@ #include "mongo/bson/bsontypes.h" #include "mongo/db/fts/fts_spec.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/shard_cannot_refresh_due_to_locks_held_exception.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/index/2d_common.h" #include "mongo/db/index/2d_key_generator.h" @@ -44,12 +42,14 @@ #include "mongo/db/index/s2_common.h" #include "mongo/db/index/s2_key_generator.h" #include "mongo/db/index/wildcard_key_generator.h" +#include "mongo/db/index_key_validate.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/index_key_validate.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/collation/collator_factory_interface.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/versioning_protocol/chunk_version.h" diff --git a/src/mongo/db/exec/mutable_bson/BUILD.bazel b/src/mongo/db/exec/mutable_bson/BUILD.bazel index adb28edc9d1..b5e1b5f4068 100644 --- a/src/mongo/db/exec/mutable_bson/BUILD.bazel +++ b/src/mongo/db/exec/mutable_bson/BUILD.bazel @@ -44,8 +44,8 @@ mongo_cc_unit_test( deps = [ ":mutable_bson", ":mutable_bson_test_utils", - "//src/mongo/db/local_catalog/lock_manager", "//src/mongo/db/query/collation:collator_interface_mock", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/transport:transport_layer_common", ], ) diff --git a/src/mongo/db/exec/plan_cache_util.h b/src/mongo/db/exec/plan_cache_util.h index 96b906edb16..b7239ef48ae 100644 --- a/src/mongo/db/exec/plan_cache_util.h +++ b/src/mongo/db/exec/plan_cache_util.h @@ -33,7 +33,6 @@ #include "mongo/db/exec/classic/plan_stage.h" #include "mongo/db/exec/plan_stats.h" #include "mongo/db/exec/sbe/stages/stages.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/canonical_query.h" #include "mongo/db/query/collection_query_info.h" @@ -44,6 +43,7 @@ #include "mongo/db/query/plan_ranker.h" #include "mongo/db/query/plan_ranking_decision.h" #include "mongo/db/query/stage_builder/sbe/builder_data.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/exec/runtime_planners/classic_runtime_planner/idhack_planner.cpp b/src/mongo/db/exec/runtime_planners/classic_runtime_planner/idhack_planner.cpp index c74fc1a829f..e1dd0ccf925 100644 --- a/src/mongo/db/exec/runtime_planners/classic_runtime_planner/idhack_planner.cpp +++ b/src/mongo/db/exec/runtime_planners/classic_runtime_planner/idhack_planner.cpp @@ -33,7 +33,7 @@ #include "mongo/db/exec/classic/shard_filter.h" #include "mongo/db/exec/classic/sort_key_generator.h" #include "mongo/db/exec/runtime_planners/classic_runtime_planner/planner_interface.h" -#include "mongo/db/local_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" namespace mongo::classic_runtime_planner { diff --git a/src/mongo/db/exec/runtime_planners/classic_runtime_planner_for_sbe/BUILD.bazel b/src/mongo/db/exec/runtime_planners/classic_runtime_planner_for_sbe/BUILD.bazel index ca351a41928..09ef9e8b878 100644 --- a/src/mongo/db/exec/runtime_planners/classic_runtime_planner_for_sbe/BUILD.bazel +++ b/src/mongo/db/exec/runtime_planners/classic_runtime_planner_for_sbe/BUILD.bazel @@ -29,7 +29,7 @@ mongo_cc_unit_test( tags = ["mongo_unittest_third_group"], deps = [ ":classic_runtime_planner_for_sbe_test_util", - "//src/mongo/db/local_catalog:catalog_test_fixture", "//src/mongo/db/pipeline:expression_context_for_test", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", ], ) diff --git a/src/mongo/db/exec/runtime_planners/classic_runtime_planner_for_sbe/classic_runtime_planner_for_sbe_test.cpp b/src/mongo/db/exec/runtime_planners/classic_runtime_planner_for_sbe/classic_runtime_planner_for_sbe_test.cpp index 21b71ce4360..1bfd3430f8c 100644 --- a/src/mongo/db/exec/runtime_planners/classic_runtime_planner_for_sbe/classic_runtime_planner_for_sbe_test.cpp +++ b/src/mongo/db/exec/runtime_planners/classic_runtime_planner_for_sbe/classic_runtime_planner_for_sbe_test.cpp @@ -30,10 +30,6 @@ #include "mongo/bson/json.h" #include "mongo/db/exec/runtime_planners/classic_runtime_planner_for_sbe/classic_runtime_planner_for_sbe_test_util.h" #include "mongo/db/exec/runtime_planners/classic_runtime_planner_for_sbe/planner_interface.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/pipeline/document_source_internal_projection.h" #include "mongo/db/pipeline/expression_context_for_test.h" #include "mongo/db/query/canonical_query.h" @@ -44,6 +40,10 @@ #include "mongo/db/query/plan_cache/plan_cache_key_factory.h" #include "mongo/db/query/plan_yield_policy.h" #include "mongo/db/query/query_planner.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/exec/sbe/BUILD.bazel b/src/mongo/db/exec/sbe/BUILD.bazel index e604e8ae76c..70281dc5935 100644 --- a/src/mongo/db/exec/sbe/BUILD.bazel +++ b/src/mongo/db/exec/sbe/BUILD.bazel @@ -72,13 +72,13 @@ mongo_cc_library( "//src/mongo/db/exec/sbe:query_sbe_makeobj_spec", "//src/mongo/db/fts:base_fts", "//src/mongo/db/index:index_access_method", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/query:random_utils", "//src/mongo/db/query:spill_util", "//src/mongo/db/query/compiler/logical_model/sort_pattern", "//src/mongo/db/query/compiler/metadata:query_metadata", "//src/mongo/db/query/compiler/physical_model/index_bounds", "//src/mongo/db/query/util:field_set", + "//src/mongo/db/shard_role/lock_manager:exception_util", "//src/mongo/db/sorter:sorter_base", "//src/mongo/db/sorter:sorter_stats", "//src/mongo/db/storage:record_store_base", @@ -144,7 +144,6 @@ mongo_cc_library( "//src/mongo/db:service_context", "//src/mongo/db/exec:js_function", "//src/mongo/db/exec:scoped_timer", - "//src/mongo/db/local_catalog/lock_manager", "//src/mongo/db/pipeline", "//src/mongo/db/query:plan_yield_policy", "//src/mongo/db/query:query_knobs", @@ -152,6 +151,7 @@ mongo_cc_library( "//src/mongo/db/query/compiler/metadata:query_metadata", "//src/mongo/db/query/compiler/physical_model/index_bounds", "//src/mongo/db/query/stage_memory_limit_knobs", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/db/sorter:sorter_base", "//src/mongo/db/sorter:sorter_stats", "//src/mongo/db/storage:encryption_hooks", @@ -193,8 +193,8 @@ mongo_cc_library( "//src/mongo/db:query_exec", "//src/mongo/db:service_context_d_test_fixture", "//src/mongo/db/auth:authmocks", - "//src/mongo/db/local_catalog:catalog_test_fixture", "//src/mongo/db/query:query_test_service_context", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", "//src/mongo/executor:network_interface_mock", "//src/mongo/executor:task_executor_cursor", "//src/mongo/executor:task_executor_interface", diff --git a/src/mongo/db/exec/sbe/sbe_block_hashagg_test.cpp b/src/mongo/db/exec/sbe/sbe_block_hashagg_test.cpp index 337305cc024..4edc636fd15 100644 --- a/src/mongo/db/exec/sbe/sbe_block_hashagg_test.cpp +++ b/src/mongo/db/exec/sbe/sbe_block_hashagg_test.cpp @@ -33,7 +33,7 @@ #include "mongo/db/exec/sbe/stages/block_hashagg.h" #include "mongo/db/exec/sbe/values/slot.h" #include "mongo/db/exec/sbe/values/value.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include #include diff --git a/src/mongo/db/exec/sbe/sbe_hash_agg_test.cpp b/src/mongo/db/exec/sbe/sbe_hash_agg_test.cpp index 196c46dec92..8af3bc5eed3 100644 --- a/src/mongo/db/exec/sbe/sbe_hash_agg_test.cpp +++ b/src/mongo/db/exec/sbe/sbe_hash_agg_test.cpp @@ -45,13 +45,13 @@ #include "mongo/db/exec/sbe/stages/stages.h" #include "mongo/db/exec/sbe/values/slot.h" #include "mongo/db/exec/sbe/values/value.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/query/collation/collator_interface_mock.h" #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h" #include "mongo/db/query/stage_builder/sbe/gen_helpers.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/platform/atomic_word.h" #include "mongo/stdx/unordered_map.h" diff --git a/src/mongo/db/exec/sbe/sbe_ix_scan_bm.cpp b/src/mongo/db/exec/sbe/sbe_ix_scan_bm.cpp index d26dfb1efcb..b071aeeb144 100644 --- a/src/mongo/db/exec/sbe/sbe_ix_scan_bm.cpp +++ b/src/mongo/db/exec/sbe/sbe_ix_scan_bm.cpp @@ -36,10 +36,10 @@ #include "mongo/db/exec/sbe/stages/stages.h" #include "mongo/db/exec/sbe/values/slot.h" #include "mongo/db/exec/sbe/values/value.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/pipeline/expression_context_for_test.h" #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h" #include "mongo/db/query/multiple_collection_accessor.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/logv2/log.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/exec/sbe/sbe_plan_stage_test.h b/src/mongo/db/exec/sbe/sbe_plan_stage_test.h index 53316d26dcc..4b8a386dfc8 100644 --- a/src/mongo/db/exec/sbe/sbe_plan_stage_test.h +++ b/src/mongo/db/exec/sbe/sbe_plan_stage_test.h @@ -47,8 +47,8 @@ #include "mongo/db/exec/sbe/stages/stages.h" #include "mongo/db/exec/sbe/values/slot.h" #include "mongo/db/exec/sbe/values/value.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" #include "mongo/db/query/stage_builder/sbe/gen_helpers.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" #include "mongo/util/modules.h" namespace mongo::sbe { diff --git a/src/mongo/db/exec/sbe/sbe_scan_test.cpp b/src/mongo/db/exec/sbe/sbe_scan_test.cpp index 2be97c28d1a..318fa20d2b4 100644 --- a/src/mongo/db/exec/sbe/sbe_scan_test.cpp +++ b/src/mongo/db/exec/sbe/sbe_scan_test.cpp @@ -39,10 +39,10 @@ #include "mongo/db/exec/sbe/stages/stages.h" #include "mongo/db/exec/sbe/values/slot.h" #include "mongo/db/exec/sbe/values/value.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/pipeline/expression_context_for_test.h" #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h" #include "mongo/db/query/multiple_collection_accessor.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/logv2/log.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/exec/sbe/stages/collection_helpers.cpp b/src/mongo/db/exec/sbe/stages/collection_helpers.cpp index 5adf58a3670..68dd6f5d947 100644 --- a/src/mongo/db/exec/sbe/stages/collection_helpers.cpp +++ b/src/mongo/db/exec/sbe/stages/collection_helpers.cpp @@ -30,8 +30,8 @@ #include "mongo/db/exec/sbe/stages/collection_helpers.h" #include "mongo/base/error_codes.h" -#include "mongo/db/local_catalog/collection_catalog.h" #include "mongo/db/query/plan_yield_policy.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/exec/sbe/stages/collection_helpers.h b/src/mongo/db/exec/sbe/stages/collection_helpers.h index a615602b8ff..103a7c0d966 100644 --- a/src/mongo/db/exec/sbe/stages/collection_helpers.h +++ b/src/mongo/db/exec/sbe/stages/collection_helpers.h @@ -30,12 +30,12 @@ #pragma once #include "mongo/db/exec/sbe/values/slot.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/storage/record_store.h" #include "mongo/util/assert_util.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/exec/sbe/stages/ix_scan.cpp b/src/mongo/db/exec/sbe/stages/ix_scan.cpp index 8a35dafe22e..00adaf6d408 100644 --- a/src/mongo/db/exec/sbe/stages/ix_scan.cpp +++ b/src/mongo/db/exec/sbe/stages/ix_scan.cpp @@ -35,12 +35,12 @@ #include "mongo/db/exec/sbe/expressions/compile_ctx.h" #include "mongo/db/exec/sbe/expressions/expression.h" #include "mongo/db/exec/sbe/size_estimator.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/snapshot.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/exec/sbe/stages/ix_scan.h b/src/mongo/db/exec/sbe/stages/ix_scan.h index 4f82a976d95..826d7c2132d 100644 --- a/src/mongo/db/exec/sbe/stages/ix_scan.h +++ b/src/mongo/db/exec/sbe/stages/ix_scan.h @@ -44,11 +44,11 @@ #include "mongo/db/exec/sbe/values/value.h" #include "mongo/db/exec/sbe/vm/vm.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/compiler/physical_model/index_bounds/index_bounds.h" #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h" #include "mongo/db/query/plan_yield_policy.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/db/storage/index_entry_comparison.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/record_store.h" diff --git a/src/mongo/db/exec/sbe/stages/random_scan.cpp b/src/mongo/db/exec/sbe/stages/random_scan.cpp index 4a5f48da3f5..cebdfec57ab 100644 --- a/src/mongo/db/exec/sbe/stages/random_scan.cpp +++ b/src/mongo/db/exec/sbe/stages/random_scan.cpp @@ -41,7 +41,7 @@ #include "mongo/db/exec/sbe/stages/scan.h" #include "mongo/db/exec/sbe/values/bson.h" #include "mongo/db/exec/sbe/values/value.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_data.h" #include "mongo/platform/compiler.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/exec/sbe/stages/random_scan.h b/src/mongo/db/exec/sbe/stages/random_scan.h index 5125c675ac0..5c815c939c2 100644 --- a/src/mongo/db/exec/sbe/stages/random_scan.h +++ b/src/mongo/db/exec/sbe/stages/random_scan.h @@ -40,12 +40,12 @@ #include "mongo/db/exec/sbe/stages/stages.h" #include "mongo/db/exec/sbe/util/debug_print.h" #include "mongo/db/exec/sbe/values/slot.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h" #include "mongo/db/query/plan_yield_policy.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/db/storage/record_store.h" #include "mongo/platform/atomic_word.h" #include "mongo/stdx/mutex.h" diff --git a/src/mongo/db/exec/sbe/stages/scan.cpp b/src/mongo/db/exec/sbe/stages/scan.cpp index 30033ceccfb..723f0ab1e15 100644 --- a/src/mongo/db/exec/sbe/stages/scan.cpp +++ b/src/mongo/db/exec/sbe/stages/scan.cpp @@ -42,7 +42,7 @@ #include "mongo/db/exec/sbe/stages/scan.h" #include "mongo/db/exec/sbe/values/bson.h" #include "mongo/db/exec/sbe/values/value.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_data.h" #include "mongo/platform/compiler.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/exec/sbe/stages/scan.h b/src/mongo/db/exec/sbe/stages/scan.h index 600df05ca8c..9d574122c8f 100644 --- a/src/mongo/db/exec/sbe/stages/scan.h +++ b/src/mongo/db/exec/sbe/stages/scan.h @@ -40,12 +40,12 @@ #include "mongo/db/exec/sbe/stages/stages.h" #include "mongo/db/exec/sbe/util/debug_print.h" #include "mongo/db/exec/sbe/values/slot.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h" #include "mongo/db/query/plan_yield_policy.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/db/storage/record_store.h" #include "mongo/platform/atomic_word.h" #include "mongo/stdx/mutex.h" diff --git a/src/mongo/db/exec/sbe/util/spilling.cpp b/src/mongo/db/exec/sbe/util/spilling.cpp index 6c06f1c8fdb..c7d110df923 100644 --- a/src/mongo/db/exec/sbe/util/spilling.cpp +++ b/src/mongo/db/exec/sbe/util/spilling.cpp @@ -34,10 +34,10 @@ #include "mongo/base/string_data.h" #include "mongo/bson/timestamp.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/query/query_knobs_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_parameters_gen.h" diff --git a/src/mongo/db/exec/sbe/util/spilling.h b/src/mongo/db/exec/sbe/util/spilling.h index e1a6e463b3b..03fc9e0a38b 100644 --- a/src/mongo/db/exec/sbe/util/spilling.h +++ b/src/mongo/db/exec/sbe/util/spilling.h @@ -32,9 +32,9 @@ #include "mongo/bson/util/builder.h" #include "mongo/db/exec/sbe/values/row.h" #include "mongo/db/exec/sbe/values/slot.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/spill_table.h" diff --git a/src/mongo/db/exec/shard_filterer_impl.h b/src/mongo/db/exec/shard_filterer_impl.h index 84d862b1b94..32f9f488fa0 100644 --- a/src/mongo/db/exec/shard_filterer_impl.h +++ b/src/mongo/db/exec/shard_filterer_impl.h @@ -33,7 +33,7 @@ #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/shard_filterer.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/exec/trial_period_utils.cpp b/src/mongo/db/exec/trial_period_utils.cpp index 8bbbd81700d..4a7270bd35c 100644 --- a/src/mongo/db/exec/trial_period_utils.cpp +++ b/src/mongo/db/exec/trial_period_utils.cpp @@ -29,9 +29,9 @@ #include "mongo/db/exec/trial_period_utils.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/query/find_command.h" #include "mongo/db/query/query_knob_configuration.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include diff --git a/src/mongo/db/exec/write_stage_common.cpp b/src/mongo/db/exec/write_stage_common.cpp index 58f67ee6d73..b3e31eaec35 100644 --- a/src/mongo/db/exec/write_stage_common.cpp +++ b/src/mongo/db/exec/write_stage_common.cpp @@ -35,15 +35,15 @@ #include "mongo/db/exec/matcher/matcher.h" #include "mongo/db/exec/shard_filterer_impl.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/canonical_query.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/snapshot.h" diff --git a/src/mongo/db/feature_flag_test.idl.tpl b/src/mongo/db/feature_flag_test.idl.tpl index bcef0306a39..d01df03d3a1 100644 --- a/src/mongo/db/feature_flag_test.idl.tpl +++ b/src/mongo/db/feature_flag_test.idl.tpl @@ -22,7 +22,7 @@ global: imports: - "mongo/db/basic_types.idl" - - "mongo/db/cluster_parameters/cluster_server_parameter.idl" + - "mongo/db/topology/cluster_parameters/cluster_server_parameter.idl" structs: CWSPIntStorage: diff --git a/src/mongo/db/fle_crud_mongod.cpp b/src/mongo/db/fle_crud_mongod.cpp index c6be31ef89a..77f3bce3833 100644 --- a/src/mongo/db/fle_crud_mongod.cpp +++ b/src/mongo/db/fle_crud_mongod.cpp @@ -42,14 +42,6 @@ #include "mongo/db/fle_crud.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/index/index_constants.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielder.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" @@ -69,6 +61,14 @@ #include "mongo/db/session/session.h" #include "mongo/db/session/session_catalog.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/resource_yielder.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/index_entry_comparison.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/record_data.h" diff --git a/src/mongo/db/fle_crud_test.cpp b/src/mongo/db/fle_crud_test.cpp index 8de2206651f..0bd2aafe714 100644 --- a/src/mongo/db/fle_crud_test.cpp +++ b/src/mongo/db/fle_crud_test.cpp @@ -53,9 +53,6 @@ #include "mongo/db/client.h" #include "mongo/db/fle_query_interface_mock.h" #include "mongo/db/fts/unicode/string.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/query/collation/collator_interface.h" @@ -68,6 +65,9 @@ #include "mongo/db/repl/storage_interface_impl.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/idl/idl_parser.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/platform/atomic_word.h" diff --git a/src/mongo/db/ftdc/collector.cpp b/src/mongo/db/ftdc/collector.cpp index 11661ca8056..bbe05b29aab 100644 --- a/src/mongo/db/ftdc/collector.cpp +++ b/src/mongo/db/ftdc/collector.cpp @@ -37,10 +37,10 @@ #include "mongo/db/client_strand.h" #include "mongo/db/ftdc/collection_metrics.h" #include "mongo/db/ftdc/constants.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/replica_set_endpoint_util.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/ftdc/ftdc_mongod.cpp b/src/mongo/db/ftdc/ftdc_mongod.cpp index 4c7115ecae1..63d0b678145 100644 --- a/src/mongo/db/ftdc/ftdc_mongod.cpp +++ b/src/mongo/db/ftdc/ftdc_mongod.cpp @@ -42,10 +42,10 @@ #include "mongo/db/ftdc/ftdc_mongod_gen.h" #include "mongo/db/ftdc/ftdc_mongos.h" #include "mongo/db/ftdc/ftdc_server.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/storage/storage_options.h" #include "mongo/db/topology/cluster_role.h" diff --git a/src/mongo/db/ftdc/ftdc_server.cpp b/src/mongo/db/ftdc/ftdc_server.cpp index 08bb96a020f..56177b799c6 100644 --- a/src/mongo/db/ftdc/ftdc_server.cpp +++ b/src/mongo/db/ftdc/ftdc_server.cpp @@ -41,10 +41,10 @@ #include "mongo/db/ftdc/controller.h" #include "mongo/db/ftdc/ftdc_server_gen.h" #include "mongo/db/ftdc/ftdc_system_stats.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/mirror_maestro.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/tenant_id.h" #include "mongo/rpc/get_status_from_command_result.h" diff --git a/src/mongo/db/global_catalog/chunk_manager_query_test.cpp b/src/mongo/db/global_catalog/chunk_manager_query_test.cpp index 16609235157..b2fca5a7012 100644 --- a/src/mongo/db/global_catalog/chunk_manager_query_test.cpp +++ b/src/mongo/db/global_catalog/chunk_manager_query_test.cpp @@ -34,8 +34,6 @@ #include "mongo/bson/json.h" #include "mongo/bson/oid.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_test_fixture.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/chunks_test_util.h" #include "mongo/db/global_catalog/shard_key_pattern.h" @@ -46,6 +44,8 @@ #include "mongo/db/query/collation/collator_factory_interface.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/query/collation/collator_interface_mock.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_test_fixture.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" diff --git a/src/mongo/db/global_catalog/chunk_manager_refresh_bm.cpp b/src/mongo/db/global_catalog/chunk_manager_refresh_bm.cpp index c140eb58b94..4d2bef7eecf 100644 --- a/src/mongo/db/global_catalog/chunk_manager_refresh_bm.cpp +++ b/src/mongo/db/global_catalog/chunk_manager_refresh_bm.cpp @@ -40,9 +40,9 @@ #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_collection_common_types_gen.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/collation/collator_interface.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.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" diff --git a/src/mongo/db/global_catalog/chunk_manager_test.cpp b/src/mongo/db/global_catalog/chunk_manager_test.cpp index 145e446fbd9..a5afb4bd4ba 100644 --- a/src/mongo/db/global_catalog/chunk_manager_test.cpp +++ b/src/mongo/db/global_catalog/chunk_manager_test.cpp @@ -32,10 +32,10 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/json.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_test_fixture.h" #include "mongo/db/global_catalog/type_shard.h" #include "mongo/db/hasher.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_test_fixture.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/unittest/unittest.h" #include "mongo/util/duration.h" diff --git a/src/mongo/db/global_catalog/ddl/BUILD.bazel b/src/mongo/db/global_catalog/ddl/BUILD.bazel index 61338081102..4b6f3b3d5dc 100644 --- a/src/mongo/db/global_catalog/ddl/BUILD.bazel +++ b/src/mongo/db/global_catalog/ddl/BUILD.bazel @@ -19,16 +19,6 @@ idl_generator( ], ) -idl_generator( - name = "cleanup_structured_encryption_data_coordinator_gen", - src = "cleanup_structured_encryption_data_coordinator.idl", - deps = [ - "//src/mongo/db:basic_types_gen", - "//src/mongo/db/commands:fle2_cleanup_gen", - "//src/mongo/db/global_catalog/ddl:sharding_ddl_coordinator_gen", - ], -) - idl_generator( name = "clone_authoritative_metadata_coordinator_gen", src = "clone_authoritative_metadata_coordinator.idl", @@ -45,7 +35,7 @@ idl_generator( deps = [ "//src/mongo/db:basic_types_gen", "//src/mongo/db/global_catalog/ddl:sharding_ddl_coordinator_gen", - "//src/mongo/db/local_catalog/ddl:coll_mod_gen", + "//src/mongo/db/shard_role/ddl:coll_mod_gen", "//src/mongo/db/sharding_environment:sharding_types_gen", ], ) @@ -61,17 +51,6 @@ idl_generator( ], ) -idl_generator( - name = "compact_structured_encryption_data_coordinator_gen", - src = "compact_structured_encryption_data_coordinator.idl", - deps = [ - "//src/mongo/crypto:fle_field_schema_gen", - "//src/mongo/db:basic_types_gen", - "//src/mongo/db/commands:fle2_compact_gen", - "//src/mongo/db/global_catalog/ddl:sharding_ddl_coordinator_gen", - ], -) - idl_generator( name = "configsvr_coordinator_gen", src = "configsvr_coordinator.idl", @@ -147,7 +126,7 @@ idl_generator( deps = [ "//src/mongo/db:basic_types_gen", "//src/mongo/db/global_catalog/ddl:sharding_ddl_coordinator_gen", - "//src/mongo/db/local_catalog/ddl:drop_indexes_gen", + "//src/mongo/db/shard_role/ddl:drop_indexes_gen", "//src/mongo/db/sharding_environment:sharding_types_gen", ], ) @@ -190,15 +169,6 @@ idl_generator( ], ) -idl_generator( - name = "remove_tags_gen", - src = "remove_tags.idl", - deps = [ - "//src/mongo/db:basic_types_gen", - "//src/mongo/idl:generic_argument_gen", - ], -) - idl_generator( name = "set_allow_migrations_coordinator_document_gen", src = "set_allow_migrations_coordinator_document.idl", @@ -214,7 +184,7 @@ idl_generator( src = "sharded_collmod.idl", deps = [ "//src/mongo/db:basic_types_gen", - "//src/mongo/db/local_catalog/ddl:coll_mod_gen", + "//src/mongo/db/shard_role/ddl:coll_mod_gen", ], ) @@ -359,15 +329,15 @@ idl_generator( "//src/mongo/db:keypattern_gen", "//src/mongo/db/global_catalog:type_database_gen", "//src/mongo/db/global_catalog/metadata_consistency_validation:metadata_consistency_types_gen", - "//src/mongo/db/local_catalog/ddl:coll_mod_gen", - "//src/mongo/db/local_catalog/ddl:create_gen", - "//src/mongo/db/local_catalog/ddl:drop_database_gen", - "//src/mongo/db/local_catalog/ddl:drop_indexes_gen", - "//src/mongo/db/local_catalog/ddl:rename_collection_gen", "//src/mongo/db/query/client_cursor:cursor_response_gen", + "//src/mongo/db/shard_role/ddl:coll_mod_gen", + "//src/mongo/db/shard_role/ddl:create_gen", + "//src/mongo/db/shard_role/ddl:drop_database_gen", + "//src/mongo/db/shard_role/ddl:drop_indexes_gen", + "//src/mongo/db/shard_role/ddl:rename_collection_gen", "//src/mongo/db/sharding_environment:sharding_types_gen", "//src/mongo/db/timeseries:timeseries_gen", - "//src/mongo/db/user_write_block:set_user_write_block_mode_gen", + "//src/mongo/db/topology/user_write_block:set_user_write_block_mode_gen", "//src/mongo/s/resharding:common_types_gen", ], ) diff --git a/src/mongo/db/global_catalog/ddl/OWNERS.yml b/src/mongo/db/global_catalog/ddl/OWNERS.yml index 6141f6cbe84..79468f0ba0d 100644 --- a/src/mongo/db/global_catalog/ddl/OWNERS.yml +++ b/src/mongo/db/global_catalog/ddl/OWNERS.yml @@ -15,14 +15,6 @@ filters: approvers: - 10gen/server-catalog-and-routing-ddl - 10gen/server-cluster-scalability - - "cleanup_structured*": - approvers: - - 10gen/server-catalog-and-routing-ddl - - 10gen/server-security - - "compact_structured*": - approvers: - - 10gen/server-catalog-and-routing-ddl - - 10gen/server-security - "*refine_collection_shard_key*": approvers: - 10gen/server-cluster-scalability diff --git a/src/mongo/db/global_catalog/ddl/README_ddl_operations.md b/src/mongo/db/global_catalog/ddl/README_ddl_operations.md index 4219fde38ec..de3006ab4d0 100644 --- a/src/mongo/db/global_catalog/ddl/README_ddl_operations.md +++ b/src/mongo/db/global_catalog/ddl/README_ddl_operations.md @@ -1,6 +1,6 @@ # DDL Operations -On the Sharding team, we use the term _DDL_ to mean any operation that needs to update any subset of [catalog containers](../../local_catalog/README_sharding_catalog.md#catalog-containers). Within this definition, there are standard DDLs that use the DDL coordinator infrastructure as well as non-standard DDLs that each have their own implementations. +On the Sharding team, we use the term _DDL_ to mean any operation that needs to update any subset of [catalog containers](../../shard_role/shard_catalog/README_sharding_catalog.md#catalog-containers). Within this definition, there are standard DDLs that use the DDL coordinator infrastructure as well as non-standard DDLs that each have their own implementations. ## Standard DDLs @@ -72,7 +72,7 @@ When a new primary node is elected, the DDL primary only service is rebuilt, and ### Sections about specific standard DDL operations -- [User write blocking](../../user_write_block/README_user_write_blocking.md) +- [User write blocking](../../topology/user_write_block/README_user_write_blocking.md) ## Non-Standard DDLs diff --git a/src/mongo/db/global_catalog/ddl/README_transactions_and_ddl.md b/src/mongo/db/global_catalog/ddl/README_transactions_and_ddl.md index f6328244333..8a253a48a33 100644 --- a/src/mongo/db/global_catalog/ddl/README_transactions_and_ddl.md +++ b/src/mongo/db/global_catalog/ddl/README_transactions_and_ddl.md @@ -43,7 +43,7 @@ in itself cannot forbid the following anomalies: unable to observe the incoming range. Processing this request would miss data belonging to that range. This anomaly could occur when a range migration interleaves with an uncommitted transaction. - **Collection generation anomaly:** The router forwards a request to the shard relative to a - [collection generation](/src/mongo/db/local_catalog/README_terminology.md) + [collection generation](../../shard_role/shard_catalog/README_terminology.md) that is newer than the one in the shard's snapshot. This could occur, for instance, when the collection's namespace is recreated on the shard after the transaction has established a snapshot. - **Collection incarnation anomaly:** Similar to the collection generation anomaly, but concerning diff --git a/src/mongo/db/global_catalog/ddl/clone_authoritative_metadata_coordinator.cpp b/src/mongo/db/global_catalog/ddl/clone_authoritative_metadata_coordinator.cpp index 2c162f737e2..4e749b62ed7 100644 --- a/src/mongo/db/global_catalog/ddl/clone_authoritative_metadata_coordinator.cpp +++ b/src/mongo/db/global_catalog/ddl/clone_authoritative_metadata_coordinator.cpp @@ -32,9 +32,9 @@ #include "mongo/db/global_catalog/ddl/ddl_lock_manager.h" #include "mongo/db/global_catalog/ddl/shardsvr_commit_create_database_metadata_command.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/executor/scoped_task_executor.h" diff --git a/src/mongo/db/global_catalog/ddl/cluster_change_primary_cmd.cpp b/src/mongo/db/global_catalog/ddl/cluster_change_primary_cmd.cpp index cc8a583cc7a..44b813a84ca 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_change_primary_cmd.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_change_primary_cmd.cpp @@ -36,11 +36,11 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/ddl/move_primary_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/namespace_string.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" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" diff --git a/src/mongo/db/global_catalog/ddl/cluster_collection_mod_cmd.cpp b/src/mongo/db/global_catalog/ddl/cluster_collection_mod_cmd.cpp index b92c2d6e113..ad293d187fa 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_collection_mod_cmd.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_collection_mod_cmd.cpp @@ -44,16 +44,16 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch_info.h" -#include "mongo/db/local_catalog/ddl/coll_mod_gen.h" -#include "mongo/db/local_catalog/ddl/coll_mod_reply_validation.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/explain_verbosity_gen.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" +#include "mongo/db/shard_role/ddl/coll_mod_gen.h" +#include "mongo/db/shard_role/ddl/coll_mod_reply_validation.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/executor/remote_command_response.h" diff --git a/src/mongo/db/global_catalog/ddl/cluster_convert_to_capped_cmd.cpp b/src/mongo/db/global_catalog/ddl/cluster_convert_to_capped_cmd.cpp index 755f8166d8b..1c131c0f7b0 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_convert_to_capped_cmd.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_convert_to_capped_cmd.cpp @@ -33,7 +33,7 @@ #include "mongo/db/commands.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/executor/remote_command_response.h" #include "mongo/rpc/get_status_from_command_result.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 eac02e6fe72..f132cbf3731 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_create_cmd.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_create_cmd.cpp @@ -33,14 +33,14 @@ #include "mongo/db/auth/authorization_checks.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/commands.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/ddl/cluster_ddl.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/ddl/create_gen.h" #include "mongo/db/namespace_string.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" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/create_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/write_concern.h" 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 b200d5bbd5e..9aac59c85a1 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 @@ -42,17 +42,17 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/ddl/cluster_ddl.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" -#include "mongo/db/global_catalog/router_role_api/collection_uuid_mismatch.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch_info.h" -#include "mongo/db/local_catalog/ddl/create_indexes_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/legacy_runtime_constants_gen.h" #include "mongo/db/query/explain_verbosity_gen.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" +#include "mongo/db/router_role/collection_uuid_mismatch.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/create_indexes_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/timeseries/timeseries_commands_conversion_helper.h" #include "mongo/idl/idl_parser.h" diff --git a/src/mongo/db/global_catalog/ddl/cluster_ddl.cpp b/src/mongo/db/global_catalog/ddl/cluster_ddl.cpp index aad0ce02b0f..09865d4db66 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_ddl.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_ddl.cpp @@ -37,10 +37,10 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/shard_registry.h" diff --git a/src/mongo/db/global_catalog/ddl/cluster_ddl.h b/src/mongo/db/global_catalog/ddl/cluster_ddl.h index 94dc8cb4df6..c4754fd5797 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_ddl.h +++ b/src/mongo/db/global_catalog/ddl/cluster_ddl.h @@ -31,9 +31,9 @@ #include "mongo/base/string_data.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/operation_context.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/sharding_environment/shard_id.h" #include diff --git a/src/mongo/db/global_catalog/ddl/cluster_drop_collection_cmd.cpp b/src/mongo/db/global_catalog/ddl/cluster_drop_collection_cmd.cpp index cbdf3447434..23d02bc8264 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_drop_collection_cmd.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_drop_collection_cmd.cpp @@ -38,14 +38,14 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch_info.h" -#include "mongo/db/local_catalog/ddl/drop_gen.h" #include "mongo/db/namespace_string.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" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/drop_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/executor/remote_command_response.h" 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 be64c543acf..1e5da08c6df 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 @@ -36,13 +36,13 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/local_catalog/ddl/drop_database_gen.h" #include "mongo/db/namespace_string.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" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/drop_database_gen.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/executor/remote_command_response.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 05be8d1e033..39b46347316 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 @@ -40,14 +40,14 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/local_catalog/ddl/drop_indexes_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/explain_verbosity_gen.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" +#include "mongo/db/shard_role/ddl/drop_indexes_gen.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/executor/remote_command_response.h" 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 b2b3ae4a1f2..161d8f8bda3 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 @@ -36,10 +36,10 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/cluster_commands_gen.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 9e592d01ff4..5bea8ca8863 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 @@ -49,14 +49,14 @@ #include "mongo/db/exec/mutable_bson/algorithm.h" #include "mongo/db/exec/mutable_bson/document.h" #include "mongo/db/exec/mutable_bson/element.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/global_catalog/type_database_gen.h" -#include "mongo/db/local_catalog/ddl/list_collections_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/explain_verbosity_gen.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" +#include "mongo/db/shard_role/ddl/list_collections_gen.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/executor/remote_command_response.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 a467e3de6c6..e12413c339d 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,11 +38,11 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/local_catalog/ddl/list_databases_gen.h" #include "mongo/db/namespace_string.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/shard_role/ddl/list_databases_gen.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" diff --git a/src/mongo/db/global_catalog/ddl/cluster_list_indexes_cmd.cpp b/src/mongo/db/global_catalog/ddl/cluster_list_indexes_cmd.cpp index 4af460d994c..a7208f66728 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_list_indexes_cmd.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_list_indexes_cmd.cpp @@ -39,13 +39,13 @@ #include "mongo/db/auth/privilege.h" #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" -#include "mongo/db/local_catalog/ddl/list_indexes_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/list_indexes_gen.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/timeseries/timeseries_commands_conversion_helper.h" diff --git a/src/mongo/db/global_catalog/ddl/cluster_merge_all_chunks_on_shard_cmd.cpp b/src/mongo/db/global_catalog/ddl/cluster_merge_all_chunks_on_shard_cmd.cpp index 3e36ec594fd..e0e8191a959 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_merge_all_chunks_on_shard_cmd.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_merge_all_chunks_on_shard_cmd.cpp @@ -35,10 +35,10 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/ddl/merge_chunk_request_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" diff --git a/src/mongo/db/global_catalog/ddl/cluster_merge_chunks_cmd.cpp b/src/mongo/db/global_catalog/ddl/cluster_merge_chunks_cmd.cpp index d7671d2d7f1..5274d7903ac 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_merge_chunks_cmd.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_merge_chunks_cmd.cpp @@ -36,9 +36,9 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/ddl/merge_chunk_request_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/namespace_string.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/grid.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/global_catalog/ddl/cluster_move_primary_cmd.cpp b/src/mongo/db/global_catalog/ddl/cluster_move_primary_cmd.cpp index a85721c88ee..2ad3256820e 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_move_primary_cmd.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_move_primary_cmd.cpp @@ -36,11 +36,11 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/ddl/move_primary_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/namespace_string.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" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" diff --git a/src/mongo/db/global_catalog/ddl/cluster_refine_collection_shard_key_cmd.cpp b/src/mongo/db/global_catalog/ddl/cluster_refine_collection_shard_key_cmd.cpp index ef3c4863bf5..21a909661ca 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_refine_collection_shard_key_cmd.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_refine_collection_shard_key_cmd.cpp @@ -37,12 +37,12 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/ddl/refine_collection_shard_key_gen.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/namespace_string.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" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" diff --git a/src/mongo/db/global_catalog/ddl/cluster_rename_collection_cmd.cpp b/src/mongo/db/global_catalog/ddl/cluster_rename_collection_cmd.cpp index 8dca92c1cf1..90bcda4b453 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_rename_collection_cmd.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_rename_collection_cmd.cpp @@ -37,17 +37,17 @@ #include "mongo/db/commands.h" #include "mongo/db/curop_failpoint_helpers.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/ddl/cluster_ddl.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/global_catalog/type_database_gen.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch_info.h" -#include "mongo/db/local_catalog/ddl/rename_collection_common.h" -#include "mongo/db/local_catalog/ddl/rename_collection_gen.h" #include "mongo/db/namespace_string.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" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/rename_collection_common.h" +#include "mongo/db/shard_role/ddl/rename_collection_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/shard_registry.h" diff --git a/src/mongo/db/global_catalog/ddl/cluster_set_allow_migrations_cmd.cpp b/src/mongo/db/global_catalog/ddl/cluster_set_allow_migrations_cmd.cpp index 5f750c3bf56..046037db0bb 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_set_allow_migrations_cmd.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_set_allow_migrations_cmd.cpp @@ -36,12 +36,12 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/ddl/set_allow_migrations_gen.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/namespace_string.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" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" diff --git a/src/mongo/db/global_catalog/ddl/cluster_untrack_unsplittable_collection.cpp b/src/mongo/db/global_catalog/ddl/cluster_untrack_unsplittable_collection.cpp index 34b97ad3460..2caa6296bb4 100644 --- a/src/mongo/db/global_catalog/ddl/cluster_untrack_unsplittable_collection.cpp +++ b/src/mongo/db/global_catalog/ddl/cluster_untrack_unsplittable_collection.cpp @@ -32,8 +32,8 @@ #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/global_catalog/ddl/untrack_unsplittable_collection_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/profile_settings.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" #include "mongo/db/sharding_environment/grid.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kSharding diff --git a/src/mongo/db/global_catalog/ddl/collmod_coordinator.cpp b/src/mongo/db/global_catalog/ddl/collmod_coordinator.cpp index a181471e9ab..d7f21e0d1b2 100644 --- a/src/mongo/db/global_catalog/ddl/collmod_coordinator.cpp +++ b/src/mongo/db/global_catalog/ddl/collmod_coordinator.cpp @@ -37,21 +37,21 @@ #include "mongo/db/client.h" #include "mongo/db/commands.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_util.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/global_catalog/type_database_gen.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/coll_mod.h" -#include "mongo/db/local_catalog/ddl/coll_mod_gen.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/participant_block_gen.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/s/forwardable_operation_metadata.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/ddl/coll_mod_gen.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/coll_mod.h" +#include "mongo/db/shard_role/shard_catalog/participant_block_gen.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/timeseries/catalog_helper.h" diff --git a/src/mongo/db/global_catalog/ddl/collmod_coordinator.h b/src/mongo/db/global_catalog/ddl/collmod_coordinator.h index 1a06d6dc153..e21cae1e41c 100644 --- a/src/mongo/db/global_catalog/ddl/collmod_coordinator.h +++ b/src/mongo/db/global_catalog/ddl/collmod_coordinator.h @@ -38,10 +38,10 @@ #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_service.h" -#include "mongo/db/local_catalog/ddl/coll_mod_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/write_ops.h" +#include "mongo/db/shard_role/ddl/coll_mod_gen.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/executor/scoped_task_executor.h" diff --git a/src/mongo/db/global_catalog/ddl/collmod_coordinator_document.idl b/src/mongo/db/global_catalog/ddl/collmod_coordinator_document.idl index 9d33311c948..ac4188e36a1 100644 --- a/src/mongo/db/global_catalog/ddl/collmod_coordinator_document.idl +++ b/src/mongo/db/global_catalog/ddl/collmod_coordinator_document.idl @@ -36,7 +36,7 @@ global: imports: - "mongo/db/basic_types.idl" - - "mongo/db/local_catalog/ddl/coll_mod.idl" + - "mongo/db/shard_role/ddl/coll_mod.idl" - "mongo/db/global_catalog/ddl/sharding_ddl_coordinator.idl" - "mongo/db/sharding_environment/sharding_types.idl" diff --git a/src/mongo/db/global_catalog/ddl/configsvr_collmod_command.cpp b/src/mongo/db/global_catalog/ddl/configsvr_collmod_command.cpp index d6b8e31d957..a432c10910e 100644 --- a/src/mongo/db/global_catalog/ddl/configsvr_collmod_command.cpp +++ b/src/mongo/db/global_catalog/ddl/configsvr_collmod_command.cpp @@ -36,13 +36,13 @@ #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/ddl/sharded_collmod_gen.h" #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" -#include "mongo/db/local_catalog/ddl/coll_mod_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/coll_mod_gen.h" #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/rpc/op_msg.h" diff --git a/src/mongo/db/global_catalog/ddl/configsvr_coordinator_service.cpp b/src/mongo/db/global_catalog/ddl/configsvr_coordinator_service.cpp index 4ff2d8bda07..2a57c5f491b 100644 --- a/src/mongo/db/global_catalog/ddl/configsvr_coordinator_service.cpp +++ b/src/mongo/db/global_catalog/ddl/configsvr_coordinator_service.cpp @@ -35,14 +35,14 @@ #include "mongo/bson/bsonmisc.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/client/dbclient_cursor.h" -#include "mongo/db/cluster_parameters/set_cluster_parameter_coordinator.h" -#include "mongo/db/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_catalog/ddl/configsvr_coordinator.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_service.h" #include "mongo/db/query/find_command.h" #include "mongo/db/repl/primary_only_service.h" -#include "mongo/db/user_write_block/set_user_write_block_mode_coordinator.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator.h" +#include "mongo/db/topology/cluster_parameters/sharding_cluster_parameters_gen.h" +#include "mongo/db/topology/user_write_block/set_user_write_block_mode_coordinator.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" #include "mongo/util/future.h" diff --git a/src/mongo/db/global_catalog/ddl/configsvr_coordinator_service_test.cpp b/src/mongo/db/global_catalog/ddl/configsvr_coordinator_service_test.cpp index fbcf9211ff7..464b5ae915e 100644 --- a/src/mongo/db/global_catalog/ddl/configsvr_coordinator_service_test.cpp +++ b/src/mongo/db/global_catalog/ddl/configsvr_coordinator_service_test.cpp @@ -32,13 +32,13 @@ #include "mongo/bson/bsonmisc.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/client.h" -#include "mongo/db/cluster_parameters/set_cluster_parameter_coordinator_document_gen.h" #include "mongo/db/global_catalog/ddl/configsvr_coordinator.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_service.h" #include "mongo/db/repl/primary_only_service_test_fixture.h" #include "mongo/db/repl/storage_interface.h" #include "mongo/db/repl/storage_interface_mock.h" -#include "mongo/db/user_write_block/set_user_write_block_mode_coordinator_document_gen.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator_document_gen.h" +#include "mongo/db/topology/user_write_block/set_user_write_block_mode_coordinator_document_gen.h" #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" #include "mongo/util/fail_point.h" 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 e0f6e6ce1dc..edc18cc139d 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 @@ -39,8 +39,6 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/routing_information_cache.h" #include "mongo/db/global_catalog/ddl/repair_sharded_collection_chunks_history_gen.h" #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" #include "mongo/db/logical_time.h" @@ -48,10 +46,12 @@ #include "mongo/db/operation_context.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/read_concern_level.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/routing_information_cache.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/topology/cluster_role.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/util/assert_util.h" #include "mongo/util/namespace_string_util.h" 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 98836e185a0..c72eed7965b 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 @@ -45,9 +45,6 @@ #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/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/find_command.h" @@ -55,6 +52,9 @@ #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/repl/storage_interface.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/storage/storage_options.h" #include "mongo/db/tenant_id.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/global_catalog/ddl/convert_to_capped_coordinator.cpp b/src/mongo/db/global_catalog/ddl/convert_to_capped_coordinator.cpp index 4c0af85c746..e3e468441d8 100644 --- a/src/mongo/db/global_catalog/ddl/convert_to_capped_coordinator.cpp +++ b/src/mongo/db/global_catalog/ddl/convert_to_capped_coordinator.cpp @@ -36,15 +36,15 @@ #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_util.h" #include "mongo/db/global_catalog/ddl/sharding_recovery_service.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/ddl/list_collections_gen.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/s/config/initial_split_policy.h" +#include "mongo/db/shard_role/ddl/list_collections_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/sharding_environment/sharding_logging.h" #include "mongo/db/topology/sharding_state.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/db/versioning_protocol/shard_version_factory.h" #include "mongo/executor/async_rpc.h" diff --git a/src/mongo/db/global_catalog/ddl/convert_to_capped_coordinator.h b/src/mongo/db/global_catalog/ddl/convert_to_capped_coordinator.h index 1124a2aa606..c272e904047 100644 --- a/src/mongo/db/global_catalog/ddl/convert_to_capped_coordinator.h +++ b/src/mongo/db/global_catalog/ddl/convert_to_capped_coordinator.h @@ -31,7 +31,7 @@ #include "mongo/db/global_catalog/ddl/convert_to_capped_coordinator_document_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator.h" -#include "mongo/db/local_catalog/shard_role_catalog/participant_block_gen.h" +#include "mongo/db/shard_role/shard_catalog/participant_block_gen.h" namespace mongo { diff --git a/src/mongo/db/global_catalog/ddl/create_collection_coordinator.cpp b/src/mongo/db/global_catalog/ddl/create_collection_coordinator.cpp index 911ae646f4a..d1727da4d26 100644 --- a/src/mongo/db/global_catalog/ddl/create_collection_coordinator.cpp +++ b/src/mongo/db/global_catalog/ddl/create_collection_coordinator.cpp @@ -45,7 +45,6 @@ #include "mongo/db/database_name.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/create_collection_coordinator_document_gen.h" #include "mongo/db/global_catalog/ddl/notify_sharding_event_gen.h" @@ -58,7 +57,6 @@ #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/ddl/sharding_util.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_collection.h" @@ -66,19 +64,6 @@ #include "mongo/db/global_catalog/type_namespace_placement_gen.h" #include "mongo/db/global_catalog/type_tags.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_catalog_helper.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch.h" -#include "mongo/db/local_catalog/ddl/create_gen.h" -#include "mongo/db/local_catalog/ddl/list_collections_gen.h" -#include "mongo/db/local_catalog/ddl/list_indexes_gen.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/query/collation/collator_factory_interface.h" #include "mongo/db/query/collation/collator_interface.h" @@ -87,10 +72,25 @@ #include "mongo/db/repl/change_stream_oplog_notification.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/repl/repl_client_info.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/s/forwardable_operation_metadata.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/ddl/create_gen.h" +#include "mongo/db/shard_role/ddl/list_collections_gen.h" +#include "mongo/db/shard_role/ddl/list_indexes_gen.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" @@ -103,8 +103,8 @@ #include "mongo/db/timeseries/timeseries_options.h" #include "mongo/db/topology/shard_registry.h" #include "mongo/db/topology/sharding_state.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/db/transaction/transaction_api.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/db/versioning_protocol/shard_version.h" #include "mongo/db/versioning_protocol/shard_version_factory.h" 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 9a26c56c8e9..d0339df08ef 100644 --- a/src/mongo/db/global_catalog/ddl/create_collection_coordinator.h +++ b/src/mongo/db/global_catalog/ddl/create_collection_coordinator.h @@ -39,13 +39,13 @@ #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_service.h" #include "mongo/db/global_catalog/shard_key_pattern.h" -#include "mongo/db/local_catalog/shard_role_catalog/participant_block_gen.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/namespace_string.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" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/shard_catalog/participant_block_gen.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/executor/scoped_task_executor.h" #include "mongo/executor/task_executor.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/global_catalog/ddl/create_database_coordinator.cpp b/src/mongo/db/global_catalog/ddl/create_database_coordinator.cpp index fba553a3f7d..119a8d36d07 100644 --- a/src/mongo/db/global_catalog/ddl/create_database_coordinator.cpp +++ b/src/mongo/db/global_catalog/ddl/create_database_coordinator.cpp @@ -34,7 +34,7 @@ #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_util.h" #include "mongo/db/global_catalog/ddl/sharding_util.h" -#include "mongo/db/local_catalog/shard_role_catalog/participant_block_gen.h" +#include "mongo/db/shard_role/shard_catalog/participant_block_gen.h" #include "mongo/executor/async_rpc.h" namespace mongo { diff --git a/src/mongo/db/global_catalog/ddl/ddl_lock_manager.cpp b/src/mongo/db/global_catalog/ddl/ddl_lock_manager.cpp index 1592333624d..a486f6331cd 100644 --- a/src/mongo/db/global_catalog/ddl/ddl_lock_manager.cpp +++ b/src/mongo/db/global_catalog/ddl/ddl_lock_manager.cpp @@ -32,11 +32,11 @@ #include "mongo/db/cancelable_operation_context.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/lock_manager/resource_catalog.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h" #include "mongo/db/namespace_string.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" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/logv2/log.h" #include "mongo/stdx/mutex.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/global_catalog/ddl/ddl_lock_manager.h b/src/mongo/db/global_catalog/ddl/ddl_lock_manager.h index e8c23e14ca1..062c8fb16d4 100644 --- a/src/mongo/db/global_catalog/ddl/ddl_lock_manager.h +++ b/src/mongo/db/global_catalog/ddl/ddl_lock_manager.h @@ -31,10 +31,10 @@ #include "mongo/base/string_data.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/stdx/mutex.h" #include "mongo/util/duration.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/global_catalog/ddl/ddl_lock_manager_test.cpp b/src/mongo/db/global_catalog/ddl/ddl_lock_manager_test.cpp index 9bc62e2dabc..9a01c41a07d 100644 --- a/src/mongo/db/global_catalog/ddl/ddl_lock_manager_test.cpp +++ b/src/mongo/db/global_catalog/ddl/ddl_lock_manager_test.cpp @@ -31,9 +31,9 @@ #include "mongo/base/string_data.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/global_catalog/ddl/drop_agg_temp_collections.cpp b/src/mongo/db/global_catalog/ddl/drop_agg_temp_collections.cpp index 7b5b78b77bd..ad457efe8bb 100644 --- a/src/mongo/db/global_catalog/ddl/drop_agg_temp_collections.cpp +++ b/src/mongo/db/global_catalog/ddl/drop_agg_temp_collections.cpp @@ -32,12 +32,12 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/sharding_environment/grid.h" -#include "mongo/db/user_write_block/write_block_bypass.h" +#include "mongo/db/topology/user_write_block/write_block_bypass.h" #include "mongo/util/log_and_backoff.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kQuery diff --git a/src/mongo/db/global_catalog/ddl/drop_collection_coordinator.cpp b/src/mongo/db/global_catalog/ddl/drop_collection_coordinator.cpp index 7f1ce3175bd..fef81e0d1d1 100644 --- a/src/mongo/db/global_catalog/ddl/drop_collection_coordinator.cpp +++ b/src/mongo/db/global_catalog/ddl/drop_collection_coordinator.cpp @@ -35,23 +35,23 @@ #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/notify_sharding_event_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_util.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/ddl/drop_gen.h" -#include "mongo/db/local_catalog/drop_collection.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/participant_block_gen.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/query/query_feature_flags_gen.h" #include "mongo/db/repl/repl_client_info.h" #include "mongo/db/s/range_deletion_util.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/ddl/drop_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/drop_collection.h" +#include "mongo/db/shard_role/shard_catalog/participant_block_gen.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_logging.h" #include "mongo/db/topology/sharding_state.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/logv2/log.h" #include "mongo/util/future_impl.h" #include "mongo/util/uuid.h" 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 80f34d8ac69..783d5cf3427 100644 --- a/src/mongo/db/global_catalog/ddl/drop_collection_coordinator.h +++ b/src/mongo/db/global_catalog/ddl/drop_collection_coordinator.h @@ -38,10 +38,10 @@ #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_service.h" -#include "mongo/db/local_catalog/drop_collection.h" #include "mongo/db/namespace_string.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" #include "mongo/executor/scoped_task_executor.h" #include "mongo/util/assert_util.h" #include "mongo/util/cancellation.h" 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 50183e3b367..f09abfb7fd6 100644 --- a/src/mongo/db/global_catalog/ddl/drop_database_coordinator.cpp +++ b/src/mongo/db/global_catalog/ddl/drop_database_coordinator.cpp @@ -46,9 +46,6 @@ #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/global_catalog/type_namespace_placement_gen.h" -#include "mongo/db/local_catalog/ddl/list_collections_filter.h" -#include "mongo/db/local_catalog/shard_role_catalog/flush_database_cache_updates_gen.h" -#include "mongo/db/local_catalog/shard_role_catalog/participant_block_gen.h" #include "mongo/db/logical_time.h" #include "mongo/db/query/query_feature_flags_gen.h" #include "mongo/db/query/write_ops/write_ops_gen.h" @@ -57,15 +54,18 @@ #include "mongo/db/s/forwardable_operation_metadata.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/ddl/list_collections_filter.h" +#include "mongo/db/shard_role/shard_catalog/flush_database_cache_updates_gen.h" +#include "mongo/db/shard_role/shard_catalog/participant_block_gen.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/sharding_logging.h" #include "mongo/db/tenant_id.h" #include "mongo/db/topology/shard_registry.h" #include "mongo/db/topology/sharding_state.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/db/transaction/transaction_api.h" -#include "mongo/db/vector_clock/vector_clock.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/db/write_concern.h" #include "mongo/db/write_concern_options.h" diff --git a/src/mongo/db/global_catalog/ddl/drop_indexes_coordinator.cpp b/src/mongo/db/global_catalog/ddl/drop_indexes_coordinator.cpp index 547e17031dc..8b5657e84d4 100644 --- a/src/mongo/db/global_catalog/ddl/drop_indexes_coordinator.cpp +++ b/src/mongo/db/global_catalog/ddl/drop_indexes_coordinator.cpp @@ -30,8 +30,8 @@ #include "mongo/db/global_catalog/ddl/drop_indexes_coordinator.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_util_detail.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/timeseries/catalog_helper.h" #include "mongo/db/timeseries/timeseries_commands_conversion_helper.h" #include "mongo/db/topology/sharding_state.h" diff --git a/src/mongo/db/global_catalog/ddl/drop_indexes_coordinator_document.idl b/src/mongo/db/global_catalog/ddl/drop_indexes_coordinator_document.idl index 4fd0be51d4d..f5f70983f36 100644 --- a/src/mongo/db/global_catalog/ddl/drop_indexes_coordinator_document.idl +++ b/src/mongo/db/global_catalog/ddl/drop_indexes_coordinator_document.idl @@ -36,7 +36,7 @@ global: imports: - "mongo/db/basic_types.idl" - - "mongo/db/local_catalog/ddl/drop_indexes.idl" + - "mongo/db/shard_role/ddl/drop_indexes.idl" - "mongo/db/global_catalog/ddl/sharding_ddl_coordinator.idl" - "mongo/db/sharding_environment/sharding_types.idl" diff --git a/src/mongo/db/global_catalog/ddl/initialize_placement_history_coordinator.cpp b/src/mongo/db/global_catalog/ddl/initialize_placement_history_coordinator.cpp index f12b67861aa..1e12e19bd85 100644 --- a/src/mongo/db/global_catalog/ddl/initialize_placement_history_coordinator.cpp +++ b/src/mongo/db/global_catalog/ddl/initialize_placement_history_coordinator.cpp @@ -34,9 +34,9 @@ #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" #include "mongo/db/global_catalog/ddl/sharding_util.h" #include "mongo/db/global_catalog/ddl/shardsvr_join_ddl_coordinators_request_gen.h" -#include "mongo/db/local_catalog/drop_collection.h" +#include "mongo/db/shard_role/shard_catalog/drop_collection.h" #include "mongo/db/sharding_environment/sharding_logging.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kSharding diff --git a/src/mongo/db/global_catalog/ddl/migration_blocking_operation_coordinator_test.cpp b/src/mongo/db/global_catalog/ddl/migration_blocking_operation_coordinator_test.cpp index 2ae24fb9b84..49b9ba954f7 100644 --- a/src/mongo/db/global_catalog/ddl/migration_blocking_operation_coordinator_test.cpp +++ b/src/mongo/db/global_catalog/ddl/migration_blocking_operation_coordinator_test.cpp @@ -31,8 +31,8 @@ #include "mongo/db/global_catalog/ddl/migration_blocking_operation_coordinator_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_external_state_for_test.h" -#include "mongo/db/local_catalog/catalog_raii.h" #include "mongo/db/repl/primary_only_service_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" #include "mongo/stdx/thread.h" #include "mongo/unittest/death_test.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 965e5e1acee..33722d6e4b1 100644 --- a/src/mongo/db/global_catalog/ddl/move_primary_coordinator.cpp +++ b/src/mongo/db/global_catalog/ddl/move_primary_coordinator.cpp @@ -47,28 +47,28 @@ #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/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/ddl/list_collections_filter.h" -#include "mongo/db/local_catalog/ddl/list_collections_gen.h" -#include "mongo/db/local_catalog/drop_collection.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/participant_block_gen.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" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/ddl/list_collections_filter.h" +#include "mongo/db/shard_role/ddl/list_collections_gen.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/drop_collection.h" +#include "mongo/db/shard_role/shard_catalog/participant_block_gen.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/sharding_logging.h" #include "mongo/db/topology/shard_registry.h" #include "mongo/db/topology/sharding_state.h" -#include "mongo/db/user_write_block/write_block_bypass.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/user_write_block/write_block_bypass.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log_attr.h" #include "mongo/logv2/log_component.h" diff --git a/src/mongo/db/global_catalog/ddl/placement_history_bm.cpp b/src/mongo/db/global_catalog/ddl/placement_history_bm.cpp index e6eafa6888a..9d60df6d9d5 100644 --- a/src/mongo/db/global_catalog/ddl/placement_history_bm.cpp +++ b/src/mongo/db/global_catalog/ddl/placement_history_bm.cpp @@ -56,7 +56,7 @@ #include "mongo/db/sharding_environment/config_server_test_fixture.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/topology/cluster_role.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/idl/server_parameter_test_controller.h" diff --git a/src/mongo/db/global_catalog/ddl/refine_collection_shard_key_coordinator.cpp b/src/mongo/db/global_catalog/ddl/refine_collection_shard_key_coordinator.cpp index c138254f9a9..e656642927c 100644 --- a/src/mongo/db/global_catalog/ddl/refine_collection_shard_key_coordinator.cpp +++ b/src/mongo/db/global_catalog/ddl/refine_collection_shard_key_coordinator.cpp @@ -43,22 +43,22 @@ #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_util.h" #include "mongo/db/global_catalog/ddl/sharding_util.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/participant_block_gen.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" +#include "mongo/db/router_role/router_role.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/participant_block_gen.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/sharding_environment/sharding_logging.h" #include "mongo/db/topology/shard_registry.h" -#include "mongo/db/vector_clock/vector_clock.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/logv2/log.h" 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 d7fe742faeb..292a082f508 100644 --- a/src/mongo/db/global_catalog/ddl/rename_collection_coordinator.cpp +++ b/src/mongo/db/global_catalog/ddl/rename_collection_coordinator.cpp @@ -41,31 +41,18 @@ #include "mongo/db/client.h" #include "mongo/db/database_name.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/notify_sharding_event_gen.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_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/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/global_catalog/type_collection_gen.h" #include "mongo/db/global_catalog/type_namespace_placement_gen.h" #include "mongo/db/global_catalog/type_tags.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch.h" -#include "mongo/db/local_catalog/ddl/list_collections_gen.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/rename_collection.h" -#include "mongo/db/local_catalog/shard_role_catalog/participant_block_gen.h" #include "mongo/db/logical_time.h" #include "mongo/db/operation_context.h" #include "mongo/db/persistent_task_store.h" @@ -74,9 +61,22 @@ #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" #include "mongo/db/repl/read_concern_args.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/router_role.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/s/forwardable_operation_metadata.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/ddl/list_collections_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch.h" +#include "mongo/db/shard_role/shard_catalog/participant_block_gen.h" +#include "mongo/db/shard_role/shard_catalog/rename_collection.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" @@ -84,9 +84,9 @@ #include "mongo/db/sharding_environment/sharding_logging.h" #include "mongo/db/topology/shard_registry.h" #include "mongo/db/topology/sharding_state.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/db/transaction/transaction_api.h" -#include "mongo/db/vector_clock/vector_clock.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" #include "mongo/db/versioning_protocol/shard_version.h" #include "mongo/db/versioning_protocol/shard_version_factory.h" #include "mongo/db/write_concern_options.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 f800ab395fb..fe6ce1c19a8 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 @@ -42,25 +42,25 @@ #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/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/rename_collection.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/repl/wait_for_majority_service.h" #include "mongo/db/s/forwardable_operation_metadata.h" #include "mongo/db/s/range_deletion_util.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/rename_collection.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/topology/sharding_state.h" -#include "mongo/db/vector_clock/vector_clock_mutable.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" 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 9c50fbd5f98..416480b0b6e 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 @@ -36,24 +36,24 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/client/read_preference.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_constraints.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/cluster_ddl.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/global_catalog/type_collection_gen.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/legacy_runtime_constants_gen.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/router_role.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/session/sessions_collection.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/shard_registry.h" diff --git a/src/mongo/db/global_catalog/ddl/sessions_collection_sharded.cpp b/src/mongo/db/global_catalog/ddl/sessions_collection_sharded.cpp index 0489a859701..e8a11f79ccb 100644 --- a/src/mongo/db/global_catalog/ddl/sessions_collection_sharded.cpp +++ b/src/mongo/db/global_catalog/ddl/sessions_collection_sharded.cpp @@ -35,7 +35,6 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/client/read_preference.h" #include "mongo/db/api_parameters.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/matcher/extensions_callback_noop.h" @@ -49,6 +48,7 @@ #include "mongo/db/query/compiler/parsers/matcher/expression_parser.h" #include "mongo/db/query/find_command.h" #include "mongo/db/query/query_request_helper.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/rpc/op_msg.h" diff --git a/src/mongo/db/global_catalog/ddl/sessions_collection_sharded_test.cpp b/src/mongo/db/global_catalog/ddl/sessions_collection_sharded_test.cpp index c5d54dea794..2eb15f00840 100644 --- a/src/mongo/db/global_catalog/ddl/sessions_collection_sharded_test.cpp +++ b/src/mongo/db/global_catalog/ddl/sessions_collection_sharded_test.cpp @@ -35,12 +35,12 @@ #include "mongo/bson/bsonmisc.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_test_fixture.h" #include "mongo/db/global_catalog/ddl/sessions_collection_sharded.h" #include "mongo/db/global_catalog/type_shard.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/client_cursor/cursor_response.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_test_fixture.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/executor/network_test_env.h" #include "mongo/executor/remote_command_request.h" diff --git a/src/mongo/db/global_catalog/ddl/shard_key_index_util.cpp b/src/mongo/db/global_catalog/ddl/shard_key_index_util.cpp index 25e453af7da..8dce0c61dac 100644 --- a/src/mongo/db/global_catalog/ddl/shard_key_index_util.cpp +++ b/src/mongo/db/global_catalog/ddl/shard_key_index_util.cpp @@ -30,11 +30,11 @@ #include "mongo/db/global_catalog/ddl/shard_key_index_util.h" #include "mongo/bson/simple_bsonelement_comparator.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/server_feature_flags_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/sharding_environment/sharding_api_d_params_gen.h" #include "mongo/db/sharding_environment/sharding_statistics.h" #include "mongo/logv2/log_severity_suppressor.h" diff --git a/src/mongo/db/global_catalog/ddl/shard_key_index_util.h b/src/mongo/db/global_catalog/ddl/shard_key_index_util.h index 148d9f496e5..438eba67f84 100644 --- a/src/mongo/db/global_catalog/ddl/shard_key_index_util.h +++ b/src/mongo/db/global_catalog/ddl/shard_key_index_util.h @@ -30,10 +30,10 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include diff --git a/src/mongo/db/global_catalog/ddl/shard_key_index_util_test.cpp b/src/mongo/db/global_catalog/ddl/shard_key_index_util_test.cpp index dc748a7cc0b..1412059515e 100644 --- a/src/mongo/db/global_catalog/ddl/shard_key_index_util_test.cpp +++ b/src/mongo/db/global_catalog/ddl/shard_key_index_util_test.cpp @@ -34,14 +34,14 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/crypto/encryption_fields_gen.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/storage_interface.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/unittest/unittest.h" 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 5d03e7ebafc..9f7d8d3af5b 100644 --- a/src/mongo/db/global_catalog/ddl/shard_key_util.cpp +++ b/src/mongo/db/global_catalog/ddl/shard_key_util.cpp @@ -53,21 +53,21 @@ #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/shard_key_index_util.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/hasher.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/ddl/create_indexes_gen.h" -#include "mongo/db/local_catalog/ddl/list_indexes_gen.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/list_indexes.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.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" #include "mongo/db/server_feature_flags_gen.h" +#include "mongo/db/shard_role/ddl/create_indexes_gen.h" +#include "mongo/db/shard_role/ddl/list_indexes_gen.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/list_indexes.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/timeseries/timeseries_constants.h" #include "mongo/db/timeseries/timeseries_index_schema_conversion_functions.h" diff --git a/src/mongo/db/global_catalog/ddl/shard_key_util.h b/src/mongo/db/global_catalog/ddl/shard_key_util.h index 1aa0d93eb53..f995b2c78db 100644 --- a/src/mongo/db/global_catalog/ddl/shard_key_util.h +++ b/src/mongo/db/global_catalog/ddl/shard_key_util.h @@ -32,13 +32,13 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/timestamp.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/shard_util.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/plan_executor.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" diff --git a/src/mongo/db/global_catalog/ddl/sharded_collmod.idl b/src/mongo/db/global_catalog/ddl/sharded_collmod.idl index 7dd404ce54e..9e46891e119 100644 --- a/src/mongo/db/global_catalog/ddl/sharded_collmod.idl +++ b/src/mongo/db/global_catalog/ddl/sharded_collmod.idl @@ -29,7 +29,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/db/local_catalog/ddl/coll_mod.idl" + - "mongo/db/shard_role/ddl/coll_mod.idl" - "mongo/db/basic_types.idl" commands: diff --git a/src/mongo/db/global_catalog/ddl/sharded_ddl_commands.idl b/src/mongo/db/global_catalog/ddl/sharded_ddl_commands.idl index 29d53a7b713..0d5cd104866 100644 --- a/src/mongo/db/global_catalog/ddl/sharded_ddl_commands.idl +++ b/src/mongo/db/global_catalog/ddl/sharded_ddl_commands.idl @@ -35,13 +35,13 @@ global: - "mongo/db/versioning_protocol/shard_version.h" imports: - - "mongo/db/local_catalog/ddl/create.idl" - - "mongo/db/local_catalog/ddl/rename_collection.idl" - - "mongo/db/user_write_block/set_user_write_block_mode.idl" - - "mongo/db/local_catalog/ddl/drop_indexes.idl" - - "mongo/db/local_catalog/ddl/drop_database.idl" + - "mongo/db/shard_role/ddl/create.idl" + - "mongo/db/shard_role/ddl/rename_collection.idl" + - "mongo/db/topology/user_write_block/set_user_write_block_mode.idl" + - "mongo/db/shard_role/ddl/drop_indexes.idl" + - "mongo/db/shard_role/ddl/drop_database.idl" - "mongo/db/keypattern.idl" - - "mongo/db/local_catalog/ddl/coll_mod.idl" + - "mongo/db/shard_role/ddl/coll_mod.idl" - "mongo/db/basic_types.idl" - "mongo/db/global_catalog/type_database.idl" - "mongo/db/sharding_environment/sharding_types.idl" 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 e7996a4501e..2d3b80b0d63 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager.cpp @@ -51,9 +51,6 @@ #include "mongo/db/global_catalog/type_namespace_placement_gen.h" #include "mongo/db/global_catalog/type_shard.h" #include "mongo/db/global_catalog/type_tags.h" -#include "mongo/db/local_catalog/coll_mod.h" -#include "mongo/db/local_catalog/collection_options_gen.h" -#include "mongo/db/local_catalog/ddl/coll_mod_gen.h" #include "mongo/db/logical_time.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/aggregate_command_gen.h" @@ -73,10 +70,13 @@ #include "mongo/db/server_options.h" #include "mongo/db/session/logical_session_cache.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/ddl/coll_mod_gen.h" +#include "mongo/db/shard_role/shard_catalog/coll_mod.h" +#include "mongo/db/shard_role/shard_catalog/collection_options_gen.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/topology/shard_registry.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/executor/connection_pool_stats.h" #include "mongo/executor/inline_executor.h" #include "mongo/executor/task_executor_pool.h" diff --git a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager.h b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager.h index 92cfade2dbd..064520643f3 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager.h +++ b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager.h @@ -51,8 +51,6 @@ #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/global_catalog/type_namespace_placement_gen.h" #include "mongo/db/global_catalog/type_shard.h" -#include "mongo/db/local_catalog/ddl/coll_mod_gen.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/optime_with.h" @@ -61,6 +59,8 @@ #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_cache.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/ddl/coll_mod_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/tenant_id.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 42185fd9027..38e4967356f 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 @@ -52,7 +52,6 @@ #include "mongo/db/database_name.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/routing_information_cache.h" #include "mongo/db/global_catalog/ddl/shard_util.h" #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" #include "mongo/db/global_catalog/ddl/sharding_util.h" @@ -63,8 +62,6 @@ #include "mongo/db/global_catalog/type_collection_gen.h" #include "mongo/db/global_catalog/type_namespace_placement_gen.h" #include "mongo/db/global_catalog/type_tags.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielder.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -76,7 +73,10 @@ #include "mongo/db/query/write_ops/write_ops_parsers.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/repl/repl_client_info.h" +#include "mongo/db/router_role/routing_cache/routing_information_cache.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/resource_yielder.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" @@ -84,10 +84,10 @@ #include "mongo/db/sharding_environment/sharding_logging.h" #include "mongo/db/storage/snapshot_window_options_gen.h" #include "mongo/db/topology/shard_registry.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/transaction/transaction_api.h" #include "mongo/db/transaction/transaction_participant_gen.h" #include "mongo/db/transaction/transaction_participant_resource_yielder.h" -#include "mongo/db/vector_clock/vector_clock.h" #include "mongo/db/write_concern.h" #include "mongo/db/write_concern_options.h" #include "mongo/executor/inline_executor.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 dc47aaf33c5..6fa3a1e2139 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 @@ -40,8 +40,6 @@ #include "mongo/client/read_preference.h" #include "mongo/db/database_name.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/routing_information_cache.h" #include "mongo/db/global_catalog/chunk_constraints.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" @@ -54,7 +52,6 @@ #include "mongo/db/global_catalog/type_collection_gen.h" #include "mongo/db/global_catalog/type_shard.h" #include "mongo/db/global_catalog/type_tags.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -62,9 +59,12 @@ #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/repl/optime_with.h" #include "mongo/db/repl/read_concern_level.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/routing_information_cache.h" #include "mongo/db/s/balancer/balancer.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" @@ -72,8 +72,8 @@ #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/db/timeseries/timeseries_options.h" #include "mongo/db/topology/shard_registry.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/transaction/transaction_api.h" -#include "mongo/db/vector_clock/vector_clock.h" #include "mongo/db/write_concern_options.h" #include "mongo/executor/task_executor_pool.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_commit_chunk_migration_test.cpp b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_commit_chunk_migration_test.cpp index d18368dd737..e297131d246 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_commit_chunk_migration_test.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_commit_chunk_migration_test.cpp @@ -55,7 +55,7 @@ #include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/sharding_environment/config_server_test_fixture.h" #include "mongo/db/sharding_environment/shard_id.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/logv2/log.h" #include "mongo/platform/random.h" diff --git a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_config_initialization_test.cpp b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_config_initialization_test.cpp index 910f09ccc63..ce4d93cbbc0 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_config_initialization_test.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_config_initialization_test.cpp @@ -48,10 +48,6 @@ #include "mongo/db/global_catalog/type_tags.h" #include "mongo/db/index/index_constants.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -68,12 +64,16 @@ #include "mongo/db/session/logical_session_cache_noop.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/sharding_environment/config_server_op_observer.h" #include "mongo/db/sharding_environment/config_server_test_fixture.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/write_unit_of_work.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/idl/server_parameter_test_controller.h" diff --git a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_configure_collection_balancing_test.cpp b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_configure_collection_balancing_test.cpp index a22dab4b8b7..57243edcda8 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_configure_collection_balancing_test.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_configure_collection_balancing_test.cpp @@ -38,13 +38,13 @@ #include "mongo/db/global_catalog/type_shard.h" #include "mongo/db/global_catalog/type_tags.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/session/logical_session_cache.h" #include "mongo/db/session/logical_session_cache_noop.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/sharding_environment/config_server_test_fixture.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/versioning_protocol/chunk_version.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 0b21f6d5b6c..faf4c589dba 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 @@ -38,7 +38,6 @@ #include "mongo/db/database_name.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/routing_information_cache.h" #include "mongo/db/global_catalog/ddl/create_database_util.h" #include "mongo/db/global_catalog/ddl/ddl_lock_manager.h" #include "mongo/db/global_catalog/ddl/notify_sharding_event_gen.h" @@ -48,25 +47,26 @@ #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/global_catalog/type_namespace_placement_gen.h" #include "mongo/db/global_catalog/type_shard.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.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" #include "mongo/db/repl/repl_client_info.h" +#include "mongo/db/router_role/routing_cache/routing_information_cache.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/sharding_logging.h" #include "mongo/db/tenant_id.h" #include "mongo/db/topology/shard_registry.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/transaction/transaction_api.h" -#include "mongo/db/vector_clock/vector_clock.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/executor/inline_executor.h" #include "mongo/executor/task_executor_pool.h" diff --git a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_get_historical_placement_test.cpp b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_get_historical_placement_test.cpp index 95f9ac8036c..8fac0da25a5 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_get_historical_placement_test.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_get_historical_placement_test.cpp @@ -36,7 +36,7 @@ #include "mongo/db/session/logical_session_cache_noop.h" #include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/sharding_environment/config_server_test_fixture.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include diff --git a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_placement_history_operations.cpp b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_placement_history_operations.cpp index 0704da83e96..0c030a5916f 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_placement_history_operations.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_placement_history_operations.cpp @@ -46,7 +46,7 @@ #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/topology/shard_registry.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/logv2/log.h" #include "mongo/util/pcre_util.h" diff --git a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_shard_collection_test.cpp b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_shard_collection_test.cpp index 6f4f2caf3fd..567b765e136 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_shard_collection_test.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_catalog_manager_shard_collection_test.cpp @@ -50,10 +50,10 @@ #include "mongo/db/global_catalog/type_shard.h" #include "mongo/db/global_catalog/type_tags.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_mock.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_mock.h" #include "mongo/db/sharding_environment/config_server_test_fixture.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/executor/network_test_env.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 a18c2014014..30d3130dae7 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 @@ -50,11 +50,11 @@ #include "mongo/db/global_catalog/type_shard.h" #include "mongo/db/global_catalog/type_tags.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/s/balancer/balancer_policy.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/timeseries/timeseries_constants.h" #include "mongo/db/topology/topology_change_helpers.h" diff --git a/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator.cpp b/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator.cpp index c8ed478c40b..b04f34aa13f 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator.cpp @@ -37,10 +37,10 @@ #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_util.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" -#include "mongo/db/local_catalog/lock_manager/locker.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/repl/repl_client_info.h" +#include "mongo/db/shard_role/lock_manager/locker.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" diff --git a/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator.h b/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator.h index 4fd14eb6457..cf46d7e5cea 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator.h +++ b/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator.h @@ -41,8 +41,6 @@ #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_service.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/persistent_task_store.h" @@ -54,6 +52,8 @@ #include "mongo/db/service_context.h" #include "mongo/db/session/internal_session_pool.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/executor/scoped_task_executor.h" #include "mongo/executor/task_executor.h" diff --git a/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator_external_state.cpp b/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator_external_state.cpp index 2542d85ce8a..273ec69c7a2 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator_external_state.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator_external_state.cpp @@ -30,10 +30,10 @@ #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_external_state.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_util.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state.h" #include "mongo/db/sharding_environment/grid.h" -#include "mongo/db/user_write_block/global_user_write_block_state.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/user_write_block/global_user_write_block_state.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" namespace mongo { diff --git a/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator_service.cpp b/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator_service.cpp index 8a9b5eaa428..4938f27125f 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator_service.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator_service.cpp @@ -36,14 +36,13 @@ #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsonmisc.h" #include "mongo/client/dbclient_cursor.h" +#include "mongo/db/cleanup_structured_encryption_data_coordinator.h" #include "mongo/db/client.h" -#include "mongo/db/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/commands/feature_compatibility_version.h" +#include "mongo/db/compact_structured_encryption_data_coordinator.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/global_catalog/ddl/cleanup_structured_encryption_data_coordinator.h" #include "mongo/db/global_catalog/ddl/clone_authoritative_metadata_coordinator.h" #include "mongo/db/global_catalog/ddl/collmod_coordinator.h" -#include "mongo/db/global_catalog/ddl/compact_structured_encryption_data_coordinator.h" #include "mongo/db/global_catalog/ddl/convert_to_capped_coordinator.h" #include "mongo/db/global_catalog/ddl/create_collection_coordinator.h" #include "mongo/db/global_catalog/ddl/create_database_coordinator.h" @@ -58,13 +57,14 @@ #include "mongo/db/global_catalog/ddl/set_allow_migrations_coordinator.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator.h" #include "mongo/db/global_catalog/ddl/untrack_unsplittable_collection_coordinator.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/s/forwardable_operation_metadata.h" #include "mongo/db/s/resharding/reshard_collection_coordinator.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/topology/add_shard_coordinator.h" +#include "mongo/db/topology/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/topology/remove_shard_commit_coordinator.h" #include "mongo/db/version_context.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator_service_test.cpp b/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator_service_test.cpp index da25f1ada00..8b69adea7a1 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator_service_test.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator_service_test.cpp @@ -34,10 +34,10 @@ #include "mongo/db/global_catalog/ddl/ddl_lock_manager.h" #include "mongo/db/global_catalog/ddl/migration_blocking_operation_coordinator.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_external_state_for_test.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/repl/primary_only_service_test_fixture.h" #include "mongo/db/s/forwardable_operation_metadata.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/version_context.h" #include "mongo/executor/network_interface_factory.h" #include "mongo/executor/thread_pool_task_executor.h" diff --git a/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator_test.cpp b/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator_test.cpp index e9149b37a77..773bd3d4fe8 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator_test.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_ddl_coordinator_test.cpp @@ -30,7 +30,7 @@ #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_external_state_for_test.h" -#include "mongo/db/local_catalog/lock_manager/locker.h" +#include "mongo/db/shard_role/lock_manager/locker.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/executor/thread_pool_task_executor_test_fixture.h" 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 ea6a4b47bfd..0c1f7edfc8e 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_ddl_util.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_ddl_util.cpp @@ -40,26 +40,19 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/basic_types_gen.h" #include "mongo/db/client.h" -#include "mongo/db/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/cluster_transaction_api.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/notify_sharding_event_gen.h" -#include "mongo/db/global_catalog/ddl/remove_tags_gen.h" #include "mongo/db/global_catalog/ddl/set_allow_migrations_gen.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/global_catalog/type_namespace_placement_gen.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/collation/collator_interface.h" @@ -68,18 +61,25 @@ #include "mongo/db/repl/change_stream_oplog_notification.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/repl/repl_client_info.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/s/config/initial_split_policy.h" +#include "mongo/db/s/remove_tags_gen.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/sharding_environment/sharding_logging.h" +#include "mongo/db/topology/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/topology/shard_registry.h" #include "mongo/db/topology/sharding_state.h" -#include "mongo/db/vector_clock/vector_clock.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/db/versioning_protocol/shard_version_factory.h" #include "mongo/db/write_concern.h" #include "mongo/executor/inline_executor.h" diff --git a/src/mongo/db/global_catalog/ddl/sharding_ddl_util.h b/src/mongo/db/global_catalog/ddl/sharding_ddl_util.h index 37e7621b81f..c380b2f9f43 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_ddl_util.h +++ b/src/mongo/db/global_catalog/ddl/sharding_ddl_util.h @@ -40,10 +40,10 @@ #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/global_catalog/type_namespace_placement_gen.h" -#include "mongo/db/local_catalog/drop_collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/shard_catalog/drop_collection.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/transaction/transaction_api.h" diff --git a/src/mongo/db/global_catalog/ddl/sharding_ddl_util_detail.h b/src/mongo/db/global_catalog/ddl/sharding_ddl_util_detail.h index 499c26b016c..5614e8a7c44 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_ddl_util_detail.h +++ b/src/mongo/db/global_catalog/ddl/sharding_ddl_util_detail.h @@ -30,7 +30,7 @@ #pragma once #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/user_write_block/write_block_bypass.h" +#include "mongo/db/topology/user_write_block/write_block_bypass.h" #include "mongo/executor/async_rpc.h" #include "mongo/executor/async_rpc_error_info.h" #include "mongo/executor/async_rpc_targeter.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 7fbfc4a54af..4f40116021b 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_recovery_service.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_recovery_service.cpp @@ -37,14 +37,6 @@ #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/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_critical_section_document_gen.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/pipeline.h" @@ -53,6 +45,14 @@ #include "mongo/db/query/write_ops/write_ops_parsers.h" #include "mongo/db/repl/repl_client_info.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_critical_section_document_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/write_concern.h" #include "mongo/idl/idl_parser.h" diff --git a/src/mongo/db/global_catalog/ddl/sharding_recovery_service_test.cpp b/src/mongo/db/global_catalog/ddl/sharding_recovery_service_test.cpp index eca71acdef2..8a7941c5a65 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_recovery_service_test.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_recovery_service_test.cpp @@ -35,15 +35,6 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_catalog/ddl/sharding_migration_critical_section.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/ddl/create_gen.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_critical_section_document_gen.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_util.h" @@ -52,6 +43,15 @@ #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/ddl/create_gen.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_critical_section_document_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/sharding_environment/shard_server_op_observer.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/global_catalog/ddl/sharding_util.cpp b/src/mongo/db/global_catalog/ddl/sharding_util.cpp index f53469f8db0..9e1099c5c81 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_util.cpp +++ b/src/mongo/db/global_catalog/ddl/sharding_util.cpp @@ -36,19 +36,19 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/index_builds/index_builds_manager.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/ddl/list_databases_gen.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/flush_routing_table_cache_updates_gen.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/shard_role/ddl/list_databases_gen.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/flush_routing_table_cache_updates_gen.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/executor/remote_command_response.h" diff --git a/src/mongo/db/global_catalog/ddl/sharding_util.h b/src/mongo/db/global_catalog/ddl/sharding_util.h index 148cd70fdcf..5ddf611487f 100644 --- a/src/mongo/db/global_catalog/ddl/sharding_util.h +++ b/src/mongo/db/global_catalog/ddl/sharding_util.h @@ -32,9 +32,9 @@ #include "mongo/base/status.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/executor/task_executor.h" diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_change_primary_command.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_change_primary_command.cpp index 2052d9e2576..f8003780eea 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_change_primary_command.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_change_primary_command.cpp @@ -36,7 +36,6 @@ #include "mongo/db/commands.h" #include "mongo/db/commands/feature_compatibility_version.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/ddl/move_primary_coordinator.h" #include "mongo/db/global_catalog/ddl/move_primary_coordinator_document_gen.h" #include "mongo/db/global_catalog/ddl/move_primary_gen.h" @@ -45,6 +44,7 @@ #include "mongo/db/global_catalog/ddl/sharding_ddl_util.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_collmod_command.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_collmod_command.cpp index 3d854d1ce7c..3e01479aadd 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_collmod_command.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_collmod_command.cpp @@ -43,13 +43,13 @@ #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_service.h" -#include "mongo/db/local_catalog/ddl/coll_mod_gen.h" -#include "mongo/db/local_catalog/ddl/coll_mod_reply_validation.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/profile_settings.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/coll_mod_gen.h" +#include "mongo/db/shard_role/ddl/coll_mod_reply_validation.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/idl/idl_parser.h" #include "mongo/util/assert_util.h" 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 676363a7009..5fd9a19e03d 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 @@ -46,15 +46,15 @@ #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/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/ddl/coll_mod_gen.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/coll_mod_gen.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/timeseries/catalog_helper.h" #include "mongo/db/timeseries/timeseries_collmod.h" diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_commit_create_database_metadata_command.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_commit_create_database_metadata_command.cpp index 3da656ee45e..4b84746da4a 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_commit_create_database_metadata_command.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_commit_create_database_metadata_command.cpp @@ -35,11 +35,11 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/type_oplog_catalog_metadata_gen.h" #include "mongo/db/query/write_ops/delete.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/type_oplog_catalog_metadata_gen.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/db/transaction/transaction_participant.h" diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_commit_drop_database_metadata_command.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_commit_drop_database_metadata_command.cpp index 125f7783dcd..8afe0c6a12e 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_commit_drop_database_metadata_command.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_commit_drop_database_metadata_command.cpp @@ -34,11 +34,11 @@ #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/global_catalog/type_database_gen.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/type_oplog_catalog_metadata_gen.h" #include "mongo/db/query/write_ops/delete.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/type_oplog_catalog_metadata_gen.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/db/transaction/transaction_participant.h" 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 1533e9d159c..1fbcee1fb2b 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 @@ -44,10 +44,10 @@ #include "mongo/db/database_name.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/local_catalog/catalog_raii.h" #include "mongo/db/namespace_string.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" diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_drain_ongoing_ddl_operations_cmd.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_drain_ongoing_ddl_operations_cmd.cpp index 0938a17cfa9..9d822f3dea4 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_drain_ongoing_ddl_operations_cmd.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_drain_ongoing_ddl_operations_cmd.cpp @@ -30,10 +30,10 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/commands.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/local_catalog/ddl/direct_connection_ddl_hook.h" -#include "mongo/db/local_catalog/ddl/replica_set_ddl_tracker.h" #include "mongo/db/session/kill_sessions_local.h" #include "mongo/db/session/session_killer.h" +#include "mongo/db/shard_role/ddl/direct_connection_ddl_hook.h" +#include "mongo/db/shard_role/ddl/replica_set_ddl_tracker.h" namespace mongo { namespace { diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_drop_collection_command.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_drop_collection_command.cpp index 1e30a9521d8..47337b2c3e8 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_drop_collection_command.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_drop_collection_command.cpp @@ -41,12 +41,12 @@ #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_service.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/profile_settings.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/sharding_state.h" diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_drop_collection_if_uuid_not_matching_command.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_drop_collection_if_uuid_not_matching_command.cpp index 82750497654..8a45dacba9b 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_drop_collection_if_uuid_not_matching_command.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_drop_collection_if_uuid_not_matching_command.cpp @@ -34,11 +34,11 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/ddl/drop_collection_if_uuid_not_matching_gen.h" -#include "mongo/db/local_catalog/drop_collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/repl_client_info.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/drop_collection.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/db/write_concern.h" #include "mongo/rpc/op_msg.h" diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_drop_collection_participant_command.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_drop_collection_participant_command.cpp index 4808700d439..7c167297453 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_drop_collection_participant_command.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_drop_collection_participant_command.cpp @@ -44,8 +44,8 @@ #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" #include "mongo/db/topology/sharding_state.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/db/transaction/transaction_participant.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" #include "mongo/util/future.h" diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_drop_database_command.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_drop_database_command.cpp index 8a034b6b311..734ae668c1b 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_drop_database_command.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_drop_database_command.cpp @@ -39,11 +39,11 @@ #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_service.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_util.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/namespace_string.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/operation_sharding_state.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_drop_database_participant_command.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_drop_database_participant_command.cpp index 1708cb3e56b..4223bf0a3f6 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_drop_database_participant_command.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_drop_database_participant_command.cpp @@ -37,10 +37,10 @@ #include "mongo/db/database_name.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/local_catalog/drop_database.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/drop_database.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/db/transaction/transaction_participant.h" diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_drop_indexes_command.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_drop_indexes_command.cpp index 3848344bdc6..2db31871e49 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_drop_indexes_command.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_drop_indexes_command.cpp @@ -42,19 +42,19 @@ #include "mongo/db/curop.h" #include "mongo/db/database_name.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/ddl/ddl_lock_manager.h" #include "mongo/db/global_catalog/ddl/drop_indexes_coordinator.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/local_catalog/ddl/drop_indexes_gen.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/legacy_runtime_constants_gen.h" #include "mongo/db/profile_settings.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/drop_indexes_gen.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_drop_indexes_participant_command.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_drop_indexes_participant_command.cpp index 49fa5a2cb84..d204631facf 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_drop_indexes_participant_command.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_drop_indexes_participant_command.cpp @@ -32,10 +32,10 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch_info.h" -#include "mongo/db/local_catalog/drop_indexes.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" #include "mongo/db/s/forwardable_operation_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h" +#include "mongo/db/shard_role/shard_catalog/drop_indexes.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/timeseries/timeseries_request_util.h" #include "mongo/db/topology/sharding_state.h" diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_join_migrations_command.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_join_migrations_command.cpp index 1d4251e9bab..df12e6da549 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_join_migrations_command.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_join_migrations_command.cpp @@ -34,14 +34,14 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/ddl/shardsvr_join_migrations_request_gen.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/s/active_migrations_registry.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_merge_chunks_command.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_merge_chunks_command.cpp index 3706ec214e6..78c4eca43e6 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_merge_chunks_command.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_merge_chunks_command.cpp @@ -39,7 +39,6 @@ #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/merge_chunk_request_gen.h" #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/read_concern_args.h" @@ -48,6 +47,7 @@ #include "mongo/db/s/chunk_operation_precondition_checks.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/topology/sharding_state.h" diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_move_primary_command.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_move_primary_command.cpp index a78e76d522b..8e9fe8573fd 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_move_primary_command.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_move_primary_command.cpp @@ -36,7 +36,6 @@ #include "mongo/db/commands.h" #include "mongo/db/commands/feature_compatibility_version.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/ddl/move_primary_coordinator.h" #include "mongo/db/global_catalog/ddl/move_primary_coordinator_document_gen.h" #include "mongo/db/global_catalog/ddl/move_primary_gen.h" @@ -45,6 +44,7 @@ #include "mongo/db/global_catalog/ddl/sharding_ddl_util.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_move_primary_enter_critical_section_command.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_move_primary_enter_critical_section_command.cpp index ace852bb8e2..7e3cc330ef7 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_move_primary_enter_critical_section_command.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_move_primary_enter_critical_section_command.cpp @@ -44,12 +44,12 @@ #include "mongo/db/global_catalog/ddl/sharding_migration_critical_section.h" #include "mongo/db/global_catalog/ddl/sharding_recovery_service.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_runtime.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/transaction/transaction_participant.h" #include "mongo/executor/task_executor_pool.h" diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_move_primary_exit_critical_section_command.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_move_primary_exit_critical_section_command.cpp index 9a4232a353c..de78d5edb43 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_move_primary_exit_critical_section_command.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_move_primary_exit_critical_section_command.cpp @@ -42,12 +42,12 @@ #include "mongo/db/global_catalog/ddl/move_primary_gen.h" #include "mongo/db/global_catalog/ddl/sharding_recovery_service.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/transaction/transaction_participant.h" #include "mongo/executor/task_executor_pool.h" 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 782ca6aa57f..53e41a35520 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 @@ -42,11 +42,11 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_catalog/ddl/sharding_recovery_service.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/participant_block_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/participant_block_gen.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/db/transaction/transaction_participant.h" diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_rename_collection_command.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_rename_collection_command.cpp index b90f0a8ee5d..631299dd3d5 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_rename_collection_command.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_rename_collection_command.cpp @@ -41,10 +41,10 @@ #include "mongo/db/global_catalog/ddl/sharded_rename_collection_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_service.h" -#include "mongo/db/local_catalog/rename_collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/rename_collection.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.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 ca0cec83c6c..377b699a54d 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 @@ -46,12 +46,12 @@ #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/ddl/split_chunk.h" #include "mongo/db/global_catalog/type_chunk.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/s/chunk_operation_precondition_checks.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/tenant_id.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/db/versioning_protocol/chunk_version.h" diff --git a/src/mongo/db/global_catalog/ddl/shardsvr_validate_shard_key_candidate.cpp b/src/mongo/db/global_catalog/ddl/shardsvr_validate_shard_key_candidate.cpp index 1f901371fbb..4274d060753 100644 --- a/src/mongo/db/global_catalog/ddl/shardsvr_validate_shard_key_candidate.cpp +++ b/src/mongo/db/global_catalog/ddl/shardsvr_validate_shard_key_candidate.cpp @@ -34,11 +34,11 @@ #include "mongo/db/global_catalog/ddl/shard_key_util.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/global_catalog/shard_key_pattern.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/global_catalog/ddl/split_chunk.cpp b/src/mongo/db/global_catalog/ddl/split_chunk.cpp index f9305495775..16545e35ef2 100644 --- a/src/mongo/db/global_catalog/ddl/split_chunk.cpp +++ b/src/mongo/db/global_catalog/ddl/split_chunk.cpp @@ -43,16 +43,16 @@ #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/internal_plans.h" #include "mongo/db/query/plan_executor.h" #include "mongo/db/query/plan_yield_policy.h" #include "mongo/db/s/active_migrations_registry.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" diff --git a/src/mongo/db/global_catalog/ddl/untrack_unsplittable_collection_coordinator.cpp b/src/mongo/db/global_catalog/ddl/untrack_unsplittable_collection_coordinator.cpp index 98786b8b87a..ef6251c0548 100644 --- a/src/mongo/db/global_catalog/ddl/untrack_unsplittable_collection_coordinator.cpp +++ b/src/mongo/db/global_catalog/ddl/untrack_unsplittable_collection_coordinator.cpp @@ -32,11 +32,11 @@ #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_util.h" #include "mongo/db/global_catalog/ddl/sharding_recovery_service.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_logging.h" #include "mongo/db/topology/sharding_state.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kSharding 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 185c8214280..2926bfd11e0 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 @@ -37,12 +37,12 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/ddl/shard_key_index_util.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.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" 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 124fa4320e4..c2ed4cd1b06 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 @@ -44,11 +44,9 @@ #include "mongo/db/curop.h" #include "mongo/db/database_name.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.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" #include "mongo/db/global_catalog/metadata_consistency_validation/metadata_consistency_types_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/namespace_string.h" @@ -58,6 +56,8 @@ #include "mongo/db/query/find_common.h" #include "mongo/db/query/query_request_helper.h" #include "mongo/db/repl/read_concern_level.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" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" diff --git a/src/mongo/db/global_catalog/metadata_consistency_validation/metadata_consistency_util.cpp b/src/mongo/db/global_catalog/metadata_consistency_validation/metadata_consistency_util.cpp index f6b0a351876..6bbfba5ad58 100644 --- a/src/mongo/db/global_catalog/metadata_consistency_validation/metadata_consistency_util.cpp +++ b/src/mongo/db/global_catalog/metadata_consistency_validation/metadata_consistency_util.cpp @@ -43,14 +43,8 @@ #include "mongo/db/global_catalog/ddl/shard_key_index_util.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/global_catalog/metadata_consistency_validation/metadata_consistency_types_gen.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h" #include "mongo/db/memory_tracking/operation_memory_usage_tracker.h" #include "mongo/db/pipeline/document_source_internal_unpack_bucket.h" #include "mongo/db/pipeline/expression_context.h" @@ -62,9 +56,15 @@ #include "mongo/db/query/plan_executor_factory.h" #include "mongo/db/query/plan_yield_policy.h" #include "mongo/db/record_id.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/s/range_deletion_util.h" #include "mongo/db/scoped_read_concern.h" #include "mongo/db/server_feature_flags_gen.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_runtime.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/storage/snapshot.h" diff --git a/src/mongo/db/global_catalog/metadata_consistency_validation/metadata_consistency_util.h b/src/mongo/db/global_catalog/metadata_consistency_validation/metadata_consistency_util.h index e02a0060cf5..419268e3666 100644 --- a/src/mongo/db/global_catalog/metadata_consistency_validation/metadata_consistency_util.h +++ b/src/mongo/db/global_catalog/metadata_consistency_validation/metadata_consistency_util.h @@ -36,12 +36,12 @@ #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/global_catalog/type_tags.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/client_cursor/cursor_response_gen.h" #include "mongo/db/query/plan_executor.h" #include "mongo/db/query/plan_executor_factory.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/sharding_environment/shard_id.h" #include diff --git a/src/mongo/db/global_catalog/metadata_consistency_validation/metadata_consistency_util_test.cpp b/src/mongo/db/global_catalog/metadata_consistency_validation/metadata_consistency_util_test.cpp index 88f09dc6e56..9135451c20f 100644 --- a/src/mongo/db/global_catalog/metadata_consistency_validation/metadata_consistency_util_test.cpp +++ b/src/mongo/db/global_catalog/metadata_consistency_validation/metadata_consistency_util_test.cpp @@ -38,11 +38,11 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state_mock.h" #include "mongo/db/query/collation/collator_factory_icu.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state_mock.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/timeseries/timeseries_options.h" #include "mongo/db/versioning_protocol/chunk_version.h" diff --git a/src/mongo/db/global_catalog/metadata_consistency_validation/periodic_sharded_index_consistency_checker.cpp b/src/mongo/db/global_catalog/metadata_consistency_validation/periodic_sharded_index_consistency_checker.cpp index 61d0641b591..ec626b1aa78 100644 --- a/src/mongo/db/global_catalog/metadata_consistency_validation/periodic_sharded_index_consistency_checker.cpp +++ b/src/mongo/db/global_catalog/metadata_consistency_validation/periodic_sharded_index_consistency_checker.cpp @@ -39,9 +39,7 @@ #include "mongo/db/auth/validated_tenancy_scope.h" #include "mongo/db/client.h" #include "mongo/db/curop.h" -#include "mongo/db/global_catalog/catalog_cache/routing_information_cache.h" #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/namespace_string.h" @@ -50,6 +48,8 @@ #include "mongo/db/pipeline/aggregation_request_helper.h" #include "mongo/db/pipeline/lite_parsed_pipeline.h" #include "mongo/db/repl/read_concern_level.h" +#include "mongo/db/router_role/router_role.h" +#include "mongo/db/router_role/routing_cache/routing_information_cache.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/sharding_config_server_parameters_gen.h" #include "mongo/db/topology/sharding_state.h" diff --git a/src/mongo/db/global_catalog/metadata_consistency_validation/shardsvr_check_metadata_consistency_command.cpp b/src/mongo/db/global_catalog/metadata_consistency_validation/shardsvr_check_metadata_consistency_command.cpp index 8046d15e842..1882f8e37b8 100644 --- a/src/mongo/db/global_catalog/metadata_consistency_validation/shardsvr_check_metadata_consistency_command.cpp +++ b/src/mongo/db/global_catalog/metadata_consistency_validation/shardsvr_check_metadata_consistency_command.cpp @@ -47,10 +47,6 @@ #include "mongo/db/global_catalog/metadata_consistency_validation/metadata_consistency_types_gen.h" #include "mongo/db/global_catalog/metadata_consistency_validation/metadata_consistency_util.h" #include "mongo/db/global_catalog/type_database_gen.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" @@ -66,6 +62,10 @@ #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" diff --git a/src/mongo/db/global_catalog/metadata_consistency_validation/shardsvr_check_metadata_consistency_participant_command.cpp b/src/mongo/db/global_catalog/metadata_consistency_validation/shardsvr_check_metadata_consistency_participant_command.cpp index 1686af38699..9e6bf0b0f42 100644 --- a/src/mongo/db/global_catalog/metadata_consistency_validation/shardsvr_check_metadata_consistency_participant_command.cpp +++ b/src/mongo/db/global_catalog/metadata_consistency_validation/shardsvr_check_metadata_consistency_participant_command.cpp @@ -45,10 +45,6 @@ #include "mongo/db/global_catalog/metadata_consistency_validation/metadata_consistency_util.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_collection.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/aggregation_request_helper.h" @@ -57,6 +53,10 @@ #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" diff --git a/src/mongo/db/global_catalog/shard_key_pattern_query_util.cpp b/src/mongo/db/global_catalog/shard_key_pattern_query_util.cpp index 56fde85bb6e..3d9030c8eb5 100644 --- a/src/mongo/db/global_catalog/shard_key_pattern_query_util.cpp +++ b/src/mongo/db/global_catalog/shard_key_pattern_query_util.cpp @@ -43,7 +43,6 @@ #include "mongo/db/hasher.h" #include "mongo/db/index/multikey_paths.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/matcher/extensions_callback_noop.h" #include "mongo/db/matcher/path_internal.h" @@ -59,6 +58,7 @@ #include "mongo/db/query/query_planner.h" #include "mongo/db/query/query_planner_common.h" #include "mongo/db/query/query_planner_params.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/update/path_support.h" #include "mongo/logv2/log.h" #include "mongo/s/shard_targeting_helpers.h" diff --git a/src/mongo/db/global_catalog/shard_key_pattern_query_util_chunk_ranges_test.cpp b/src/mongo/db/global_catalog/shard_key_pattern_query_util_chunk_ranges_test.cpp index 6e568b38698..ccc7075a9a1 100644 --- a/src/mongo/db/global_catalog/shard_key_pattern_query_util_chunk_ranges_test.cpp +++ b/src/mongo/db/global_catalog/shard_key_pattern_query_util_chunk_ranges_test.cpp @@ -32,7 +32,6 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/json.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_test_fixture.h" #include "mongo/db/global_catalog/shard_key_pattern_query_util.h" #include "mongo/db/global_catalog/type_shard.h" #include "mongo/db/hasher.h" @@ -40,6 +39,7 @@ #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_test_fixture.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/s/write_ops/write_command_ref.h" #include "mongo/unittest/unittest.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 a31c06b7007..f24ee59aaea 100644 --- a/src/mongo/db/global_catalog/sharding_catalog_client_impl.cpp +++ b/src/mongo/db/global_catalog/sharding_catalog_client_impl.cpp @@ -36,7 +36,6 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/util/bson_extract.h" #include "mongo/client/read_preference.h" -#include "mongo/db/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/exec/document_value/document.h" @@ -68,9 +67,10 @@ #include "mongo/db/server_options.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" +#include "mongo/db/topology/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/topology/shard_registry.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/global_catalog/sharding_catalog_client_read_preference_test.cpp b/src/mongo/db/global_catalog/sharding_catalog_client_read_preference_test.cpp index 665e4e3aaa7..0785977adf2 100644 --- a/src/mongo/db/global_catalog/sharding_catalog_client_read_preference_test.cpp +++ b/src/mongo/db/global_catalog/sharding_catalog_client_read_preference_test.cpp @@ -30,13 +30,13 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/client/remote_command_targeter_mock.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_gen.h" -#include "mongo/db/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/commands.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/query/find_command.h" #include "mongo/db/query/query_request_helper.h" #include "mongo/db/sharding_environment/sharding_mongos_test_fixture.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_gen.h" +#include "mongo/db/topology/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/executor/network_test_env.h" #include "mongo/executor/remote_command_request.h" #include "mongo/rpc/get_status_from_command_result.h" diff --git a/src/mongo/db/global_catalog/sharding_catalog_client_test.cpp b/src/mongo/db/global_catalog/sharding_catalog_client_test.cpp index 7440c34571b..2d47348e785 100644 --- a/src/mongo/db/global_catalog/sharding_catalog_client_test.cpp +++ b/src/mongo/db/global_catalog/sharding_catalog_client_test.cpp @@ -58,7 +58,7 @@ #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/sharding_environment/sharding_mongos_test_fixture.h" #include "mongo/db/time_proof_service.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/executor/network_connection_hook.h" #include "mongo/executor/network_interface_mock.h" diff --git a/src/mongo/db/local_catalog/import_collection_oplog_entry.idl b/src/mongo/db/import_collection_oplog_entry.idl similarity index 100% rename from src/mongo/db/local_catalog/import_collection_oplog_entry.idl rename to src/mongo/db/import_collection_oplog_entry.idl diff --git a/src/mongo/db/index/2d_access_method.cpp b/src/mongo/db/index/2d_access_method.cpp index f307404a770..cac450ef978 100644 --- a/src/mongo/db/index/2d_access_method.cpp +++ b/src/mongo/db/index/2d_access_method.cpp @@ -31,8 +31,8 @@ #include "mongo/db/index/2d_key_generator.h" #include "mongo/db/index/expression_keys_private.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include diff --git a/src/mongo/db/index/2d_access_method.h b/src/mongo/db/index/2d_access_method.h index bcb44f839bf..f0fac6f7e47 100644 --- a/src/mongo/db/index/2d_access_method.h +++ b/src/mongo/db/index/2d_access_method.h @@ -34,9 +34,9 @@ #include "mongo/db/index/2d_common.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/sorted_data_interface.h" #include "mongo/util/shared_buffer_fragment.h" diff --git a/src/mongo/db/index/BUILD.bazel b/src/mongo/db/index/BUILD.bazel index 4c8f1d00422..ff8e61acc40 100644 --- a/src/mongo/db/index/BUILD.bazel +++ b/src/mongo/db/index/BUILD.bazel @@ -56,7 +56,7 @@ mongo_cc_library( "wildcard_access_method.cpp", "wildcard_key_generator.cpp", "wildcard_validation.cpp", - "//src/mongo/db/local_catalog:index_descriptor.cpp", + "//src/mongo/db/shard_role/shard_catalog:index_descriptor.cpp", ], deps = [ ":expression_params", @@ -77,15 +77,15 @@ mongo_cc_library( "//src/mongo/db/index:preallocated_container_pool", "//src/mongo/db/index_builds:index_build_interceptor", "//src/mongo/db/index_builds:resumable_index_builds_idl", - "//src/mongo/db/local_catalog:index_catalog", - "//src/mongo/db/local_catalog/lock_manager", # TODO(SERVER-93876): Remove. - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/pipeline:document_path_support", "//src/mongo/db/query:spill_util", "//src/mongo/db/query/collation:collator_factory_interface", # TODO(SERVER-93876): Remove. "//src/mongo/db/query/compiler/logical_model/projection:projection_ast", "//src/mongo/db/query/compiler/logical_model/sort_pattern", # TODO(SERVER-93876): Remove. "//src/mongo/db/query/query_stats", # TODO(SERVER-93876): Remove. + "//src/mongo/db/shard_role/lock_manager", # TODO(SERVER-93876): Remove. + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:index_catalog", "//src/mongo/db/sorter:sorter_base", "//src/mongo/db/sorter:sorter_stats", # TODO(SERVER-93876): Remove. "//src/mongo/db/storage:encryption_hooks", # TODO(SERVER-93876): Remove. @@ -152,11 +152,11 @@ mongo_cc_unit_test( "//src/mongo/db/exec:working_set", "//src/mongo/db/exec/document_value:document_value_test_util", "//src/mongo/db/index_builds:index_build_test_helpers", - "//src/mongo/db/local_catalog:catalog_test_fixture", "//src/mongo/db/pipeline:expression_context_for_test", "//src/mongo/db/query:query_test_service_context", "//src/mongo/db/query/collation:collator_interface_mock", "//src/mongo/db/query/compiler/logical_model/sort_pattern", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", "//src/mongo/db/sorter:sorter_stats", "//src/mongo/db/storage:storage_options", "//src/third_party/snappy", diff --git a/src/mongo/db/index/btree_access_method.cpp b/src/mongo/db/index/btree_access_method.cpp index 722ab3bc737..a02cc323c8c 100644 --- a/src/mongo/db/index/btree_access_method.cpp +++ b/src/mongo/db/index/btree_access_method.cpp @@ -31,8 +31,8 @@ #include "mongo/bson/bsonelement.h" #include "mongo/db/index/expression_keys_private.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include #include diff --git a/src/mongo/db/index/btree_access_method.h b/src/mongo/db/index/btree_access_method.h index 522356eeba9..ee88cc01e03 100644 --- a/src/mongo/db/index/btree_access_method.h +++ b/src/mongo/db/index/btree_access_method.h @@ -35,9 +35,9 @@ #include "mongo/db/index/btree_key_generator.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/sorted_data_interface.h" #include "mongo/util/shared_buffer_fragment.h" diff --git a/src/mongo/db/index/btree_key_generator.cpp b/src/mongo/db/index/btree_key_generator.cpp index f709ede0ecd..3143ca6da42 100644 --- a/src/mongo/db/index/btree_key_generator.cpp +++ b/src/mongo/db/index/btree_key_generator.cpp @@ -42,8 +42,8 @@ #include "mongo/bson/bsontypes.h" #include "mongo/bson/dotted_path/dotted_path_support.h" #include "mongo/db/field_ref.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/query/collation/collator_interface.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/index/btree_key_generator.h b/src/mongo/db/index/btree_key_generator.h index 5d44ff5c97a..3293e6444eb 100644 --- a/src/mongo/db/index/btree_key_generator.h +++ b/src/mongo/db/index/btree_key_generator.h @@ -34,9 +34,9 @@ #include "mongo/bson/bsonobj_comparator_interface.h" #include "mongo/bson/ordering.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/util/shared_buffer_fragment.h" diff --git a/src/mongo/db/index/expression_keys_private.cpp b/src/mongo/db/index/expression_keys_private.cpp index 98635adaae9..60695c83984 100644 --- a/src/mongo/db/index/expression_keys_private.cpp +++ b/src/mongo/db/index/expression_keys_private.cpp @@ -45,9 +45,9 @@ #include "mongo/db/fts/fts_index_format.h" #include "mongo/db/fts/fts_spec.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/query/collation/collation_index_key.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/storage/storage_parameters_gen.h" #include "mongo/db/timeseries/timeseries_constants.h" #include "mongo/db/timeseries/timeseries_dotted_path_support.h" diff --git a/src/mongo/db/index/expression_keys_private.h b/src/mongo/db/index/expression_keys_private.h index f6c28f52f6c..c08a5201519 100644 --- a/src/mongo/db/index/expression_keys_private.h +++ b/src/mongo/db/index/expression_keys_private.h @@ -35,9 +35,9 @@ #include "mongo/bson/ordering.h" #include "mongo/db/hasher.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/index_catalog.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/util/shared_buffer_fragment.h" diff --git a/src/mongo/db/index/fts_access_method.cpp b/src/mongo/db/index/fts_access_method.cpp index 745a7205526..f71537941b7 100644 --- a/src/mongo/db/index/fts_access_method.cpp +++ b/src/mongo/db/index/fts_access_method.cpp @@ -30,8 +30,8 @@ #include "mongo/db/index/fts_access_method.h" #include "mongo/db/index/expression_keys_private.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include diff --git a/src/mongo/db/index/fts_access_method.h b/src/mongo/db/index/fts_access_method.h index 4d6bdd2d870..919ae627881 100644 --- a/src/mongo/db/index/fts_access_method.h +++ b/src/mongo/db/index/fts_access_method.h @@ -34,10 +34,10 @@ #include "mongo/db/fts/fts_spec.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/sorted_data_interface.h" #include "mongo/util/shared_buffer_fragment.h" diff --git a/src/mongo/db/index/hash_access_method.cpp b/src/mongo/db/index/hash_access_method.cpp index 0b9ae9acaa7..04e5a645e20 100644 --- a/src/mongo/db/index/hash_access_method.cpp +++ b/src/mongo/db/index/hash_access_method.cpp @@ -31,8 +31,8 @@ #include "mongo/db/index/expression_keys_private.h" #include "mongo/db/index/expression_params.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/util/assert_util.h" #include diff --git a/src/mongo/db/index/hash_access_method.h b/src/mongo/db/index/hash_access_method.h index 78f929dec6f..ed72bcc3e98 100644 --- a/src/mongo/db/index/hash_access_method.h +++ b/src/mongo/db/index/hash_access_method.h @@ -34,11 +34,11 @@ #include "mongo/db/hasher.h" // For HashSeed. #include "mongo/db/index/index_access_method.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/sorted_data_interface.h" #include "mongo/util/shared_buffer_fragment.h" diff --git a/src/mongo/db/index/index_access_method.cpp b/src/mongo/db/index/index_access_method.cpp index ee923bad531..11c1fb7cd32 100644 --- a/src/mongo/db/index/index_access_method.cpp +++ b/src/mongo/db/index/index_access_method.cpp @@ -47,15 +47,15 @@ #include "mongo/db/index/wildcard_access_method.h" #include "mongo/db/index_builds/index_build_interceptor.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sorter/sorter.h" #include "mongo/db/sorter/sorter_template_defs.h" #include "mongo/db/storage/index_entry_comparison.h" diff --git a/src/mongo/db/index/index_access_method.h b/src/mongo/db/index/index_access_method.h index 649df9888f9..7cf197800b1 100644 --- a/src/mongo/db/index/index_access_method.h +++ b/src/mongo/db/index/index_access_method.h @@ -35,13 +35,13 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/database_name.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/sorter/sorter_stats.h" #include "mongo/db/storage/duplicate_key_error_info.h" #include "mongo/db/storage/ident.h" diff --git a/src/mongo/db/index/index_access_method_test.cpp b/src/mongo/db/index/index_access_method_test.cpp index 1c9ac94f62a..7afc5c552b1 100644 --- a/src/mongo/db/index/index_access_method_test.cpp +++ b/src/mongo/db/index/index_access_method_test.cpp @@ -38,18 +38,18 @@ #include "mongo/bson/ordering.h" #include "mongo/db/client.h" #include "mongo/db/index_builds/index_build_test_helpers.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/index/multikey_paths_test.cpp b/src/mongo/db/index/multikey_paths_test.cpp index 623b5c5e3eb..87f58ae12fd 100644 --- a/src/mongo/db/index/multikey_paths_test.cpp +++ b/src/mongo/db/index/multikey_paths_test.cpp @@ -40,19 +40,19 @@ #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/curop.h" #include "mongo/db/index_builds/index_build_test_helpers.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/index/s2_access_method.cpp b/src/mongo/db/index/s2_access_method.cpp index 655f26808af..f8d4b79bd40 100644 --- a/src/mongo/db/index/s2_access_method.cpp +++ b/src/mongo/db/index/s2_access_method.cpp @@ -38,8 +38,8 @@ #include "mongo/db/index/expression_params.h" #include "mongo/db/index/s2_key_generator.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/index/s2_access_method.h b/src/mongo/db/index/s2_access_method.h index 4b5a1773897..ffc8ec73480 100644 --- a/src/mongo/db/index/s2_access_method.h +++ b/src/mongo/db/index/s2_access_method.h @@ -35,11 +35,11 @@ #include "mongo/db/index/index_access_method.h" #include "mongo/db/index/multikey_paths.h" #include "mongo/db/index/s2_common.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/sorted_data_interface.h" #include "mongo/util/shared_buffer_fragment.h" diff --git a/src/mongo/db/index/s2_bucket_access_method.h b/src/mongo/db/index/s2_bucket_access_method.h index 6d66e1f061e..aee55c18057 100644 --- a/src/mongo/db/index/s2_bucket_access_method.h +++ b/src/mongo/db/index/s2_bucket_access_method.h @@ -34,7 +34,7 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/index/s2_access_method.h" #include "mongo/db/index/s2_common.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/db/storage/sorted_data_interface.h" namespace mongo { diff --git a/src/mongo/db/index/wildcard_access_method.cpp b/src/mongo/db/index/wildcard_access_method.cpp index 5e20211876f..dffd8a59fab 100644 --- a/src/mongo/db/index/wildcard_access_method.cpp +++ b/src/mongo/db/index/wildcard_access_method.cpp @@ -32,8 +32,8 @@ #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/key_format.h" #include diff --git a/src/mongo/db/index/wildcard_access_method.h b/src/mongo/db/index/wildcard_access_method.h index 374eaf521ae..732902b4c1f 100644 --- a/src/mongo/db/index/wildcard_access_method.h +++ b/src/mongo/db/index/wildcard_access_method.h @@ -35,10 +35,10 @@ #include "mongo/db/index/index_access_method.h" #include "mongo/db/index/multikey_paths.h" #include "mongo/db/index/wildcard_key_generator.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/compiler/physical_model/index_bounds/index_bounds.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/sorted_data_interface.h" #include "mongo/util/shared_buffer_fragment.h" diff --git a/src/mongo/db/index_builds/BUILD.bazel b/src/mongo/db/index_builds/BUILD.bazel index cc8743a1a41..8aa048dfed7 100644 --- a/src/mongo/db/index_builds/BUILD.bazel +++ b/src/mongo/db/index_builds/BUILD.bazel @@ -34,11 +34,11 @@ mongo_cc_library( "//src/mongo/db:server_base", "//src/mongo/db:vector_clock", "//src/mongo/db/index:index_access_method", - "//src/mongo/db/local_catalog:collection_catalog", - "//src/mongo/db/local_catalog:collection_query_info", - "//src/mongo/db/local_catalog:durable_catalog", - "//src/mongo/db/local_catalog:index_key_validate", "//src/mongo/db/repl:repl_coordinator_interface", + "//src/mongo/db/shard_role/shard_catalog:collection_catalog", + "//src/mongo/db/shard_role/shard_catalog:collection_query_info", + "//src/mongo/db/shard_role/shard_catalog:durable_catalog", + "//src/mongo/db/shard_role/shard_catalog:index_key_validate", "//src/mongo/db/ttl:ttl_collection_cache", ], ) @@ -56,8 +56,8 @@ mongo_cc_library( "//src/mongo/db:service_context", "//src/mongo/db:shard_role", "//src/mongo/db/collection_crud", - "//src/mongo/db/local_catalog:local_oplog_info", - "//src/mongo/db/local_catalog/lock_manager:exception_util", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:local_oplog_info", ], ) @@ -125,13 +125,13 @@ mongo_cc_library( "//src/mongo/db:server_base", "//src/mongo/db:shard_role", "//src/mongo/db/index:multikey_paths", - "//src/mongo/db/local_catalog:collection_catalog", - "//src/mongo/db/local_catalog:index_repair", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/query/query_stats", "//src/mongo/db/repl:repl_coordinator_interface", "//src/mongo/db/repl:timestamp_block", "//src/mongo/db/repl/initial_sync:cloner_utils", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:collection_catalog", + "//src/mongo/db/shard_role/shard_catalog:index_repair", "//src/mongo/db/storage:disk_space_monitor", "//src/mongo/db/storage:disk_space_util", "//src/mongo/db/storage:encryption_hooks", @@ -169,8 +169,8 @@ mongo_cc_library( "//src/mongo/db:server_base", "//src/mongo/db/collection_crud:container_write", "//src/mongo/db/index:preallocated_container_pool", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/repl:repl_coordinator_interface", + "//src/mongo/db/shard_role/lock_manager:exception_util", "//src/mongo/db/sorter:sorter_stats", "//src/mongo/db/storage:spill_table", "//src/mongo/db/storage:storage_options", @@ -190,8 +190,8 @@ mongo_cc_library( ":resumable_index_builds_idl", ":two_phase_index_build_knobs_idl", "//src/mongo/db:shard_role", - "//src/mongo/db/local_catalog:collection_catalog", "//src/mongo/db/s:forwardable_operation_metadata", + "//src/mongo/db/shard_role/shard_catalog:collection_catalog", "//src/mongo/executor:task_executor_interface", "//src/mongo/rpc:metadata_impersonated_user", "//src/mongo/util/concurrency:thread_pool", @@ -218,12 +218,12 @@ mongo_cc_library( "//src/mongo/db:service_context", "//src/mongo/db:shard_role", "//src/mongo/db/index:index_access_method", - "//src/mongo/db/local_catalog:collection_catalog", - "//src/mongo/db/local_catalog:collection_query_info", - "//src/mongo/db/local_catalog:index_catalog", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/query/query_stats", "//src/mongo/db/repl:repl_coordinator_interface", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:collection_catalog", + "//src/mongo/db/shard_role/shard_catalog:collection_query_info", + "//src/mongo/db/shard_role/shard_catalog:index_catalog", "//src/mongo/db/storage:storage_options", "//src/mongo/db/timeseries:timeseries_conversion_util", "//src/mongo/util:log_and_backoff", @@ -335,9 +335,9 @@ mongo_cc_unit_test( "//src/mongo/db:service_context_test_fixture", "//src/mongo/db:shard_role", "//src/mongo/db/collection_crud", - "//src/mongo/db/local_catalog:catalog_test_fixture", "//src/mongo/db/repl:replmocks", "//src/mongo/db/repl:storage_interface_impl", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", ], ) diff --git a/src/mongo/db/index_builds/duplicate_key_tracker.cpp b/src/mongo/db/index_builds/duplicate_key_tracker.cpp index 87ea8f4386e..8f27e7b2ddc 100644 --- a/src/mongo/db/index_builds/duplicate_key_tracker.cpp +++ b/src/mongo/db/index_builds/duplicate_key_tracker.cpp @@ -37,10 +37,10 @@ #include "mongo/db/collection_crud/container_write.h" #include "mongo/db/curop.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/key_format.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/recovery_unit.h" diff --git a/src/mongo/db/index_builds/duplicate_key_tracker.h b/src/mongo/db/index_builds/duplicate_key_tracker.h index 14de91c7145..fdd2d8b9634 100644 --- a/src/mongo/db/index_builds/duplicate_key_tracker.h +++ b/src/mongo/db/index_builds/duplicate_key_tracker.h @@ -31,8 +31,8 @@ #include "mongo/base/status.h" #include "mongo/base/string_data.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/sorted_data_interface.h" diff --git a/src/mongo/db/index_builds/index_build_block.cpp b/src/mongo/db/index_builds/index_build_block.cpp index a07940d674e..ada7b161ae3 100644 --- a/src/mongo/db/index_builds/index_build_block.cpp +++ b/src/mongo/db/index_builds/index_build_block.cpp @@ -38,18 +38,18 @@ #include "mongo/db/client.h" #include "mongo/db/collection_index_usage_tracker.h" #include "mongo/db/index/index_access_method.h" +#include "mongo/db/index_key_validate.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/durable_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/index_key_validate.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/collection_index_usage_tracker_decoration.h" #include "mongo/db/query/collection_query_info.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/ttl/ttl_collection_cache.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/index_builds/index_build_block.h b/src/mongo/db/index_builds/index_build_block.h index 3dfc7b65e09..66168d6f890 100644 --- a/src/mongo/db/index_builds/index_build_block.h +++ b/src/mongo/db/index_builds/index_build_block.h @@ -34,11 +34,11 @@ #include "mongo/db/index_builds/index_build_interceptor.h" #include "mongo/db/index_builds/index_builds_common.h" #include "mongo/db/index_builds/resumable_index_builds_gen.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/util/modules.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/index_builds/index_build_entry_helpers.cpp b/src/mongo/db/index_builds/index_build_entry_helpers.cpp index 18e845a4fcd..af7b17790b6 100644 --- a/src/mongo/db/index_builds/index_build_entry_helpers.cpp +++ b/src/mongo/db/index_builds/index_build_entry_helpers.cpp @@ -41,22 +41,22 @@ #include "mongo/db/dbhelpers.h" #include "mongo/db/index_builds/commit_quorum_options.h" #include "mongo/db/index_builds/index_build_entry_gen.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/local_oplog_info.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" +#include "mongo/db/repl/local_oplog_info.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_parameters_gen.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/index_builds/index_build_entry_helpers.h b/src/mongo/db/index_builds/index_build_entry_helpers.h index 8d4e8534c34..b8cc149b71b 100644 --- a/src/mongo/db/index_builds/index_build_entry_helpers.h +++ b/src/mongo/db/index_builds/index_build_entry_helpers.h @@ -30,8 +30,8 @@ #pragma once #include "mongo/db/index_builds/index_build_entry_gen.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/modules.h" /** diff --git a/src/mongo/db/index_builds/index_build_entry_helpers_test.cpp b/src/mongo/db/index_builds/index_build_entry_helpers_test.cpp index b1e3673c06b..19791af8a45 100644 --- a/src/mongo/db/index_builds/index_build_entry_helpers_test.cpp +++ b/src/mongo/db/index_builds/index_build_entry_helpers_test.cpp @@ -36,11 +36,11 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/index_builds/commit_quorum_options.h" #include "mongo/db/index_builds/index_build_entry_gen.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" #include "mongo/unittest/unittest.h" #include "mongo/util/net/hostandport.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/index_builds/index_build_interceptor.cpp b/src/mongo/db/index_builds/index_build_interceptor.cpp index e2305bd114f..9a22b1cc343 100644 --- a/src/mongo/db/index_builds/index_build_interceptor.cpp +++ b/src/mongo/db/index_builds/index_build_interceptor.cpp @@ -45,15 +45,15 @@ #include "mongo/db/index_builds/duplicate_key_tracker.h" #include "mongo/db/index_builds/index_build_interceptor_gen.h" #include "mongo/db/index_builds/index_builds_common.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/multi_key_path_tracker.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_engine.h" diff --git a/src/mongo/db/index_builds/index_build_interceptor.h b/src/mongo/db/index_builds/index_build_interceptor.h index 823c18f0652..fc81bcffee2 100644 --- a/src/mongo/db/index_builds/index_build_interceptor.h +++ b/src/mongo/db/index_builds/index_build_interceptor.h @@ -36,10 +36,10 @@ #include "mongo/db/index_builds/duplicate_key_tracker.h" #include "mongo/db/index_builds/index_builds_common.h" #include "mongo/db/index_builds/skipped_record_tracker.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" #include "mongo/db/repl/oplog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/temporary_record_store.h" diff --git a/src/mongo/db/index_builds/index_build_interceptor_test.cpp b/src/mongo/db/index_builds/index_build_interceptor_test.cpp index 53ecc42facb..c18cd6a6eb8 100644 --- a/src/mongo/db/index_builds/index_build_interceptor_test.cpp +++ b/src/mongo/db/index_builds/index_build_interceptor_test.cpp @@ -34,14 +34,14 @@ #include "mongo/bson/bsontypes_util.h" #include "mongo/bson/json.h" #include "mongo/bson/util/builder.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/index_builds/index_build_test_helpers.cpp b/src/mongo/db/index_builds/index_build_test_helpers.cpp index 0c753be702a..9bd28d49208 100644 --- a/src/mongo/db/index_builds/index_build_test_helpers.cpp +++ b/src/mongo/db/index_builds/index_build_test_helpers.cpp @@ -33,16 +33,16 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/client.h" #include "mongo/db/index_builds/multi_index_block.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/service_context.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" namespace mongo { Status createIndex(OperationContext* opCtx, StringData ns, const BSONObj& keys, bool unique) { diff --git a/src/mongo/db/index_builds/index_build_test_helpers.h b/src/mongo/db/index_builds/index_build_test_helpers.h index 0588ce7d436..6956e8541e9 100644 --- a/src/mongo/db/index_builds/index_build_test_helpers.h +++ b/src/mongo/db/index_builds/index_build_test_helpers.h @@ -33,9 +33,9 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" #include "mongo/db/index_builds/multi_index_block.h" -#include "mongo/db/local_catalog/catalog_raii.h" #include "mongo/db/operation_context.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/util/modules.h" namespace MONGO_MOD_PUBLIC mongo { diff --git a/src/mongo/db/index_builds/index_builds_coordinator.cpp b/src/mongo/db/index_builds/index_builds_coordinator.cpp index 67e24611a9c..5313cea1cb2 100644 --- a/src/mongo/db/index_builds/index_builds_coordinator.cpp +++ b/src/mongo/db/index_builds/index_builds_coordinator.cpp @@ -48,16 +48,6 @@ #include "mongo/db/index_builds/multi_index_block.h" #include "mongo/db/index_builds/repl_index_build_state.h" #include "mongo/db/index_builds/two_phase_index_build_knobs_gen.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_util.h" #include "mongo/db/operation_context.h" @@ -71,6 +61,16 @@ #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_recovery.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/disk_space_util.h" #include "mongo/db/storage/mdb_catalog.h" #include "mongo/db/storage/recovery_unit.h" diff --git a/src/mongo/db/index_builds/index_builds_coordinator.h b/src/mongo/db/index_builds/index_builds_coordinator.h index 43534b29b25..b5a157fcac0 100644 --- a/src/mongo/db/index_builds/index_builds_coordinator.h +++ b/src/mongo/db/index_builds/index_builds_coordinator.h @@ -45,13 +45,13 @@ #include "mongo/db/index_builds/rebuild_indexes.h" #include "mongo/db/index_builds/repl_index_build_state.h" #include "mongo/db/index_builds/resumable_index_builds_gen.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" #include "mongo/db/replication_state_transition_lock_guard.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/storage/disk_space_monitor.h" #include "mongo/db/tenant_id.h" #include "mongo/executor/task_executor.h" diff --git a/src/mongo/db/index_builds/index_builds_coordinator_mongod.cpp b/src/mongo/db/index_builds/index_builds_coordinator_mongod.cpp index e38ba93ff78..efee649b819 100644 --- a/src/mongo/db/index_builds/index_builds_coordinator_mongod.cpp +++ b/src/mongo/db/index_builds/index_builds_coordinator_mongod.cpp @@ -43,13 +43,6 @@ #include "mongo/db/index_builds/index_build_entry_helpers.h" #include "mongo/db/index_builds/index_builds_common.h" #include "mongo/db/index_builds/two_phase_index_build_knobs_gen.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/operation_context.h" #include "mongo/db/profile_settings.h" #include "mongo/db/repl/member_config.h" @@ -61,10 +54,17 @@ #include "mongo/db/server_parameter.h" #include "mongo/db/server_parameter_with_storage.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_parameters_gen.h" #include "mongo/db/topology/cluster_role.h" -#include "mongo/db/user_write_block/global_user_write_block_state.h" +#include "mongo/db/topology/user_write_block/global_user_write_block_state.h" #include "mongo/executor/task_executor.h" #include "mongo/logv2/log.h" #include "mongo/platform/atomic_word.h" diff --git a/src/mongo/db/index_builds/index_builds_coordinator_mongod_test.cpp b/src/mongo/db/index_builds/index_builds_coordinator_mongod_test.cpp index 777bc9f4f6b..d2fdc027a6f 100644 --- a/src/mongo/db/index_builds/index_builds_coordinator_mongod_test.cpp +++ b/src/mongo/db/index_builds/index_builds_coordinator_mongod_test.cpp @@ -34,12 +34,12 @@ #include "mongo/bson/oid.h" #include "mongo/bson/timestamp.h" #include "mongo/db/index_builds/commit_quorum_options.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/optime.h" #include "mongo/db/repl/storage_interface.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/tenant_id.h" #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/index_builds/index_builds_coordinator_test.cpp b/src/mongo/db/index_builds/index_builds_coordinator_test.cpp index e3c2dd77dc7..7edbd4219d8 100644 --- a/src/mongo/db/index_builds/index_builds_coordinator_test.cpp +++ b/src/mongo/db/index_builds/index_builds_coordinator_test.cpp @@ -35,16 +35,16 @@ #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/curop.h" #include "mongo/db/index_builds/index_builds_common.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/op_observer/op_observer_noop.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/storage_interface.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/index_builds/index_builds_manager.cpp b/src/mongo/db/index_builds/index_builds_manager.cpp index f81a624d855..89cdb41432a 100644 --- a/src/mongo/db/index_builds/index_builds_manager.cpp +++ b/src/mongo/db/index_builds/index_builds_manager.cpp @@ -36,15 +36,15 @@ #include "mongo/db/curop.h" #include "mongo/db/index_builds/index_builds_common.h" #include "mongo/db/index_builds/multi_index_block.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/index_repair.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" +#include "mongo/db/index_repair.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/storage_parameters_gen.h" diff --git a/src/mongo/db/index_builds/index_builds_manager.h b/src/mongo/db/index_builds/index_builds_manager.h index 9259ae380bc..e129c4f1179 100644 --- a/src/mongo/db/index_builds/index_builds_manager.h +++ b/src/mongo/db/index_builds/index_builds_manager.h @@ -38,12 +38,12 @@ #include "mongo/db/index_builds/rebuild_indexes.h" #include "mongo/db/index_builds/repl_index_build_state.h" #include "mongo/db/index_builds/resumable_index_builds_gen.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/stdx/mutex.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/index_builds/index_builds_manager_test.cpp b/src/mongo/db/index_builds/index_builds_manager_test.cpp index 22acdb89b7f..478d10ebf0f 100644 --- a/src/mongo/db/index_builds/index_builds_manager_test.cpp +++ b/src/mongo/db/index_builds/index_builds_manager_test.cpp @@ -31,11 +31,11 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonmisc.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/storage_interface.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/unittest/unittest.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/index_builds/multi_index_block.cpp b/src/mongo/db/index_builds/multi_index_block.cpp index 717f07fc014..73787889257 100644 --- a/src/mongo/db/index_builds/multi_index_block.cpp +++ b/src/mongo/db/index_builds/multi_index_block.cpp @@ -41,13 +41,6 @@ #include "mongo/db/index/multikey_paths.h" #include "mongo/db/index_builds/index_builds_common.h" #include "mongo/db/index_builds/multi_index_block_gen.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_yield_restore.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/multi_key_path_tracker.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" @@ -61,6 +54,13 @@ #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_yield_restore.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/ident.h" #include "mongo/db/storage/key_format.h" #include "mongo/db/storage/key_string/key_string.h" diff --git a/src/mongo/db/index_builds/multi_index_block.h b/src/mongo/db/index_builds/multi_index_block.h index 3506a5e0ca6..c905f6242ed 100644 --- a/src/mongo/db/index_builds/multi_index_block.h +++ b/src/mongo/db/index_builds/multi_index_block.h @@ -38,13 +38,13 @@ #include "mongo/db/index_builds/index_build_block.h" #include "mongo/db/index_builds/index_build_interceptor.h" #include "mongo/db/index_builds/resumable_index_builds_gen.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/util/fail_point.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/index_builds/multi_index_block_test.cpp b/src/mongo/db/index_builds/multi_index_block_test.cpp index b032b2de988..b896feeefe0 100644 --- a/src/mongo/db/index_builds/multi_index_block_test.cpp +++ b/src/mongo/db/index_builds/multi_index_block_test.cpp @@ -32,15 +32,15 @@ #include "mongo/base/error_codes.h" #include "mongo/bson/bsonmisc.h" #include "mongo/db/collection_crud/collection_write_path.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/repl/storage_interface.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/exceptions.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/index_builds/rebuild_indexes.cpp b/src/mongo/db/index_builds/rebuild_indexes.cpp index b05cde364bc..e92869f867f 100644 --- a/src/mongo/db/index_builds/rebuild_indexes.cpp +++ b/src/mongo/db/index_builds/rebuild_indexes.cpp @@ -34,10 +34,10 @@ #include "mongo/base/status.h" #include "mongo/bson/bsonelement.h" #include "mongo/db/index_builds/index_builds_coordinator.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/index_key_validate.h" +#include "mongo/db/index_key_validate.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/index_builds/rebuild_indexes.h b/src/mongo/db/index_builds/rebuild_indexes.h index a20c4224d10..a04c9826c58 100644 --- a/src/mongo/db/index_builds/rebuild_indexes.h +++ b/src/mongo/db/index_builds/rebuild_indexes.h @@ -30,7 +30,7 @@ #pragma once #include "mongo/base/status.h" -#include "mongo/db/local_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" #include "mongo/util/modules.h" namespace MONGO_MOD_PUBLIC mongo { diff --git a/src/mongo/db/index_builds/repl_index_build_state.cpp b/src/mongo/db/index_builds/repl_index_build_state.cpp index 358119b1740..cccc3a3ac0c 100644 --- a/src/mongo/db/index_builds/repl_index_build_state.cpp +++ b/src/mongo/db/index_builds/repl_index_build_state.cpp @@ -33,15 +33,15 @@ #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/repl_settings.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_options.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/index_builds/repl_index_build_state.h b/src/mongo/db/index_builds/repl_index_build_state.h index a30ee65d89a..2660a1185c0 100644 --- a/src/mongo/db/index_builds/repl_index_build_state.h +++ b/src/mongo/db/index_builds/repl_index_build_state.h @@ -35,12 +35,12 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/database_name.h" #include "mongo/db/index_builds/index_builds_common.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/operation_id.h" #include "mongo/db/repl/optime.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/executor/task_executor.h" #include "mongo/stdx/mutex.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/index_builds/skipped_record_tracker.cpp b/src/mongo/db/index_builds/skipped_record_tracker.cpp index f525186a203..bd57bf0b17b 100644 --- a/src/mongo/db/index_builds/skipped_record_tracker.cpp +++ b/src/mongo/db/index_builds/skipped_record_tracker.cpp @@ -39,15 +39,15 @@ #include "mongo/db/curop.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/index/preallocated_container_pool.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/multi_key_path_tracker.h" #include "mongo/db/namespace_string.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/key_format.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/record_data.h" diff --git a/src/mongo/db/index_builds/skipped_record_tracker.h b/src/mongo/db/index_builds/skipped_record_tracker.h index 22224edc093..8d8c7928c09 100644 --- a/src/mongo/db/index_builds/skipped_record_tracker.h +++ b/src/mongo/db/index_builds/skipped_record_tracker.h @@ -32,9 +32,9 @@ #include "mongo/base/status.h" #include "mongo/base/string_data.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/temporary_record_store.h" #include "mongo/platform/atomic_word.h" diff --git a/src/mongo/db/local_catalog/index_key_validate.cpp b/src/mongo/db/index_key_validate.cpp similarity index 99% rename from src/mongo/db/local_catalog/index_key_validate.cpp rename to src/mongo/db/index_key_validate.cpp index ded8526e5ac..d3b4a027c37 100644 --- a/src/mongo/db/local_catalog/index_key_validate.cpp +++ b/src/mongo/db/index_key_validate.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/index_key_validate.h" +#include "mongo/db/index_key_validate.h" #include "mongo/base/error_codes.h" #include "mongo/bson/bsonobjbuilder.h" @@ -40,12 +40,12 @@ #include "mongo/db/index/wildcard_key_generator.h" #include "mongo/db/index/wildcard_validation.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" #include "mongo/db/matcher/extensions_callback_noop.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/query/collation/collator_factory_interface.h" #include "mongo/db/query/compiler/parsers/matcher/expression_parser.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" #include "mongo/db/storage/storage_options.h" #include "mongo/logv2/log.h" #include "mongo/platform/compiler.h" diff --git a/src/mongo/db/local_catalog/index_key_validate.h b/src/mongo/db/index_key_validate.h similarity index 99% rename from src/mongo/db/local_catalog/index_key_validate.h rename to src/mongo/db/index_key_validate.h index 60678f4fac7..8748ad2fc09 100644 --- a/src/mongo/db/local_catalog/index_key_validate.h +++ b/src/mongo/db/index_key_validate.h @@ -34,10 +34,10 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/collation/collator_interface.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/ttl/ttl_collection_cache.h" #include "mongo/util/duration.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/local_catalog/index_key_validate_test.cpp b/src/mongo/db/index_key_validate_test.cpp similarity index 99% rename from src/mongo/db/local_catalog/index_key_validate_test.cpp rename to src/mongo/db/index_key_validate_test.cpp index 4e118b5e47d..28350becc12 100644 --- a/src/mongo/db/local_catalog/index_key_validate_test.cpp +++ b/src/mongo/db/index_key_validate_test.cpp @@ -27,12 +27,12 @@ * it in the license file. */ -#include "mongo/db/local_catalog/index_key_validate.h" +#include "mongo/db/index_key_validate.h" #include "mongo/base/error_codes.h" #include "mongo/bson/bsonmisc.h" #include "mongo/bson/json.h" -#include "mongo/db/local_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/local_catalog/index_repair.cpp b/src/mongo/db/index_repair.cpp similarity index 94% rename from src/mongo/db/local_catalog/index_repair.cpp rename to src/mongo/db/index_repair.cpp index 18ea1491715..536910f162a 100644 --- a/src/mongo/db/local_catalog/index_repair.cpp +++ b/src/mongo/db/index_repair.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/index_repair.h" +#include "mongo/db/index_repair.h" #include "mongo/base/error_codes.h" #include "mongo/base/status.h" @@ -35,19 +35,19 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/duplicate_key_error_info.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/local_catalog/index_repair.h b/src/mongo/db/index_repair.h similarity index 96% rename from src/mongo/db/local_catalog/index_repair.h rename to src/mongo/db/index_repair.h index cba674f6a3d..729e86b9d8d 100644 --- a/src/mongo/db/local_catalog/index_repair.h +++ b/src/mongo/db/index_repair.h @@ -30,11 +30,11 @@ #pragma once #include "mongo/base/status_with.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/db/storage/key_format.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/validate/validate_results.h" diff --git a/src/mongo/db/local_catalog/index_spec_validate_test.cpp b/src/mongo/db/index_spec_validate_test.cpp similarity index 99% rename from src/mongo/db/local_catalog/index_spec_validate_test.cpp rename to src/mongo/db/index_spec_validate_test.cpp index f761ced07bc..4d1c71940b7 100644 --- a/src/mongo/db/local_catalog/index_spec_validate_test.cpp +++ b/src/mongo/db/index_spec_validate_test.cpp @@ -34,7 +34,7 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/index/index_constants.h" -#include "mongo/db/local_catalog/index_key_validate.h" +#include "mongo/db/index_key_validate.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/collation/collator_factory_mock.h" #include "mongo/db/query/collation/collator_interface.h" diff --git a/src/mongo/db/key_generator.cpp b/src/mongo/db/key_generator.cpp index d9b90726680..6fa812f895b 100644 --- a/src/mongo/db/key_generator.cpp +++ b/src/mongo/db/key_generator.cpp @@ -37,7 +37,7 @@ #include "mongo/db/logical_time.h" #include "mongo/db/operation_context.h" #include "mongo/db/time_proof_service.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/platform/compiler.h" #include "mongo/util/fail_point.h" diff --git a/src/mongo/db/key_generator_update_test.cpp b/src/mongo/db/key_generator_update_test.cpp index 85073ac9ba4..583d6381f2c 100644 --- a/src/mongo/db/key_generator_update_test.cpp +++ b/src/mongo/db/key_generator_update_test.cpp @@ -41,8 +41,8 @@ #include "mongo/db/sharding_environment/config_server_test_fixture.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/time_proof_service.h" -#include "mongo/db/vector_clock/vector_clock.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/unittest/unittest.h" #include "mongo/util/duration.h" #include "mongo/util/fail_point.h" diff --git a/src/mongo/db/keys_collection_cache_test.cpp b/src/mongo/db/keys_collection_cache_test.cpp index 21f5ca42411..0094d11f77a 100644 --- a/src/mongo/db/keys_collection_cache_test.cpp +++ b/src/mongo/db/keys_collection_cache_test.cpp @@ -42,15 +42,15 @@ #include "mongo/db/keys_collection_client_direct.h" #include "mongo/db/keys_collection_client_sharded.h" #include "mongo/db/keys_collection_document_gen.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/update_result.h" #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/config_server_test_fixture.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/storage/storage_engine.h" diff --git a/src/mongo/db/keys_collection_manager.cpp b/src/mongo/db/keys_collection_manager.cpp index e83b3343ef4..4859b073ec5 100644 --- a/src/mongo/db/keys_collection_manager.cpp +++ b/src/mongo/db/keys_collection_manager.cpp @@ -42,7 +42,7 @@ #include "mongo/db/logical_time.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" #include "mongo/util/concurrency/idle_thread_block.h" diff --git a/src/mongo/db/keys_collection_manager_sharding_test.cpp b/src/mongo/db/keys_collection_manager_sharding_test.cpp index 4141d227462..5f4226b75b1 100644 --- a/src/mongo/db/keys_collection_manager_sharding_test.cpp +++ b/src/mongo/db/keys_collection_manager_sharding_test.cpp @@ -46,7 +46,7 @@ #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/db/time_proof_service.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/platform/atomic_word.h" #include "mongo/stdx/thread.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/keys_collection_util.cpp b/src/mongo/db/keys_collection_util.cpp index 08cf3496b70..8133823af42 100644 --- a/src/mongo/db/keys_collection_util.cpp +++ b/src/mongo/db/keys_collection_util.cpp @@ -35,14 +35,14 @@ #include "mongo/bson/oid.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/keys_collection_document_gen.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/repl_client_info.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/db/versioning_protocol/shard_version.h" #include "mongo/idl/idl_parser.h" diff --git a/src/mongo/db/local_catalog/OWNERS.yml b/src/mongo/db/local_catalog/OWNERS.yml deleted file mode 100644 index 653e91e9512..00000000000 --- a/src/mongo/db/local_catalog/OWNERS.yml +++ /dev/null @@ -1,40 +0,0 @@ -version: 1.0.0 -filters: - - "*": - approvers: - - 10gen/server-catalog-and-routing-shard-catalog - - "collection_compact*": - approvers: - - 10gen/server-compact - - "import*": - approvers: - - 10gen/server-storage-engine-integration - - 10gen/server-catalog-and-routing-shard-catalog - - "index_key_validate*": - approvers: - - 10gen/server-index-builds - - "index_spec_validate*": - approvers: - - 10gen/server-index-builds - - "index_repair*": - approvers: - - 10gen/server-index-builds - - "throttle_cursor*": - approvers: - - 10gen/server-validate - - "durable_catalog*": - approvers: - - 10gen/server-catalog-and-routing-shard-catalog - - 10gen/server-storage-engine-integration - - "index_catalog_entry_helpers*": - approvers: - - 10gen/query-execution-write-exec - - "local_oplog_info*": - approvers: - - 10gen/server-oplog - - "document_validation*": - approvers: - - 10gen/query-execution - - "external_data_source_scope_guard*": - approvers: - - 10gen/query-integration-features diff --git a/src/mongo/db/local_catalog/shard_role_catalog/BUILD.bazel b/src/mongo/db/local_catalog/shard_role_catalog/BUILD.bazel deleted file mode 100644 index 832990e8ba1..00000000000 --- a/src/mongo/db/local_catalog/shard_role_catalog/BUILD.bazel +++ /dev/null @@ -1,63 +0,0 @@ -load("//bazel:mongo_src_rules.bzl", "idl_generator", "mongo_cc_library") -load("//bazel/config:generate_config_header.bzl", "generate_config_header") - -package(default_visibility = ["//visibility:public"]) - -exports_files( - glob([ - "*.h", - "*.cpp", - ]), -) - -idl_generator( - name = "shard_authoritative_catalog_gen", - src = "shard_authoritative_catalog.idl", - deps = [ - "//src/mongo/db:basic_types_gen", - ], -) - -idl_generator( - name = "type_oplog_catalog_metadata_gen", - src = "type_oplog_catalog_metadata.idl", - deps = [ - "//src/mongo/db:basic_types_gen", - "//src/mongo/db/global_catalog:type_database_gen", - ], -) - -idl_generator( - name = "collection_critical_section_document_gen", - src = "collection_critical_section_document.idl", - deps = [ - "//src/mongo/db:basic_types_gen", - ], -) - -idl_generator( - name = "participant_block_gen", - src = "participant_block.idl", - deps = [ - "//src/mongo/db:basic_types_gen", - "//src/mongo/idl:generic_argument_gen", - ], -) - -idl_generator( - name = "flush_database_cache_updates_gen", - src = "flush_database_cache_updates.idl", - deps = [ - "//src/mongo/db:basic_types_gen", - "//src/mongo/idl:generic_argument_gen", - ], -) - -idl_generator( - name = "flush_routing_table_cache_updates_gen", - src = "flush_routing_table_cache_updates.idl", - deps = [ - "//src/mongo/db:basic_types_gen", - "//src/mongo/idl:generic_argument_gen", - ], -) diff --git a/src/mongo/db/local_catalog/shard_role_catalog/OWNERS.yml b/src/mongo/db/local_catalog/shard_role_catalog/OWNERS.yml deleted file mode 100644 index 9f3cd9671e0..00000000000 --- a/src/mongo/db/local_catalog/shard_role_catalog/OWNERS.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: 1.0.0 -filters: - - "*": - approvers: - - 10gen/server-catalog-and-routing-shard-catalog diff --git a/src/mongo/db/local_catalog/util/BUILD.bazel b/src/mongo/db/local_catalog/util/BUILD.bazel deleted file mode 100644 index 8a2b2e66a3f..00000000000 --- a/src/mongo/db/local_catalog/util/BUILD.bazel +++ /dev/null @@ -1,19 +0,0 @@ -load("//bazel:mongo_src_rules.bzl", "mongo_cc_library", "mongo_cc_unit_test") - -package(default_visibility = ["//visibility:public"]) - -exports_files( - glob([ - "*.h", - "*.cpp", - ]), -) - -mongo_cc_unit_test( - name = "db_catalog_util_test", - srcs = [ - "partitioned_test.cpp", - ], - tags = ["mongo_unittest_seventh_group"], - deps = [], -) diff --git a/src/mongo/db/logical_time_validator.cpp b/src/mongo/db/logical_time_validator.cpp index c73b77529c7..a2a73d52b09 100644 --- a/src/mongo/db/logical_time_validator.cpp +++ b/src/mongo/db/logical_time_validator.cpp @@ -41,7 +41,7 @@ #include "mongo/db/keys_collection_manager.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/logv2/log.h" #include "mongo/platform/compiler.h" #include "mongo/transport/session.h" diff --git a/src/mongo/db/logical_time_validator_test.cpp b/src/mongo/db/logical_time_validator_test.cpp index c4380dc5a73..ab88f2098ea 100644 --- a/src/mongo/db/logical_time_validator_test.cpp +++ b/src/mongo/db/logical_time_validator_test.cpp @@ -41,7 +41,7 @@ #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/signed_logical_time.h" #include "mongo/db/time_proof_service.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/unittest/unittest.h" #include "mongo/util/duration.h" diff --git a/src/mongo/db/matcher/expression_text.cpp b/src/mongo/db/matcher/expression_text.cpp index 92332de3d21..3282170dc16 100644 --- a/src/mongo/db/matcher/expression_text.cpp +++ b/src/mongo/db/matcher/expression_text.cpp @@ -37,17 +37,17 @@ #include "mongo/db/fts/fts_util.h" #include "mongo/db/index/fts_access_method.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/mongod_main.cpp b/src/mongo/db/mongod_main.cpp index 63a68316f6c..bf08c7158a0 100644 --- a/src/mongo/db/mongod_main.cpp +++ b/src/mongo/db/mongod_main.cpp @@ -55,8 +55,6 @@ #include "mongo/db/auth/user_cache_invalidator_job.h" #include "mongo/db/change_stream_options_manager.h" #include "mongo/db/client.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_initializer.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_op_observer.h" #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/commands.h" #include "mongo/db/commands/feature_compatibility_version.h" @@ -74,8 +72,6 @@ #include "mongo/db/flow_control_ticketholder.h" #include "mongo/db/ftdc/ftdc_mongod.h" #include "mongo/db/ftdc/util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/routing_information_cache.h" #include "mongo/db/global_catalog/ddl/configsvr_coordinator_service.h" #include "mongo/db/global_catalog/ddl/ddl_lock_manager.h" #include "mongo/db/global_catalog/ddl/rename_collection_participant_service.h" @@ -88,25 +84,6 @@ #include "mongo/db/keys_collection_client_direct.h" #include "mongo/db/keys_collection_manager.h" #include "mongo/db/keys_collection_manager_gen.h" -#include "mongo/db/local_catalog/catalog_helper.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog_helper.h" -#include "mongo/db/local_catalog/collection_impl.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/database_holder_impl.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/ddl/direct_connection_ddl_hook.h" -#include "mongo/db/local_catalog/ddl/replica_set_ddl_tracker.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielders.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state_factory_shard.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_shard.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/local_executor.h" #include "mongo/db/log_process_details.h" #include "mongo/db/logical_session_cache_factory_mongod.h" @@ -158,6 +135,8 @@ #include "mongo/db/repl/wait_for_majority_service.h" #include "mongo/db/replication_state_transition_lock_guard.h" #include "mongo/db/request_execution_context.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/routing_information_cache.h" #include "mongo/db/rss/replicated_storage_service.h" #include "mongo/db/s/migration_blocking_operation/multi_update_coordinator.h" #include "mongo/db/s/migration_chunk_cloner_source_op_observer.h" @@ -180,6 +159,25 @@ #include "mongo/db/session/logical_session_cache.h" #include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/session/session_killer.h" +#include "mongo/db/shard_role/ddl/direct_connection_ddl_hook.h" +#include "mongo/db/shard_role/ddl/replica_set_ddl_tracker.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/resource_yielders.h" +#include "mongo/db/shard_role/shard_catalog/catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog_helper.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/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state_factory_shard.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/database_holder_impl.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state_factory_shard.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/sharding_environment/config_server_op_observer.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_server_op_observer.h" @@ -201,16 +199,18 @@ #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/system_index.h" #include "mongo/db/timeseries/timeseries_op_observer.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_initializer.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_op_observer.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/topology/periodic_replica_set_configshard_maintenance_mode_checker.h" #include "mongo/db/topology/shard_registry.h" #include "mongo/db/topology/sharding_state.h" +#include "mongo/db/topology/user_write_block/user_write_block_mode_op_observer.h" +#include "mongo/db/topology/vector_clock/vector_clock_metadata_hook.h" #include "mongo/db/transaction/session_catalog_mongod_transaction_interface_impl.h" #include "mongo/db/transaction/transaction_participant.h" #include "mongo/db/transaction/transaction_participant_gen.h" #include "mongo/db/ttl/ttl.h" -#include "mongo/db/user_write_block/user_write_block_mode_op_observer.h" -#include "mongo/db/vector_clock/vector_clock_metadata_hook.h" #include "mongo/db/wire_version.h" #include "mongo/executor/network_connection_hook.h" #include "mongo/executor/network_interface_factory.h" diff --git a/src/mongo/db/op_debug.cpp b/src/mongo/db/op_debug.cpp index e920cb1ebef..faab0544356 100644 --- a/src/mongo/db/op_debug.cpp +++ b/src/mongo/db/op_debug.cpp @@ -35,12 +35,12 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/curop.h" #include "mongo/db/curop_bson_helpers.h" -#include "mongo/db/local_catalog/local_oplog_info.h" #include "mongo/db/profile_filter.h" #include "mongo/db/query/plan_executor.h" #include "mongo/db/query/plan_summary_stats.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/repl/local_oplog_info.h" #include "mongo/db/repl/read_concern_args.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/logv2/log.h" #include "mongo/rpc/metadata/client_metadata.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/op_msg_fuzzer_shard_fixture.cpp b/src/mongo/db/op_msg_fuzzer_shard_fixture.cpp index 7a0a988ef94..d9f1ad3ef24 100644 --- a/src/mongo/db/op_msg_fuzzer_shard_fixture.cpp +++ b/src/mongo/db/op_msg_fuzzer_shard_fixture.cpp @@ -36,16 +36,6 @@ #include "mongo/db/auth/authorization_manager.h" #include "mongo/db/auth/authorization_manager_factory_mock.h" #include "mongo/db/auth/authorization_router_impl.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog_helper.h" -#include "mongo/db/local_catalog/collection_impl.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/database_holder_impl.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state_factory_shard.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_shard.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_registry.h" #include "mongo/db/repl/repl_settings.h" @@ -54,12 +44,22 @@ #include "mongo/db/server_options.h" #include "mongo/db/service_entry_point_shard_role.h" #include "mongo/db/session_manager_mongod.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/collection_impl.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state_factory_shard.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/database_holder_impl.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state_factory_shard.h" #include "mongo/db/storage/control/storage_control.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/db/storage/storage_options.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/topology/sharding_state.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/rpc/message.h" #include "mongo/transport/service_entry_point.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/op_observer/BUILD.bazel b/src/mongo/db/op_observer/BUILD.bazel index b550f5099de..b690a355308 100644 --- a/src/mongo/db/op_observer/BUILD.bazel +++ b/src/mongo/db/op_observer/BUILD.bazel @@ -31,8 +31,8 @@ mongo_cc_library( "//src/mongo:base", "//src/mongo/bson/dotted_path:dotted_path_support", # TODO(SERVER-93876): Remove. "//src/mongo/db:shard_role_api", - "//src/mongo/db/local_catalog:collection_options", "//src/mongo/db/rss:replicated_storage_service", + "//src/mongo/db/shard_role/shard_catalog:collection_options", ], ) @@ -52,7 +52,7 @@ mongo_cc_library(name = "operation_logger_mock") mongo_cc_library( name = "user_write_block_mode_op_observer", srcs = [ - "//src/mongo/db/user_write_block:user_write_block_mode_op_observer.cpp", + "//src/mongo/db/topology/user_write_block:user_write_block_mode_op_observer.cpp", ], deps = [ ":op_observer", @@ -71,9 +71,9 @@ mongo_cc_library( "//src/mongo/db:commands", "//src/mongo/db:dbhelpers", "//src/mongo/db:shard_role", - "//src/mongo/db/local_catalog:document_validation", - "//src/mongo/db/local_catalog/lock_manager", "//src/mongo/db/repl:image_collection_entry", + "//src/mongo/db/shard_role/lock_manager", + "//src/mongo/db/shard_role/shard_catalog:document_validation", ], ) @@ -104,8 +104,8 @@ mongo_cc_library( "//src/mongo/db:read_write_concern_defaults", "//src/mongo/db:shard_role_api", "//src/mongo/db:vector_clock", - "//src/mongo/db/local_catalog:collection_catalog", "//src/mongo/db/session:session_catalog_mongod", + "//src/mongo/db/shard_role/shard_catalog:collection_catalog", "//src/mongo/db/transaction", "//src/mongo/db/views:view_catalog_helpers", ], @@ -127,15 +127,15 @@ mongo_cc_library( "//src/mongo/db:server_feature_flags", "//src/mongo/db/commands:txn_cmd_request", "//src/mongo/db/index_builds:commit_quorum_options", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:collection_catalog", - "//src/mongo/db/local_catalog:collection_options", - "//src/mongo/db/local_catalog:database_holder", - "//src/mongo/db/local_catalog:import_collection_oplog_entry", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/repl:repl_server_parameters", "//src/mongo/db/repl:truncate_range_oplog_entry_idl", "//src/mongo/db/session:session_catalog_mongod", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:collection_catalog", + "//src/mongo/db/shard_role/shard_catalog:collection_options", + "//src/mongo/db/shard_role/shard_catalog:database_holder", + "//src/mongo/db/shard_role/shard_catalog:import_collection_oplog_entry", "//src/mongo/db/storage:storage_options", "//src/mongo/db/transaction", "//src/mongo/db/transaction:transaction_operations", @@ -185,7 +185,7 @@ mongo_cc_unit_test( name = "db_op_observer_test", srcs = [ "op_observer_impl_test.cpp", - "//src/mongo/db/user_write_block:user_write_block_mode_op_observer_test.cpp", + "//src/mongo/db/topology/user_write_block:user_write_block_mode_op_observer_test.cpp", ], tags = ["mongo_unittest_third_group"], deps = [ @@ -206,16 +206,16 @@ mongo_cc_unit_test( "//src/mongo/db:write_block_bypass", "//src/mongo/db/auth:authmocks", "//src/mongo/db/commands:create_command", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:import_collection_oplog_entry", - "//src/mongo/db/local_catalog:local_oplog_info", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/repl:image_collection_entry", "//src/mongo/db/repl:oplog", "//src/mongo/db/repl:oplog_interface_local", "//src/mongo/db/repl:replmocks", "//src/mongo/db/repl:storage_interface_impl", "//src/mongo/db/session:session_catalog_mongod", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:import_collection_oplog_entry", + "//src/mongo/db/shard_role/shard_catalog:local_oplog_info", "//src/mongo/db/storage:recovery_unit_base", "//src/mongo/db/storage:storage_options", "//src/mongo/db/transaction", @@ -273,10 +273,10 @@ mongo_cc_benchmark( "//src/mongo/db:service_context_d", "//src/mongo/db/auth:auth_op_observer", "//src/mongo/db/auth:authserver", - "//src/mongo/db/local_catalog:collection_mock", "//src/mongo/db/repl:primary_only_service", "//src/mongo/db/repl:replmocks", "//src/mongo/db/s:sharding_runtime_d", + "//src/mongo/db/shard_role/shard_catalog:collection_mock", "//src/mongo/db/timeseries:timeseries_op_observer", "//src/mongo/idl:cluster_server_parameter_op_observer", ], diff --git a/src/mongo/db/op_observer/batched_write_context.cpp b/src/mongo/db/op_observer/batched_write_context.cpp index f9ad9f315df..a6fde50fbc1 100644 --- a/src/mongo/db/op_observer/batched_write_context.cpp +++ b/src/mongo/db/op_observer/batched_write_context.cpp @@ -29,9 +29,9 @@ #include "mongo/db/op_observer/batched_write_context.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/repl/oplog_entry.h" #include "mongo/db/repl/oplog_entry_gen.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" diff --git a/src/mongo/db/op_observer/batched_write_context_test.cpp b/src/mongo/db/op_observer/batched_write_context_test.cpp index 40cd6e747e3..580b4fb5a69 100644 --- a/src/mongo/db/op_observer/batched_write_context_test.cpp +++ b/src/mongo/db/op_observer/batched_write_context_test.cpp @@ -31,10 +31,10 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonmisc.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/oplog_entry.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/tenant_id.h" #include "mongo/unittest/death_test.h" diff --git a/src/mongo/db/op_observer/change_stream_pre_images_op_observer.cpp b/src/mongo/db/op_observer/change_stream_pre_images_op_observer.cpp index 91672211dc4..86808a35d81 100644 --- a/src/mongo/db/op_observer/change_stream_pre_images_op_observer.cpp +++ b/src/mongo/db/op_observer/change_stream_pre_images_op_observer.cpp @@ -30,8 +30,8 @@ #include "mongo/db/op_observer/change_stream_pre_images_op_observer.h" #include "mongo/db/change_stream_pre_images_collection_manager.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/pipeline/change_stream_preimage_gen.h" +#include "mongo/db/shard_role/transaction_resources.h" #include diff --git a/src/mongo/db/op_observer/fallback_op_observer.cpp b/src/mongo/db/op_observer/fallback_op_observer.cpp index 4565190d6db..1b19e540380 100644 --- a/src/mongo/db/op_observer/fallback_op_observer.cpp +++ b/src/mongo/db/op_observer/fallback_op_observer.cpp @@ -33,9 +33,6 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/timestamp.h" #include "mongo/db/keys_collection_document_gen.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/views_for_database.h" #include "mongo/db/logical_time_validator.h" #include "mongo/db/op_observer/batched_write_context.h" #include "mongo/db/op_observer/op_observer_util.h" @@ -44,6 +41,9 @@ #include "mongo/db/session/session_catalog.h" #include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/session/session_killer.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/views_for_database.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/transaction/transaction_participant.h" #include "mongo/db/views/util.h" diff --git a/src/mongo/db/op_observer/fallback_op_observer.h b/src/mongo/db/op_observer/fallback_op_observer.h index a0df372fb85..49994553233 100644 --- a/src/mongo/db/op_observer/fallback_op_observer.h +++ b/src/mongo/db/op_observer/fallback_op_observer.h @@ -30,7 +30,6 @@ #pragma once #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_noop.h" @@ -38,6 +37,7 @@ #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/optime.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/uuid.h" #include diff --git a/src/mongo/db/op_observer/fcv_op_observer.cpp b/src/mongo/db/op_observer/fcv_op_observer.cpp index f007382773b..c861e86bef2 100644 --- a/src/mongo/db/op_observer/fcv_op_observer.cpp +++ b/src/mongo/db/op_observer/fcv_op_observer.cpp @@ -36,7 +36,6 @@ #include "mongo/bson/bsontypes.h" #include "mongo/db/commands/feature_compatibility_version.h" #include "mongo/db/feature_compatibility_version_parser.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer_util.h" #include "mongo/db/operation_context.h" @@ -47,6 +46,7 @@ #include "mongo/db/session/kill_sessions.h" #include "mongo/db/session/kill_sessions_local.h" #include "mongo/db/session/session_killer.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/executor/egress_connection_closer_manager.h" #include "mongo/logv2/attribute_storage.h" diff --git a/src/mongo/db/op_observer/fcv_op_observer.h b/src/mongo/db/op_observer/fcv_op_observer.h index cf6ea07957d..6ea80cd8cc9 100644 --- a/src/mongo/db/op_observer/fcv_op_observer.h +++ b/src/mongo/db/op_observer/fcv_op_observer.h @@ -31,12 +31,12 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_noop.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/modules.h" #include "mongo/util/version/releases.h" diff --git a/src/mongo/db/op_observer/find_and_modify_images_op_observer.cpp b/src/mongo/db/op_observer/find_and_modify_images_op_observer.cpp index 42fa9f9db0d..03eb0758f5a 100644 --- a/src/mongo/db/op_observer/find_and_modify_images_op_observer.cpp +++ b/src/mongo/db/op_observer/find_and_modify_images_op_observer.cpp @@ -31,13 +31,13 @@ #include "mongo/db/curop.h" #include "mongo/db/dbhelpers.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" // for acquireCollection() and CollectionAcquisitionRequest -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/image_collection_entry_gen.h" #include "mongo/db/repl/oplog_entry.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_role.h" // for acquireCollection() and CollectionAcquisitionRequest +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/util/assert_util.h" #include diff --git a/src/mongo/db/op_observer/op_observer.h b/src/mongo/db/op_observer/op_observer.h index a552412121f..891d95a8e12 100644 --- a/src/mongo/db/op_observer/op_observer.h +++ b/src/mongo/db/op_observer/op_observer.h @@ -35,8 +35,6 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/database_name.h" #include "mongo/db/index_builds/commit_quorum_options.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" @@ -45,6 +43,8 @@ #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/transaction/transaction_operations.h" #include "mongo/stdx/unordered_map.h" #include "mongo/util/decorable.h" diff --git a/src/mongo/db/op_observer/op_observer_bm.cpp b/src/mongo/db/op_observer/op_observer_bm.cpp index 10eec6bdf24..184dc4448e4 100644 --- a/src/mongo/db/op_observer/op_observer_bm.cpp +++ b/src/mongo/db/op_observer/op_observer_bm.cpp @@ -29,8 +29,6 @@ #include "mongo/db/audit.h" #include "mongo/db/auth/auth_op_observer.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_op_observer.h" -#include "mongo/db/local_catalog/collection_mock.h" #include "mongo/db/op_observer/change_stream_pre_images_op_observer.h" #include "mongo/db/op_observer/fallback_op_observer.h" #include "mongo/db/op_observer/fcv_op_observer.h" @@ -47,10 +45,12 @@ #include "mongo/db/s/query_analysis_op_observer_rs.h" #include "mongo/db/s/query_analysis_op_observer_shardsvr.h" #include "mongo/db/s/resharding/resharding_op_observer.h" +#include "mongo/db/shard_role/shard_catalog/collection_mock.h" #include "mongo/db/sharding_environment/config_server_op_observer.h" #include "mongo/db/sharding_environment/shard_server_op_observer.h" #include "mongo/db/timeseries/timeseries_op_observer.h" -#include "mongo/db/user_write_block/user_write_block_mode_op_observer.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_op_observer.h" +#include "mongo/db/topology/user_write_block/user_write_block_mode_op_observer.h" #include "mongo/logv2/log_domain_global.h" #include "mongo/platform/compiler.h" diff --git a/src/mongo/db/op_observer/op_observer_impl.cpp b/src/mongo/db/op_observer/op_observer_impl.cpp index 8f43016aa30..1c1ce5bdbce 100644 --- a/src/mongo/db/op_observer/op_observer_impl.cpp +++ b/src/mongo/db/op_observer/op_observer_impl.cpp @@ -38,21 +38,8 @@ #include "mongo/db/client.h" #include "mongo/db/commands/txn_cmds_gen.h" #include "mongo/db/feature_flag.h" -#include "mongo/db/global_catalog/router_role_api/sharding_write_router.h" +#include "mongo/db/import_collection_oplog_entry_gen.h" #include "mongo/db/index_builds/index_builds_common.h" -#include "mongo/db/local_catalog/backwards_compatible_collection_options_util.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_operation_source.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/ddl/create_indexes_gen.h" -#include "mongo/db/local_catalog/import_collection_oplog_entry_gen.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/logical_time_validator.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/batched_write_context.h" @@ -66,11 +53,24 @@ #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/repl/truncate_range_oplog_entry_gen.h" +#include "mongo/db/router_role/sharding_write_router.h" #include "mongo/db/rss/replicated_storage_service.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" #include "mongo/db/session/logical_session_id_helpers.h" #include "mongo/db/session/session_txn_record_gen.h" +#include "mongo/db/shard_role/ddl/create_indexes_gen.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/backwards_compatible_collection_options_util.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_operation_source.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" diff --git a/src/mongo/db/op_observer/op_observer_impl.h b/src/mongo/db/op_observer/op_observer_impl.h index bcc517af9a0..576e9b8823f 100644 --- a/src/mongo/db/op_observer/op_observer_impl.h +++ b/src/mongo/db/op_observer/op_observer_impl.h @@ -33,8 +33,6 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/timestamp.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/operation_logger.h" @@ -45,6 +43,8 @@ #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/transaction/transaction_operations.h" #include "mongo/util/modules.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/op_observer/op_observer_impl_test.cpp b/src/mongo/db/op_observer/op_observer_impl_test.cpp index e0ef5dd1d39..3931949ba32 100644 --- a/src/mongo/db/op_observer/op_observer_impl_test.cpp +++ b/src/mongo/db/op_observer/op_observer_impl_test.cpp @@ -45,18 +45,7 @@ #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/dbhelpers.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options_gen.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/import_collection_oplog_entry_gen.h" -#include "mongo/db/local_catalog/local_oplog_info.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" +#include "mongo/db/import_collection_oplog_entry_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/batched_write_context.h" #include "mongo/db/op_observer/change_stream_pre_images_op_observer.h" @@ -72,6 +61,7 @@ #include "mongo/db/record_id.h" #include "mongo/db/repl/apply_ops_command_info.h" #include "mongo/db/repl/image_collection_entry_gen.h" +#include "mongo/db/repl/local_oplog_info.h" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/oplog_entry.h" @@ -93,6 +83,16 @@ #include "mongo/db/session/session_catalog.h" #include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/session/session_txn_record_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/ident.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_options.h" diff --git a/src/mongo/db/op_observer/op_observer_registry.h b/src/mongo/db/op_observer/op_observer_registry.h index 6d108d66c93..95853a0c777 100644 --- a/src/mongo/db/op_observer/op_observer_registry.h +++ b/src/mongo/db/op_observer/op_observer_registry.h @@ -33,8 +33,6 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/timestamp.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" @@ -44,6 +42,8 @@ #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/transaction/transaction_operations.h" #include "mongo/util/assert_util.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/op_observer/op_observer_util.h b/src/mongo/db/op_observer/op_observer_util.h index 5bbeab7a7e8..08bd2dfc4fa 100644 --- a/src/mongo/db/op_observer/op_observer_util.h +++ b/src/mongo/db/op_observer/op_observer_util.h @@ -30,12 +30,12 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/global_catalog/router_role_api/sharding_write_router.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" +#include "mongo/db/router_role/sharding_write_router.h" #include "mongo/db/rss/persistence_provider.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" #include "mongo/util/fail_point.h" diff --git a/src/mongo/db/op_observer/operation_logger.h b/src/mongo/db/op_observer/operation_logger.h index de8035ac902..a79549ec17e 100644 --- a/src/mongo/db/op_observer/operation_logger.h +++ b/src/mongo/db/op_observer/operation_logger.h @@ -29,12 +29,12 @@ #pragma once -#include "mongo/db/local_catalog/collection.h" // for CollectionPtr #include "mongo/db/operation_context.h" -#include "mongo/db/repl/oplog.h" // for OplogLink -#include "mongo/db/repl/oplog_entry.h" // for MutableOplogEntry -#include "mongo/db/session/logical_session_id.h" // for StmtId -#include "mongo/db/storage/record_store.h" // for Record +#include "mongo/db/repl/oplog.h" // for OplogLink +#include "mongo/db/repl/oplog_entry.h" // for MutableOplogEntry +#include "mongo/db/session/logical_session_id.h" // for StmtId +#include "mongo/db/shard_role/shard_catalog/collection.h" // for CollectionPtr +#include "mongo/db/storage/record_store.h" // for Record #include "mongo/util/modules.h" #include "mongo/util/time_support.h" // for Date_t diff --git a/src/mongo/db/op_observer/operation_logger_impl.h b/src/mongo/db/op_observer/operation_logger_impl.h index 97326dadea8..66096098063 100644 --- a/src/mongo/db/op_observer/operation_logger_impl.h +++ b/src/mongo/db/op_observer/operation_logger_impl.h @@ -30,7 +30,6 @@ #pragma once #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/operation_logger.h" #include "mongo/db/operation_context.h" @@ -38,6 +37,7 @@ #include "mongo/db/repl/oplog_entry.h" #include "mongo/db/repl/optime.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/storage/record_store.h" #include "mongo/util/modules.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/op_observer/operation_logger_transaction_proxy.h b/src/mongo/db/op_observer/operation_logger_transaction_proxy.h index eb546ff4368..19df8fab9d4 100644 --- a/src/mongo/db/op_observer/operation_logger_transaction_proxy.h +++ b/src/mongo/db/op_observer/operation_logger_transaction_proxy.h @@ -30,7 +30,6 @@ #pragma once #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/operation_logger.h" #include "mongo/db/operation_context.h" @@ -38,6 +37,7 @@ #include "mongo/db/repl/oplog_entry.h" #include "mongo/db/repl/optime.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/storage/record_store.h" #include "mongo/util/modules.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/operation_context.cpp b/src/mongo/db/operation_context.cpp index 3b07fd4b9b8..a812760a7ec 100644 --- a/src/mongo/db/operation_context.cpp +++ b/src/mongo/db/operation_context.cpp @@ -33,11 +33,11 @@ #include "mongo/base/error_extra_info.h" #include "mongo/base/string_data.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/lock_manager/locker.h" #include "mongo/db/operation_context_options_gen.h" #include "mongo/db/operation_key_manager.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/locker.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/logv2/log.h" #include "mongo/platform/compiler.h" diff --git a/src/mongo/db/operation_context.h b/src/mongo/db/operation_context.h index 3ec4ffdd963..82d707ad40c 100644 --- a/src/mongo/db/operation_context.h +++ b/src/mongo/db/operation_context.h @@ -36,14 +36,14 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/baton.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/lock_manager/locker.h" #include "mongo/db/operation_id.h" #include "mongo/db/query/datetime/date_time_support.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" #include "mongo/db/session/logical_session_id_helpers.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/locker.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/write_concern_options.h" diff --git a/src/mongo/db/local_catalog/util/partitioned.h b/src/mongo/db/partitioned.h similarity index 100% rename from src/mongo/db/local_catalog/util/partitioned.h rename to src/mongo/db/partitioned.h diff --git a/src/mongo/db/local_catalog/util/partitioned_test.cpp b/src/mongo/db/partitioned_test.cpp similarity index 99% rename from src/mongo/db/local_catalog/util/partitioned_test.cpp rename to src/mongo/db/partitioned_test.cpp index 837835aa5cf..fb6a05ed253 100644 --- a/src/mongo/db/local_catalog/util/partitioned_test.cpp +++ b/src/mongo/db/partitioned_test.cpp @@ -33,7 +33,7 @@ // IWYU pragma: no_include "boost/align/detail/aligned_alloc_posix.hpp" #include "mongo/base/string_data.h" -#include "mongo/db/local_catalog/util/partitioned.h" +#include "mongo/db/partitioned.h" #include "mongo/platform/atomic_word.h" #include "mongo/stdx/thread.h" #include "mongo/stdx/unordered_map.h" diff --git a/src/mongo/db/periodic_runner_cache_pressure_rollback.cpp b/src/mongo/db/periodic_runner_cache_pressure_rollback.cpp index 12412fd36c1..3c42da81e58 100644 --- a/src/mongo/db/periodic_runner_cache_pressure_rollback.cpp +++ b/src/mongo/db/periodic_runner_cache_pressure_rollback.cpp @@ -31,11 +31,11 @@ #include "mongo/base/error_codes.h" #include "mongo/db/admission/execution_control_parameters_gen.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" #include "mongo/db/session/kill_sessions_local.h" #include "mongo/db/session/session_catalog.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/stats/single_transaction_stats.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_parameters_gen.h" diff --git a/src/mongo/db/periodic_runner_job_abort_expired_transactions.cpp b/src/mongo/db/periodic_runner_job_abort_expired_transactions.cpp index 05a2dee9d5f..aa774c0c31b 100644 --- a/src/mongo/db/periodic_runner_job_abort_expired_transactions.cpp +++ b/src/mongo/db/periodic_runner_job_abort_expired_transactions.cpp @@ -31,10 +31,10 @@ #include "mongo/base/error_codes.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" #include "mongo/db/session/kill_sessions_local.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/transaction/transaction_participant.h" #include "mongo/db/transaction/transaction_participant_gen.h" diff --git a/src/mongo/db/persistent_task_store_test.cpp b/src/mongo/db/persistent_task_store_test.cpp index 656d3ae6a55..3281b4db8a2 100644 --- a/src/mongo/db/persistent_task_store_test.cpp +++ b/src/mongo/db/persistent_task_store_test.cpp @@ -30,10 +30,10 @@ #include "mongo/db/persistent_task_store.h" #include "mongo/bson/bsonelement.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" #include "mongo/unittest/unittest.h" #include diff --git a/src/mongo/db/pipeline/BUILD.bazel b/src/mongo/db/pipeline/BUILD.bazel index dabecc08e23..439c89f9ac1 100644 --- a/src/mongo/db/pipeline/BUILD.bazel +++ b/src/mongo/db/pipeline/BUILD.bazel @@ -135,9 +135,9 @@ mongo_cc_library( "//src/mongo/db:namespace_spec", "//src/mongo/db/auth:security_token_auth", "//src/mongo/db/exec/document_value", # TODO(SERVER-93876): Remove. - "//src/mongo/db/local_catalog:local_oplog_info", "//src/mongo/db/query/query_shape", # TODO(SERVER-93876): Remove. "//src/mongo/db/query/query_stats:query_stats_parse", + "//src/mongo/db/shard_role/shard_catalog:local_oplog_info", "//src/mongo/db/storage/key_string", "//src/mongo/db/timeseries:timeseries_options", # TODO(SERVER-93876): Remove. "//src/mongo/idl:idl_parser", @@ -554,7 +554,6 @@ mongo_cc_library( "//src/mongo/db/exec/document_value", "//src/mongo/db/fts:base_fts", "//src/mongo/db/index:index_access_method", - "//src/mongo/db/local_catalog:collection_catalog", "//src/mongo/db/memory_tracking", "//src/mongo/db/pipeline/spilling", "//src/mongo/db/query:bucket_predicate_generator", @@ -589,6 +588,7 @@ mongo_cc_library( "//src/mongo/db/session:logical_session_cache", "//src/mongo/db/session:logical_session_id_helpers", "//src/mongo/db/session:sessions_collection", + "//src/mongo/db/shard_role/shard_catalog:collection_catalog", "//src/mongo/db/sorter:sorter_base", "//src/mongo/db/sorter:sorter_stats", "//src/mongo/db/storage:encryption_hooks", @@ -1291,7 +1291,6 @@ mongo_cc_unit_test( "//src/mongo/db/extension/host:extension_loader", "//src/mongo/db/extension/sdk:sdk_cpp", "//src/mongo/db/extension/sdk/tests:shared_test_stages", - "//src/mongo/db/local_catalog:catalog_test_fixture", "//src/mongo/db/op_observer", "//src/mongo/db/op_observer:op_observer_impl", "//src/mongo/db/op_observer:operation_logger_impl", @@ -1309,6 +1308,7 @@ mongo_cc_unit_test( "//src/mongo/db/repl:replmocks", "//src/mongo/db/repl:storage_interface_impl", "//src/mongo/db/s:shard_server_test_fixture", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", "//src/mongo/db/storage/devnull:storage_devnull_core", "//src/mongo/executor:thread_pool_task_executor_test_fixture", "//src/mongo/s:sharding_mongos_test_fixture", diff --git a/src/mongo/db/pipeline/dispatch_shard_pipeline_test.cpp b/src/mongo/db/pipeline/dispatch_shard_pipeline_test.cpp index be869f18984..f6e7f84bf5f 100644 --- a/src/mongo/db/pipeline/dispatch_shard_pipeline_test.cpp +++ b/src/mongo/db/pipeline/dispatch_shard_pipeline_test.cpp @@ -41,8 +41,6 @@ #include "mongo/bson/oid.h" #include "mongo/bson/timestamp.h" #include "mongo/db/exec/document_value/document.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/keypattern.h" @@ -54,6 +52,8 @@ #include "mongo/db/pipeline/sharded_agg_helpers.h" #include "mongo/db/query/client_cursor/cursor_id.h" #include "mongo/db/query/client_cursor/cursor_response.h" +#include "mongo/db/router_role/router_role.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/db/versioning_protocol/shard_version.h" diff --git a/src/mongo/db/pipeline/document_source_change_stream.cpp b/src/mongo/db/pipeline/document_source_change_stream.cpp index c54547837ec..4a740eaf5bf 100644 --- a/src/mongo/db/pipeline/document_source_change_stream.cpp +++ b/src/mongo/db/pipeline/document_source_change_stream.cpp @@ -42,7 +42,7 @@ #include "mongo/db/repl/optime.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_options.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/version_context.h" #include "mongo/idl/idl_parser.h" #include "mongo/util/pcre_util.h" diff --git a/src/mongo/db/pipeline/document_source_change_stream_test.cpp b/src/mongo/db/pipeline/document_source_change_stream_test.cpp index a02b6c5bfdf..f69cf2954fc 100644 --- a/src/mongo/db/pipeline/document_source_change_stream_test.cpp +++ b/src/mongo/db/pipeline/document_source_change_stream_test.cpp @@ -40,10 +40,6 @@ #include "mongo/db/exec/document_value/document_value_test_util.h" #include "mongo/db/exec/document_value/value.h" #include "mongo/db/index/index_constants.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_mock.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" #include "mongo/db/pipeline/change_stream_filter_helpers.h" #include "mongo/db/pipeline/change_stream_helpers.h" #include "mongo/db/pipeline/change_stream_read_mode.h" @@ -77,6 +73,10 @@ #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_mock.h" #include "mongo/db/tenant_id.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/stdx/unordered_set.h" diff --git a/src/mongo/db/pipeline/document_source_check_resume_token_test.cpp b/src/mongo/db/pipeline/document_source_check_resume_token_test.cpp index 5ec26966b00..2ad2a8bbc58 100644 --- a/src/mongo/db/pipeline/document_source_check_resume_token_test.cpp +++ b/src/mongo/db/pipeline/document_source_check_resume_token_test.cpp @@ -47,9 +47,6 @@ #include "mongo/db/exec/document_value/value.h" #include "mongo/db/exec/document_value/value_comparator.h" #include "mongo/db/exec/plan_stats.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_mock.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role_mock.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -65,6 +62,9 @@ #include "mongo/db/query/collation/collator_interface_mock.h" #include "mongo/db/query/compiler/parsers/matcher/expression_parser.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_mock.h" +#include "mongo/db/shard_role/shard_role_mock.h" #include "mongo/db/storage/devnull/devnull_kv_engine.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" diff --git a/src/mongo/db/pipeline/document_source_cursor.cpp b/src/mongo/db/pipeline/document_source_cursor.cpp index 50483c4ed4c..4c7508ca561 100644 --- a/src/mongo/db/pipeline/document_source_cursor.cpp +++ b/src/mongo/db/pipeline/document_source_cursor.cpp @@ -32,14 +32,14 @@ #include "mongo/bson/bsontypes.h" #include "mongo/db/exec/document_value/document.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/db_raii.h" #include "mongo/db/pipeline/initialize_auto_get_helper.h" #include "mongo/db/query/collection_index_usage_tracker_decoration.h" #include "mongo/db/query/explain.h" #include "mongo/db/query/explain_options.h" #include "mongo/db/query/find_common.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" #include "mongo/logv2/log.h" #include "mongo/util/serialization_context.h" diff --git a/src/mongo/db/pipeline/document_source_exchange.h b/src/mongo/db/pipeline/document_source_exchange.h index caa4505c3a1..fb08c00f61b 100644 --- a/src/mongo/db/pipeline/document_source_exchange.h +++ b/src/mongo/db/pipeline/document_source_exchange.h @@ -31,12 +31,12 @@ #include "mongo/base/string_data.h" #include "mongo/db/exec/agg/exchange_stage.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielder.h" #include "mongo/db/pipeline/document_source.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/stage_constraints.h" #include "mongo/db/pipeline/variables.h" #include "mongo/db/query/query_shape/serialization_options.h" +#include "mongo/db/shard_role/resource_yielder.h" #include "mongo/util/assert_util.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/pipeline/document_source_graph_lookup.cpp b/src/mongo/db/pipeline/document_source_graph_lookup.cpp index c0967d62f02..d6c47f76c0f 100644 --- a/src/mongo/db/pipeline/document_source_graph_lookup.cpp +++ b/src/mongo/db/pipeline/document_source_graph_lookup.cpp @@ -44,7 +44,7 @@ #include "mongo/db/query/allowed_contexts.h" #include "mongo/db/query/query_knobs_gen.h" #include "mongo/db/query/stage_memory_limit_knobs/knobs.h" -#include "mongo/db/raw_data_operation.h" +#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" diff --git a/src/mongo/db/pipeline/document_source_lookup.cpp b/src/mongo/db/pipeline/document_source_lookup.cpp index 8066be260e5..9a86f65a1a9 100644 --- a/src/mongo/db/pipeline/document_source_lookup.cpp +++ b/src/mongo/db/pipeline/document_source_lookup.cpp @@ -60,7 +60,7 @@ #include "mongo/db/pipeline/variable_validation.h" #include "mongo/db/query/allowed_contexts.h" #include "mongo/db/query/query_knobs_gen.h" -#include "mongo/db/raw_data_operation.h" +#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/db/views/resolved_view.h" diff --git a/src/mongo/db/pipeline/document_source_out.cpp b/src/mongo/db/pipeline/document_source_out.cpp index 1d6140c9545..161c05cbcc6 100644 --- a/src/mongo/db/pipeline/document_source_out.cpp +++ b/src/mongo/db/pipeline/document_source_out.cpp @@ -35,8 +35,8 @@ #include "mongo/db/client.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/allowed_contexts.h" -#include "mongo/db/raw_data_operation.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/timeseries/catalog_helper.h" #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/pipeline/document_source_set_window_fields.cpp b/src/mongo/db/pipeline/document_source_set_window_fields.cpp index 69f874a5ede..13dcf307442 100644 --- a/src/mongo/db/pipeline/document_source_set_window_fields.cpp +++ b/src/mongo/db/pipeline/document_source_set_window_fields.cpp @@ -37,7 +37,6 @@ #include "mongo/db/exec/inclusion_projection_executor.h" #include "mongo/db/field_ref.h" #include "mongo/db/field_ref_set.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/matcher/expression_algo.h" #include "mongo/db/pipeline/document_source_add_fields.h" #include "mongo/db/pipeline/document_source_project.h" @@ -52,6 +51,7 @@ #include "mongo/db/query/compiler/logical_model/sort_pattern/sort_pattern.h" #include "mongo/db/query/explain_options.h" #include "mongo/db/query/query_knobs_gen.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" #include "mongo/platform/atomic_word.h" diff --git a/src/mongo/db/pipeline/document_source_union_with.cpp b/src/mongo/db/pipeline/document_source_union_with.cpp index 3b48b55bf1d..1ca09e7d453 100644 --- a/src/mongo/db/pipeline/document_source_union_with.cpp +++ b/src/mongo/db/pipeline/document_source_union_with.cpp @@ -49,7 +49,7 @@ #include "mongo/db/pipeline/process_interface/mongo_process_interface.h" #include "mongo/db/pipeline/variables.h" #include "mongo/db/query/allowed_contexts.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/stats/counters.h" #include "mongo/db/views/resolved_view.h" #include "mongo/idl/idl_parser.h" diff --git a/src/mongo/db/pipeline/document_source_writer.h b/src/mongo/db/pipeline/document_source_writer.h index cf6ffb6aa21..fc92e4e63fd 100644 --- a/src/mongo/db/pipeline/document_source_writer.h +++ b/src/mongo/db/pipeline/document_source_writer.h @@ -29,11 +29,11 @@ #pragma once -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/document_source.h" #include "mongo/db/read_concern.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/pipeline/expression_context_test.cpp b/src/mongo/db/pipeline/expression_context_test.cpp index 0a640c6d044..2c1dfe2d6b9 100644 --- a/src/mongo/db/pipeline/expression_context_test.cpp +++ b/src/mongo/db/pipeline/expression_context_test.cpp @@ -39,7 +39,7 @@ #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/service_context_test_fixture.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/unittest/death_test.h" #include "mongo/unittest/unittest.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/pipeline/initialize_auto_get_helper.h b/src/mongo/db/pipeline/initialize_auto_get_helper.h index de398e3b765..c03404c0554 100644 --- a/src/mongo/db/pipeline/initialize_auto_get_helper.h +++ b/src/mongo/db/pipeline/initialize_auto_get_helper.h @@ -29,9 +29,9 @@ #pragma once -#include "mongo/db/global_catalog/router_role_api/router_role.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role_loop.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/router_role/router_role.h" +#include "mongo/db/shard_role/shard_role_loop.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/s/transaction_router.h" diff --git a/src/mongo/db/pipeline/pipeline.h b/src/mongo/db/pipeline/pipeline.h index 0c4fadf458f..1452769b6b2 100644 --- a/src/mongo/db/pipeline/pipeline.h +++ b/src/mongo/db/pipeline/pipeline.h @@ -36,8 +36,6 @@ #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/document_value/document_metadata_fields.h" #include "mongo/db/exec/document_value/value.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/document_source.h" @@ -53,7 +51,9 @@ #include "mongo/db/query/plan_summary_stats.h" #include "mongo/db/query/query_knobs_gen.h" #include "mongo/db/query/query_shape/serialization_options.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/executor/task_executor.h" #include "mongo/stdx/unordered_set.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/pipeline/pipeline_d.cpp b/src/mongo/db/pipeline/pipeline_d.cpp index a9340f681b1..f30239cc819 100644 --- a/src/mongo/db/pipeline/pipeline_d.cpp +++ b/src/mongo/db/pipeline/pipeline_d.cpp @@ -55,12 +55,6 @@ #include "mongo/db/exec/shard_filterer_impl.h" #include "mongo/db/feature_flag.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/matcher/expression_algo.h" #include "mongo/db/matcher/expression_expr.h" #include "mongo/db/matcher/extensions_callback_real.h" @@ -111,6 +105,12 @@ #include "mongo/db/query/util/make_data_structure.h" #include "mongo/db/server_parameter.h" #include "mongo/db/server_parameter_with_storage.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/sorted_data_interface.h" #include "mongo/db/timeseries/timeseries_constants.h" diff --git a/src/mongo/db/pipeline/pipeline_d.h b/src/mongo/db/pipeline/pipeline_d.h index 8b0a6bbcb55..da17f570fe2 100644 --- a/src/mongo/db/pipeline/pipeline_d.h +++ b/src/mongo/db/pipeline/pipeline_d.h @@ -36,7 +36,6 @@ #include "mongo/db/exec/agg/exec_pipeline.h" #include "mongo/db/exec/document_value/document_metadata_fields.h" #include "mongo/db/exec/timeseries/bucket_unpacker.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/document_source_cursor.h" @@ -55,6 +54,7 @@ #include "mongo/db/query/plan_executor.h" #include "mongo/db/query/query_planner.h" #include "mongo/db/query/query_planner_params.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/pipeline/pipeline_test.cpp b/src/mongo/db/pipeline/pipeline_test.cpp index 6d2d06b3131..a5a026d29f3 100644 --- a/src/mongo/db/pipeline/pipeline_test.cpp +++ b/src/mongo/db/pipeline/pipeline_test.cpp @@ -37,7 +37,6 @@ #include "mongo/db/client.h" #include "mongo/db/database_name.h" #include "mongo/db/exec/document_value/document_value_test_util.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/aggregation_context_fixture.h" #include "mongo/db/pipeline/document_source.h" @@ -73,6 +72,7 @@ #include "mongo/db/query/query_test_service_context.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/repl/replication_coordinator_mock.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/tenant_id.h" #include "mongo/db/topology/sharding_state.h" diff --git a/src/mongo/db/pipeline/process_interface/BUILD.bazel b/src/mongo/db/pipeline/process_interface/BUILD.bazel index 99759cd5858..1109cd0e750 100644 --- a/src/mongo/db/pipeline/process_interface/BUILD.bazel +++ b/src/mongo/db/pipeline/process_interface/BUILD.bazel @@ -35,9 +35,9 @@ mongo_cc_library( deps = [ "//src/mongo/db:operation_time_tracker", "//src/mongo/db/auth", - "//src/mongo/db/local_catalog/lock_manager", "//src/mongo/db/pipeline:field_path", "//src/mongo/db/query/client_cursor:generic_cursor", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/s:sharding_router_api", "//src/mongo/util/concurrency:spin_lock", ], @@ -85,10 +85,6 @@ mongo_cc_library( "//src/mongo/db:operation_time_tracker", "//src/mongo/db:server_feature_flags", "//src/mongo/db/index_builds:index_builds_coordinator_mongod", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:database_holder", - "//src/mongo/db/local_catalog/lock_manager:exception_util", - "//src/mongo/db/local_catalog/lock_manager:flow_control_ticketholder", "//src/mongo/db/pipeline", "//src/mongo/db/query/client_cursor", "//src/mongo/db/query/write_ops", @@ -98,6 +94,10 @@ mongo_cc_library( "//src/mongo/db/s:query_analysis_writer", "//src/mongo/db/s:transaction_coordinator", "//src/mongo/db/session:session_catalog", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/lock_manager:flow_control_ticketholder", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:database_holder", "//src/mongo/db/stats:top", "//src/mongo/db/storage:backup_cursor_hooks", "//src/mongo/db/storage:feature_document_util", 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 c40ca2cf163..2f55efd4be7 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 @@ -42,24 +42,6 @@ #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/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_catalog_helper.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/fill_locker_info.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/catalog_resource_handle.h" #include "mongo/db/pipeline/document_source.h" @@ -88,6 +70,24 @@ #include "mongo/db/service_context.h" #include "mongo/db/session/kill_sessions.h" #include "mongo/db/session/session_catalog.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/fill_locker_info.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/stats/storage_stats.h" #include "mongo/db/stats/top.h" diff --git a/src/mongo/db/pipeline/process_interface/common_mongod_process_interface.h b/src/mongo/db/pipeline/process_interface/common_mongod_process_interface.h index 5fa3a220be2..07ee4e812ee 100644 --- a/src/mongo/db/pipeline/process_interface/common_mongod_process_interface.h +++ b/src/mongo/db/pipeline/process_interface/common_mongod_process_interface.h @@ -38,7 +38,6 @@ #include "mongo/db/database_name.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/shard_filterer.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielder.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -59,6 +58,7 @@ #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/record_id.h" #include "mongo/db/repl/optime.h" +#include "mongo/db/shard_role/resource_yielder.h" #include "mongo/db/storage/backup_cursor_state.h" #include "mongo/db/storage/key_format.h" #include "mongo/db/storage/record_store.h" 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 2f0d018d032..b1984b9cf2d 100644 --- a/src/mongo/db/pipeline/process_interface/common_process_interface.cpp +++ b/src/mongo/db/pipeline/process_interface/common_process_interface.cpp @@ -39,12 +39,8 @@ #include "mongo/db/client.h" #include "mongo/db/curop.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/global_catalog/shard_key_pattern.h" -#include "mongo/db/local_catalog/ddl/list_collections_gen.h" #include "mongo/db/logical_time.h" #include "mongo/db/operation_context.h" #include "mongo/db/operation_time_tracker.h" @@ -52,8 +48,12 @@ #include "mongo/db/query/client_cursor/generic_cursor_gen.h" #include "mongo/db/repl/repl_client_info.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/router_role.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/ddl/list_collections_gen.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/tenant_id.h" #include "mongo/db/topology/cluster_role.h" diff --git a/src/mongo/db/pipeline/process_interface/common_process_interface.h b/src/mongo/db/pipeline/process_interface/common_process_interface.h index 6aa86724c4c..63a93569447 100644 --- a/src/mongo/db/pipeline/process_interface/common_process_interface.h +++ b/src/mongo/db/pipeline/process_interface/common_process_interface.h @@ -32,7 +32,6 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/client.h" #include "mongo/db/field_ref.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" @@ -41,6 +40,7 @@ #include "mongo/db/query/write_ops/write_ops.h" #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/versioning_protocol/shard_version.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/pipeline/process_interface/mongo_process_interface.h b/src/mongo/db/pipeline/process_interface/mongo_process_interface.h index c6c117ec9a5..51b37b90fdf 100644 --- a/src/mongo/db/pipeline/process_interface/mongo_process_interface.h +++ b/src/mongo/db/pipeline/process_interface/mongo_process_interface.h @@ -42,8 +42,6 @@ #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/local_catalog/collection_type.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielder.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -61,6 +59,8 @@ #include "mongo/db/record_id.h" #include "mongo/db/repl/oplog_entry.h" #include "mongo/db/repl/optime.h" +#include "mongo/db/shard_role/resource_yielder.h" +#include "mongo/db/shard_role/shard_catalog/collection_type.h" #include "mongo/db/storage/backup_cursor_hooks.h" #include "mongo/db/storage/backup_cursor_state.h" #include "mongo/db/storage/key_format.h" diff --git a/src/mongo/db/pipeline/process_interface/mongos_process_interface.cpp b/src/mongo/db/pipeline/process_interface/mongos_process_interface.cpp index 678d942e0bd..8689ccc648f 100644 --- a/src/mongo/db/pipeline/process_interface/mongos_process_interface.cpp +++ b/src/mongo/db/pipeline/process_interface/mongos_process_interface.cpp @@ -36,12 +36,8 @@ #include "mongo/db/auth/authorization_manager.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/curop.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/index/index_constants.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/document_source_merge.h" #include "mongo/db/pipeline/expression_context_builder.h" @@ -53,9 +49,13 @@ #include "mongo/db/query/collation/collator_factory_interface.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/repl/read_concern_args.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/router_role.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/service_context.h" #include "mongo/db/session/kill_sessions.h" #include "mongo/db/session/session_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/versioning_protocol/shard_version.h" diff --git a/src/mongo/db/pipeline/process_interface/mongos_process_interface.h b/src/mongo/db/pipeline/process_interface/mongos_process_interface.h index a33d66a4276..86efce63e84 100644 --- a/src/mongo/db/pipeline/process_interface/mongos_process_interface.h +++ b/src/mongo/db/pipeline/process_interface/mongos_process_interface.h @@ -40,7 +40,6 @@ #include "mongo/db/database_name.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/shard_filterer.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielder.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -56,6 +55,7 @@ #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/record_id.h" #include "mongo/db/repl/optime.h" +#include "mongo/db/shard_role/resource_yielder.h" #include "mongo/db/storage/backup_cursor_state.h" #include "mongo/db/storage/key_format.h" #include "mongo/db/storage/record_store.h" diff --git a/src/mongo/db/pipeline/process_interface/non_shardsvr_process_interface.cpp b/src/mongo/db/pipeline/process_interface/non_shardsvr_process_interface.cpp index e600d63efe2..a3f6be1f3a0 100644 --- a/src/mongo/db/pipeline/process_interface/non_shardsvr_process_interface.cpp +++ b/src/mongo/db/pipeline/process_interface/non_shardsvr_process_interface.cpp @@ -38,19 +38,6 @@ #include "mongo/db/exec/agg/pipeline_builder.h" #include "mongo/db/exec/document_value/value.h" #include "mongo/db/index_builds/index_builds_coordinator.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/ddl/list_databases_gen.h" -#include "mongo/db/local_catalog/drop_collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/list_indexes.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/rename_collection.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/document_source_cursor.h" #include "mongo/db/pipeline/pipeline_factory.h" @@ -59,6 +46,19 @@ #include "mongo/db/query/write_ops/write_ops.h" #include "mongo/db/query/write_ops/write_ops_exec.h" #include "mongo/db/repl/speculative_majority_read_info.h" +#include "mongo/db/shard_role/ddl/list_databases_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/drop_collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/list_indexes.h" +#include "mongo/db/shard_role/shard_catalog/rename_collection.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/timeseries/timeseries_request_util.h" diff --git a/src/mongo/db/pipeline/process_interface/replica_set_node_process_interface.cpp b/src/mongo/db/pipeline/process_interface/replica_set_node_process_interface.cpp index dc5e92d2db0..ea081263301 100644 --- a/src/mongo/db/pipeline/process_interface/replica_set_node_process_interface.cpp +++ b/src/mongo/db/pipeline/process_interface/replica_set_node_process_interface.cpp @@ -35,9 +35,6 @@ #include "mongo/bson/bsontypes.h" #include "mongo/bson/dotted_path/dotted_path_support.h" #include "mongo/db/commands.h" -#include "mongo/db/local_catalog/ddl/list_collections_gen.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/logical_time.h" #include "mongo/db/operation_time_tracker.h" #include "mongo/db/pipeline/process_interface/common_mongod_process_interface.h" @@ -46,6 +43,9 @@ #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/session/logical_session_id_helpers.h" +#include "mongo/db/shard_role/ddl/list_collections_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/executor/remote_command_request.h" #include "mongo/rpc/get_status_from_command_result.h" #include "mongo/s/write_ops/batched_command_request.h" diff --git a/src/mongo/db/pipeline/process_interface/shardsvr_process_interface.cpp b/src/mongo/db/pipeline/process_interface/shardsvr_process_interface.cpp index de517d665c6..560539dfb68 100644 --- a/src/mongo/db/pipeline/process_interface/shardsvr_process_interface.cpp +++ b/src/mongo/db/pipeline/process_interface/shardsvr_process_interface.cpp @@ -36,18 +36,18 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/client/read_preference.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/cluster_ddl.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/document_source_cursor.h" #include "mongo/db/pipeline/document_source_merge.h" #include "mongo/db/pipeline/pipeline_factory.h" #include "mongo/db/pipeline/sharded_agg_helpers.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/router_role.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" #include "mongo/db/sharding_environment/client/shard.h" diff --git a/src/mongo/db/pipeline/process_interface/standalone_process_interface_test.cpp b/src/mongo/db/pipeline/process_interface/standalone_process_interface_test.cpp index 3102eba060e..0635919633d 100644 --- a/src/mongo/db/pipeline/process_interface/standalone_process_interface_test.cpp +++ b/src/mongo/db/pipeline/process_interface/standalone_process_interface_test.cpp @@ -32,10 +32,10 @@ #include "mongo/base/string_data.h" #include "mongo/bson/oid.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/expression_context_for_test.h" #include "mongo/db/pipeline/field_path.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/pipeline/search/document_source_internal_search_id_lookup_test.cpp b/src/mongo/db/pipeline/search/document_source_internal_search_id_lookup_test.cpp index 9ce2834b8a6..f5ee1f40839 100644 --- a/src/mongo/db/pipeline/search/document_source_internal_search_id_lookup_test.cpp +++ b/src/mongo/db/pipeline/search/document_source_internal_search_id_lookup_test.cpp @@ -35,7 +35,6 @@ #include "mongo/db/exec/agg/mock_stage.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/document_value/document_value_test_util.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" #include "mongo/db/pipeline/aggregation_context_fixture.h" #include "mongo/db/pipeline/catalog_resource_handle.h" #include "mongo/db/pipeline/document_source_cursor.h" @@ -47,6 +46,7 @@ #include "mongo/db/pipeline/process_interface/stub_lookup_single_document_process_interface.h" #include "mongo/db/query/multiple_collection_accessor.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" #include "mongo/unittest/death_test.h" #include "mongo/unittest/temp_dir.h" diff --git a/src/mongo/db/pipeline/search/document_source_vector_search.cpp b/src/mongo/db/pipeline/search/document_source_vector_search.cpp index 5edef9a5287..70e4d43b122 100644 --- a/src/mongo/db/pipeline/search/document_source_vector_search.cpp +++ b/src/mongo/db/pipeline/search/document_source_vector_search.cpp @@ -30,7 +30,6 @@ #include "mongo/db/pipeline/search/document_source_vector_search.h" #include "mongo/base/string_data.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/pipeline/document_source_sort.h" #include "mongo/db/pipeline/search/document_source_internal_search_id_lookup.h" #include "mongo/db/pipeline/search/lite_parsed_search.h" @@ -41,6 +40,7 @@ #include "mongo/db/query/search/mongot_cursor.h" #include "mongo/db/query/search/search_index_view_validation.h" #include "mongo/db/query/search/search_task_executors.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/views/resolved_view.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kQuery diff --git a/src/mongo/db/pipeline/shard_role_transaction_resources_stasher_for_pipeline.h b/src/mongo/db/pipeline/shard_role_transaction_resources_stasher_for_pipeline.h index 92b2f34a0bd..1fe97a2b257 100644 --- a/src/mongo/db/pipeline/shard_role_transaction_resources_stasher_for_pipeline.h +++ b/src/mongo/db/pipeline/shard_role_transaction_resources_stasher_for_pipeline.h @@ -29,7 +29,7 @@ #pragma once -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/util/intrusive_counter.h" namespace mongo { diff --git a/src/mongo/db/pipeline/sharded_agg_helpers.cpp b/src/mongo/db/pipeline/sharded_agg_helpers.cpp index ae119a18363..0977e05dffa 100644 --- a/src/mongo/db/pipeline/sharded_agg_helpers.cpp +++ b/src/mongo/db/pipeline/sharded_agg_helpers.cpp @@ -44,9 +44,6 @@ #include "mongo/db/exec/document_value/value.h" #include "mongo/db/field_ref.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/collection_uuid_mismatch.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/keypattern.h" #include "mongo/db/logical_time.h" @@ -72,14 +69,17 @@ #include "mongo/db/query/explain_common.h" #include "mongo/db/query/query_request_helper.h" #include "mongo/db/query/query_stats/query_stats.h" -#include "mongo/db/raw_data_operation.h" #include "mongo/db/repl/read_concern_args.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/collection_uuid_mismatch.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/topology/shard_registry.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/version_context.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/db/versioning_protocol/shard_version.h" diff --git a/src/mongo/db/pipeline/sharded_agg_helpers.h b/src/mongo/db/pipeline/sharded_agg_helpers.h index b748bb82ebd..0539df1cb5b 100644 --- a/src/mongo/db/pipeline/sharded_agg_helpers.h +++ b/src/mongo/db/pipeline/sharded_agg_helpers.h @@ -34,8 +34,6 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/exec/document_value/document.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/aggregate_command_gen.h" @@ -45,6 +43,8 @@ #include "mongo/db/pipeline/sharded_agg_helpers_targeting_policy.h" #include "mongo/db/pipeline/split_pipeline.h" #include "mongo/db/query/explain_options.h" +#include "mongo/db/router_role/router_role.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/s/async_requests_sender.h" diff --git a/src/mongo/db/pipeline/spilling/BUILD.bazel b/src/mongo/db/pipeline/spilling/BUILD.bazel index 4c8ff09257e..8c324180a69 100644 --- a/src/mongo/db/pipeline/spilling/BUILD.bazel +++ b/src/mongo/db/pipeline/spilling/BUILD.bazel @@ -41,10 +41,10 @@ mongo_cc_library( ], deps = [ "//src/mongo/db:service_context_d_test_fixture", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/pipeline:expression_context_for_test", "//src/mongo/db/pipeline/process_interface:mongod_process_interface_factory", "//src/mongo/db/query:query_test_service_context", + "//src/mongo/db/shard_role/lock_manager:exception_util", ], ) diff --git a/src/mongo/db/pipeline/spilling/spillable_map.cpp b/src/mongo/db/pipeline/spilling/spillable_map.cpp index 6dfaeb8448c..34117d3112c 100644 --- a/src/mongo/db/pipeline/spilling/spillable_map.cpp +++ b/src/mongo/db/pipeline/spilling/spillable_map.cpp @@ -30,9 +30,9 @@ #include "mongo/db/pipeline/spilling/spillable_map.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/pipeline/spilling/spill_table_batch_writer.h" #include "mongo/db/query/util/spill_util.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/storage_options.h" #include "mongo/db/storage/storage_parameters_gen.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/pipeline/variables.cpp b/src/mongo/db/pipeline/variables.cpp index 9522fd1fdca..b763fa38949 100644 --- a/src/mongo/db/pipeline/variables.cpp +++ b/src/mongo/db/pipeline/variables.cpp @@ -45,7 +45,7 @@ #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/variable_validation.h" #include "mongo/db/query/compiler/dependency_analysis/dependencies.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/rpc/metadata/audit_user_attrs.h" #include "mongo/transport/session.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/profile_collection.cpp b/src/mongo/db/profile_collection.cpp index 2cd9a4f5dc7..556ecc3b007 100644 --- a/src/mongo/db/profile_collection.cpp +++ b/src/mongo/db/profile_collection.cpp @@ -39,21 +39,21 @@ #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/commands/server_status/server_status.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/lock_manager/locker.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/locker.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/versioning_protocol/shard_version.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/query/BUILD.bazel b/src/mongo/db/query/BUILD.bazel index 4665d4e0504..81f2acadd9e 100644 --- a/src/mongo/db/query/BUILD.bazel +++ b/src/mongo/db/query/BUILD.bazel @@ -172,7 +172,7 @@ idl_generator( src = "query_knobs.idl", deps = [ "//src/mongo/db:basic_types_gen", - "//src/mongo/db/cluster_parameters:cluster_server_parameter_gen", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_gen", ], ) @@ -183,8 +183,8 @@ mongo_cc_library( ], deps = [ "//src/mongo/db:shard_role", - "//src/mongo/db/local_catalog/lock_manager", "//src/mongo/db/query/query_settings", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/util:elapsed_tracker", ], ) @@ -571,8 +571,8 @@ mongo_cc_unit_test( ":parsed_distinct_command", ":query_planner_test_fixture", "//src/mongo/db:service_context_d", - "//src/mongo/db/local_catalog:collection_mock", "//src/mongo/db/query/compiler/optimizer/index_bounds_builder:index_bounds_builder_test_fixture", + "//src/mongo/db/shard_role/shard_catalog:collection_mock", ], ) @@ -626,12 +626,12 @@ mongo_cc_unit_test( "//src/mongo/db/exec/document_value:document_value_test_util", "//src/mongo/db/exec/sbe:query_sbe_stages", "//src/mongo/db/exec/sbe:sbe_unittest_base", - "//src/mongo/db/local_catalog:catalog_test_fixture", - "//src/mongo/db/local_catalog:collection_mock", "//src/mongo/db/pipeline:aggregation_context_fixture", "//src/mongo/db/pipeline:expression_context_for_test", "//src/mongo/db/query/collation:collator_interface_mock", "//src/mongo/db/query/compiler/optimizer/index_bounds_builder:index_bounds_builder_test_fixture", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", + "//src/mongo/db/shard_role/shard_catalog:collection_mock", "//src/mongo/rpc", "//src/mongo/util:clock_source_mock", ], @@ -673,7 +673,7 @@ mongo_cc_library( deps = [ "//src/mongo/db:read_write_concern_defaults_mock", "//src/mongo/db:service_context_d", - "//src/mongo/db/local_catalog:catalog_test_fixture", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", "//src/third_party/benchmark", ], ) diff --git a/src/mongo/db/query/all_indices_required_checker.cpp b/src/mongo/db/query/all_indices_required_checker.cpp index 214d8b2d18c..05b031ea104 100644 --- a/src/mongo/db/query/all_indices_required_checker.cpp +++ b/src/mongo/db/query/all_indices_required_checker.cpp @@ -30,10 +30,10 @@ #include "mongo/db/query/all_indices_required_checker.h" #include "mongo/base/error_codes.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/query/all_indices_required_checker.h b/src/mongo/db/query/all_indices_required_checker.h index a682dd51947..7d41a3d9e76 100644 --- a/src/mongo/db/query/all_indices_required_checker.h +++ b/src/mongo/db/query/all_indices_required_checker.h @@ -29,10 +29,10 @@ #pragma once -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/multiple_collection_accessor.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/util/string_map.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/query/client_cursor/clientcursor.cpp b/src/mongo/db/query/client_cursor/clientcursor.cpp index bb560b18e75..47685fc21da 100644 --- a/src/mongo/db/query/client_cursor/clientcursor.cpp +++ b/src/mongo/db/query/client_cursor/clientcursor.cpp @@ -33,8 +33,6 @@ #include "mongo/db/client.h" #include "mongo/db/commands/server_status/server_status_metric.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/external_data_source_scope_guard.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/memory_tracking/operation_memory_usage_tracker.h" #include "mongo/db/query/client_cursor/cursor_manager.h" #include "mongo/db/query/client_cursor/cursor_server_params.h" @@ -42,6 +40,8 @@ #include "mongo/db/query/query_knob_configuration.h" #include "mongo/db/query/query_knobs_gen.h" #include "mongo/db/query/query_stats/query_stats.h" +#include "mongo/db/shard_role/shard_catalog/external_data_source_scope_guard.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/util/background.h" #include "mongo/util/clock_source.h" diff --git a/src/mongo/db/query/client_cursor/cursor_manager.h b/src/mongo/db/query/client_cursor/cursor_manager.h index 92cc061dc1e..5e7afbf53b7 100644 --- a/src/mongo/db/query/client_cursor/cursor_manager.h +++ b/src/mongo/db/query/client_cursor/cursor_manager.h @@ -31,9 +31,9 @@ #include "mongo/base/status.h" #include "mongo/base/status_with.h" -#include "mongo/db/local_catalog/util/partitioned.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/partitioned.h" #include "mongo/db/pipeline/process_interface/mongo_process_interface.h" #include "mongo/db/query/client_cursor/clientcursor.h" #include "mongo/db/query/client_cursor/cursor_id.h" diff --git a/src/mongo/db/query/collation/BUILD.bazel b/src/mongo/db/query/collation/BUILD.bazel index b67cdc45f61..1c37fb103f7 100644 --- a/src/mongo/db/query/collation/BUILD.bazel +++ b/src/mongo/db/query/collation/BUILD.bazel @@ -97,7 +97,7 @@ mongo_cc_unit_test( ":collator_interface", ":collator_interface_mock", "//src/mongo:base", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/db/storage/key_string", ], ) diff --git a/src/mongo/db/query/collection_index_usage_tracker_decoration.cpp b/src/mongo/db/query/collection_index_usage_tracker_decoration.cpp index 02e6a7ecc1c..d0ce8aeb83a 100644 --- a/src/mongo/db/query/collection_index_usage_tracker_decoration.cpp +++ b/src/mongo/db/query/collection_index_usage_tracker_decoration.cpp @@ -32,8 +32,8 @@ #include "mongo/db/aggregated_index_usage_tracker.h" #include "mongo/db/commands/server_status/server_status_metric.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/decorable.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kQuery diff --git a/src/mongo/db/query/collection_index_usage_tracker_decoration.h b/src/mongo/db/query/collection_index_usage_tracker_decoration.h index 8e67d84baf1..90ab9773a33 100644 --- a/src/mongo/db/query/collection_index_usage_tracker_decoration.h +++ b/src/mongo/db/query/collection_index_usage_tracker_decoration.h @@ -30,7 +30,7 @@ #pragma once #include "mongo/db/collection_index_usage_tracker.h" -#include "mongo/db/local_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include diff --git a/src/mongo/db/query/collection_query_info.cpp b/src/mongo/db/query/collection_query_info.cpp index 220b905895b..d79a915f18d 100644 --- a/src/mongo/db/query/collection_query_info.cpp +++ b/src/mongo/db/query/collection_query_info.cpp @@ -40,10 +40,6 @@ #include "mongo/db/index/index_access_method.h" #include "mongo/db/index/wildcard_access_method.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/transformer_interface.h" @@ -52,6 +48,10 @@ #include "mongo/db/query/plan_cache/classic_plan_cache.h" #include "mongo/db/query/query_feature_flags_gen.h" #include "mongo/db/query/query_knobs_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/storage_options.h" #include "mongo/logv2/log.h" #include "mongo/platform/atomic_word.h" diff --git a/src/mongo/db/query/collection_query_info.h b/src/mongo/db/query/collection_query_info.h index 6c58c655165..1782a9b05b9 100644 --- a/src/mongo/db/query/collection_query_info.h +++ b/src/mongo/db/query/collection_query_info.h @@ -31,10 +31,10 @@ #include // IWYU pragma: no_include "boost/intrusive/detail/iterator.hpp" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/query/plan_cache/classic_plan_cache.h" #include "mongo/db/query/plan_cache/plan_cache_indexability.h" #include "mongo/db/query/plan_cache/plan_cache_invalidator.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/decorable.h" #include diff --git a/src/mongo/db/query/compiler/ce/exact/exact_cardinality_impl.h b/src/mongo/db/query/compiler/ce/exact/exact_cardinality_impl.h index 6f54ba58ffe..afa13827c85 100644 --- a/src/mongo/db/query/compiler/ce/exact/exact_cardinality_impl.h +++ b/src/mongo/db/query/compiler/ce/exact/exact_cardinality_impl.h @@ -28,11 +28,11 @@ */ #pragma once -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/query/compiler/ce/ce_common.h" #include "mongo/db/query/compiler/ce/exact/exact_cardinality.h" #include "mongo/db/query/compiler/optimizer/cost_based_ranker/estimates.h" #include "mongo/db/query/compiler/optimizer/cost_based_ranker/estimates_storage.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/util/modules.h" namespace mongo::ce { diff --git a/src/mongo/db/query/compiler/ce/histogram/BUILD.bazel b/src/mongo/db/query/compiler/ce/histogram/BUILD.bazel index fef4b660864..c80dcb36bd5 100644 --- a/src/mongo/db/query/compiler/ce/histogram/BUILD.bazel +++ b/src/mongo/db/query/compiler/ce/histogram/BUILD.bazel @@ -40,10 +40,10 @@ mongo_cc_library( deps = [ ":histogram_estimator", "//src/mongo/db:query_exec", - "//src/mongo/db/local_catalog:catalog_test_fixture", "//src/mongo/db/query/compiler/ce:ce_test_utils", "//src/mongo/db/query/compiler/stats:stats_gen", "//src/mongo/db/query/compiler/stats:stats_test_utils", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", "//src/mongo/unittest", ], ) diff --git a/src/mongo/db/query/compiler/ce/sampling/BUILD.bazel b/src/mongo/db/query/compiler/ce/sampling/BUILD.bazel index efe9db496f9..80f9ae0693d 100644 --- a/src/mongo/db/query/compiler/ce/sampling/BUILD.bazel +++ b/src/mongo/db/query/compiler/ce/sampling/BUILD.bazel @@ -17,11 +17,11 @@ mongo_cc_library( deps = [ "//src/mongo/db:write_stage_common", "//src/mongo/db/collection_crud", - "//src/mongo/db/local_catalog:catalog_control", - "//src/mongo/db/local_catalog:catalog_test_fixture", "//src/mongo/db/query:query_planner", "//src/mongo/db/query/compiler/ce:ce_test_utils", "//src/mongo/db/query/compiler/optimizer/index_bounds_builder", + "//src/mongo/db/shard_role/shard_catalog:catalog_control", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", ], ) diff --git a/src/mongo/db/query/compiler/ce/sampling/sampling_test_utils.cpp b/src/mongo/db/query/compiler/ce/sampling/sampling_test_utils.cpp index dfadda4dce2..41ed563a353 100644 --- a/src/mongo/db/query/compiler/ce/sampling/sampling_test_utils.cpp +++ b/src/mongo/db/query/compiler/ce/sampling/sampling_test_utils.cpp @@ -30,8 +30,8 @@ #include "mongo/db/query/compiler/ce/sampling/sampling_test_utils.h" #include "mongo/db/exec/matcher/matcher.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" #include "mongo/db/query/compiler/optimizer/index_bounds_builder/index_bounds_builder.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kQuery diff --git a/src/mongo/db/query/compiler/ce/sampling/sampling_test_utils.h b/src/mongo/db/query/compiler/ce/sampling/sampling_test_utils.h index e5b6abb89c1..b5c9dd6a114 100644 --- a/src/mongo/db/query/compiler/ce/sampling/sampling_test_utils.h +++ b/src/mongo/db/query/compiler/ce/sampling/sampling_test_utils.h @@ -31,8 +31,6 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/collection_crud/collection_write_path.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/query/compiler/ce/ce_test_utils.h" @@ -40,6 +38,8 @@ #include "mongo/db/query/compiler/physical_model/index_bounds/index_bounds.h" #include "mongo/db/query/compiler/stats/value_utils.h" #include "mongo/db/repl/oplog.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/unittest/unittest.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/query/compiler/metadata/index_entry.h b/src/mongo/db/query/compiler/metadata/index_entry.h index 808aee43942..f6d796117ce 100644 --- a/src/mongo/db/query/compiler/metadata/index_entry.h +++ b/src/mongo/db/query/compiler/metadata/index_entry.h @@ -35,9 +35,9 @@ #include "mongo/db/field_ref.h" #include "mongo/db/index/multikey_paths.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/query/collation/collator_interface.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/util/assert_util.h" #include "mongo/util/container_size_helper.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/query/compiler/optimizer/index_bounds_builder/index_bounds_builder_test_fixture.h b/src/mongo/db/query/compiler/optimizer/index_bounds_builder/index_bounds_builder_test_fixture.h index 95bf319c99c..21470e0f327 100644 --- a/src/mongo/db/query/compiler/optimizer/index_bounds_builder/index_bounds_builder_test_fixture.h +++ b/src/mongo/db/query/compiler/optimizer/index_bounds_builder/index_bounds_builder_test_fixture.h @@ -36,7 +36,6 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/index/multikey_paths.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/pipeline/expression_context_for_test.h" #include "mongo/db/query/compiler/metadata/index_entry.h" @@ -46,6 +45,7 @@ #include "mongo/db/query/compiler/physical_model/index_bounds/index_bounds.h" #include "mongo/db/query/compiler/rewrites/matcher/expression_optimizer.h" #include "mongo/db/query/compiler/rewrites/matcher/expression_parameterization.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/unittest/unittest.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/query/compiler/optimizer/index_bounds_builder/interval_evaluation_tree_test.cpp b/src/mongo/db/query/compiler/optimizer/index_bounds_builder/interval_evaluation_tree_test.cpp index ac42b486585..9fc79b04a79 100644 --- a/src/mongo/db/query/compiler/optimizer/index_bounds_builder/interval_evaluation_tree_test.cpp +++ b/src/mongo/db/query/compiler/optimizer/index_bounds_builder/interval_evaluation_tree_test.cpp @@ -37,7 +37,6 @@ #include "mongo/bson/json.h" #include "mongo/db/field_ref.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/matcher/expression_tree.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/expression_context_for_test.h" @@ -45,6 +44,7 @@ #include "mongo/db/query/compiler/parsers/matcher/expression_parser.h" #include "mongo/db/query/compiler/rewrites/matcher/expression_optimizer.h" #include "mongo/db/query/compiler/rewrites/matcher/expression_parameterization.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/unittest/unittest.h" #include "mongo/util/intrusive_counter.h" diff --git a/src/mongo/db/query/compiler/optimizer/join/BUILD.bazel b/src/mongo/db/query/compiler/optimizer/join/BUILD.bazel index 61d759aa12b..3c1c688b841 100644 --- a/src/mongo/db/query/compiler/optimizer/join/BUILD.bazel +++ b/src/mongo/db/query/compiler/optimizer/join/BUILD.bazel @@ -77,8 +77,8 @@ mongo_cc_unit_test( ":reorder_joins", ":unit_test_helpers", "//src/mongo/db:query_exec", - "//src/mongo/db/local_catalog:index_catalog_mock", "//src/mongo/db/pipeline:aggregation_context_fixture", + "//src/mongo/db/shard_role/shard_catalog:index_catalog_mock", ], ) @@ -152,8 +152,8 @@ mongo_cc_library( ], deps = [ "//src/mongo/db:server_base", - "//src/mongo/db/local_catalog:catalog_test_fixture", "//src/mongo/db/pipeline", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", "//src/mongo/unittest", ], ) diff --git a/src/mongo/db/query/compiler/optimizer/join/reorder_joins_test.cpp b/src/mongo/db/query/compiler/optimizer/join/reorder_joins_test.cpp index b5e3f9f1370..8d17baf78a2 100644 --- a/src/mongo/db/query/compiler/optimizer/join/reorder_joins_test.cpp +++ b/src/mongo/db/query/compiler/optimizer/join/reorder_joins_test.cpp @@ -30,10 +30,10 @@ #include "mongo/db/query/compiler/optimizer/join/reorder_joins.h" #include "mongo/bson/json.h" -#include "mongo/db/local_catalog/index_catalog_entry_mock.h" -#include "mongo/db/local_catalog/index_catalog_mock.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/compiler/optimizer/join/unit_test_helpers.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry_mock.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_mock.h" #include "mongo/unittest/golden_test.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/query/compiler/optimizer/join/unit_test_helpers.h b/src/mongo/db/query/compiler/optimizer/join/unit_test_helpers.h index ef331c3b558..9d6641f2343 100644 --- a/src/mongo/db/query/compiler/optimizer/join/unit_test_helpers.h +++ b/src/mongo/db/query/compiler/optimizer/join/unit_test_helpers.h @@ -27,13 +27,13 @@ * it in the license file. */ -#include "mongo/db/local_catalog/catalog_test_fixture.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/compiler/ce/sampling/sampling_estimator.h" #include "mongo/db/query/compiler/optimizer/cost_based_ranker/estimates.h" #include "mongo/db/query/compiler/optimizer/join/join_graph.h" #include "mongo/db/query/multiple_collection_accessor.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" namespace mongo::join_ordering { diff --git a/src/mongo/db/query/compiler/physical_model/query_solution/query_solution.cpp b/src/mongo/db/query/compiler/physical_model/query_solution/query_solution.cpp index 613ded1270d..10a48fc0058 100644 --- a/src/mongo/db/query/compiler/physical_model/query_solution/query_solution.cpp +++ b/src/mongo/db/query/compiler/physical_model/query_solution/query_solution.cpp @@ -38,7 +38,6 @@ #include "mongo/db/index/multikey_paths.h" #include "mongo/db/index_names.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" #include "mongo/db/matcher/expression_algo.h" #include "mongo/db/matcher/expression_geo.h" #include "mongo/db/query/collation/collation_index_key.h" @@ -48,6 +47,7 @@ #include "mongo/db/query/compiler/physical_model/query_solution/query_solution_helpers.h" #include "mongo/db/query/query_planner_common.h" #include "mongo/db/query/stage_memory_limit_knobs/knobs.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" #include #include diff --git a/src/mongo/db/query/compiler/physical_model/query_solution/query_solution.h b/src/mongo/db/query/compiler/physical_model/query_solution/query_solution.h index 168c1ac5d20..3f6cb39eb84 100644 --- a/src/mongo/db/query/compiler/physical_model/query_solution/query_solution.h +++ b/src/mongo/db/query/compiler/physical_model/query_solution/query_solution.h @@ -43,7 +43,6 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/exec/collection_scan_common.h" #include "mongo/db/fts/fts_query.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/accumulation_statement.h" @@ -66,6 +65,7 @@ #include "mongo/db/query/plan_enumerator/plan_enumerator_explain_info.h" #include "mongo/db/query/record_id_bound.h" #include "mongo/db/query/timeseries/bucket_spec.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" #include "mongo/util/assert_util.h" #include "mongo/util/modules.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/query/compiler/physical_model/query_solution/query_solution_test.cpp b/src/mongo/db/query/compiler/physical_model/query_solution/query_solution_test.cpp index 9d6a8111d41..bf69636806b 100644 --- a/src/mongo/db/query/compiler/physical_model/query_solution/query_solution_test.cpp +++ b/src/mongo/db/query/compiler/physical_model/query_solution/query_solution_test.cpp @@ -36,7 +36,6 @@ #include "mongo/db/field_ref.h" #include "mongo/db/index/multikey_paths.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/query/collation/collator_interface_mock.h" @@ -50,6 +49,7 @@ #include "mongo/db/query/planner_wildcard_helpers.h" #include "mongo/db/query/query_test_service_context.h" #include "mongo/db/query/wildcard_test_utils.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/stdx/type_traits.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/query/compiler/stats/stats_cache_loader_test.cpp b/src/mongo/db/query/compiler/stats/stats_cache_loader_test.cpp index a989e543399..bf964306c4b 100644 --- a/src/mongo/db/query/compiler/stats/stats_cache_loader_test.cpp +++ b/src/mongo/db/query/compiler/stats/stats_cache_loader_test.cpp @@ -32,10 +32,6 @@ #include "mongo/base/string_data.h" #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/exec/sbe/values/value.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/compiler/stats/ce_histogram.h" #include "mongo/db/query/compiler/stats/max_diff.h" @@ -44,6 +40,10 @@ #include "mongo/db/query/compiler/stats/stats_cache_loader_test_fixture.h" #include "mongo/db/query/compiler/stats/value_utils.h" #include "mongo/db/repl/oplog.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/database.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/unittest/unittest.h" #include "mongo/util/future.h" diff --git a/src/mongo/db/query/datetime/BUILD.bazel b/src/mongo/db/query/datetime/BUILD.bazel index f341c601613..abc9f806080 100644 --- a/src/mongo/db/query/datetime/BUILD.bazel +++ b/src/mongo/db/query/datetime/BUILD.bazel @@ -40,7 +40,7 @@ mongo_cc_unit_test( tags = ["mongo_unittest_seventh_group"], deps = [ ":date_time_support", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/transport:transport_layer_common", ], ) @@ -52,7 +52,7 @@ mongo_cc_fuzzer_test( ], deps = [ "date_time_support", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/transport:transport_layer_common", ], ) diff --git a/src/mongo/db/query/find.h b/src/mongo/db/query/find.h index f4b4562db0f..56127110b4d 100644 --- a/src/mongo/db/query/find.h +++ b/src/mongo/db/query/find.h @@ -31,11 +31,11 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/dbmessage.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/canonical_query.h" #include "mongo/db/query/client_cursor/clientcursor.h" #include "mongo/db/query/plan_executor.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/query/get_executor.cpp b/src/mongo/db/query/get_executor.cpp index c5f9a7a54cc..32a5e3f38d8 100644 --- a/src/mongo/db/query/get_executor.cpp +++ b/src/mongo/db/query/get_executor.cpp @@ -63,10 +63,6 @@ #include "mongo/db/exec/sbe/stages/stages.h" #include "mongo/db/feature_flag.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/matcher/extensions_callback_real.h" #include "mongo/db/pipeline/expression_context_builder.h" @@ -114,6 +110,10 @@ #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_parameter.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/stats/counters.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/recovery_unit.h" diff --git a/src/mongo/db/query/get_executor.h b/src/mongo/db/query/get_executor.h index 2b49b6d7610..865124a97f8 100644 --- a/src/mongo/db/query/get_executor.h +++ b/src/mongo/db/query/get_executor.h @@ -34,9 +34,6 @@ #include "mongo/db/curop.h" #include "mongo/db/exec/classic/delete_stage.h" #include "mongo/db/exec/classic/update_stage.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" @@ -53,6 +50,9 @@ #include "mongo/db/query/write_ops/parsed_delete.h" #include "mongo/db/query/write_ops/parsed_update.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/update/update_driver.h" #include "mongo/executor/task_executor_cursor.h" diff --git a/src/mongo/db/query/internal_plans.cpp b/src/mongo/db/query/internal_plans.cpp index ff4e2409a38..0304afda722 100644 --- a/src/mongo/db/query/internal_plans.cpp +++ b/src/mongo/db/query/internal_plans.cpp @@ -40,14 +40,14 @@ #include "mongo/db/exec/classic/multi_iterator.h" #include "mongo/db/exec/classic/update_stage.h" #include "mongo/db/exec/classic/upsert_stage.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/query/get_executor.h" #include "mongo/db/query/internal_plans.h" #include "mongo/db/query/plan_executor_factory.h" #include "mongo/db/query/write_ops/update_request.h" #include "mongo/db/record_id_helpers.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/db/storage/record_store.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/query/internal_plans.h b/src/mongo/db/query/internal_plans.h index 7fa6cde6a6d..6a8cc5bbd27 100644 --- a/src/mongo/db/query/internal_plans.h +++ b/src/mongo/db/query/internal_plans.h @@ -36,10 +36,6 @@ #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/collection_scan_common.h" #include "mongo/db/global_catalog/ddl/shard_key_index_util.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" @@ -48,6 +44,10 @@ #include "mongo/db/query/plan_yield_policy.h" #include "mongo/db/query/record_id_bound.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_role.h" #include #include diff --git a/src/mongo/db/query/multiple_collection_accessor.h b/src/mongo/db/query/multiple_collection_accessor.h index 2a68adeeab8..ac22329a3de 100644 --- a/src/mongo/db/query/multiple_collection_accessor.h +++ b/src/mongo/db/query/multiple_collection_accessor.h @@ -29,10 +29,10 @@ #pragma once -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/query/plan_executor.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_role.h" namespace mongo { diff --git a/src/mongo/db/query/multiple_collection_accessor_test.cpp b/src/mongo/db/query/multiple_collection_accessor_test.cpp index 89e67a05260..e795e39ddf9 100644 --- a/src/mongo/db/query/multiple_collection_accessor_test.cpp +++ b/src/mongo/db/query/multiple_collection_accessor_test.cpp @@ -40,21 +40,21 @@ #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/global_catalog/type_chunk.h" -#include "mongo/db/local_catalog/catalog_control.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/query/client_cursor/cursor_manager.h" #include "mongo/db/query/internal_plans.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/catalog_control.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/storage/recovery_unit.h" diff --git a/src/mongo/db/query/partitioned_cache.h b/src/mongo/db/query/partitioned_cache.h index a9438279651..f00f35c079a 100644 --- a/src/mongo/db/query/partitioned_cache.h +++ b/src/mongo/db/query/partitioned_cache.h @@ -30,7 +30,7 @@ #pragma once #include "mongo/db/commands/server_status/server_status_metric.h" -#include "mongo/db/local_catalog/util/partitioned.h" +#include "mongo/db/partitioned.h" #include "mongo/db/query/lru_key_value.h" #include "mongo/util/container_size_helper.h" diff --git a/src/mongo/db/query/plan_cache/BUILD.bazel b/src/mongo/db/query/plan_cache/BUILD.bazel index bed0a91d902..36f7b1ecea5 100644 --- a/src/mongo/db/query/plan_cache/BUILD.bazel +++ b/src/mongo/db/query/plan_cache/BUILD.bazel @@ -67,10 +67,10 @@ mongo_cc_benchmark( deps = [ "plan_cache_test_util", "//src/mongo/db:service_context_d", - "//src/mongo/db/local_catalog:catalog_impl", - "//src/mongo/db/local_catalog:collection_mock", "//src/mongo/db/query:canonical_query_base", "//src/mongo/db/query:query_test_service_context", + "//src/mongo/db/shard_role/shard_catalog:catalog_impl", + "//src/mongo/db/shard_role/shard_catalog:collection_mock", "//src/mongo/idl:server_parameter_test_util", "//src/mongo/s:sharding_router_api", ], @@ -100,10 +100,10 @@ mongo_cc_unit_test( "plan_cache_test_util", "//src/mongo/db:service_context_d", "//src/mongo/db/index:index_access_method", - "//src/mongo/db/local_catalog:collection_mock", "//src/mongo/db/pipeline:expression_context_for_test", "//src/mongo/db/query:canonical_query_test_util", "//src/mongo/db/query:query_planner_test_lib", + "//src/mongo/db/shard_role/shard_catalog:collection_mock", "//src/mongo/idl:server_parameter_test_util", ], ) diff --git a/src/mongo/db/query/plan_cache/plan_cache.h b/src/mongo/db/query/plan_cache/plan_cache.h index 52313aa57be..45edb51379a 100644 --- a/src/mongo/db/query/plan_cache/plan_cache.h +++ b/src/mongo/db/query/plan_cache/plan_cache.h @@ -46,7 +46,7 @@ #include "mongo/db/commands/server_status/server_status_metric.h" #include "mongo/db/exec/plan_stats.h" #include "mongo/db/exec/sbe/stages/plan_stats.h" -#include "mongo/db/local_catalog/util/partitioned.h" +#include "mongo/db/partitioned.h" #include "mongo/db/query/lru_key_value.h" #include "mongo/db/query/partitioned_cache.h" #include "mongo/db/query/plan_cache/plan_cache_callbacks.h" diff --git a/src/mongo/db/query/plan_cache/plan_cache_classic_bm.cpp b/src/mongo/db/query/plan_cache/plan_cache_classic_bm.cpp index 088f2e7ce5b..36ab616a8f7 100644 --- a/src/mongo/db/query/plan_cache/plan_cache_classic_bm.cpp +++ b/src/mongo/db/query/plan_cache/plan_cache_classic_bm.cpp @@ -30,9 +30,6 @@ #include "mongo/bson/json.h" #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/runtime_planners/classic_runtime_planner/planner_interface.h" -#include "mongo/db/local_catalog/collection_mock.h" -#include "mongo/db/local_catalog/index_catalog_mock.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role_mock.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/query/compiler/metadata/index_entry.h" #include "mongo/db/query/multiple_collection_accessor.h" @@ -43,6 +40,9 @@ #include "mongo/db/query/query_planner_params.h" #include "mongo/db/query/query_planner_test_fixture.h" #include "mongo/db/query/query_test_service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection_mock.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_mock.h" +#include "mongo/db/shard_role/shard_role_mock.h" #include "mongo/idl/server_parameter_test_util.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/query/plan_cache/plan_cache_invalidator.h b/src/mongo/db/query/plan_cache/plan_cache_invalidator.h index 0ce8ef66f47..eee7ebe4bb9 100644 --- a/src/mongo/db/query/plan_cache/plan_cache_invalidator.h +++ b/src/mongo/db/query/plan_cache/plan_cache_invalidator.h @@ -29,8 +29,8 @@ #pragma once -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/modules.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/query/plan_cache/plan_cache_key_factory.cpp b/src/mongo/db/query/plan_cache/plan_cache_key_factory.cpp index a0bb7c1546e..9da5124529a 100644 --- a/src/mongo/db/query/plan_cache/plan_cache_key_factory.cpp +++ b/src/mongo/db/query/plan_cache/plan_cache_key_factory.cpp @@ -30,7 +30,6 @@ #include "mongo/db/query/plan_cache/plan_cache_key_factory.h" #include "mongo/base/string_data.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/document_source_match.h" #include "mongo/db/query/canonical_query_encoder.h" @@ -39,6 +38,7 @@ #include "mongo/db/query/plan_cache/plan_cache_key_info.h" #include "mongo/db/query/planner_ixselect.h" #include "mongo/db/query/query_settings/query_settings_gen.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/db/versioning_protocol/shard_version.h" diff --git a/src/mongo/db/query/plan_cache/plan_cache_key_factory.h b/src/mongo/db/query/plan_cache/plan_cache_key_factory.h index 7b1b6814565..1861b933c39 100644 --- a/src/mongo/db/query/plan_cache/plan_cache_key_factory.h +++ b/src/mongo/db/query/plan_cache/plan_cache_key_factory.h @@ -30,7 +30,6 @@ #pragma once #include "mongo/bson/util/builder_fwd.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/query/canonical_query.h" #include "mongo/db/query/collection_query_info.h" @@ -38,6 +37,7 @@ #include "mongo/db/query/plan_cache/classic_plan_cache.h" #include "mongo/db/query/plan_cache/plan_cache_indexability.h" #include "mongo/db/query/plan_cache/sbe_plan_cache.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/modules.h" namespace mongo { diff --git a/src/mongo/db/query/plan_cache/plan_cache_test.cpp b/src/mongo/db/query/plan_cache/plan_cache_test.cpp index 5c12370d372..c2dbc423b28 100644 --- a/src/mongo/db/query/plan_cache/plan_cache_test.cpp +++ b/src/mongo/db/query/plan_cache/plan_cache_test.cpp @@ -43,9 +43,6 @@ #include "mongo/db/index/index_constants.h" #include "mongo/db/index/wildcard_key_generator.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_mock.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role_mock.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/expression_context_builder.h" @@ -70,6 +67,9 @@ #include "mongo/db/query/query_request_helper.h" #include "mongo/db/query/query_test_service_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_mock.h" +#include "mongo/db/shard_role/shard_role_mock.h" #include "mongo/idl/server_parameter_test_util.h" #include "mongo/logv2/log.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/query/plan_cache/sbe_plan_cache.h b/src/mongo/db/query/plan_cache/sbe_plan_cache.h index 162152d0663..96699f4fd42 100644 --- a/src/mongo/db/query/plan_cache/sbe_plan_cache.h +++ b/src/mongo/db/query/plan_cache/sbe_plan_cache.h @@ -33,8 +33,8 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/exec/sbe/stages/stages.h" #include "mongo/db/hasher.h" -#include "mongo/db/local_catalog/util/partitioned.h" #include "mongo/db/operation_context.h" +#include "mongo/db/partitioned.h" #include "mongo/db/query/plan_cache/plan_cache.h" #include "mongo/db/query/plan_cache/plan_cache_debug_info.h" #include "mongo/db/query/plan_cache/plan_cache_key_info.h" diff --git a/src/mongo/db/query/plan_executor.cpp b/src/mongo/db/query/plan_executor.cpp index bef1a820499..c56242f7d9c 100644 --- a/src/mongo/db/query/plan_executor.cpp +++ b/src/mongo/db/query/plan_executor.cpp @@ -30,9 +30,9 @@ #include "mongo/db/query/plan_executor.h" #include "mongo/base/error_codes.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/logv2/log.h" #include "mongo/platform/compiler.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/query/plan_executor.h b/src/mongo/db/query/plan_executor.h index 3d82c0039f2..4b1e7fd4497 100644 --- a/src/mongo/db/query/plan_executor.h +++ b/src/mongo/db/query/plan_executor.h @@ -35,8 +35,6 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/plan_stats.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/canonical_query.h" @@ -47,6 +45,8 @@ #include "mongo/db/record_id.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/optime.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" #include "mongo/util/future.h" diff --git a/src/mongo/db/query/plan_executor_impl.cpp b/src/mongo/db/query/plan_executor_impl.cpp index 485c6487e92..0b049597b11 100644 --- a/src/mongo/db/query/plan_executor_impl.cpp +++ b/src/mongo/db/query/plan_executor_impl.cpp @@ -40,9 +40,6 @@ #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/local_catalog/collection.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_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" @@ -52,6 +49,9 @@ #include "mongo/db/query/plan_yield_policy_impl.h" #include "mongo/db/repl/optime.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_util.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/exceptions.h" #include "mongo/logv2/log.h" #include "mongo/platform/compiler.h" diff --git a/src/mongo/db/query/plan_executor_impl.h b/src/mongo/db/query/plan_executor_impl.h index 56bdbe9e025..c78118bf3c6 100644 --- a/src/mongo/db/query/plan_executor_impl.h +++ b/src/mongo/db/query/plan_executor_impl.h @@ -38,9 +38,6 @@ #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/plan_stats.h" -#include "mongo/db/global_catalog/catalog_cache/shard_cannot_refresh_due_to_locks_held_exception.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" @@ -56,6 +53,9 @@ #include "mongo/db/query/stage_builder/classic_stage_builder.h" #include "mongo/db/query/write_ops/update_result.h" #include "mongo/db/record_id.h" +#include "mongo/db/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/yieldable.h" #include "mongo/util/assert_util.h" #include "mongo/util/duration.h" diff --git a/src/mongo/db/query/plan_executor_sbe.cpp b/src/mongo/db/query/plan_executor_sbe.cpp index 5df31fb6eab..f52aa89e660 100644 --- a/src/mongo/db/query/plan_executor_sbe.cpp +++ b/src/mongo/db/query/plan_executor_sbe.cpp @@ -37,7 +37,6 @@ #include "mongo/bson/oid.h" #include "mongo/db/exec/document_value/value.h" #include "mongo/db/exec/sbe/values/bson.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/query/plan_explainer_factory.h" #include "mongo/db/query/plan_insert_listener.h" @@ -45,6 +44,7 @@ #include "mongo/db/query/sbe_plan_ranker.h" #include "mongo/db/query/stage_builder/sbe/builder.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/logv2/log.h" #include "mongo/platform/compiler.h" diff --git a/src/mongo/db/query/plan_explainer_sbe.cpp b/src/mongo/db/query/plan_explainer_sbe.cpp index 5f4608dd8c3..8fb110bd7dc 100644 --- a/src/mongo/db/query/plan_explainer_sbe.cpp +++ b/src/mongo/db/query/plan_explainer_sbe.cpp @@ -36,7 +36,6 @@ #include "mongo/db/exec/sbe/stages/plan_stats.h" #include "mongo/db/fts/fts_query_impl.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/pipeline/field_path.h" #include "mongo/db/query/compiler/logical_model/projection/projection.h" @@ -51,6 +50,7 @@ #include "mongo/db/query/plan_summary_stats_visitor.h" #include "mongo/db/query/query_knobs_gen.h" #include "mongo/db/query/record_id_bound.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/platform/atomic_word.h" #include "mongo/stdx/unordered_map.h" #include "mongo/util/duration.h" diff --git a/src/mongo/db/query/plan_explainer_test.cpp b/src/mongo/db/query/plan_explainer_test.cpp index f8525ea5324..8fee4d2e152 100644 --- a/src/mongo/db/query/plan_explainer_test.cpp +++ b/src/mongo/db/query/plan_explainer_test.cpp @@ -30,9 +30,6 @@ #include "mongo/bson/json.h" #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/commands.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/pipeline/expression_context_for_test.h" #include "mongo/db/pipeline/pipeline_d.h" #include "mongo/db/query/canonical_query.h" @@ -44,6 +41,9 @@ #include "mongo/db/query/plan_executor_factory.h" #include "mongo/db/query/plan_explainer_sbe.h" #include "mongo/db/query/plan_yield_policy.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/query/plan_insert_listener.cpp b/src/mongo/db/query/plan_insert_listener.cpp index 7bc40a71fb8..071b1355b92 100644 --- a/src/mongo/db/query/plan_insert_listener.cpp +++ b/src/mongo/db/query/plan_insert_listener.cpp @@ -30,13 +30,13 @@ #include "mongo/db/query/plan_insert_listener.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/query/find_command.h" #include "mongo/db/query/find_common.h" #include "mongo/db/query/plan_executor.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/logv2/log.h" #include "mongo/platform/compiler.h" #include "mongo/util/clock_source.h" diff --git a/src/mongo/db/query/plan_insert_listener.h b/src/mongo/db/query/plan_insert_listener.h index ff906110d42..656dcaefec2 100644 --- a/src/mongo/db/query/plan_insert_listener.h +++ b/src/mongo/db/query/plan_insert_listener.h @@ -31,7 +31,6 @@ #include "mongo/base/status.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/canonical_query.h" @@ -39,6 +38,7 @@ #include "mongo/db/repl/optime.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/repl/wait_for_majority_service.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/query/plan_yield_policy.cpp b/src/mongo/db/query/plan_yield_policy.cpp index 2f98eecd928..6cd335ec62f 100644 --- a/src/mongo/db/query/plan_yield_policy.cpp +++ b/src/mongo/db/query/plan_yield_policy.cpp @@ -29,10 +29,10 @@ #include "mongo/db/query/plan_yield_policy.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/yieldable.h" #include "mongo/platform/compiler.h" diff --git a/src/mongo/db/query/plan_yield_policy_release_memory.h b/src/mongo/db/query/plan_yield_policy_release_memory.h index 85966776525..05c1cbf508b 100644 --- a/src/mongo/db/query/plan_yield_policy_release_memory.h +++ b/src/mongo/db/query/plan_yield_policy_release_memory.h @@ -29,9 +29,9 @@ #pragma once -#include "mongo/db/local_catalog/db_raii.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/plan_yield_policy.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" #include "mongo/db/yieldable.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/query/planner_access.cpp b/src/mongo/db/query/planner_access.cpp index 4d7bcaea534..50ea80cd7c8 100644 --- a/src/mongo/db/query/planner_access.cpp +++ b/src/mongo/db/query/planner_access.cpp @@ -50,8 +50,6 @@ #include "mongo/db/fts/fts_spec.h" #include "mongo/db/fts/fts_util.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/matcher/expression_algo.h" #include "mongo/db/matcher/expression_geo.h" @@ -78,6 +76,8 @@ #include "mongo/db/record_id.h" #include "mongo/db/record_id_helpers.h" #include "mongo/db/repl/optime.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" #include "mongo/db/storage/key_format.h" #include "mongo/logv2/log.h" #include "mongo/platform/atomic_word.h" diff --git a/src/mongo/db/query/planner_wildcard_helpers.cpp b/src/mongo/db/query/planner_wildcard_helpers.cpp index f87e9039d48..dc1ec249c60 100644 --- a/src/mongo/db/query/planner_wildcard_helpers.cpp +++ b/src/mongo/db/query/planner_wildcard_helpers.cpp @@ -47,12 +47,12 @@ #include "mongo/db/field_ref.h" #include "mongo/db/index/multikey_paths.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/query/compiler/physical_model/index_bounds/index_bounds.h" #include "mongo/db/query/compiler/physical_model/interval/interval.h" #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h" #include "mongo/db/query/index_multikey_helpers.h" #include "mongo/db/query/planner_wildcard_helpers.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/query/query_bm_fixture.cpp b/src/mongo/db/query/query_bm_fixture.cpp index aba9e5c12d8..5c436c19b60 100644 --- a/src/mongo/db/query/query_bm_fixture.cpp +++ b/src/mongo/db/query/query_bm_fixture.cpp @@ -29,7 +29,7 @@ #include "mongo/db/query/query_bm_fixture.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/transport/service_entry_point.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kTest diff --git a/src/mongo/db/query/query_bm_fixture.h b/src/mongo/db/query/query_bm_fixture.h index ab4dc758088..eef2a453332 100644 --- a/src/mongo/db/query/query_bm_fixture.h +++ b/src/mongo/db/query/query_bm_fixture.h @@ -29,8 +29,8 @@ #pragma once -#include "mongo/db/local_catalog/catalog_test_fixture.h" #include "mongo/db/read_write_concern_defaults_cache_lookup_mock.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" #include "mongo/platform/random.h" #include "mongo/unittest/benchmark_util.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/query/query_knobs.idl b/src/mongo/db/query/query_knobs.idl index 82860c9dd53..e856a784631 100644 --- a/src/mongo/db/query/query_knobs.idl +++ b/src/mongo/db/query/query_knobs.idl @@ -27,7 +27,7 @@ # imports: - - "mongo/db/cluster_parameters/cluster_server_parameter.idl" + - "mongo/db/topology/cluster_parameters/cluster_server_parameter.idl" global: cpp_namespace: "mongo" diff --git a/src/mongo/db/query/query_planner.cpp b/src/mongo/db/query/query_planner.cpp index 84102419ff4..2befec68b86 100644 --- a/src/mongo/db/query/query_planner.cpp +++ b/src/mongo/db/query/query_planner.cpp @@ -46,7 +46,6 @@ #include "mongo/bson/bsontypes.h" #include "mongo/db/index/index_constants.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" #include "mongo/db/matcher/expression_algo.h" #include "mongo/db/matcher/expression_hasher.h" #include "mongo/db/matcher/expression_text.h" @@ -89,6 +88,7 @@ #include "mongo/db/query/query_planner_common.h" #include "mongo/db/query/query_request_helper.h" #include "mongo/db/query/search/mongot_cursor.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/query/query_planner.h b/src/mongo/db/query/query_planner.h index a585e72a003..db68d6b4989 100644 --- a/src/mongo/db/query/query_planner.h +++ b/src/mongo/db/query/query_planner.h @@ -31,7 +31,6 @@ #include "mongo/base/status.h" #include "mongo/base/status_with.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -43,6 +42,7 @@ #include "mongo/db/query/compiler/physical_model/query_solution/query_solution.h" #include "mongo/db/query/plan_cache/classic_plan_cache.h" #include "mongo/db/query/query_planner_params.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include #include diff --git a/src/mongo/db/query/query_planner_collation_test.cpp b/src/mongo/db/query/query_planner_collation_test.cpp index 26acd15f306..c6f596a765d 100644 --- a/src/mongo/db/query/query_planner_collation_test.cpp +++ b/src/mongo/db/query/query_planner_collation_test.cpp @@ -30,10 +30,10 @@ // IWYU pragma: no_include "ext/alloc_traits.h" #include "mongo/base/string_data.h" #include "mongo/bson/json.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" #include "mongo/db/query/collation/collator_interface_mock.h" #include "mongo/db/query/query_planner_params.h" #include "mongo/db/query/query_planner_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" #include "mongo/unittest/unittest.h" #include diff --git a/src/mongo/db/query/query_planner_common.cpp b/src/mongo/db/query/query_planner_common.cpp index 791de48ced1..60f1b769cc6 100644 --- a/src/mongo/db/query/query_planner_common.cpp +++ b/src/mongo/db/query/query_planner_common.cpp @@ -30,13 +30,13 @@ #include "mongo/db/query/query_planner_common.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/query/compiler/metadata/index_entry.h" #include "mongo/db/query/compiler/physical_model/index_bounds/index_bounds.h" #include "mongo/db/query/compiler/physical_model/query_solution/query_solution.h" #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" #include "mongo/logv2/redaction.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/query/query_planner_params.h b/src/mongo/db/query/query_planner_params.h index 4e300793e1c..3b24003cd1f 100644 --- a/src/mongo/db/query/query_planner_params.h +++ b/src/mongo/db/query/query_planner_params.h @@ -29,8 +29,6 @@ #pragma once -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/query/canonical_distinct.h" #include "mongo/db/query/canonical_query.h" #include "mongo/db/query/collation/collation_index_key.h" @@ -40,6 +38,8 @@ #include "mongo/db/query/index_hint.h" #include "mongo/db/query/multiple_collection_accessor.h" #include "mongo/db/query/query_knobs_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include diff --git a/src/mongo/db/query/query_planner_params_test.cpp b/src/mongo/db/query/query_planner_params_test.cpp index 8a10c722500..7dd5964ca53 100644 --- a/src/mongo/db/query/query_planner_params_test.cpp +++ b/src/mongo/db/query/query_planner_params_test.cpp @@ -39,7 +39,6 @@ #include "mongo/db/exec/index_path_projection.h" #include "mongo/db/exec/projection_executor_builder.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/collection_mock.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/pipeline/expression_context_for_test.h" #include "mongo/db/query/compiler/logical_model/projection/projection_parser.h" @@ -50,6 +49,7 @@ #include "mongo/db/query/query_settings.h" #include "mongo/db/query/query_settings_decoration.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection_mock.h" #include "mongo/stdx/unordered_set.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/query/query_planner_tree_test.cpp b/src/mongo/db/query/query_planner_tree_test.cpp index 66dc1810671..4223699b8a7 100644 --- a/src/mongo/db/query/query_planner_tree_test.cpp +++ b/src/mongo/db/query/query_planner_tree_test.cpp @@ -33,11 +33,11 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/json.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" #include "mongo/db/query/query_knobs_gen.h" #include "mongo/db/query/query_planner_params.h" #include "mongo/db/query/query_planner_test_fixture.h" #include "mongo/db/query/util/cartesian_product.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/platform/atomic_word.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/query/query_planner_wildcard_index_test.cpp b/src/mongo/db/query/query_planner_wildcard_index_test.cpp index 6afa294d1a6..d154c2f04e8 100644 --- a/src/mongo/db/query/query_planner_wildcard_index_test.cpp +++ b/src/mongo/db/query/query_planner_wildcard_index_test.cpp @@ -35,7 +35,6 @@ #include "mongo/db/field_ref.h" #include "mongo/db/index/wildcard_key_generator.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/query/collation/collator_interface_mock.h" @@ -45,6 +44,7 @@ #include "mongo/db/query/query_knobs_gen.h" #include "mongo/db/query/query_planner_params.h" #include "mongo/db/query/query_planner_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/platform/atomic_word.h" #include "mongo/unittest/death_test.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/query/query_request_helper.h b/src/mongo/db/query/query_request_helper.h index fdbea68681e..7189e4a3292 100644 --- a/src/mongo/db/query/query_request_helper.h +++ b/src/mongo/db/query/query_request_helper.h @@ -34,12 +34,12 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/find_command.h" #include "mongo/db/query/tailable_mode.h" #include "mongo/db/query/tailable_mode_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/tenant_id.h" #include "mongo/util/serialization_context.h" diff --git a/src/mongo/db/query/query_settings/BUILD.bazel b/src/mongo/db/query/query_settings/BUILD.bazel index 7ce663d6902..a7f1f8f6585 100644 --- a/src/mongo/db/query/query_settings/BUILD.bazel +++ b/src/mongo/db/query/query_settings/BUILD.bazel @@ -45,9 +45,9 @@ idl_generator( src = "query_settings_cluster_parameter.idl", deps = [ "//src/mongo/db:basic_types_gen", - "//src/mongo/db/cluster_parameters:cluster_server_parameter_gen", "//src/mongo/db/query:query_feature_flags_gen", "//src/mongo/db/query/query_settings:query_settings_gen", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_gen", ], ) @@ -58,7 +58,7 @@ mongo_cc_library( ], deps = [ "//src/mongo/db:server_base", - "//src/mongo/db/cluster_parameters:cluster_server_parameter_cmds_idl", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_cmds_idl", ], ) @@ -81,13 +81,13 @@ mongo_cc_library( "//src/mongo/db:service_context", # TODO(SERVER-93876): Remove. "//src/mongo/db/commands/server_status:server_status_core", "//src/mongo/db/index:index_access_method", - "//src/mongo/db/local_catalog:index_key_validate", - "//src/mongo/db/local_catalog/lock_manager", - "//src/mongo/db/local_catalog/lock_manager:exception_util", # TODO(SERVER-93876): Remove. "//src/mongo/db/pipeline/process_interface:common_process_interface", "//src/mongo/db/query:command_shapes", "//src/mongo/db/query:query_knobs", # TODO(SERVER-93876): Remove. "//src/mongo/db/query/query_shape", + "//src/mongo/db/shard_role/lock_manager", + "//src/mongo/db/shard_role/lock_manager:exception_util", # TODO(SERVER-93876): Remove. + "//src/mongo/db/shard_role/shard_catalog:index_key_validate", "//src/mongo/executor:async_rpc", "//src/mongo/idl:cluster_server_parameter", # TODO(SERVER-93876): Remove. ], diff --git a/src/mongo/db/query/query_settings/query_settings_cluster_parameter.idl b/src/mongo/db/query/query_settings/query_settings_cluster_parameter.idl index 2ea3414a710..25ebb9fb832 100644 --- a/src/mongo/db/query/query_settings/query_settings_cluster_parameter.idl +++ b/src/mongo/db/query/query_settings/query_settings_cluster_parameter.idl @@ -35,7 +35,7 @@ imports: - "mongo/db/basic_types.idl" - "mongo/db/query/query_feature_flags.idl" - "mongo/db/query/query_settings/query_settings.idl" - - "mongo/db/cluster_parameters/cluster_server_parameter.idl" + - "mongo/db/topology/cluster_parameters/cluster_server_parameter.idl" structs: QuerySettingsClusterParameterValue: diff --git a/src/mongo/db/query/query_settings/query_settings_manager.h b/src/mongo/db/query/query_settings/query_settings_manager.h index ee971d5f917..c15c5c1904e 100644 --- a/src/mongo/db/query/query_settings/query_settings_manager.h +++ b/src/mongo/db/query/query_settings/query_settings_manager.h @@ -33,7 +33,6 @@ #include "mongo/base/data_view.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -42,6 +41,7 @@ #include "mongo/db/query/query_shape/query_shape.h" #include "mongo/db/server_parameter.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" #include "mongo/db/tenant_id.h" #include "mongo/platform/rwmutex.h" diff --git a/src/mongo/db/query/query_settings/query_settings_service.cpp b/src/mongo/db/query/query_settings/query_settings_service.cpp index d2527d39c66..56fbb76f836 100644 --- a/src/mongo/db/query/query_settings/query_settings_service.cpp +++ b/src/mongo/db/query/query_settings/query_settings_service.cpp @@ -29,12 +29,10 @@ #include "mongo/db/query/query_settings/query_settings_service.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_cmds_gen.h" #include "mongo/db/curop.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/index_key_validate.h" +#include "mongo/db/index_key_validate.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/pipeline/lite_parsed_pipeline.h" #include "mongo/db/query/query_settings/query_settings_backfill.h" @@ -45,7 +43,9 @@ #include "mongo/db/query/query_shape/distinct_cmd_shape.h" #include "mongo/db/query/query_shape/find_cmd_shape.h" #include "mongo/db/query/query_utils.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_cmds_gen.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/query/query_settings/query_settings_service_dependencies.h b/src/mongo/db/query/query_settings/query_settings_service_dependencies.h index 05193593d04..d18c484ff58 100644 --- a/src/mongo/db/query/query_settings/query_settings_service_dependencies.h +++ b/src/mongo/db/query/query_settings/query_settings_service_dependencies.h @@ -29,8 +29,8 @@ #pragma once -#include "mongo/db/cluster_parameters/cluster_server_parameter_cmds_gen.h" #include "mongo/db/pipeline/expression_context.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_cmds_gen.h" namespace mongo::query_settings { using SetClusterParameterFn = std::function diff --git a/src/mongo/db/query/query_settings_test.cpp b/src/mongo/db/query/query_settings_test.cpp index 8024b8237d9..e107b205126 100644 --- a/src/mongo/db/query/query_settings_test.cpp +++ b/src/mongo/db/query/query_settings_test.cpp @@ -40,8 +40,8 @@ #include "mongo/db/exec/mutable_bson/mutable_bson_test_utils.h" #include "mongo/db/field_ref.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/query/compiler/metadata/index_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/unittest/unittest.h" using mongo::AllowedIndicesFilter; diff --git a/src/mongo/db/query/query_stats/agg_key.h b/src/mongo/db/query/query_stats/agg_key.h index 92de41ebeed..497f49ef00d 100644 --- a/src/mongo/db/query/query_stats/agg_key.h +++ b/src/mongo/db/query/query_stats/agg_key.h @@ -32,7 +32,6 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/local_catalog/collection_type.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/aggregate_command_gen.h" @@ -42,6 +41,7 @@ #include "mongo/db/query/explain_options.h" #include "mongo/db/query/query_shape/agg_cmd_shape.h" #include "mongo/db/query/query_stats/key.h" +#include "mongo/db/shard_role/shard_catalog/collection_type.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/query/query_stats/key.h b/src/mongo/db/query/query_stats/key.h index ec4d3f38344..9a36b5947c4 100644 --- a/src/mongo/db/query/query_stats/key.h +++ b/src/mongo/db/query/query_stats/key.h @@ -33,11 +33,11 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/api_parameters.h" -#include "mongo/db/local_catalog/collection_type.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/query_shape/query_shape.h" #include "mongo/db/query/query_shape/serialization_options.h" #include "mongo/db/repl/read_concern_args.h" +#include "mongo/db/shard_role/shard_catalog/collection_type.h" #include "mongo/rpc/metadata/client_metadata.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/query/query_stats/key_test.cpp b/src/mongo/db/query/query_stats/key_test.cpp index 9f9fabf9cfc..73a08f2f911 100644 --- a/src/mongo/db/query/query_stats/key_test.cpp +++ b/src/mongo/db/query/query_stats/key_test.cpp @@ -30,11 +30,11 @@ #include "mongo/db/query/query_stats/key.h" #include "mongo/bson/bsonelement.h" -#include "mongo/db/local_catalog/collection_type.h" #include "mongo/db/pipeline/expression_context_for_test.h" #include "mongo/db/query/query_shape/query_shape.h" #include "mongo/db/query/query_shape/shape_helpers.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection_type.h" #include "mongo/unittest/unittest.h" namespace mongo::query_stats { diff --git a/src/mongo/db/query/query_stats/query_stats.cpp b/src/mongo/db/query/query_stats/query_stats.cpp index 9bc09abc4e0..a527e1d8117 100644 --- a/src/mongo/db/query/query_stats/query_stats.cpp +++ b/src/mongo/db/query/query_stats/query_stats.cpp @@ -33,9 +33,9 @@ #include "mongo/db/commands/server_status/server_status_metric.h" #include "mongo/db/curop.h" #include "mongo/db/feature_flag.h" -#include "mongo/db/local_catalog/util/partitioned.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/partitioned.h" #include "mongo/db/query/lru_key_value.h" #include "mongo/db/query/query_feature_flags_gen.h" #include "mongo/db/query/query_knobs_gen.h" diff --git a/src/mongo/db/query/query_stats/query_stats_store_test.cpp b/src/mongo/db/query/query_stats/query_stats_store_test.cpp index 3a0f2df2627..22609116aab 100644 --- a/src/mongo/db/query/query_stats/query_stats_store_test.cpp +++ b/src/mongo/db/query/query_stats/query_stats_store_test.cpp @@ -34,7 +34,6 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/json.h" #include "mongo/db/basic_types_gen.h" -#include "mongo/db/local_catalog/collection_type.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/aggregate_command_gen.h" @@ -52,6 +51,7 @@ #include "mongo/db/query/query_stats/key.h" #include "mongo/db/query/query_stats/query_stats.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection_type.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/platform/decimal128.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/query/query_stats/query_stats_test.cpp b/src/mongo/db/query/query_stats/query_stats_test.cpp index af1aaf358a8..f79a803f9c0 100644 --- a/src/mongo/db/query/query_stats/query_stats_test.cpp +++ b/src/mongo/db/query/query_stats/query_stats_test.cpp @@ -30,7 +30,6 @@ #include "mongo/db/query/query_stats/query_stats.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/collection_type.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" @@ -40,6 +39,7 @@ #include "mongo/db/query/parsed_find_command.h" #include "mongo/db/query/query_stats/find_key.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection_type.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/query/query_stats/update_key.h b/src/mongo/db/query/query_stats/update_key.h index 992ae1c4b0a..9cde8884521 100644 --- a/src/mongo/db/query/query_stats/update_key.h +++ b/src/mongo/db/query/query_stats/update_key.h @@ -31,12 +31,12 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/local_catalog/collection_type.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/pipeline.h" #include "mongo/db/pipeline/variables.h" #include "mongo/db/query/query_stats/key.h" #include "mongo/db/query/write_ops/write_ops_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_type.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/query/query_utils.cpp b/src/mongo/db/query/query_utils.cpp index afae59ea00c..32f72c51ec5 100644 --- a/src/mongo/db/query/query_utils.cpp +++ b/src/mongo/db/query/query_utils.cpp @@ -34,7 +34,6 @@ #include "mongo/db/basic_types.h" #include "mongo/db/exec/document_value/document_metadata_fields.h" #include "mongo/db/exec/sbe/match_path.h" -#include "mongo/db/local_catalog/index_catalog.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/field_path.h" @@ -43,6 +42,7 @@ #include "mongo/db/query/find_command.h" #include "mongo/db/query/query_feature_flags_gen.h" #include "mongo/db/query/query_knob_configuration.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" #include "mongo/util/assert_util.h" #include "mongo/util/string_map.h" diff --git a/src/mongo/db/query/query_utils.h b/src/mongo/db/query/query_utils.h index 70f1d28366c..9cf8973b9fd 100644 --- a/src/mongo/db/query/query_utils.h +++ b/src/mongo/db/query/query_utils.h @@ -29,13 +29,13 @@ #pragma once -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/query/canonical_query.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/query/compiler/logical_model/sort_pattern/sort_pattern.h" #include "mongo/db/query/indexability.h" #include "mongo/db/query/query_knobs_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" namespace mongo { /** diff --git a/src/mongo/db/query/search/BUILD.bazel b/src/mongo/db/query/search/BUILD.bazel index 836ef1fb934..2f6e438fee9 100644 --- a/src/mongo/db/query/search/BUILD.bazel +++ b/src/mongo/db/query/search/BUILD.bazel @@ -14,8 +14,8 @@ idl_generator( src = "internal_search_cluster_parameters.idl", deps = [ "//src/mongo/db:basic_types_gen", - "//src/mongo/db/cluster_parameters:cluster_server_parameter_gen", "//src/mongo/db/query:query_feature_flags_gen", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_gen", ], ) @@ -160,7 +160,7 @@ mongo_cc_library( ], deps = [ ":search_index_process_interface", - "//src/mongo/db/local_catalog:collection_catalog", + "//src/mongo/db/shard_role/shard_catalog:collection_catalog", "//src/mongo/db/views:view_catalog_helpers", ], ) diff --git a/src/mongo/db/query/search/internal_search_cluster_parameters.idl b/src/mongo/db/query/search/internal_search_cluster_parameters.idl index e6774061251..b1319efe178 100644 --- a/src/mongo/db/query/search/internal_search_cluster_parameters.idl +++ b/src/mongo/db/query/search/internal_search_cluster_parameters.idl @@ -27,7 +27,7 @@ imports: - "mongo/db/basic_types.idl" - - "mongo/db/cluster_parameters/cluster_server_parameter.idl" + - "mongo/db/topology/cluster_parameters/cluster_server_parameter.idl" - "mongo/db/query/query_feature_flags.idl" global: diff --git a/src/mongo/db/query/search/search_index_process_router.cpp b/src/mongo/db/query/search/search_index_process_router.cpp index e62d5021687..8d2b8fe36c9 100644 --- a/src/mongo/db/query/search/search_index_process_router.cpp +++ b/src/mongo/db/query/search/search_index_process_router.cpp @@ -29,10 +29,10 @@ #include "mongo/db/query/search/search_index_process_router.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" -#include "mongo/db/local_catalog/ddl/list_collections_gen.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/list_collections_gen.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/views/view_graph.h" diff --git a/src/mongo/db/query/search/search_index_process_shard.cpp b/src/mongo/db/query/search/search_index_process_shard.cpp index 22dfe5e353a..89586003679 100644 --- a/src/mongo/db/query/search/search_index_process_shard.cpp +++ b/src/mongo/db/query/search/search_index_process_shard.cpp @@ -29,8 +29,8 @@ #include "mongo/db/query/search/search_index_process_shard.h" -#include "mongo/db/local_catalog/collection_catalog.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" #include "mongo/db/views/view_catalog_helpers.h" #include diff --git a/src/mongo/db/query/shard_filterer_factory_impl.cpp b/src/mongo/db/query/shard_filterer_factory_impl.cpp index 1f0a4c9f5ad..dc385f05dc2 100644 --- a/src/mongo/db/query/shard_filterer_factory_impl.cpp +++ b/src/mongo/db/query/shard_filterer_factory_impl.cpp @@ -30,7 +30,7 @@ #include "mongo/db/query/shard_filterer_factory_impl.h" #include "mongo/db/exec/shard_filterer_impl.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" namespace mongo { diff --git a/src/mongo/db/query/shard_filterer_factory_impl.h b/src/mongo/db/query/shard_filterer_factory_impl.h index 53a85237b06..c40a7376024 100644 --- a/src/mongo/db/query/shard_filterer_factory_impl.h +++ b/src/mongo/db/query/shard_filterer_factory_impl.h @@ -32,10 +32,10 @@ #include "mongo/db/exec/sbe/expressions/runtime_environment.h" #include "mongo/db/exec/sbe/values/slot.h" #include "mongo/db/exec/shard_filterer.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/multiple_collection_accessor.h" #include "mongo/db/query/shard_filterer_factory_interface.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include diff --git a/src/mongo/db/query/stage_builder/classic_stage_builder.cpp b/src/mongo/db/query/stage_builder/classic_stage_builder.cpp index 483efee1759..34786fc586d 100644 --- a/src/mongo/db/query/stage_builder/classic_stage_builder.cpp +++ b/src/mongo/db/query/stage_builder/classic_stage_builder.cpp @@ -64,10 +64,6 @@ #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/matcher/matcher.h" #include "mongo/db/index/fts_access_method.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/compiler/logical_model/sort_pattern/sort_pattern.h" #include "mongo/db/query/compiler/metadata/index_entry.h" @@ -75,6 +71,10 @@ #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h" #include "mongo/db/query/find_command.h" #include "mongo/db/query/stage_builder/classic_stage_builder.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/snapshot.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/query/stage_builder/classic_stage_builder_test.cpp b/src/mongo/db/query/stage_builder/classic_stage_builder_test.cpp index 5249546e362..34bb5545958 100644 --- a/src/mongo/db/query/stage_builder/classic_stage_builder_test.cpp +++ b/src/mongo/db/query/stage_builder/classic_stage_builder_test.cpp @@ -37,10 +37,6 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/json.h" #include "mongo/db/exec/document_value/document.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_mock.h" -#include "mongo/db/local_catalog/index_catalog_mock.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role_mock.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context_builder.h" @@ -49,6 +45,10 @@ #include "mongo/db/query/find_command.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_mock.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_mock.h" +#include "mongo/db/shard_role/shard_role_mock.h" #include "mongo/db/storage/snapshot.h" #include "mongo/unittest/unittest.h" #include "mongo/util/intrusive_counter.h" diff --git a/src/mongo/db/query/stage_builder/sbe/BUILD.bazel b/src/mongo/db/query/stage_builder/sbe/BUILD.bazel index c2802cdc7c8..34099c649e8 100644 --- a/src/mongo/db/query/stage_builder/sbe/BUILD.bazel +++ b/src/mongo/db/query/stage_builder/sbe/BUILD.bazel @@ -16,9 +16,9 @@ mongo_cc_benchmark( ], tags = ["query_bm"], deps = [ - "//src/mongo/db/local_catalog:catalog_test_fixture", "//src/mongo/db/query:query_fcv_environment_for_test", "//src/mongo/db/query:query_test_service_context", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", ], ) @@ -149,8 +149,6 @@ mongo_cc_library( "//src/mongo/db/fts:fts_query_noop", "//src/mongo/db/index:index_access_method", "//src/mongo/db/index:preallocated_container_pool", - "//src/mongo/db/local_catalog:collection_options", - "//src/mongo/db/local_catalog:index_catalog", "//src/mongo/db/matcher:expressions_mongod_only", "//src/mongo/db/pipeline", "//src/mongo/db/pipeline:accumulator", @@ -175,6 +173,8 @@ mongo_cc_library( "//src/mongo/db/query/stage_builder/sbe/abt/syntax:syntax_expr", "//src/mongo/db/query/util:field_set", "//src/mongo/db/repl:optime", + "//src/mongo/db/shard_role/shard_catalog:collection_options", + "//src/mongo/db/shard_role/shard_catalog:index_catalog", "//src/mongo/db/stats:counters", "//src/mongo/db/storage:feature_document_util", "//src/mongo/db/storage:index_entry_comparison", diff --git a/src/mongo/db/query/stage_builder/sbe/builder.cpp b/src/mongo/db/query/stage_builder/sbe/builder.cpp index 23066555355..8320f330079 100644 --- a/src/mongo/db/query/stage_builder/sbe/builder.cpp +++ b/src/mongo/db/query/stage_builder/sbe/builder.cpp @@ -50,11 +50,6 @@ #include "mongo/db/index/fts_access_method.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/matcher/expression_leaf.h" #include "mongo/db/matcher/matcher_type_set.h" #include "mongo/db/pipeline/accumulator.h" @@ -88,6 +83,11 @@ #include "mongo/db/query/stage_builder/sbe/gen_projection.h" #include "mongo/db/query/stage_builder/sbe/gen_window_function.h" #include "mongo/db/query/stage_builder/sbe/sbexpr_helpers.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/sorted_data_interface.h" #include "mongo/logv2/log.h" #include "mongo/util/string_map.h" diff --git a/src/mongo/db/query/stage_builder/sbe/builder.h b/src/mongo/db/query/stage_builder/sbe/builder.h index 53bc212e605..3a4a2e03e9c 100644 --- a/src/mongo/db/query/stage_builder/sbe/builder.h +++ b/src/mongo/db/query/stage_builder/sbe/builder.h @@ -33,7 +33,6 @@ #include "mongo/db/exec/sbe/stages/stages.h" #include "mongo/db/exec/sbe/values/value.h" #include "mongo/db/exec/trial_period_utils.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/variables.h" #include "mongo/db/query/canonical_query.h" @@ -44,6 +43,7 @@ #include "mongo/db/query/stage_builder/sbe/builder_data.h" #include "mongo/db/query/stage_builder/sbe/gen_helpers.h" #include "mongo/db/query/stage_builder/stage_builder.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/assert_util.h" #include "mongo/util/modules.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/query/stage_builder/sbe/gen_coll_scan.h b/src/mongo/db/query/stage_builder/sbe/gen_coll_scan.h index 284c69b3cd9..4c7741f1b4f 100644 --- a/src/mongo/db/query/stage_builder/sbe/gen_coll_scan.h +++ b/src/mongo/db/query/stage_builder/sbe/gen_coll_scan.h @@ -29,9 +29,9 @@ #pragma once -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/query/compiler/physical_model/query_solution/query_solution.h" #include "mongo/db/query/stage_builder/sbe/gen_helpers.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/query/stage_builder/sbe/gen_helpers.cpp b/src/mongo/db/query/stage_builder/sbe/gen_helpers.cpp index 0b5fab811ee..8b0546042cd 100644 --- a/src/mongo/db/query/stage_builder/sbe/gen_helpers.cpp +++ b/src/mongo/db/query/stage_builder/sbe/gen_helpers.cpp @@ -39,11 +39,6 @@ #include "mongo/db/index/index_access_method.h" #include "mongo/db/index/multikey_paths.h" #include "mongo/db/index/preallocated_container_pool.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/window_function/window_function_top_bottom_n.h" #include "mongo/db/query/compiler/logical_model/projection/projection.h" @@ -56,6 +51,11 @@ #include "mongo/db/query/stage_builder/sbe/sbexpr_helpers.h" #include "mongo/db/query/tree_walker.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/recovery_unit.h" diff --git a/src/mongo/db/query/stage_builder/sbe/gen_index_scan.cpp b/src/mongo/db/query/stage_builder/sbe/gen_index_scan.cpp index 8c9c40baccf..d3edbc8f947 100644 --- a/src/mongo/db/query/stage_builder/sbe/gen_index_scan.cpp +++ b/src/mongo/db/query/stage_builder/sbe/gen_index_scan.cpp @@ -35,10 +35,6 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/exec/sbe/expressions/runtime_environment.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/matcher/expression_leaf.h" #include "mongo/db/query/algebra/polyvalue.h" @@ -52,6 +48,10 @@ #include "mongo/db/query/stage_builder/sbe/builder.h" #include "mongo/db/query/stage_builder/sbe/gen_filter.h" #include "mongo/db/query/stage_builder/sbe/sbexpr_helpers.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/sorted_data_interface.h" #include "mongo/logv2/log.h" #include "mongo/platform/atomic_word.h" diff --git a/src/mongo/db/query/stage_builder/sbe/gen_index_scan.h b/src/mongo/db/query/stage_builder/sbe/gen_index_scan.h index 813df308cc2..dd80c121447 100644 --- a/src/mongo/db/query/stage_builder/sbe/gen_index_scan.h +++ b/src/mongo/db/query/stage_builder/sbe/gen_index_scan.h @@ -33,11 +33,11 @@ #include "mongo/bson/ordering.h" #include "mongo/db/exec/sbe/values/value.h" #include "mongo/db/index/index_constants.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/query/compiler/physical_model/index_bounds/index_bounds.h" #include "mongo/db/query/compiler/physical_model/query_solution/query_solution.h" #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h" #include "mongo/db/query/stage_builder/sbe/gen_helpers.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/query/stage_builder/sbe/gen_lookup.cpp b/src/mongo/db/query/stage_builder/sbe/gen_lookup.cpp index f5ae19dee56..eb74996b46a 100644 --- a/src/mongo/db/query/stage_builder/sbe/gen_lookup.cpp +++ b/src/mongo/db/query/stage_builder/sbe/gen_lookup.cpp @@ -39,9 +39,6 @@ #include "mongo/db/field_ref.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/field_path.h" #include "mongo/db/query/bson_typemask.h" @@ -57,6 +54,9 @@ #include "mongo/db/query/stage_builder/sbe/sbexpr.h" #include "mongo/db/query/stage_builder/sbe/sbexpr_helpers.h" #include "mongo/db/query/util/make_data_structure.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/sorted_data_interface.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/query/stage_builder/sbe/sbe_builder_bm.cpp b/src/mongo/db/query/stage_builder/sbe/sbe_builder_bm.cpp index 6fa9f486a7b..fb7d327b984 100644 --- a/src/mongo/db/query/stage_builder/sbe/sbe_builder_bm.cpp +++ b/src/mongo/db/query/stage_builder/sbe/sbe_builder_bm.cpp @@ -27,12 +27,12 @@ * it in the license file. */ -#include "mongo/db/local_catalog/catalog_test_fixture.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/pipeline/expression_context_for_test.h" #include "mongo/db/query/plan_yield_policy_sbe.h" #include "mongo/db/query/query_fcv_environment_for_test.h" #include "mongo/db/query/stage_builder/stage_builder_util.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" #include diff --git a/src/mongo/db/query/stage_builder/sbe/tests/BUILD.bazel b/src/mongo/db/query/stage_builder/sbe/tests/BUILD.bazel index 4c883b44f22..74e783a904e 100644 --- a/src/mongo/db/query/stage_builder/sbe/tests/BUILD.bazel +++ b/src/mongo/db/query/stage_builder/sbe/tests/BUILD.bazel @@ -19,9 +19,9 @@ mongo_cc_library( "//src/mongo/db:service_context_test_fixture", "//src/mongo/db/collection_crud", "//src/mongo/db/exec/sbe:sbe_plan_stage_test", - "//src/mongo/db/local_catalog:collection_mock", "//src/mongo/db/pipeline:expression_context_for_test", "//src/mongo/db/query:query_test_service_context", + "//src/mongo/db/shard_role/shard_catalog:collection_mock", ], ) @@ -60,9 +60,9 @@ mongo_cc_unit_test( deps = [ ":sbe_builder_test_fixture", "//src/mongo/db/exec/sbe:sbe_unittest_base", - "//src/mongo/db/local_catalog:index_catalog_mock", "//src/mongo/db/query:shard_filterer_factory_mock", "//src/mongo/db/query/compiler/stats:stats_histograms", "//src/mongo/db/query/stage_builder/sbe:abt_unit_test_utils", + "//src/mongo/db/shard_role/shard_catalog:index_catalog_mock", ], ) diff --git a/src/mongo/db/query/stage_builder/sbe/tests/gen_lookup_test.cpp b/src/mongo/db/query/stage_builder/sbe/tests/gen_lookup_test.cpp index f7d110e0643..94c67e48869 100644 --- a/src/mongo/db/query/stage_builder/sbe/tests/gen_lookup_test.cpp +++ b/src/mongo/db/query/stage_builder/sbe/tests/gen_lookup_test.cpp @@ -41,7 +41,6 @@ #include "mongo/db/exec/sbe/util/debug_print.h" #include "mongo/db/exec/sbe/values/slot.h" #include "mongo/db/exec/sbe/values/value.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/field_path.h" #include "mongo/db/query/compiler/physical_model/query_solution/query_solution.h" @@ -50,6 +49,7 @@ #include "mongo/db/query/stage_builder/sbe/tests/sbe_builder_test_fixture.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/storage_interface.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/unittest/unittest.h" #include diff --git a/src/mongo/db/query/stage_builder/sbe/tests/sbe_builder_test_fixture.cpp b/src/mongo/db/query/stage_builder/sbe/tests/sbe_builder_test_fixture.cpp index b037443bde0..3e8c0ab5878 100644 --- a/src/mongo/db/query/stage_builder/sbe/tests/sbe_builder_test_fixture.cpp +++ b/src/mongo/db/query/stage_builder/sbe/tests/sbe_builder_test_fixture.cpp @@ -36,12 +36,12 @@ #include "mongo/db/exec/sbe/values/value.h" #include "mongo/db/exec/shard_filterer.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_mock.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role_mock.h" #include "mongo/db/pipeline/expression_context_for_test.h" #include "mongo/db/query/canonical_query.h" #include "mongo/db/query/stage_builder/sbe/builder.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_mock.h" +#include "mongo/db/shard_role/shard_role_mock.h" #include "mongo/unittest/unittest.h" #include diff --git a/src/mongo/db/query/stage_builder/sbe/tests/sbe_builder_test_fixture.h b/src/mongo/db/query/stage_builder/sbe/tests/sbe_builder_test_fixture.h index 8e21202804d..51e1483a6c9 100644 --- a/src/mongo/db/query/stage_builder/sbe/tests/sbe_builder_test_fixture.h +++ b/src/mongo/db/query/stage_builder/sbe/tests/sbe_builder_test_fixture.h @@ -33,7 +33,6 @@ #include "mongo/db/exec/sbe/stages/stages.h" #include "mongo/db/exec/sbe/values/slot.h" #include "mongo/db/exec/sbe/values/value.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/query/collation/collator_interface.h" @@ -41,6 +40,7 @@ #include "mongo/db/query/multiple_collection_accessor.h" #include "mongo/db/query/shard_filterer_factory_interface.h" #include "mongo/db/query/stage_builder/sbe/builder.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/unittest/golden_test.h" #include "mongo/unittest/golden_test_base.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/query/timeseries/timeseries_translation.cpp b/src/mongo/db/query/timeseries/timeseries_translation.cpp index ba6bd8fcce5..e0984db75b5 100644 --- a/src/mongo/db/query/timeseries/timeseries_translation.cpp +++ b/src/mongo/db/query/timeseries/timeseries_translation.cpp @@ -33,7 +33,7 @@ #include "mongo/db/pipeline/document_source_index_stats.h" #include "mongo/db/pipeline/document_source_internal_convert_bucket_index_stats.h" #include "mongo/db/pipeline/document_source_internal_unpack_bucket.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/timeseries/timeseries_index_schema_conversion_functions.h" #include "mongo/db/timeseries/timeseries_options.h" diff --git a/src/mongo/db/query/timeseries/timeseries_translation.h b/src/mongo/db/query/timeseries/timeseries_translation.h index 0fafff6b281..5fadab259a6 100644 --- a/src/mongo/db/query/timeseries/timeseries_translation.h +++ b/src/mongo/db/query/timeseries/timeseries_translation.h @@ -29,9 +29,9 @@ #pragma once -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/pipeline/aggregate_command_gen.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/util/modules.h" namespace mongo { diff --git a/src/mongo/db/query/timeseries/timeseries_translation_test.cpp b/src/mongo/db/query/timeseries/timeseries_translation_test.cpp index c3c98778911..51bf78714cd 100644 --- a/src/mongo/db/query/timeseries/timeseries_translation_test.cpp +++ b/src/mongo/db/query/timeseries/timeseries_translation_test.cpp @@ -30,11 +30,11 @@ #include "mongo/db/query/timeseries/timeseries_translation.h" #include "mongo/bson/json.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/document_source_internal_unpack_bucket.h" #include "mongo/db/pipeline/expression_context_for_test.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/timeseries/timeseries_test_fixture.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/query/util/cluster_find_util.h b/src/mongo/db/query/util/cluster_find_util.h index a1554f16188..5f317045942 100644 --- a/src/mongo/db/query/util/cluster_find_util.h +++ b/src/mongo/db/query/util/cluster_find_util.h @@ -32,7 +32,6 @@ #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/privilege.h" #include "mongo/db/auth/resource_pattern.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/query_request_conversion.h" @@ -41,6 +40,7 @@ #include "mongo/db/query/find_command.h" #include "mongo/db/query/query_settings.h" #include "mongo/db/query/timeseries/timeseries_translation.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/rpc/reply_builder_interface.h" #include "mongo/s/query/planner/cluster_aggregate.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/query/virtual_collection/external_record_store.h b/src/mongo/db/query/virtual_collection/external_record_store.h index f218fc669a5..aaf7c7f380a 100644 --- a/src/mongo/db/query/virtual_collection/external_record_store.h +++ b/src/mongo/db/query/virtual_collection/external_record_store.h @@ -34,8 +34,8 @@ #include "mongo/base/status_with.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/virtual_collection_options.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/virtual_collection_options.h" #include "mongo/db/storage/damage_vector.h" #include "mongo/db/storage/key_format.h" #include "mongo/db/storage/record_data.h" diff --git a/src/mongo/db/query/virtual_collection/external_record_store_test.cpp b/src/mongo/db/query/virtual_collection/external_record_store_test.cpp index 561825869a5..5698aeef673 100644 --- a/src/mongo/db/query/virtual_collection/external_record_store_test.cpp +++ b/src/mongo/db/query/virtual_collection/external_record_store_test.cpp @@ -37,11 +37,11 @@ #include "mongo/bson/bsonmisc.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/local_catalog/virtual_collection_options.h" #include "mongo/db/pipeline/external_data_source_option_gen.h" #include "mongo/db/query/virtual_collection/input_stream.h" #include "mongo/db/query/virtual_collection/multi_bson_stream_cursor.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/virtual_collection_options.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" #include "mongo/platform/random.h" diff --git a/src/mongo/db/query/virtual_collection/multi_bson_stream_cursor.cpp b/src/mongo/db/query/virtual_collection/multi_bson_stream_cursor.cpp index fab82994a93..30be946a119 100644 --- a/src/mongo/db/query/virtual_collection/multi_bson_stream_cursor.cpp +++ b/src/mongo/db/query/virtual_collection/multi_bson_stream_cursor.cpp @@ -34,7 +34,7 @@ #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" #include "mongo/bson/util/builder.h" -#include "mongo/db/local_catalog/virtual_collection_options.h" +#include "mongo/db/shard_role/shard_catalog/virtual_collection_options.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" #include "mongo/platform/compiler.h" diff --git a/src/mongo/db/query/virtual_collection/multi_bson_stream_cursor.h b/src/mongo/db/query/virtual_collection/multi_bson_stream_cursor.h index eca3b56417d..0fba4f6c9b5 100644 --- a/src/mongo/db/query/virtual_collection/multi_bson_stream_cursor.h +++ b/src/mongo/db/query/virtual_collection/multi_bson_stream_cursor.h @@ -29,10 +29,10 @@ #pragma once -#include "mongo/db/local_catalog/virtual_collection_options.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/virtual_collection/input_stream.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/virtual_collection_options.h" #include "mongo/db/storage/record_store.h" #include "mongo/transport/named_pipe/named_pipe.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/query/wildcard_multikey_paths.cpp b/src/mongo/db/query/wildcard_multikey_paths.cpp index dd27b80bafe..957b8600c04 100644 --- a/src/mongo/db/query/wildcard_multikey_paths.cpp +++ b/src/mongo/db/query/wildcard_multikey_paths.cpp @@ -45,9 +45,6 @@ #include "mongo/db/index/multikey_metadata_access_stats.h" #include "mongo/db/index/wildcard_access_method.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/compiler/optimizer/index_bounds_builder/index_bounds_builder.h" @@ -56,6 +53,9 @@ #include "mongo/db/query/wildcard_multikey_paths.h" #include "mongo/db/record_id.h" #include "mongo/db/record_id_helpers.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/index_entry_comparison.h" #include "mongo/db/storage/key_format.h" #include "mongo/db/storage/sorted_data_interface.h" diff --git a/src/mongo/db/query/write_ops/BUILD.bazel b/src/mongo/db/query/write_ops/BUILD.bazel index e1a5544be9d..2df533a6378 100644 --- a/src/mongo/db/query/write_ops/BUILD.bazel +++ b/src/mongo/db/query/write_ops/BUILD.bazel @@ -88,13 +88,13 @@ mongo_cc_library( "//src/mongo/db:query_exec", "//src/mongo/db:service_context", "//src/mongo/db:shard_role", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/matcher:expressions_mongod_only", "//src/mongo/db/query:command_request_response", "//src/mongo/db/query/query_stats", "//src/mongo/db/query/util:validate_id", "//src/mongo/db/repl:image_collection_entry", "//src/mongo/db/repl:repl_coordinator_interface", + "//src/mongo/db/shard_role/lock_manager:exception_util", "//src/mongo/db/update:update_driver", ], ) @@ -185,9 +185,6 @@ mongo_cc_library( "//src/mongo/db:record_id_helpers", "//src/mongo/db:shard_role", "//src/mongo/db/collection_crud", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:collection_options", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/query:explain_diagnostic_printer", "//src/mongo/db/query:shard_key_diagnostic_printer", "//src/mongo/db/query/query_settings:query_settings_service", @@ -197,6 +194,9 @@ mongo_cc_library( "//src/mongo/db/repl:oplog", "//src/mongo/db/repl:repl_coordinator_interface", "//src/mongo/db/s:query_analysis_writer", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:collection_options", "//src/mongo/db/stats:counters", "//src/mongo/db/stats:server_read_concern_write_concern_metrics", "//src/mongo/db/stats:top", @@ -234,11 +234,11 @@ mongo_cc_unit_test( "//src/mongo/db:record_id_helpers", "//src/mongo/db/auth:authmocks", "//src/mongo/db/collection_crud", - "//src/mongo/db/local_catalog:catalog_test_fixture", "//src/mongo/db/op_observer", "//src/mongo/db/repl:mock_repl_coord_server_fixture", "//src/mongo/db/repl:oplog_entry", "//src/mongo/db/session:session_catalog", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", "//src/mongo/db/timeseries:bucket_compression", "//src/mongo/db/transaction", ], diff --git a/src/mongo/db/query/write_ops/delete.cpp b/src/mongo/db/query/write_ops/delete.cpp index 9c7d0960f81..20ad1ed8186 100644 --- a/src/mongo/db/query/write_ops/delete.cpp +++ b/src/mongo/db/query/write_ops/delete.cpp @@ -30,9 +30,9 @@ #include "mongo/db/query/write_ops/delete.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/query/get_executor.h" #include "mongo/db/query/write_ops/parsed_delete.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/util/assert_util.h" #include diff --git a/src/mongo/db/query/write_ops/insert.cpp b/src/mongo/db/query/write_ops/insert.cpp index 46d415dd649..2a0bdf6d2ee 100644 --- a/src/mongo/db/query/write_ops/insert.cpp +++ b/src/mongo/db/query/write_ops/insert.cpp @@ -36,7 +36,6 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/bsontypes.h" #include "mongo/bson/util/builder.h" -#include "mongo/db/local_catalog/document_validation.h" #include "mongo/db/logical_time.h" #include "mongo/db/mongod_options_storage_gen.h" #include "mongo/db/operation_context.h" @@ -44,8 +43,9 @@ #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/db/update/storage_validation.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" #include "mongo/platform/compiler.h" #include "mongo/util/decorable.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/query/write_ops/parsed_delete.cpp b/src/mongo/db/query/write_ops/parsed_delete.cpp index 6ea416ac6ac..24bc798c00b 100644 --- a/src/mongo/db/query/write_ops/parsed_delete.cpp +++ b/src/mongo/db/query/write_ops/parsed_delete.cpp @@ -33,13 +33,13 @@ #include "mongo/base/status_with.h" #include "mongo/bson/bsonobj.h" #include "mongo/db/feature_flag.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/query/canonical_query.h" #include "mongo/db/query/query_utils.h" #include "mongo/db/query/write_ops/delete_request_gen.h" #include "mongo/db/query/write_ops/parsed_writes_common.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/stats/counters.h" #include "mongo/db/storage/storage_parameters_gen.h" #include "mongo/db/timeseries/timeseries_update_delete_util.h" diff --git a/src/mongo/db/query/write_ops/parsed_delete.h b/src/mongo/db/query/write_ops/parsed_delete.h index 641e8d04491..a4683392467 100644 --- a/src/mongo/db/query/write_ops/parsed_delete.h +++ b/src/mongo/db/query/write_ops/parsed_delete.h @@ -30,13 +30,13 @@ #pragma once #include "mongo/base/status.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/query/canonical_query.h" #include "mongo/db/query/plan_yield_policy.h" #include "mongo/db/query/write_ops/parsed_writes_common.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/assert_util.h" #include diff --git a/src/mongo/db/query/write_ops/parsed_update.h b/src/mongo/db/query/write_ops/parsed_update.h index 63227956c2f..c4c713888b2 100644 --- a/src/mongo/db/query/write_ops/parsed_update.h +++ b/src/mongo/db/query/write_ops/parsed_update.h @@ -31,7 +31,6 @@ #include "mongo/base/status.h" #include "mongo/base/string_data.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/matcher/expression_with_placeholder.h" #include "mongo/db/matcher/extensions_callback.h" @@ -43,6 +42,7 @@ #include "mongo/db/query/plan_yield_policy.h" #include "mongo/db/query/write_ops/parsed_writes_common.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/update/update_driver.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/query/write_ops/parsed_update_base.cpp b/src/mongo/db/query/write_ops/parsed_update_base.cpp index 680d2eb991c..73c089afd5f 100644 --- a/src/mongo/db/query/write_ops/parsed_update_base.cpp +++ b/src/mongo/db/query/write_ops/parsed_update_base.cpp @@ -36,8 +36,6 @@ #include "mongo/bson/bsontypes.h" #include "mongo/db/exec/disk_use_options_gen.h" #include "mongo/db/feature_flag.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_operation_source.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/matcher/expression_with_placeholder.h" #include "mongo/db/matcher/extensions_callback.h" @@ -58,6 +56,8 @@ #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_operation_source.h" #include "mongo/db/storage/storage_options.h" #include "mongo/db/storage/storage_parameters_gen.h" #include "mongo/db/timeseries/timeseries_gen.h" diff --git a/src/mongo/db/query/write_ops/parsed_writes_common.h b/src/mongo/db/query/write_ops/parsed_writes_common.h index cfd40170c66..3ee7ccf2089 100644 --- a/src/mongo/db/query/write_ops/parsed_writes_common.h +++ b/src/mongo/db/query/write_ops/parsed_writes_common.h @@ -31,11 +31,11 @@ #include "mongo/base/status.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/matcher/extensions_callback_real.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/query/canonical_query.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/storage/storage_parameters_gen.h" #include diff --git a/src/mongo/db/query/write_ops/update.cpp b/src/mongo/db/query/write_ops/update.cpp index 64e599c564a..fda41bed675 100644 --- a/src/mongo/db/query/write_ops/update.cpp +++ b/src/mongo/db/query/write_ops/update.cpp @@ -34,17 +34,17 @@ #include "mongo/base/status.h" #include "mongo/bson/bsonobj.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/get_executor.h" #include "mongo/db/query/plan_executor.h" #include "mongo/db/query/write_ops/parsed_update.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/query/write_ops/update.h b/src/mongo/db/query/write_ops/update.h index c1e6b375288..65d28f500ff 100644 --- a/src/mongo/db/query/write_ops/update.h +++ b/src/mongo/db/query/write_ops/update.h @@ -30,11 +30,11 @@ #pragma once #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/update_request.h" #include "mongo/db/query/write_ops/update_result.h" +#include "mongo/db/shard_role/shard_role.h" namespace mongo { diff --git a/src/mongo/db/query/write_ops/update_request.h b/src/mongo/db/query/write_ops/update_request.h index bc6f1e70b48..2a98da6614c 100644 --- a/src/mongo/db/query/write_ops/update_request.h +++ b/src/mongo/db/query/write_ops/update_request.h @@ -31,12 +31,12 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/util/builder_fwd.h" -#include "mongo/db/local_catalog/collection_operation_source.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/legacy_runtime_constants_gen.h" #include "mongo/db/query/plan_yield_policy.h" #include "mongo/db/query/write_ops/write_ops.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection_operation_source.h" #include "mongo/platform/compiler.h" #include "mongo/util/assert_util.h" 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 de9a9cf019f..a1111f100ab 100644 --- a/src/mongo/db/query/write_ops/write_ops_exec.cpp +++ b/src/mongo/db/query/write_ops/write_ops_exec.cpp @@ -50,22 +50,6 @@ #include "mongo/db/error_labels.h" #include "mongo/db/feature_flag.h" #include "mongo/db/global_catalog/type_collection_common_types_gen.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/matcher/expression_leaf.h" #include "mongo/db/not_primary_error_tracker.h" @@ -100,12 +84,28 @@ #include "mongo/db/query/write_ops/write_ops.h" #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/query/write_ops/write_ops_retryability.h" -#include "mongo/db/raw_data_operation.h" #include "mongo/db/repl/optime.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/s/query_analysis_writer.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/stats/counters.h" #include "mongo/db/stats/server_write_concern_metrics.h" diff --git a/src/mongo/db/query/write_ops/write_ops_exec.h b/src/mongo/db/query/write_ops/write_ops_exec.h index 9517b7bb1ad..26eb7b25163 100644 --- a/src/mongo/db/query/write_ops/write_ops_exec.h +++ b/src/mongo/db/query/write_ops/write_ops_exec.h @@ -34,7 +34,6 @@ #include "mongo/base/status_with.h" #include "mongo/bson/bsonobj.h" #include "mongo/crypto/fle_field_schema_gen.h" -#include "mongo/db/local_catalog/collection_operation_source.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/query_settings/query_settings_gen.h" @@ -47,6 +46,7 @@ #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/repl_client_info.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection_operation_source.h" #include "mongo/db/tenant_id.h" #include "mongo/db/versioning_protocol/stale_exception.h" #include "mongo/executor/task_executor.h" diff --git a/src/mongo/db/query/write_ops/write_ops_exec_test.cpp b/src/mongo/db/query/write_ops/write_ops_exec_test.cpp index 619bf0524ac..a36b903cf28 100644 --- a/src/mongo/db/query/write_ops/write_ops_exec_test.cpp +++ b/src/mongo/db/query/write_ops/write_ops_exec_test.cpp @@ -41,11 +41,6 @@ #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/op_observer/op_observer_noop.h" #include "mongo/db/op_observer/op_observer_registry.h" #include "mongo/db/pipeline/legacy_runtime_constants_gen.h" @@ -53,6 +48,11 @@ #include "mongo/db/record_id_helpers.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/tenant_id.h" diff --git a/src/mongo/db/query/write_ops/write_ops_exec_util.cpp b/src/mongo/db/query/write_ops/write_ops_exec_util.cpp index 62ebc8ea5db..0d27a3df0b3 100644 --- a/src/mongo/db/query/write_ops/write_ops_exec_util.cpp +++ b/src/mongo/db/query/write_ops/write_ops_exec_util.cpp @@ -30,8 +30,8 @@ #include "mongo/db/query/write_ops/write_ops_exec_util.h" #include "mongo/base/error_codes.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/query/write_ops/write_ops_parsers_test.cpp b/src/mongo/db/query/write_ops/write_ops_parsers_test.cpp index 4ee7e803c43..46f25757d0b 100644 --- a/src/mongo/db/query/write_ops/write_ops_parsers_test.cpp +++ b/src/mongo/db/query/write_ops/write_ops_parsers_test.cpp @@ -38,12 +38,12 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/timestamp.h" #include "mongo/db/dbmessage.h" -#include "mongo/db/local_catalog/document_validation.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/write_ops/write_ops.h" #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/query/write_ops/write_ops_parsers_test_helpers.h" #include "mongo/db/repl/optime.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" #include "mongo/rpc/message.h" #include "mongo/rpc/op_msg.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/read_concern_mongod.cpp b/src/mongo/db/read_concern_mongod.cpp index d287a39de85..f241d20687c 100644 --- a/src/mongo/db/read_concern_mongod.cpp +++ b/src/mongo/db/read_concern_mongod.cpp @@ -38,11 +38,6 @@ #include "mongo/db/curop.h" #include "mongo/db/curop_failpoint_helpers.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" @@ -57,10 +52,15 @@ #include "mongo/db/repl/speculative_majority_read_info.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/topology/cluster_role.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/write_concern_options.h" #include "mongo/executor/task_executor.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/read_write_concern_defaults.cpp b/src/mongo/db/read_write_concern_defaults.cpp index bf4cd3b93ed..12161b30cfd 100644 --- a/src/mongo/db/read_write_concern_defaults.cpp +++ b/src/mongo/db/read_write_concern_defaults.cpp @@ -32,12 +32,12 @@ #include "mongo/base/error_codes.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/logical_time.h" #include "mongo/db/read_write_concern_provenance.h" #include "mongo/db/read_write_concern_provenance_base_gen.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/read_write_concern_defaults_test.cpp b/src/mongo/db/read_write_concern_defaults_test.cpp index ce307324ad4..f1606db9562 100644 --- a/src/mongo/db/read_write_concern_defaults_test.cpp +++ b/src/mongo/db/read_write_concern_defaults_test.cpp @@ -37,8 +37,8 @@ #include "mongo/db/read_write_concern_defaults_cache_lookup_mock.h" #include "mongo/db/repl/optime.h" #include "mongo/db/service_context_test_fixture.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" -#include "mongo/db/vector_clock/vector_clock_test_fixture.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock_test_fixture.h" #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" #include "mongo/util/clock_source_mock.h" diff --git a/src/mongo/db/record_id_helpers.cpp b/src/mongo/db/record_id_helpers.cpp index 0000c51ef80..201fae38e39 100644 --- a/src/mongo/db/record_id_helpers.cpp +++ b/src/mongo/db/record_id_helpers.cpp @@ -35,9 +35,9 @@ #include "mongo/bson/bson_validate.h" #include "mongo/bson/bsontypes.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" #include "mongo/db/query/collation/collation_index_key.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/logv2/redaction.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/record_id_helpers.h b/src/mongo/db/record_id_helpers.h index a6480676e85..7f13071dbee 100644 --- a/src/mongo/db/record_id_helpers.h +++ b/src/mongo/db/record_id_helpers.h @@ -36,9 +36,9 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/oid.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" #include "mongo/db/storage/key_format.h" #include "mongo/util/modules.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/repair.cpp b/src/mongo/db/repair.cpp index edb076e3a04..4d09e5a9ed0 100644 --- a/src/mongo/db/repair.cpp +++ b/src/mongo/db/repair.cpp @@ -35,18 +35,18 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/index_builds/rebuild_indexes.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_catalog_helper.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/repl_set_member_in_standalone_mode.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/db/storage/storage_repair_observer.h" diff --git a/src/mongo/db/repl/BUILD.bazel b/src/mongo/db/repl/BUILD.bazel index 5a086e50efd..b78b35a8b9b 100644 --- a/src/mongo/db/repl/BUILD.bazel +++ b/src/mongo/db/repl/BUILD.bazel @@ -120,7 +120,7 @@ mongo_cc_library( "//src/mongo/db:server_feature_flags", # TODO(SERVER-93876): Remove. "//src/mongo/db/auth:security_token_auth", # TODO(SERVER-93876): Remove. "//src/mongo/db/exec/document_value", # TODO(SERVER-93876): Remove. - "//src/mongo/db/local_catalog:collection_options", + "//src/mongo/db/shard_role/shard_catalog:collection_options", ], ) @@ -689,8 +689,8 @@ mongo_cc_library( "//src/mongo/db:shard_role", "//src/mongo/db/collection_crud", "//src/mongo/db/index:index_access_method", - "//src/mongo/db/local_catalog:collection_options", - "//src/mongo/db/local_catalog/lock_manager:exception_util", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:collection_options", "//src/mongo/db/storage:journal_flusher", "//src/mongo/db/storage:record_store_base", ], @@ -774,10 +774,6 @@ mongo_cc_library( "//src/mongo/db/commands:txn_cmd_request", "//src/mongo/db/index_builds:index_build_oplog_entry", "//src/mongo/db/index_builds:index_builds_coordinator", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:import_collection_oplog_entry", - "//src/mongo/db/local_catalog:local_oplog_info", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/op_observer", "//src/mongo/db/op_observer:op_observer_util", "//src/mongo/db/pipeline:change_stream_preimage", @@ -786,6 +782,10 @@ mongo_cc_library( "//src/mongo/db/repl/dbcheck:health_log_interface", "//src/mongo/db/rss:replicated_storage_service", "//src/mongo/db/session:session_catalog_mongod", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:import_collection_oplog_entry", + "//src/mongo/db/shard_role/shard_catalog:local_oplog_info", "//src/mongo/db/stats:counters", "//src/mongo/db/stats:server_read_concern_write_concern_metrics", "//src/mongo/db/storage:storage_engine_direct_crud", @@ -806,9 +806,9 @@ mongo_cc_library( ":oplog_entry", "//src/mongo/db:dbhelpers", "//src/mongo/db/global_catalog/ddl:notify_sharding_event_idl", - "//src/mongo/db/local_catalog/lock_manager", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/pipeline:change_stream_helpers", + "//src/mongo/db/shard_role/lock_manager", + "//src/mongo/db/shard_role/lock_manager:exception_util", ], ) @@ -820,9 +820,9 @@ mongo_cc_library( "//src/mongo/db:dbdirectclient", "//src/mongo/db:service_context", "//src/mongo/db:shard_role", - "//src/mongo/db/local_catalog:collection_options", - "//src/mongo/db/local_catalog:document_validation", "//src/mongo/db/query/write_ops:write_ops_exec", + "//src/mongo/db/shard_role/shard_catalog:collection_options", + "//src/mongo/db/shard_role/shard_catalog:document_validation", ], ) @@ -859,11 +859,11 @@ mongo_cc_library( "//src/mongo/db/collection_crud", "//src/mongo/db/index_builds:index_builds_coordinator", "//src/mongo/db/index_builds:multi_index_block", - "//src/mongo/db/local_catalog:catalog_control", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:database_holder", - "//src/mongo/db/local_catalog:local_oplog_info", - "//src/mongo/db/local_catalog/lock_manager:exception_util", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:catalog_control", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:database_holder", + "//src/mongo/db/shard_role/shard_catalog:local_oplog_info", "//src/mongo/db/storage:oplog_truncation", "//src/mongo/db/storage:record_store_base", "//src/mongo/db/storage:storage_control", @@ -973,9 +973,9 @@ mongo_cc_library( "//src/mongo/db:shard_role", "//src/mongo/db/collection_crud", "//src/mongo/db/commands:mongod_fsync", - "//src/mongo/db/local_catalog/lock_manager", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/repl/initial_sync:initial_syncer", + "//src/mongo/db/shard_role/lock_manager", + "//src/mongo/db/shard_role/lock_manager:exception_util", "//src/mongo/db/storage:journal_flusher", "//src/mongo/db/storage:storage_util", ], @@ -1072,11 +1072,11 @@ mongo_cc_library( "//src/mongo/db/auth:authorization_manager_global", "//src/mongo/db/collection_crud", "//src/mongo/db/commands:mongod_fsync", - "//src/mongo/db/local_catalog/lock_manager", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/query/query_stats", "//src/mongo/db/repl/initial_sync:initial_syncer", "//src/mongo/db/session:session_catalog_mongod", + "//src/mongo/db/shard_role/lock_manager", + "//src/mongo/db/shard_role/lock_manager:exception_util", "//src/mongo/db/stats:timer_stats", "//src/mongo/db/storage:storage_control", "//src/mongo/db/storage:storage_options", @@ -1138,14 +1138,14 @@ mongo_cc_library( "//src/mongo/db:server_base", "//src/mongo/db:service_context", "//src/mongo/db/index_builds:index_builds_coordinator", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:database_holder", - "//src/mongo/db/local_catalog:import_collection_oplog_entry", - "//src/mongo/db/local_catalog/lock_manager", "//src/mongo/db/query/write_ops", "//src/mongo/db/s:sharding_runtime_d", "//src/mongo/db/session:kill_sessions_local", "//src/mongo/db/session:session_catalog_mongod", + "//src/mongo/db/shard_role/lock_manager", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:database_holder", + "//src/mongo/db/shard_role/shard_catalog:import_collection_oplog_entry", "//src/mongo/db/storage:remove_saver", "//src/mongo/util/net:network", ], @@ -1172,8 +1172,8 @@ mongo_cc_library( "//src/mongo/client:fetcher", "//src/mongo/db:service_context", "//src/mongo/db/index_builds:index_builds_coordinator", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/op_observer", + "//src/mongo/db/shard_role/lock_manager:exception_util", "//src/mongo/executor:thread_pool_task_executor", "//src/mongo/util/concurrency:thread_pool", ], @@ -1231,13 +1231,13 @@ mongo_cc_library( "//src/mongo/db/commands:mongod_fcv", "//src/mongo/db/commands:rwc_defaults_commands", "//src/mongo/db/index_builds:index_builds_coordinator", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:local_oplog_info", - "//src/mongo/db/local_catalog/lock_manager", "//src/mongo/db/op_observer", "//src/mongo/db/query/query_stats", "//src/mongo/db/session:kill_sessions_local", "//src/mongo/db/session:session_catalog_mongod", + "//src/mongo/db/shard_role/lock_manager", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:local_oplog_info", "//src/mongo/db/stats:counters", "//src/mongo/db/storage:storage_control", "//src/mongo/rpc:client_metadata", @@ -1264,7 +1264,7 @@ mongo_cc_library( "//src/mongo/db:dbhelpers", "//src/mongo/db:not_primary_error_tracker", "//src/mongo/db/commands:test_commands_enabled", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/db/storage:storage_options", ], ) @@ -1319,13 +1319,13 @@ mongo_cc_library( "//src/mongo/db/commands:test_commands_enabled", "//src/mongo/db/index:index_access_method", "//src/mongo/db/index_builds:index_builds_coordinator", - "//src/mongo/db/local_catalog:collection_catalog", - "//src/mongo/db/local_catalog:local_oplog_info", - "//src/mongo/db/local_catalog/lock_manager", "//src/mongo/db/repl/initial_sync:initial_syncer", "//src/mongo/db/repl/split_horizon", "//src/mongo/db/session:kill_sessions_local", "//src/mongo/db/session:session_catalog", + "//src/mongo/db/shard_role/lock_manager", + "//src/mongo/db/shard_role/shard_catalog:collection_catalog", + "//src/mongo/db/shard_role/shard_catalog:local_oplog_info", "//src/mongo/db/storage:journal_flusher", "//src/mongo/db/storage:prepare_conflict_tracker", "//src/mongo/db/storage:storage_options", @@ -1357,7 +1357,7 @@ mongo_cc_library( ":replica_set_messages", ":storage_interface", "//src/mongo/db:service_context", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/executor:network_interface_mock", ], ) @@ -1528,12 +1528,12 @@ mongo_cc_library( "//src/mongo/db:multitenancy", "//src/mongo/db:service_context_d_test_fixture", "//src/mongo/db/index_builds:index_builds_coordinator", - "//src/mongo/db/local_catalog:database_holder", - "//src/mongo/db/local_catalog:document_validation", "//src/mongo/db/op_observer", "//src/mongo/db/repl/dbcheck:health_log", "//src/mongo/db/repl/dbcheck:health_log_interface", "//src/mongo/db/session:session_catalog_mongod", + "//src/mongo/db/shard_role/shard_catalog:database_holder", + "//src/mongo/db/shard_role/shard_catalog:document_validation", "//src/mongo/db/storage/wiredtiger:storage_wiredtiger", ], ) @@ -1752,8 +1752,6 @@ mongo_cc_unit_test( "//src/mongo/db/index:index_access_method", "//src/mongo/db/index_builds:index_build_entry_helpers", "//src/mongo/db/index_builds:index_builds_coordinator_mongod", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:catalog_test_fixture", "//src/mongo/db/op_observer", "//src/mongo/db/op_observer:op_observer_impl", "//src/mongo/db/op_observer:operation_logger_impl", @@ -1762,6 +1760,8 @@ mongo_cc_unit_test( "//src/mongo/db/repl/dbcheck:health_log", "//src/mongo/db/s:sharding_runtime_d", "//src/mongo/db/session:logical_session_id_helpers", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", "//src/mongo/db/stats:counters", "//src/mongo/db/update:update_test_helpers", "//src/mongo/dbtests:mocklib", @@ -1910,11 +1910,11 @@ mongo_cc_unit_test( "//src/mongo/db:service_context_d_test_fixture", "//src/mongo/db/index_builds:index_build_entry_helpers", "//src/mongo/db/index_builds:index_build_test_helpers", - "//src/mongo/db/local_catalog:catalog_helpers", "//src/mongo/db/op_observer", "//src/mongo/db/op_observer:op_observer_impl", "//src/mongo/db/op_observer:operation_logger_impl", "//src/mongo/db/session:session_catalog_mongod", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", "//src/mongo/db/transaction", ], ) @@ -1966,7 +1966,7 @@ mongo_cc_unit_test( ":oplog_applier_impl_test_fixture", ":replication_process", ":storage_interface", - "//src/mongo/db/local_catalog/lock_manager:exception_util", + "//src/mongo/db/shard_role/lock_manager:exception_util", "//src/mongo/transport:transport_layer_mock", ], ) @@ -1980,7 +1980,7 @@ mongo_cc_unit_test( ":repl_coordinator_test_fixture", ":replica_set_aware_service", "//src/mongo/db:service_context_test_fixture", - "//src/mongo/db/local_catalog:database_holder", + "//src/mongo/db/shard_role/shard_catalog:database_holder", ], ) @@ -1993,7 +1993,7 @@ mongo_cc_benchmark( deps = [ ":apply_ops_command_info", ":oplog_entry", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", ], ) @@ -2014,8 +2014,6 @@ mongo_cc_benchmark( "//src/mongo/db:service_context_d", "//src/mongo/db/auth:authmocks", "//src/mongo/db/index_builds:index_builds_coordinator_mongod", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:catalog_impl", "//src/mongo/db/op_observer", "//src/mongo/db/op_observer:op_observer_impl", "//src/mongo/db/op_observer:operation_logger_impl", @@ -2023,6 +2021,8 @@ mongo_cc_benchmark( "//src/mongo/db/rss:persistence_provider_impl", "//src/mongo/db/s:sharding_runtime_d", "//src/mongo/db/session:session_catalog_mongod", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:catalog_impl", "//src/mongo/db/storage:storage_control", "//src/mongo/db/storage:storage_options", "//src/mongo/db/storage/wiredtiger:storage_wiredtiger", @@ -2100,8 +2100,6 @@ mongo_cc_benchmark( "//src/mongo/db:service_context_d", "//src/mongo/db/auth:authmocks", "//src/mongo/db/index_builds:index_builds_coordinator_mongod", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:catalog_impl", "//src/mongo/db/op_observer", "//src/mongo/db/op_observer:op_observer_impl", "//src/mongo/db/op_observer:operation_logger_impl", @@ -2109,6 +2107,8 @@ mongo_cc_benchmark( "//src/mongo/db/rss:persistence_provider_impl", "//src/mongo/db/s:sharding_runtime_d", "//src/mongo/db/session:session_catalog_mongod", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:catalog_impl", "//src/mongo/db/storage:storage_control", "//src/mongo/db/storage:storage_options", "//src/mongo/db/storage/wiredtiger:storage_wiredtiger", @@ -2130,3 +2130,9 @@ mongo_cc_benchmark( "//src/mongo/unittest", ], ) + +# Auto-generated exports for moved files +exports_files([ + "local_oplog_info.cpp", + "local_oplog_info.h", +]) diff --git a/src/mongo/db/repl/apply_ops.cpp b/src/mongo/db/repl/apply_ops.cpp index 5f4cbf453f2..aee584aaade 100644 --- a/src/mongo/db/repl/apply_ops.cpp +++ b/src/mongo/db/repl/apply_ops.cpp @@ -34,18 +34,18 @@ #include "mongo/bson/bsonelement.h" #include "mongo/bson/timestamp.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/profile_settings.h" #include "mongo/db/repl/apply_ops_command_info.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/storage/storage_parameters_gen.h" #include "mongo/logv2/log.h" #include "mongo/platform/compiler.h" diff --git a/src/mongo/db/repl/apply_ops_test.cpp b/src/mongo/db/repl/apply_ops_test.cpp index 81f37998102..b733c6dfb13 100644 --- a/src/mongo/db/repl/apply_ops_test.cpp +++ b/src/mongo/db/repl/apply_ops_test.cpp @@ -35,8 +35,6 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/client.h" #include "mongo/db/commands.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_noop.h" @@ -51,6 +49,8 @@ #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/tenant_id.h" #include "mongo/db/versioning_protocol/stale_exception.h" diff --git a/src/mongo/db/repl/auto_get_rstl_for_stepup_stepdown.cpp b/src/mongo/db/repl/auto_get_rstl_for_stepup_stepdown.cpp index 5aee11fca79..406dc6121af 100644 --- a/src/mongo/db/repl/auto_get_rstl_for_stepup_stepdown.cpp +++ b/src/mongo/db/repl/auto_get_rstl_for_stepup_stepdown.cpp @@ -30,8 +30,8 @@ #include "mongo/db/repl/auto_get_rstl_for_stepup_stepdown.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/lock_manager/dump_lock_manager.h" #include "mongo/db/server_feature_flags_gen.h" +#include "mongo/db/shard_role/lock_manager/dump_lock_manager.h" #include "mongo/logv2/log.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kReplication diff --git a/src/mongo/db/repl/auto_get_rstl_for_stepup_stepdown.h b/src/mongo/db/repl/auto_get_rstl_for_stepup_stepdown.h index c255461cea5..770f2ba82cd 100644 --- a/src/mongo/db/repl/auto_get_rstl_for_stepup_stepdown.h +++ b/src/mongo/db/repl/auto_get_rstl_for_stepup_stepdown.h @@ -29,11 +29,11 @@ #pragma once -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/replication_state_transition_lock_guard.h" #include "mongo/db/session/kill_sessions_local.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/storage/execution_context.h" #include "mongo/stdx/mutex.h" #include "mongo/stdx/thread.h" diff --git a/src/mongo/db/repl/bgsync.cpp b/src/mongo/db/repl/bgsync.cpp index 6416c6d61f3..ea1db65380a 100644 --- a/src/mongo/db/repl/bgsync.cpp +++ b/src/mongo/db/repl/bgsync.cpp @@ -42,9 +42,6 @@ #include "mongo/db/client.h" #include "mongo/db/commands/server_status/server_status_metric.h" #include "mongo/db/dbhelpers.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/data_replicator_external_state_impl.h" #include "mongo/db/repl/member_state.h" @@ -60,6 +57,9 @@ #include "mongo/db/repl/sync_source_selector.h" #include "mongo/db/replication_state_transition_lock_guard.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/shutdown_in_progress_quiesce_info.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_engine.h" diff --git a/src/mongo/db/repl/change_stream_oplog_notification.cpp b/src/mongo/db/repl/change_stream_oplog_notification.cpp index 8d094a31dd7..6f8f2625a63 100644 --- a/src/mongo/db/repl/change_stream_oplog_notification.cpp +++ b/src/mongo/db/repl/change_stream_oplog_notification.cpp @@ -32,8 +32,6 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonmisc.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/pipeline/change_stream_helpers.h" @@ -42,6 +40,8 @@ #include "mongo/db/repl/oplog_entry_gen.h" #include "mongo/db/repl/optime.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/repl/collection_bulk_loader_impl.cpp b/src/mongo/db/repl/collection_bulk_loader_impl.cpp index d55688447a2..da6d56601a5 100644 --- a/src/mongo/db/repl/collection_bulk_loader_impl.cpp +++ b/src/mongo/db/repl/collection_bulk_loader_impl.cpp @@ -35,14 +35,14 @@ #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/index_builds/index_builds_common.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/repl_server_parameters_gen.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/repl/collection_bulk_loader_impl.h b/src/mongo/db/repl/collection_bulk_loader_impl.h index 4e802223c5c..eaca9c281c7 100644 --- a/src/mongo/db/repl/collection_bulk_loader_impl.h +++ b/src/mongo/db/repl/collection_bulk_loader_impl.h @@ -31,11 +31,11 @@ #include "mongo/base/status.h" #include "mongo/bson/bsonobj.h" #include "mongo/db/index_builds/multi_index_block.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/record_id.h" #include "mongo/db/repl/collection_bulk_loader.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/util/modules.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/repl/dbcheck/BUILD.bazel b/src/mongo/db/repl/dbcheck/BUILD.bazel index d20d9ea1af9..a911e35ebfb 100644 --- a/src/mongo/db/repl/dbcheck/BUILD.bazel +++ b/src/mongo/db/repl/dbcheck/BUILD.bazel @@ -41,8 +41,8 @@ mongo_cc_library( "//src/mongo/db:dbhelpers", "//src/mongo/db:server_base", "//src/mongo/db:shard_role", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog/lock_manager:exception_util", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", "//src/mongo/util/concurrency:thread_pool", ], ) @@ -60,7 +60,7 @@ mongo_cc_library( ":health_log_interface", "//src/mongo/db:server_base", "//src/mongo/db:service_context", - "//src/mongo/db/local_catalog:collection_options", + "//src/mongo/db/shard_role/shard_catalog:collection_options", ], ) @@ -93,9 +93,9 @@ mongo_cc_library( "//src/mongo/db:record_id_helpers", "//src/mongo/db:server_base", "//src/mongo/db:shard_role", - "//src/mongo/db/local_catalog:collection_options", - "//src/mongo/db/local_catalog:throttle_cursor", "//src/mongo/db/repl:repl_server_parameters", + "//src/mongo/db/shard_role/shard_catalog:collection_options", + "//src/mongo/db/shard_role/shard_catalog:throttle_cursor", "//src/mongo/util:md5", ], ) @@ -115,10 +115,10 @@ mongo_cc_library( "//src/mongo/db/collection_crud", "//src/mongo/db/commands:dbcheck_command", "//src/mongo/db/index_builds:index_builds_coordinator", - "//src/mongo/db/local_catalog:catalog_test_fixture", "//src/mongo/db/op_observer", "//src/mongo/db/op_observer:op_observer_impl", "//src/mongo/db/repl:storage_interface", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", "//src/mongo/unittest", ], ) @@ -140,8 +140,8 @@ mongo_cc_unit_test( ":dbcheck", ":dbcheck_test_fixture", ":health_log", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:catalog_test_fixture", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", "//src/mongo/unittest", "//src/mongo/unittest:task_executor_proxy", "//src/mongo/util:clock_source_mock", diff --git a/src/mongo/db/repl/dbcheck/dbcheck.cpp b/src/mongo/db/repl/dbcheck/dbcheck.cpp index 08d75b5bccc..b7b4d896357 100644 --- a/src/mongo/db/repl/dbcheck/dbcheck.cpp +++ b/src/mongo/db/repl/dbcheck/dbcheck.cpp @@ -38,12 +38,6 @@ #include "mongo/db/exec/collection_scan_common.h" #include "mongo/db/exec/matcher/matcher.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/compiler/physical_model/index_bounds/index_bounds.h" #include "mongo/db/query/internal_plans.h" @@ -56,6 +50,12 @@ #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/optime.h" #include "mongo/db/repl/repl_server_parameters_gen.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/tenant_id.h" #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/repl/dbcheck/dbcheck.h b/src/mongo/db/repl/dbcheck/dbcheck.h index a75b40f0533..31d09ba64c1 100644 --- a/src/mongo/db/repl/dbcheck/dbcheck.h +++ b/src/mongo/db/repl/dbcheck/dbcheck.h @@ -32,10 +32,6 @@ #include "mongo/base/status.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/throttle_cursor.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/plan_executor.h" @@ -44,7 +40,11 @@ #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/oplog_entry.h" #include "mongo/db/repl/optime.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/storage/recovery_unit.h" +#include "mongo/db/throttle_cursor.h" #include "mongo/util/md5.h" #include "mongo/util/modules.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/repl/dbcheck/dbcheck_test_fixture.cpp b/src/mongo/db/repl/dbcheck/dbcheck_test_fixture.cpp index 557ca4ec9fb..87a03a09f46 100644 --- a/src/mongo/db/repl/dbcheck/dbcheck_test_fixture.cpp +++ b/src/mongo/db/repl/dbcheck/dbcheck_test_fixture.cpp @@ -36,8 +36,6 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/index_builds/index_builds_coordinator.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_impl.h" #include "mongo/db/op_observer/op_observer_registry.h" @@ -46,6 +44,8 @@ #include "mongo/db/repl/dbcheck/health_log_gen.h" #include "mongo/db/repl/dbcheck/health_log_interface.h" #include "mongo/db/repl/storage_interface.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/snapshot_manager.h" #include "mongo/util/fail_point.h" diff --git a/src/mongo/db/repl/dbcheck/dbcheck_test_fixture.h b/src/mongo/db/repl/dbcheck/dbcheck_test_fixture.h index 5b0d3843ee4..c6e7be4f6ba 100644 --- a/src/mongo/db/repl/dbcheck/dbcheck_test_fixture.h +++ b/src/mongo/db/repl/dbcheck/dbcheck_test_fixture.h @@ -31,11 +31,11 @@ #include "mongo/bson/bson_validate_gen.h" #include "mongo/db/commands/dbcheck_command.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/throttle_cursor.h" #include "mongo/db/repl/dbcheck/dbcheck.h" #include "mongo/db/repl/dbcheck/dbcheck_gen.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/throttle_cursor.h" #include "mongo/db/write_concern.h" #include "mongo/db/write_concern_options.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/repl/dbcheck/deferred_writer.cpp b/src/mongo/db/repl/dbcheck/deferred_writer.cpp index 6f93c85eca0..d947c360429 100644 --- a/src/mongo/db/repl/dbcheck/deferred_writer.cpp +++ b/src/mongo/db/repl/dbcheck/deferred_writer.cpp @@ -32,13 +32,13 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/client.h" #include "mongo/db/dbhelpers.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/read_concern_args.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/db/versioning_protocol/shard_version.h" diff --git a/src/mongo/db/repl/dbcheck/deferred_writer.h b/src/mongo/db/repl/dbcheck/deferred_writer.h index 6d29a4cb70e..1ac1ca13aba 100644 --- a/src/mongo/db/repl/dbcheck/deferred_writer.h +++ b/src/mongo/db/repl/dbcheck/deferred_writer.h @@ -32,12 +32,12 @@ #include "mongo/base/status.h" #include "mongo/base/status_with.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/plan_executor.h" #include "mongo/db/repl/oplog.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/stdx/mutex.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/repl/dbcheck/health_log.cpp b/src/mongo/db/repl/dbcheck/health_log.cpp index 182c37bc2e9..b2f268ab37a 100644 --- a/src/mongo/db/repl/dbcheck/health_log.cpp +++ b/src/mongo/db/repl/dbcheck/health_log.cpp @@ -31,9 +31,9 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/oid.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/dbcheck/health_log_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include diff --git a/src/mongo/db/repl/get_next_optimes_test.cpp b/src/mongo/db/repl/get_next_optimes_test.cpp index b12887249ff..fc037966a95 100644 --- a/src/mongo/db/repl/get_next_optimes_test.cpp +++ b/src/mongo/db/repl/get_next_optimes_test.cpp @@ -27,10 +27,10 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/util/tick_source_mock.h" diff --git a/src/mongo/db/repl/idempotency_test.cpp b/src/mongo/db/repl/idempotency_test.cpp index bd05ddf57e7..495a5e2e3b4 100644 --- a/src/mongo/db/repl/idempotency_test.cpp +++ b/src/mongo/db/repl/idempotency_test.cpp @@ -41,13 +41,13 @@ #include "mongo/db/dbhelpers.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/document_value/value.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/idempotency_test_fixture.h" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/oplog_entry.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/update/document_diff_calculator.h" #include "mongo/db/update/document_diff_test_helpers.h" #include "mongo/db/update/update_oplog_entry_serialization.h" diff --git a/src/mongo/db/repl/idempotency_test_fixture.cpp b/src/mongo/db/repl/idempotency_test_fixture.cpp index efd095f9559..5ec4de4d8ed 100644 --- a/src/mongo/db/repl/idempotency_test_fixture.cpp +++ b/src/mongo/db/repl/idempotency_test_fixture.cpp @@ -35,16 +35,16 @@ #include "mongo/bson/util/builder.h" #include "mongo/db/database_name.h" #include "mongo/db/index_builds/index_builds_coordinator.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/query/internal_plans.h" #include "mongo/db/query/plan_executor.h" #include "mongo/db/query/plan_yield_policy.h" #include "mongo/db/repl/oplog_entry_test_helpers.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/validate/collection_validation.h" #include "mongo/db/validate/validate_results.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/repl/idempotency_test_fixture.h b/src/mongo/db/repl/idempotency_test_fixture.h index 6a5620eea76..bf17adc72ef 100644 --- a/src/mongo/db/repl/idempotency_test_fixture.h +++ b/src/mongo/db/repl/idempotency_test_fixture.h @@ -35,14 +35,14 @@ #include "mongo/bson/simple_bsonobj_comparator.h" #include "mongo/bson/timestamp.h" #include "mongo/bson/util/builder_fwd.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/oplog_applier_impl_test_fixture.h" #include "mongo/db/repl/oplog_entry.h" #include "mongo/db/repl/optime.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/tenant_id.h" #include "mongo/util/duration.h" #include "mongo/util/fail_point.h" diff --git a/src/mongo/db/repl/initial_sync/BUILD.bazel b/src/mongo/db/repl/initial_sync/BUILD.bazel index 20291541577..09928017518 100644 --- a/src/mongo/db/repl/initial_sync/BUILD.bazel +++ b/src/mongo/db/repl/initial_sync/BUILD.bazel @@ -27,7 +27,7 @@ mongo_cc_library( "//src/mongo/db:multitenancy", # TODO(SERVER-93876): Remove. "//src/mongo/db:server_base", "//src/mongo/db:server_feature_flags", # TODO(SERVER-93876): Remove. - "//src/mongo/db/local_catalog:collection_options", + "//src/mongo/db/shard_role/shard_catalog:collection_options", ], ) @@ -76,12 +76,12 @@ mongo_cc_library( "//src/mongo/db/commands:list_collections_filter", "//src/mongo/db/index_builds:index_build_entry_helpers", "//src/mongo/db/index_builds:index_builds_coordinator", - "//src/mongo/db/local_catalog:collection_options", "//src/mongo/db/repl:member_data", "//src/mongo/db/repl:repl_server_parameters", "//src/mongo/db/repl:replication_auth", "//src/mongo/db/repl:replication_consistency_markers_impl", "//src/mongo/db/repl:task_runner", + "//src/mongo/db/shard_role/shard_catalog:collection_options", "//src/mongo/util:progress_meter", "//src/mongo/util/concurrency:thread_pool", "//src/mongo/util/net:network", @@ -156,7 +156,7 @@ mongo_cc_library( "//src/mongo/db/repl:storage_interface_impl", # Required for service context test fixture "//src/mongo/db/auth:authmocks", - "//src/mongo/db/local_catalog:collection_options", + "//src/mongo/db/shard_role/shard_catalog:collection_options", "//src/mongo/db:service_context_d_test_fixture", "//src/mongo/dbtests:mocklib", "//src/mongo/util:clock_source_mock", diff --git a/src/mongo/db/repl/initial_sync/collection_cloner.cpp b/src/mongo/db/repl/initial_sync/collection_cloner.cpp index ab793303ed3..b8533fa8d35 100644 --- a/src/mongo/db/repl/initial_sync/collection_cloner.cpp +++ b/src/mongo/db/repl/initial_sync/collection_cloner.cpp @@ -39,9 +39,6 @@ #include "mongo/db/dbmessage.h" #include "mongo/db/index/index_constants.h" #include "mongo/db/index_builds/index_builds_coordinator.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/ddl/list_indexes_gen.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/multitenancy_gen.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/count_command_gen.h" @@ -52,6 +49,9 @@ #include "mongo/db/repl/repl_server_parameters_gen.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/list_indexes_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/db/storage/storage_parameters_gen.h" #include "mongo/db/tenant_id.h" diff --git a/src/mongo/db/repl/initial_sync/collection_cloner.h b/src/mongo/db/repl/initial_sync/collection_cloner.h index b96fd376ff9..a53845ea6b8 100644 --- a/src/mongo/db/repl/initial_sync/collection_cloner.h +++ b/src/mongo/db/repl/initial_sync/collection_cloner.h @@ -37,7 +37,6 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/client/dbclient_connection.h" #include "mongo/client/dbclient_cursor.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/collection_bulk_loader.h" #include "mongo/db/repl/initial_sync/base_cloner.h" @@ -45,6 +44,7 @@ #include "mongo/db/repl/initial_sync/initial_sync_shared_data.h" #include "mongo/db/repl/storage_interface.h" #include "mongo/db/repl/task_runner.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/executor/task_executor.h" #include "mongo/util/concurrency/thread_pool.h" #include "mongo/util/functional.h" diff --git a/src/mongo/db/repl/initial_sync/database_cloner.cpp b/src/mongo/db/repl/initial_sync/database_cloner.cpp index 33470c44113..1f819e64e4e 100644 --- a/src/mongo/db/repl/initial_sync/database_cloner.cpp +++ b/src/mongo/db/repl/initial_sync/database_cloner.cpp @@ -36,11 +36,11 @@ #include "mongo/base/status.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonelement.h" -#include "mongo/db/local_catalog/ddl/list_collections_filter.h" -#include "mongo/db/local_catalog/ddl/list_collections_gen.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" +#include "mongo/db/shard_role/ddl/list_collections_filter.h" +#include "mongo/db/shard_role/ddl/list_collections_gen.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/repl/initial_sync/database_cloner.h b/src/mongo/db/repl/initial_sync/database_cloner.h index 7a8ba180f4b..1a6d57abc12 100644 --- a/src/mongo/db/repl/initial_sync/database_cloner.h +++ b/src/mongo/db/repl/initial_sync/database_cloner.h @@ -33,13 +33,13 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/client/dbclient_connection.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/initial_sync/base_cloner.h" #include "mongo/db/repl/initial_sync/collection_cloner.h" #include "mongo/db/repl/initial_sync/initial_sync_base_cloner.h" #include "mongo/db/repl/initial_sync/initial_sync_shared_data.h" #include "mongo/db/repl/storage_interface.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/util/concurrency/thread_pool.h" #include "mongo/util/modules.h" #include "mongo/util/net/hostandport.h" diff --git a/src/mongo/db/repl/initial_sync/database_cloner_common.h b/src/mongo/db/repl/initial_sync/database_cloner_common.h index a0157a30572..3361160c91e 100644 --- a/src/mongo/db/repl/initial_sync/database_cloner_common.h +++ b/src/mongo/db/repl/initial_sync/database_cloner_common.h @@ -30,7 +30,7 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/util/modules.h" namespace mongo { diff --git a/src/mongo/db/repl/initial_sync/initial_syncer.cpp b/src/mongo/db/repl/initial_sync/initial_syncer.cpp index a1f36c831b2..750380b178f 100644 --- a/src/mongo/db/repl/initial_sync/initial_syncer.cpp +++ b/src/mongo/db/repl/initial_sync/initial_syncer.cpp @@ -45,7 +45,6 @@ #include "mongo/db/client.h" #include "mongo/db/feature_compatibility_version_parser.h" #include "mongo/db/index_builds/index_builds_coordinator.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/initial_sync/all_database_cloner.h" #include "mongo/db/repl/initial_sync/collection_cloner.h" @@ -71,6 +70,7 @@ #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/session/session_txn_record_gen.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/executor/remote_command_request.h" diff --git a/src/mongo/db/repl/initial_sync/initial_syncer_test.cpp b/src/mongo/db/repl/initial_sync/initial_syncer_test.cpp index 4f5db61aa3c..5023c807a58 100644 --- a/src/mongo/db/repl/initial_sync/initial_syncer_test.cpp +++ b/src/mongo/db/repl/initial_sync/initial_syncer_test.cpp @@ -43,7 +43,6 @@ #include "mongo/db/index/index_constants.h" #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/index_builds/index_builds_coordinator_mongod.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/client_cursor/cursor_id.h" #include "mongo/db/repl/data_replicator_external_state_mock.h" @@ -72,6 +71,7 @@ #include "mongo/db/service_context.h" #include "mongo/db/service_context_test_fixture.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/db/storage/storage_engine_mock.h" diff --git a/src/mongo/db/repl/intent_registry.cpp b/src/mongo/db/repl/intent_registry.cpp index 25cebdcbe0b..85c425eaaee 100644 --- a/src/mongo/db/repl/intent_registry.cpp +++ b/src/mongo/db/repl/intent_registry.cpp @@ -29,8 +29,8 @@ #include "mongo/db/repl/intent_registry.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/storage_options.h" #include "mongo/logv2/log.h" #include "mongo/util/decorable.h" diff --git a/src/mongo/db/local_catalog/local_oplog_info.cpp b/src/mongo/db/repl/local_oplog_info.cpp similarity index 98% rename from src/mongo/db/local_catalog/local_oplog_info.cpp rename to src/mongo/db/repl/local_oplog_info.cpp index 33079cc9154..d310f8a0757 100644 --- a/src/mongo/db/local_catalog/local_oplog_info.cpp +++ b/src/mongo/db/repl/local_oplog_info.cpp @@ -28,23 +28,23 @@ */ -#include "mongo/db/local_catalog/local_oplog_info.h" +#include "mongo/db/repl/local_oplog_info.h" #include #include // IWYU pragma: no_include "ext/alloc_traits.h" #include "mongo/db/admission/flow_control.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/logical_time.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/optime.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/rss/replicated_storage_service.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/oplog_truncate_marker_parameters_gen.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_options.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/local_catalog/local_oplog_info.h b/src/mongo/db/repl/local_oplog_info.h similarity index 100% rename from src/mongo/db/local_catalog/local_oplog_info.h rename to src/mongo/db/repl/local_oplog_info.h diff --git a/src/mongo/db/repl/mock_repl_coord_server_fixture.cpp b/src/mongo/db/repl/mock_repl_coord_server_fixture.cpp index 0efc256a3d9..104761bb749 100644 --- a/src/mongo/db/repl/mock_repl_coord_server_fixture.cpp +++ b/src/mongo/db/repl/mock_repl_coord_server_fixture.cpp @@ -34,8 +34,6 @@ #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/curop.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/member_state.h" @@ -51,6 +49,8 @@ #include "mongo/db/repl/storage_interface_mock.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" #include "mongo/db/storage/snapshot_manager.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/repl/noop_writer.cpp b/src/mongo/db/repl/noop_writer.cpp index 9ff81718003..f58aa2fa5b9 100644 --- a/src/mongo/db/repl/noop_writer.cpp +++ b/src/mongo/db/repl/noop_writer.cpp @@ -37,15 +37,15 @@ #include "mongo/db/admission/execution_admission_context.h" #include "mongo/db/client.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/repl_server_parameters_gen.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/logv2/log.h" #include "mongo/platform/atomic_word.h" diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp index 879d04b3570..2620a30ef48 100644 --- a/src/mongo/db/repl/oplog.cpp +++ b/src/mongo/db/repl/oplog.cpp @@ -46,36 +46,11 @@ #include "mongo/db/database_name.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/dbhelpers.h" +#include "mongo/db/import_collection_oplog_entry_gen.h" #include "mongo/db/index/index_constants.h" #include "mongo/db/index_builds/index_build_oplog_entry.h" #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/index_builds/index_builds_manager.h" -#include "mongo/db/local_catalog/backwards_compatible_collection_options_util.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/coll_mod.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/ddl/coll_mod_gen.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/drop_collection.h" -#include "mongo/db/local_catalog/drop_database.h" -#include "mongo/db/local_catalog/drop_indexes.h" -#include "mongo/db/local_catalog/import_collection_oplog_entry_gen.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/local_oplog_info.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/rename_collection.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/uncommitted_catalog_updates.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_util.h" @@ -93,6 +68,7 @@ #include "mongo/db/repl/dbcheck/dbcheck.h" #include "mongo/db/repl/image_collection_entry_gen.h" #include "mongo/db/repl/intent_guard.h" +#include "mongo/db/repl/local_oplog_info.h" #include "mongo/db/repl/oplog_entry_gen.h" #include "mongo/db/repl/optime.h" #include "mongo/db/repl/read_concern_args.h" @@ -107,6 +83,30 @@ #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/ddl/coll_mod_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/backwards_compatible_collection_options_util.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/coll_mod.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_catalog/drop_collection.h" +#include "mongo/db/shard_role/shard_catalog/drop_database.h" +#include "mongo/db/shard_role/shard_catalog/drop_indexes.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/rename_collection.h" +#include "mongo/db/shard_role/shard_catalog/uncommitted_catalog_updates.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/stats/counters.h" diff --git a/src/mongo/db/repl/oplog_application_bm.cpp b/src/mongo/db/repl/oplog_application_bm.cpp index 3cbf394caac..2112913a45a 100644 --- a/src/mongo/db/repl/oplog_application_bm.cpp +++ b/src/mongo/db/repl/oplog_application_bm.cpp @@ -40,18 +40,6 @@ #include "mongo/db/global_settings.h" #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/index_builds/index_builds_coordinator_mongod.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog_helper.h" -#include "mongo/db/local_catalog/collection_impl.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/database_holder_impl.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state_factory_shard.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_shard.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_impl.h" @@ -79,6 +67,18 @@ #include "mongo/db/service_entry_point_shard_role.h" #include "mongo/db/session/session_catalog.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog_helper.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/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state_factory_shard.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/database_holder_impl.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state_factory_shard.h" #include "mongo/db/storage/storage_options.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/topology/sharding_state.h" diff --git a/src/mongo/db/repl/oplog_applier_batcher.cpp b/src/mongo/db/repl/oplog_applier_batcher.cpp index b9175540d98..2dfe7f1e8e1 100644 --- a/src/mongo/db/repl/oplog_applier_batcher.cpp +++ b/src/mongo/db/repl/oplog_applier_batcher.cpp @@ -40,9 +40,6 @@ #include "mongo/db/admission/execution_admission_context.h" #include "mongo/db/change_stream_pre_image_util.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/repl/apply_ops_gen.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/oplog_applier.h" @@ -50,6 +47,9 @@ #include "mongo/db/repl/repl_server_parameters_gen.h" #include "mongo/db/repl/truncate_range_oplog_entry_gen.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/logv2/log.h" #include "mongo/platform/atomic_word.h" #include "mongo/platform/compiler.h" diff --git a/src/mongo/db/repl/oplog_applier_impl.cpp b/src/mongo/db/repl/oplog_applier_impl.cpp index 56827d55049..53dc5896bb8 100644 --- a/src/mongo/db/repl/oplog_applier_impl.cpp +++ b/src/mongo/db/repl/oplog_applier_impl.cpp @@ -40,8 +40,6 @@ #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/commands/fsync.h" #include "mongo/db/commands/server_status/server_status_metric.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/apply_ops_command_info.h" #include "mongo/db/repl/initial_sync/initial_syncer.h" @@ -55,6 +53,8 @@ #include "mongo/db/repl/transaction_oplog_application.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/stats/counters.h" #include "mongo/db/stats/timer_stats.h" #include "mongo/db/storage/control/journal_flusher.h" diff --git a/src/mongo/db/repl/oplog_applier_impl_test.cpp b/src/mongo/db/repl/oplog_applier_impl_test.cpp index d9ce924fa6d..29c66c77d3d 100644 --- a/src/mongo/db/repl/oplog_applier_impl_test.cpp +++ b/src/mongo/db/repl/oplog_applier_impl_test.cpp @@ -50,14 +50,6 @@ #include "mongo/db/dbhelpers.h" #include "mongo/db/exec/document_value/value.h" #include "mongo/db/index/index_constants.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/multi_key_path_tracker.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" @@ -90,6 +82,14 @@ #include "mongo/db/session/logical_session_id_helpers.h" #include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/session/session_txn_record_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/stats/counters.h" #include "mongo/db/storage/kv/kv_engine.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/repl/oplog_applier_impl_test_fixture.cpp b/src/mongo/db/repl/oplog_applier_impl_test_fixture.cpp index 133fa47f5a4..5a073020678 100644 --- a/src/mongo/db/repl/oplog_applier_impl_test_fixture.cpp +++ b/src/mongo/db/repl/oplog_applier_impl_test_fixture.cpp @@ -37,14 +37,6 @@ #include "mongo/db/exec/document_value/value.h" #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/index_builds/index_builds_manager.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/logical_time.h" #include "mongo/db/multi_key_path_tracker.h" #include "mongo/db/op_observer/op_observer_registry.h" @@ -61,12 +53,20 @@ #include "mongo/db/repl/storage_interface.h" #include "mongo/db/repl/storage_interface_impl.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/storage/mdb_catalog.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/tenant_id.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/db/transaction/session_catalog_mongod_transaction_interface_impl.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" #include "mongo/idl/idl_parser.h" #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/repl/oplog_applier_impl_test_fixture.h b/src/mongo/db/repl/oplog_applier_impl_test_fixture.h index dd42a11b9a7..91de39094e7 100644 --- a/src/mongo/db/repl/oplog_applier_impl_test_fixture.h +++ b/src/mongo/db/repl/oplog_applier_impl_test_fixture.h @@ -35,8 +35,6 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_noop.h" @@ -59,6 +57,8 @@ #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" #include "mongo/db/session/session_txn_record_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/platform/atomic_word.h" #include "mongo/util/duration.h" diff --git a/src/mongo/db/repl/oplog_applier_utils.cpp b/src/mongo/db/repl/oplog_applier_utils.cpp index 7d0eb184534..240cbd740f4 100644 --- a/src/mongo/db/repl/oplog_applier_utils.cpp +++ b/src/mongo/db/repl/oplog_applier_utils.cpp @@ -39,16 +39,6 @@ #include "mongo/db/curop_metrics.h" #include "mongo/db/database_name.h" #include "mongo/db/feature_flag.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/multitenancy_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/profile_settings.h" @@ -61,6 +51,16 @@ #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/stats/counters.h" #include "mongo/db/storage/exceptions.h" #include "mongo/db/tenant_id.h" diff --git a/src/mongo/db/repl/oplog_applier_utils_bm.cpp b/src/mongo/db/repl/oplog_applier_utils_bm.cpp index 6fb62110630..221d1140ea2 100644 --- a/src/mongo/db/repl/oplog_applier_utils_bm.cpp +++ b/src/mongo/db/repl/oplog_applier_utils_bm.cpp @@ -31,11 +31,11 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/query/compiler/stats/rand_utils.h" #include "mongo/db/repl/oplog_entry.h" #include "mongo/db/repl/optime.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit_noop.h" #include diff --git a/src/mongo/db/repl/oplog_buffer_collection.cpp b/src/mongo/db/repl/oplog_buffer_collection.cpp index 2e3d920e1c8..83cd92dbc50 100644 --- a/src/mongo/db/repl/oplog_buffer_collection.cpp +++ b/src/mongo/db/repl/oplog_buffer_collection.cpp @@ -38,16 +38,16 @@ #include "mongo/bson/util/bson_extract.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/index/index_constants.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/write_ops_exec.h" #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/repl/storage_interface.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" #include "mongo/util/assert_util.h" #include diff --git a/src/mongo/db/repl/oplog_buffer_collection_test.cpp b/src/mongo/db/repl/oplog_buffer_collection_test.cpp index d353134a1fa..d2e549d9706 100644 --- a/src/mongo/db/repl/oplog_buffer_collection_test.cpp +++ b/src/mongo/db/repl/oplog_buffer_collection_test.cpp @@ -36,7 +36,6 @@ #include "mongo/bson/bsonmisc.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog_applier_impl_test_fixture.h" @@ -47,6 +46,7 @@ #include "mongo/db/repl/storage_interface_impl.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/stdx/thread.h" #include "mongo/stdx/type_traits.h" #include "mongo/unittest/barrier.h" diff --git a/src/mongo/db/repl/oplog_entry.cpp b/src/mongo/db/repl/oplog_entry.cpp index 8ceef40ce34..9510bfda84f 100644 --- a/src/mongo/db/repl/oplog_entry.cpp +++ b/src/mongo/db/repl/oplog_entry.cpp @@ -32,10 +32,10 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/feature_flag.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/multitenancy_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/logv2/redaction.h" #include "mongo/util/namespace_string_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/repl/oplog_entry.h b/src/mongo/db/repl/oplog_entry.h index 470884097de..e5acb6f0c06 100644 --- a/src/mongo/db/repl/oplog_entry.h +++ b/src/mongo/db/repl/oplog_entry.h @@ -36,7 +36,6 @@ #include "mongo/bson/simple_bsonobj_comparator.h" #include "mongo/bson/timestamp.h" #include "mongo/db/exec/document_value/value.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/apply_ops_gen.h" #include "mongo/db/repl/oplog_entry_gen.h" @@ -44,6 +43,7 @@ #include "mongo/db/repl/optime_base_gen.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/tenant_id.h" #include "mongo/db/version_context_feature_flags_gen.h" diff --git a/src/mongo/db/repl/oplog_entry_test.cpp b/src/mongo/db/repl/oplog_entry_test.cpp index 91934e8d7e7..39cd293d3da 100644 --- a/src/mongo/db/repl/oplog_entry_test.cpp +++ b/src/mongo/db/repl/oplog_entry_test.cpp @@ -39,7 +39,6 @@ #include "mongo/bson/timestamp.h" #include "mongo/bson/unordered_fields_bsonobj_comparator.h" #include "mongo/db/index_builds/index_build_oplog_entry.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/create_oplog_entry_gen.h" #include "mongo/db/repl/oplog_entry_gen.h" @@ -48,6 +47,7 @@ #include "mongo/db/repl/optime_base_gen.h" #include "mongo/db/service_context_d_test_fixture.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/tenant_id.h" #include "mongo/db/version_context.h" #include "mongo/idl/idl_parser.h" diff --git a/src/mongo/db/repl/oplog_fetcher.h b/src/mongo/db/repl/oplog_fetcher.h index 864b14d27a3..c45e57e2109 100644 --- a/src/mongo/db/repl/oplog_fetcher.h +++ b/src/mongo/db/repl/oplog_fetcher.h @@ -43,7 +43,7 @@ #include "mongo/db/repl/optime.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/repl_set_config.h" -#include "mongo/db/vector_clock/vector_clock_metadata_hook.h" +#include "mongo/db/topology/vector_clock/vector_clock_metadata_hook.h" #include "mongo/executor/task_executor.h" #include "mongo/stdx/condition_variable.h" #include "mongo/stdx/mutex.h" diff --git a/src/mongo/db/repl/oplog_fetcher_test.cpp b/src/mongo/db/repl/oplog_fetcher_test.cpp index 4f81c030c30..4fcd3126103 100644 --- a/src/mongo/db/repl/oplog_fetcher_test.cpp +++ b/src/mongo/db/repl/oplog_fetcher_test.cpp @@ -55,7 +55,7 @@ #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/signed_logical_time.h" #include "mongo/db/time_proof_service.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/dbtests/mock/mock_dbclient_connection.h" #include "mongo/dbtests/mock/mock_remote_db_server.h" #include "mongo/executor/task_executor_test_fixture.h" diff --git a/src/mongo/db/repl/oplog_interface_local.cpp b/src/mongo/db/repl/oplog_interface_local.cpp index a344c6be83d..bf9d8630737 100644 --- a/src/mongo/db/repl/oplog_interface_local.cpp +++ b/src/mongo/db/repl/oplog_interface_local.cpp @@ -32,9 +32,6 @@ #include "mongo/base/error_codes.h" #include "mongo/base/status_with.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/db_raii.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/profile_settings.h" @@ -43,6 +40,9 @@ #include "mongo/db/query/plan_yield_policy.h" #include "mongo/db/record_id.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" #include "mongo/util/assert_util.h" #include "mongo/util/net/socket_utils.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/repl/oplog_test.cpp b/src/mongo/db/repl/oplog_test.cpp index 04d8a674910..ab1e1a1222e 100644 --- a/src/mongo/db/repl/oplog_test.cpp +++ b/src/mongo/db/repl/oplog_test.cpp @@ -32,10 +32,6 @@ #include "mongo/base/error_codes.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/oplog_entry.h" #include "mongo/db/repl/oplog_entry_gen.h" @@ -45,6 +41,10 @@ #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/stdx/mutex.h" #include "mongo/unittest/barrier.h" diff --git a/src/mongo/db/repl/oplog_visibility_manager.cpp b/src/mongo/db/repl/oplog_visibility_manager.cpp index b5d3d10c77b..e8da142b7e2 100644 --- a/src/mongo/db/repl/oplog_visibility_manager.cpp +++ b/src/mongo/db/repl/oplog_visibility_manager.cpp @@ -29,8 +29,8 @@ #include "mongo/db/repl/oplog_visibility_manager.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/logv2/log.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kReplication diff --git a/src/mongo/db/repl/oplog_write_bm.cpp b/src/mongo/db/repl/oplog_write_bm.cpp index ff00daaadbf..23b761faa50 100644 --- a/src/mongo/db/repl/oplog_write_bm.cpp +++ b/src/mongo/db/repl/oplog_write_bm.cpp @@ -40,18 +40,6 @@ #include "mongo/db/global_settings.h" #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/index_builds/index_builds_coordinator_mongod.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog_helper.h" -#include "mongo/db/local_catalog/collection_impl.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/database_holder_impl.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state_factory_shard.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_shard.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_impl.h" @@ -80,6 +68,18 @@ #include "mongo/db/service_entry_point_shard_role.h" #include "mongo/db/session/session_catalog.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog_helper.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/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state_factory_shard.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/database_holder_impl.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state_factory_shard.h" #include "mongo/db/storage/storage_options.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/topology/sharding_state.h" diff --git a/src/mongo/db/repl/oplog_writer_impl.cpp b/src/mongo/db/repl/oplog_writer_impl.cpp index e6d0b89242f..10cc82cfec3 100644 --- a/src/mongo/db/repl/oplog_writer_impl.cpp +++ b/src/mongo/db/repl/oplog_writer_impl.cpp @@ -32,8 +32,8 @@ #include "mongo/db/admission/execution_admission_context.h" #include "mongo/db/commands/fsync.h" #include "mongo/db/commands/server_status/server_status_metric.h" -#include "mongo/db/local_catalog/catalog_raii.h" #include "mongo/db/repl/initial_sync/initial_syncer.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" #include "mongo/db/storage/control/journal_flusher.h" #include "mongo/db/storage/storage_util.h" #include "mongo/stdx/mutex.h" diff --git a/src/mongo/db/repl/primary_only_service.cpp b/src/mongo/db/repl/primary_only_service.cpp index eceffc41aae..264554bb03b 100644 --- a/src/mongo/db/repl/primary_only_service.cpp +++ b/src/mongo/db/repl/primary_only_service.cpp @@ -35,14 +35,14 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/client.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/query/find_command.h" #include "mongo/db/repl/repl_server_parameters_gen.h" #include "mongo/db/repl/replica_set_aware_service.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/repl/wait_for_majority_service.h" #include "mongo/db/service_context.h" -#include "mongo/db/vector_clock/vector_clock_metadata_hook.h" +#include "mongo/db/shard_role/transaction_resources.h" +#include "mongo/db/topology/vector_clock/vector_clock_metadata_hook.h" #include "mongo/executor/network_connection_hook.h" #include "mongo/executor/network_interface_factory.h" #include "mongo/executor/thread_pool_task_executor.h" diff --git a/src/mongo/db/repl/primary_only_service_op_observer.cpp b/src/mongo/db/repl/primary_only_service_op_observer.cpp index 6b8bcc6dd72..fb02ccfde5a 100644 --- a/src/mongo/db/repl/primary_only_service_op_observer.cpp +++ b/src/mongo/db/repl/primary_only_service_op_observer.cpp @@ -33,8 +33,8 @@ #include "mongo/base/status.h" #include "mongo/bson/bsonelement.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/repl/primary_only_service.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" diff --git a/src/mongo/db/repl/primary_only_service_op_observer.h b/src/mongo/db/repl/primary_only_service_op_observer.h index a4a86302867..9f5f2c26b26 100644 --- a/src/mongo/db/repl/primary_only_service_op_observer.h +++ b/src/mongo/db/repl/primary_only_service_op_observer.h @@ -30,7 +30,6 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_noop.h" @@ -38,6 +37,7 @@ #include "mongo/db/repl/optime.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/modules.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/repl/primary_only_service_test.cpp b/src/mongo/db/repl/primary_only_service_test.cpp index d2c07c30fd6..1a2e5085300 100644 --- a/src/mongo/db/repl/primary_only_service_test.cpp +++ b/src/mongo/db/repl/primary_only_service_test.cpp @@ -35,13 +35,13 @@ #include "mongo/bson/bsonmisc.h" #include "mongo/db/client.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/repl/primary_only_service_test_fixture.h" #include "mongo/db/repl/repl_server_parameters_gen.h" #include "mongo/db/repl/wait_for_majority_service.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/executor/network_connection_hook.h" #include "mongo/executor/network_interface_factory.h" #include "mongo/executor/thread_pool_task_executor.h" diff --git a/src/mongo/db/repl/repl_set_commands.cpp b/src/mongo/db/repl/repl_set_commands.cpp index 7458ed9ed0e..c4d30a73d0d 100644 --- a/src/mongo/db/repl/repl_set_commands.cpp +++ b/src/mongo/db/repl/repl_set_commands.cpp @@ -59,10 +59,6 @@ #include "mongo/db/commands/test_commands_enabled.h" #include "mongo/db/database_name.h" #include "mongo/db/dbhelpers.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/member_state.h" @@ -81,6 +77,10 @@ #include "mongo/db/repl/update_position_args.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/logv2/log.h" #include "mongo/rpc/metadata/repl_set_metadata.h" diff --git a/src/mongo/db/repl/replica_set_aware_service_test.cpp b/src/mongo/db/repl/replica_set_aware_service_test.cpp index f6ce5923929..6045e65e99d 100644 --- a/src/mongo/db/repl/replica_set_aware_service_test.cpp +++ b/src/mongo/db/repl/replica_set_aware_service_test.cpp @@ -31,16 +31,16 @@ #include "mongo/base/string_data.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/database_holder_mock.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state_factory_shard.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_mock.h" #include "mongo/db/repl/optime.h" #include "mongo/db/repl/repl_server_parameters_gen.h" #include "mongo/db/repl/repl_set_config.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state_factory_shard.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/database_holder_mock.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state_factory_mock.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/platform/atomic_word.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/repl/replication_consistency_markers_impl.cpp b/src/mongo/db/repl/replication_consistency_markers_impl.cpp index d5fca4cf42c..302c9f07fb7 100644 --- a/src/mongo/db/repl/replication_consistency_markers_impl.cpp +++ b/src/mongo/db/repl/replication_consistency_markers_impl.cpp @@ -34,17 +34,17 @@ #include "mongo/db/admission/execution_admission_context.h" #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/optime.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/repl/storage_interface.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/control/journal_flusher.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_engine.h" diff --git a/src/mongo/db/repl/replication_consistency_markers_impl.h b/src/mongo/db/repl/replication_consistency_markers_impl.h index f3e0df4d0a8..d9033ae7a2d 100644 --- a/src/mongo/db/repl/replication_consistency_markers_impl.h +++ b/src/mongo/db/repl/replication_consistency_markers_impl.h @@ -33,12 +33,12 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/timestamp.h" #include "mongo/db/auth/validated_tenancy_scope.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/record_id.h" #include "mongo/db/repl/optime.h" #include "mongo/db/repl/replication_consistency_markers.h" #include "mongo/db/repl/replication_consistency_markers_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/stdx/mutex.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/repl/replication_consistency_markers_impl_bm.cpp b/src/mongo/db/repl/replication_consistency_markers_impl_bm.cpp index 0a470031288..3bd5fc855b5 100644 --- a/src/mongo/db/repl/replication_consistency_markers_impl_bm.cpp +++ b/src/mongo/db/repl/replication_consistency_markers_impl_bm.cpp @@ -31,8 +31,6 @@ #include "mongo/db/audit.h" #include "mongo/db/auth/auth_op_observer.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_op_observer.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/op_observer/change_stream_pre_images_op_observer.h" #include "mongo/db/op_observer/fallback_op_observer.h" #include "mongo/db/op_observer/fcv_op_observer.h" @@ -53,11 +51,13 @@ #include "mongo/db/s/query_analysis_op_observer_shardsvr.h" #include "mongo/db/s/resharding/resharding_op_observer.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/config_server_op_observer.h" #include "mongo/db/sharding_environment/shard_server_op_observer.h" #include "mongo/db/storage/journal_listener.h" #include "mongo/db/timeseries/timeseries_op_observer.h" -#include "mongo/db/user_write_block/user_write_block_mode_op_observer.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_op_observer.h" +#include "mongo/db/topology/user_write_block/user_write_block_mode_op_observer.h" #include "mongo/logv2/log_domain_global.h" #include diff --git a/src/mongo/db/repl/replication_consistency_markers_impl_test.cpp b/src/mongo/db/repl/replication_consistency_markers_impl_test.cpp index b913d2d80f3..87b37936101 100644 --- a/src/mongo/db/repl/replication_consistency_markers_impl_test.cpp +++ b/src/mongo/db/repl/replication_consistency_markers_impl_test.cpp @@ -32,9 +32,6 @@ #include "mongo/bson/bsonelement.h" #include "mongo/db/client.h" #include "mongo/db/dbhelpers.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/replication_coordinator.h" @@ -43,6 +40,9 @@ #include "mongo/db/repl/storage_interface_impl.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/db/storage/journal_listener.h" #include "mongo/idl/idl_parser.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/repl/replication_coordinator.cpp b/src/mongo/db/repl/replication_coordinator.cpp index ba34acf87dc..8625746c65f 100644 --- a/src/mongo/db/repl/replication_coordinator.cpp +++ b/src/mongo/db/repl/replication_coordinator.cpp @@ -31,10 +31,10 @@ #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/repl_server_parameters_gen.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/storage_options.h" #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" diff --git a/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp b/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp index e313a9fc109..3c122b73b3b 100644 --- a/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp +++ b/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp @@ -54,17 +54,6 @@ #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/index_builds/index_builds_coordinator.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/drop_collection.h" -#include "mongo/db/local_catalog/local_oplog_info.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/logical_time.h" #include "mongo/db/logical_time_validator.h" #include "mongo/db/namespace_string.h" @@ -76,6 +65,7 @@ #include "mongo/db/repl/bgsync.h" #include "mongo/db/repl/isself.h" #include "mongo/db/repl/last_vote.h" +#include "mongo/db/repl/local_oplog_info.h" #include "mongo/db/repl/noop_writer.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/oplog_applier_impl.h" @@ -96,6 +86,16 @@ #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/drop_collection.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_initialization_mongod.h" @@ -110,9 +110,9 @@ #include "mongo/db/topology/cluster_role.h" #include "mongo/db/topology/shard_registry.h" #include "mongo/db/topology/sharding_state.h" -#include "mongo/db/user_write_block/write_block_bypass.h" -#include "mongo/db/vector_clock/vector_clock.h" -#include "mongo/db/vector_clock/vector_clock_metadata_hook.h" +#include "mongo/db/topology/user_write_block/write_block_bypass.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock_metadata_hook.h" #include "mongo/db/version_context.h" #include "mongo/db/versioning_protocol/shard_version.h" #include "mongo/executor/network_connection_hook.h" diff --git a/src/mongo/db/repl/replication_coordinator_impl.cpp b/src/mongo/db/repl/replication_coordinator_impl.cpp index 03819538a4d..2a26d7a2c2c 100644 --- a/src/mongo/db/repl/replication_coordinator_impl.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl.cpp @@ -56,12 +56,6 @@ #include "mongo/db/commands/server_status/server_status_metric.h" #include "mongo/db/curop.h" #include "mongo/db/index_builds/commit_quorum_options.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/local_oplog_info.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/lock_manager/lock_stats.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/logical_time.h" #include "mongo/db/mongod_options_storage_gen.h" #include "mongo/db/read_write_concern_defaults.h" @@ -74,6 +68,7 @@ #include "mongo/db/repl/initial_sync/initial_syncer_factory.h" #include "mongo/db/repl/isself.h" #include "mongo/db/repl/last_vote.h" +#include "mongo/db/repl/local_oplog_info.h" #include "mongo/db/repl/member_config_gen.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/read_concern_args.h" @@ -103,6 +98,11 @@ #include "mongo/db/session/kill_sessions.h" #include "mongo/db/session/kill_sessions_local.h" #include "mongo/db/session/session_catalog.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/lock_stats.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/shutdown_in_progress_quiesce_info.h" #include "mongo/db/storage/control/journal_flusher.h" #include "mongo/db/storage/record_store.h" diff --git a/src/mongo/db/repl/replication_coordinator_impl_catchup.cpp b/src/mongo/db/repl/replication_coordinator_impl_catchup.cpp index 50923c52e0a..8589e597988 100644 --- a/src/mongo/db/repl/replication_coordinator_impl_catchup.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl_catchup.cpp @@ -30,8 +30,8 @@ #include "mongo/db/repl/replication_coordinator_impl.h" #include "mongo/db/repl/replication_metrics.h" -#include "mongo/db/vector_clock/vector_clock.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/executor/thread_pool_task_executor.h" #include "mongo/logv2/log.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/repl/replication_coordinator_impl_elect_v1_test.cpp b/src/mongo/db/repl/replication_coordinator_impl_elect_v1_test.cpp index 56c9bd1a522..f630af9a68e 100644 --- a/src/mongo/db/repl/replication_coordinator_impl_elect_v1_test.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl_elect_v1_test.cpp @@ -36,8 +36,6 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/timestamp.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/hello/hello_response.h" #include "mongo/db/repl/last_vote.h" @@ -58,6 +56,8 @@ #include "mongo/db/repl/vote_requester.h" #include "mongo/db/replication_state_transition_lock_guard.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/db/tenant_id.h" #include "mongo/executor/mock_network_fixture.h" #include "mongo/executor/network_connection_hook.h" diff --git a/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp b/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp index d1b8b92e757..a691d34144d 100644 --- a/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp @@ -43,9 +43,6 @@ #include "mongo/bson/oid.h" #include "mongo/db/client.h" #include "mongo/db/commands/test_commands_enabled.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/repl/delayable_timeout_callback.h" #include "mongo/db/repl/heartbeat_response_action.h" #include "mongo/db/repl/member_config.h" @@ -68,6 +65,9 @@ #include "mongo/db/repl/topology_coordinator.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/session/kill_sessions_local.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/control/journal_flusher.h" #include "mongo/executor/remote_command_request.h" #include "mongo/executor/task_executor.h" diff --git a/src/mongo/db/repl/replication_coordinator_impl_heartbeat_v1_test.cpp b/src/mongo/db/repl/replication_coordinator_impl_heartbeat_v1_test.cpp index b3da6c69db3..22372d6c016 100644 --- a/src/mongo/db/repl/replication_coordinator_impl_heartbeat_v1_test.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl_heartbeat_v1_test.cpp @@ -41,7 +41,6 @@ #include "mongo/db/client.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/document_value/value.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/repl/hello/hello_response.h" #include "mongo/db/repl/member_config.h" #include "mongo/db/repl/member_id.h" @@ -59,6 +58,7 @@ #include "mongo/db/repl/topology_coordinator.h" #include "mongo/db/replication_state_transition_lock_guard.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/executor/network_connection_hook.h" #include "mongo/executor/network_interface_mock.h" #include "mongo/executor/remote_command_request.h" diff --git a/src/mongo/db/repl/replication_coordinator_impl_step_up_step_down.cpp b/src/mongo/db/repl/replication_coordinator_impl_step_up_step_down.cpp index de8c5fd31ba..9d95d0d9df1 100644 --- a/src/mongo/db/repl/replication_coordinator_impl_step_up_step_down.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl_step_up_step_down.cpp @@ -29,7 +29,6 @@ #include "mongo/db/curop_failpoint_helpers.h" -#include "mongo/db/local_catalog/lock_manager/dump_lock_manager.h" #include "mongo/db/repl/auto_get_rstl_for_stepup_stepdown.h" #include "mongo/db/repl/intent_registry.h" #include "mongo/db/repl/replication_coordinator_impl.h" @@ -38,6 +37,7 @@ #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/session/kill_sessions_local.h" #include "mongo/db/session/session_killer.h" +#include "mongo/db/shard_role/lock_manager/dump_lock_manager.h" #include "mongo/db/storage/execution_context.h" #include "mongo/db/storage/prepare_conflict_tracker.h" #include "mongo/executor/thread_pool_task_executor.h" diff --git a/src/mongo/db/repl/replication_coordinator_impl_test.cpp b/src/mongo/db/repl/replication_coordinator_impl_test.cpp index 11229eaf3b3..9f0c448484a 100644 --- a/src/mongo/db/repl/replication_coordinator_impl_test.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl_test.cpp @@ -34,9 +34,6 @@ #include "mongo/bson/bsonmisc.h" #include "mongo/db/client.h" #include "mongo/db/index_builds/commit_quorum_options.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/read_write_concern_defaults.h" #include "mongo/db/repl/bson_extract_optime.h" #include "mongo/db/repl/data_replicator_external_state_impl.h" @@ -58,6 +55,9 @@ #include "mongo/db/replication_state_transition_lock_guard.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/shutdown_in_progress_quiesce_info.h" #include "mongo/db/storage/storage_options.h" #include "mongo/db/topology/cluster_role.h" diff --git a/src/mongo/db/repl/replication_coordinator_test_fixture.cpp b/src/mongo/db/repl/replication_coordinator_test_fixture.cpp index 51f4908dc18..95abadfcf59 100644 --- a/src/mongo/db/repl/replication_coordinator_test_fixture.cpp +++ b/src/mongo/db/repl/replication_coordinator_test_fixture.cpp @@ -35,8 +35,6 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/admission/execution_admission_context.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/read_write_concern_defaults.h" #include "mongo/db/repl/hello/hello_response.h" @@ -53,6 +51,8 @@ #include "mongo/db/repl/storage_interface_mock.h" #include "mongo/db/repl/topology_coordinator.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/executor/network_connection_hook.h" #include "mongo/executor/network_interface_mock.h" diff --git a/src/mongo/db/repl/replication_info.cpp b/src/mongo/db/repl/replication_info.cpp index 907ca4fc12a..1c4567075fe 100644 --- a/src/mongo/db/repl/replication_info.cpp +++ b/src/mongo/db/repl/replication_info.cpp @@ -47,11 +47,6 @@ #include "mongo/db/curop.h" #include "mongo/db/database_name.h" #include "mongo/db/dbhelpers.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/direct_shard_client_tracker.h" #include "mongo/db/namespace_string.h" #include "mongo/db/not_primary_error_tracker.h" #include "mongo/db/operation_context.h" @@ -71,11 +66,16 @@ #include "mongo/db/server_options.h" #include "mongo/db/server_parameter.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/direct_shard_client_tracker.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/stats/counters.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/tenant_id.h" #include "mongo/db/topology/cluster_role.h" -#include "mongo/db/user_write_block/global_user_write_block_state.h" +#include "mongo/db/topology/user_write_block/global_user_write_block_state.h" #include "mongo/db/wire_version.h" #include "mongo/db/write_concern_options.h" #include "mongo/idl/idl_parser.h" diff --git a/src/mongo/db/repl/replication_recovery.cpp b/src/mongo/db/repl/replication_recovery.cpp index d6aa90ffd1c..07ef620fdaf 100644 --- a/src/mongo/db/repl/replication_recovery.cpp +++ b/src/mongo/db/repl/replication_recovery.cpp @@ -41,12 +41,6 @@ #include "mongo/client/dbclient_cursor.h" #include "mongo/db/commands/server_status/server_status.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/find_command.h" @@ -67,6 +61,12 @@ #include "mongo/db/server_options.h" #include "mongo/db/server_recovery.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/control/journal_flusher.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/recovery_unit.h" diff --git a/src/mongo/db/repl/replication_recovery_test.cpp b/src/mongo/db/repl/replication_recovery_test.cpp index 923718e1c6f..01e0da2512c 100644 --- a/src/mongo/db/repl/replication_recovery_test.cpp +++ b/src/mongo/db/repl/replication_recovery_test.cpp @@ -41,7 +41,6 @@ #include "mongo/bson/simple_bsonobj_comparator.h" #include "mongo/db/client.h" #include "mongo/db/exec/document_value/value.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_noop.h" @@ -66,6 +65,7 @@ #include "mongo/db/session/logical_session_id_gen.h" #include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/session/session_txn_record_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/storage/durable_history_pin.h" #include "mongo/db/storage/storage_parameters_gen.h" diff --git a/src/mongo/db/repl/rollback_impl.cpp b/src/mongo/db/repl/rollback_impl.cpp index dda6a3d65d0..9dc440d4d4b 100644 --- a/src/mongo/db/repl/rollback_impl.cpp +++ b/src/mongo/db/repl/rollback_impl.cpp @@ -41,16 +41,8 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/dbhelpers.h" #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/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/drop_collection.h" -#include "mongo/db/local_catalog/import_collection_oplog_entry_gen.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/find_command.h" #include "mongo/db/query/get_executor.h" @@ -82,6 +74,14 @@ #include "mongo/db/session/logical_session_id_gen.h" #include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/session/session_txn_record_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/drop_collection.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/remove_saver.h" diff --git a/src/mongo/db/repl/rollback_impl_test.cpp b/src/mongo/db/repl/rollback_impl_test.cpp index 645bcce7a22..a478b3559d7 100644 --- a/src/mongo/db/repl/rollback_impl_test.cpp +++ b/src/mongo/db/repl/rollback_impl_test.cpp @@ -40,14 +40,6 @@ #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/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_mock.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/op_observer/op_observer_util.h" #include "mongo/db/record_id.h" #include "mongo/db/repl/member_state.h" @@ -65,6 +57,14 @@ #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" #include "mongo/db/session/logical_session_id_helpers.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_mock.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/storage/durable_history_pin.h" #include "mongo/db/storage/recovery_unit.h" diff --git a/src/mongo/db/repl/rollback_test_fixture.cpp b/src/mongo/db/repl/rollback_test_fixture.cpp index 88ffdcb88a7..bfcafeb8e57 100644 --- a/src/mongo/db/repl/rollback_test_fixture.cpp +++ b/src/mongo/db/repl/rollback_test_fixture.cpp @@ -35,12 +35,6 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/client.h" #include "mongo/db/dbhelpers.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_noop.h" #include "mongo/db/op_observer/op_observer_registry.h" @@ -56,6 +50,12 @@ #include "mongo/db/repl/replication_recovery.h" #include "mongo/db/repl/storage_interface.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/transaction/session_catalog_mongod_transaction_interface_impl.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/repl/rollback_test_fixture.h b/src/mongo/db/repl/rollback_test_fixture.h index e73f765bcde..0146e356a5e 100644 --- a/src/mongo/db/repl/rollback_test_fixture.h +++ b/src/mongo/db/repl/rollback_test_fixture.h @@ -35,8 +35,6 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/timestamp.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/read_write_concern_defaults_cache_lookup_mock.h" @@ -52,6 +50,8 @@ #include "mongo/db/repl/storage_interface_impl.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/tenant_id.h" #include "mongo/logv2/log_component.h" #include "mongo/logv2/log_severity.h" diff --git a/src/mongo/db/repl/storage_interface.h b/src/mongo/db/repl/storage_interface.h index 0486d2b852d..f6273e29961 100644 --- a/src/mongo/db/repl/storage_interface.h +++ b/src/mongo/db/repl/storage_interface.h @@ -37,14 +37,14 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/timestamp.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/collection_bulk_loader.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/optime.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/util/modules.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/repl/storage_interface_impl.cpp b/src/mongo/db/repl/storage_interface_impl.cpp index 196cb428cb9..8ee33c6c055 100644 --- a/src/mongo/db/repl/storage_interface_impl.cpp +++ b/src/mongo/db/repl/storage_interface_impl.cpp @@ -48,21 +48,6 @@ #include "mongo/db/index/index_constants.h" #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/catalog_control.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection_catalog_helper.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/periodic_runner_cache_pressure_rollback.h" #include "mongo/db/query/canonical_query.h" @@ -86,6 +71,21 @@ #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/repl/rollback_gen.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_control.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/checkpointer.h" #include "mongo/db/storage/control/journal_flusher.h" #include "mongo/db/storage/control/storage_control.h" diff --git a/src/mongo/db/repl/storage_interface_impl.h b/src/mongo/db/repl/storage_interface_impl.h index e4cd072546d..3ec4b70635c 100644 --- a/src/mongo/db/repl/storage_interface_impl.h +++ b/src/mongo/db/repl/storage_interface_impl.h @@ -37,14 +37,14 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/timestamp.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/collection_bulk_loader.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/storage_interface.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/util/modules.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/repl/storage_interface_impl_test.cpp b/src/mongo/db/repl/storage_interface_impl_test.cpp index 3b29ec42387..7ed9f8d7e0d 100644 --- a/src/mongo/db/repl/storage_interface_impl_test.cpp +++ b/src/mongo/db/repl/storage_interface_impl_test.cpp @@ -36,19 +36,6 @@ #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/index/index_constants.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/member_state.h" @@ -59,6 +46,19 @@ #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/platform/compiler.h" diff --git a/src/mongo/db/repl/storage_interface_mock.h b/src/mongo/db/repl/storage_interface_mock.h index 757d214c140..9c14c15cd40 100644 --- a/src/mongo/db/repl/storage_interface_mock.h +++ b/src/mongo/db/repl/storage_interface_mock.h @@ -38,14 +38,14 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/timestamp.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/collection_bulk_loader.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/storage_interface.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/stdx/mutex.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/repl/storage_timestamp_test.cpp b/src/mongo/db/repl/storage_timestamp_test.cpp index 72dc19a47fc..08af8a0e23e 100644 --- a/src/mongo/db/repl/storage_timestamp_test.cpp +++ b/src/mongo/db/repl/storage_timestamp_test.cpp @@ -53,24 +53,6 @@ #include "mongo/db/index_builds/index_build_test_helpers.h" #include "mongo/db/index_builds/multi_index_block.h" #include "mongo/db/index_builds/skipped_record_tracker.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/drop_database.h" -#include "mongo/db/local_catalog/drop_indexes.h" -#include "mongo/db/local_catalog/durable_catalog.h" -#include "mongo/db/local_catalog/durable_catalog_entry_metadata.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" @@ -111,6 +93,24 @@ #include "mongo/db/session/session_catalog.h" #include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/session/session_txn_record_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_catalog/drop_database.h" +#include "mongo/db/shard_role/shard_catalog/drop_indexes.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/damage_vector.h" #include "mongo/db/storage/mdb_catalog.h" #include "mongo/db/storage/record_data.h" @@ -121,13 +121,13 @@ #include "mongo/db/storage/storage_engine.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/tenant_id.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/db/transaction/session_catalog_mongod_transaction_interface_impl.h" #include "mongo/db/transaction/transaction_participant.h" #include "mongo/db/transaction/transaction_participant_gen.h" #include "mongo/db/update/document_diff_serialization.h" #include "mongo/db/update/update_oplog_entry_serialization.h" -#include "mongo/db/vector_clock/vector_clock.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" #include "mongo/executor/task_executor.h" #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/repl/timestamp_block.cpp b/src/mongo/db/repl/timestamp_block.cpp index eeb7fb127dd..e40e0d3a61e 100644 --- a/src/mongo/db/repl/timestamp_block.cpp +++ b/src/mongo/db/repl/timestamp_block.cpp @@ -30,7 +30,7 @@ #include "mongo/db/repl/timestamp_block.h" #include "mongo/base/error_codes.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/repl/transaction_oplog_application.cpp b/src/mongo/db/repl/transaction_oplog_application.cpp index 1fca2c92fb0..9261117347a 100644 --- a/src/mongo/db/repl/transaction_oplog_application.cpp +++ b/src/mongo/db/repl/transaction_oplog_application.cpp @@ -39,11 +39,6 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/index_builds/repl_index_build_state.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/query/find_command.h" @@ -60,6 +55,11 @@ #include "mongo/db/session/logical_session_id_helpers.h" #include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/session/session_txn_record_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/storage/exceptions.h" #include "mongo/db/storage/recovery_unit.h" diff --git a/src/mongo/db/replica_set_endpoint_sharding_state.cpp b/src/mongo/db/replica_set_endpoint_sharding_state.cpp index db102d5dbdf..e33212e93e9 100644 --- a/src/mongo/db/replica_set_endpoint_sharding_state.cpp +++ b/src/mongo/db/replica_set_endpoint_sharding_state.cpp @@ -29,8 +29,8 @@ #include "mongo/db/replica_set_endpoint_sharding_state.h" -#include "mongo/db/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/multitenancy_gen.h" +#include "mongo/db/topology/cluster_parameters/sharding_cluster_parameters_gen.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kSharding diff --git a/src/mongo/db/replication_state_transition_lock_guard.cpp b/src/mongo/db/replication_state_transition_lock_guard.cpp index 3994660fd86..358ace2cd02 100644 --- a/src/mongo/db/replication_state_transition_lock_guard.cpp +++ b/src/mongo/db/replication_state_transition_lock_guard.cpp @@ -29,9 +29,9 @@ #include "mongo/db/replication_state_transition_lock_guard.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/server_feature_flags_gen.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/util/assert_util.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kReplication diff --git a/src/mongo/db/replication_state_transition_lock_guard.h b/src/mongo/db/replication_state_transition_lock_guard.h index 8b68bb6398f..1a9d160ecad 100644 --- a/src/mongo/db/replication_state_transition_lock_guard.h +++ b/src/mongo/db/replication_state_transition_lock_guard.h @@ -29,8 +29,8 @@ #pragma once -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/util/modules.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/global_catalog/router_role_api/BUILD.bazel b/src/mongo/db/router_role/BUILD.bazel similarity index 100% rename from src/mongo/db/global_catalog/router_role_api/BUILD.bazel rename to src/mongo/db/router_role/BUILD.bazel diff --git a/src/mongo/db/cluster_parameters/OWNERS.yml b/src/mongo/db/router_role/OWNERS.yml similarity index 100% rename from src/mongo/db/cluster_parameters/OWNERS.yml rename to src/mongo/db/router_role/OWNERS.yml diff --git a/src/mongo/db/global_catalog/router_role_api/README_router_role_api.md b/src/mongo/db/router_role/README_router_role_api.md similarity index 97% rename from src/mongo/db/global_catalog/router_role_api/README_router_role_api.md rename to src/mongo/db/router_role/README_router_role_api.md index 9cc242d10f0..44d39c04141 100644 --- a/src/mongo/db/global_catalog/router_role_api/README_router_role_api.md +++ b/src/mongo/db/router_role/README_router_role_api.md @@ -43,7 +43,7 @@ return router.route( You can also find below two real usage examples for each case: - [CollectionRouter example](https://github.com/mongodb/mongo/blob/66405cdf815cdd2504ea4360f3317657e0dbda92/src/mongo/db/s/rename_collection_coordinator.cpp#L630-L642). In this case we need to create indexes for the `config.system.sessions` collection to on all the shards owning data for that collection. -- [DBPrimaryRouter example](https://github.com/mongodb/mongo/blob/25ddfc96fc2adb2859e91f0401d95b32f3d7af40/src/mongo/db/s/resharding/resharding_manual_cleanup.cpp#L288-L304). In this example, we must target the DBPrimary of the collection’s database to drop the resharding temporary collection. On sharded clusters, it’s important to note that most DDL operations must be directed exclusively to the DBPrimary shard. This is because the DBPrimary is responsible for instantiating a ShardingDDLCoordinator, which coordinates the operation across all shards. To learn more about how DDL operations work in a sharded cluster, go [here](../ddl/README_ddl_operations.md). +- [DBPrimaryRouter example](https://github.com/mongodb/mongo/blob/25ddfc96fc2adb2859e91f0401d95b32f3d7af40/src/mongo/db/s/resharding/resharding_manual_cleanup.cpp#L288-L304). In this example, we must target the DBPrimary of the collection’s database to drop the resharding temporary collection. On sharded clusters, it’s important to note that most DDL operations must be directed exclusively to the DBPrimary shard. This is because the DBPrimary is responsible for instantiating a ShardingDDLCoordinator, which coordinates the operation across all shards. To learn more about how DDL operations work in a sharded cluster, go [here](../global_catalog/ddl/README_ddl_operations.md). These classes handle the following processes internally: @@ -57,7 +57,7 @@ When using `CollectionRouter` or `DBPrimaryRouter`, keep the following in mind: - Any stale routing error returned by a shard must be thrown so that it can be properly handled by the router logic. - During a single routing operation, it is crucial to consult only one version of the routing table. -For more details on routing internals, see the [Versioning Protocols](../../versioning_protocol/README_versioning_protocols.md) architecture guide. +For more details on routing internals, see the [Versioning Protocols](../versioning_protocol/README_versioning_protocols.md) architecture guide. ## MultiCollectionRouter diff --git a/src/mongo/db/global_catalog/router_role_api/README_routing_context.md b/src/mongo/db/router_role/README_routing_context.md similarity index 100% rename from src/mongo/db/global_catalog/router_role_api/README_routing_context.md rename to src/mongo/db/router_role/README_routing_context.md diff --git a/src/mongo/db/global_catalog/router_role_api/cluster_commands_helpers.cpp b/src/mongo/db/router_role/cluster_commands_helpers.cpp similarity index 99% rename from src/mongo/db/global_catalog/router_role_api/cluster_commands_helpers.cpp rename to src/mongo/db/router_role/cluster_commands_helpers.cpp index a6c1973bed8..9cc74c7f633 100644 --- a/src/mongo/db/global_catalog/router_role_api/cluster_commands_helpers.cpp +++ b/src/mongo/db/router_role/cluster_commands_helpers.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" #include "mongo/base/error_codes.h" #include "mongo/base/error_extra_info.h" @@ -35,16 +35,10 @@ #include "mongo/db/commands.h" #include "mongo/db/curop.h" #include "mongo/db/error_labels.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/router_role_api/collection_uuid_mismatch.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" -#include "mongo/db/global_catalog/router_role_api/routing_context.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/global_catalog/shard_key_pattern_query_util.h" #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch_info.h" -#include "mongo/db/local_catalog/ddl/list_indexes_gen.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/expression_context.h" @@ -54,13 +48,19 @@ #include "mongo/db/query/collation/collator_factory_interface.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/query/query_planner_common.h" -#include "mongo/db/raw_data_operation.h" #include "mongo/db/read_concern_support_result.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/read_concern_gen.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/router_role/collection_uuid_mismatch.h" +#include "mongo/db/router_role/router_role.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_context.h" #include "mongo/db/server_feature_flags_gen.h" +#include "mongo/db/shard_role/ddl/list_indexes_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/tenant_id.h" #include "mongo/db/topology/shard_registry.h" diff --git a/src/mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h b/src/mongo/db/router_role/cluster_commands_helpers.h similarity index 99% rename from src/mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h rename to src/mongo/db/router_role/cluster_commands_helpers.h index 419ef9ab1e1..d24b3f94e6e 100644 --- a/src/mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h +++ b/src/mongo/db/router_role/cluster_commands_helpers.h @@ -37,14 +37,14 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/client/read_preference.h" #include "mongo/db/commands.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/legacy_runtime_constants_gen.h" #include "mongo/db/query/explain_options.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/versioning_protocol/database_version.h" diff --git a/src/mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.cpp b/src/mongo/db/router_role/collection_routing_info_targeter.cpp similarity index 99% rename from src/mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.cpp rename to src/mongo/db/router_role/collection_routing_info_targeter.cpp index 84115cce7b4..34527b94bcd 100644 --- a/src/mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.cpp +++ b/src/mongo/db/router_role/collection_routing_info_targeter.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" @@ -38,7 +38,6 @@ #include "mongo/db/feature_flag.h" #include "mongo/db/global_catalog/chunk.h" #include "mongo/db/global_catalog/ddl/cluster_ddl.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/global_catalog/shard_key_pattern_query_util.h" #include "mongo/db/global_catalog/type_collection_common_types_gen.h" #include "mongo/db/pipeline/expression_context_builder.h" @@ -51,8 +50,9 @@ #include "mongo/db/query/write_ops/update_request.h" #include "mongo/db/query/write_ops/write_ops.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/stats/counters.h" diff --git a/src/mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h b/src/mongo/db/router_role/collection_routing_info_targeter.h similarity index 98% rename from src/mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h rename to src/mongo/db/router_role/collection_routing_info_targeter.h index c41b6fbf4d3..f23a6a10a16 100644 --- a/src/mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h +++ b/src/mongo/db/router_role/collection_routing_info_targeter.h @@ -32,17 +32,17 @@ #include "mongo/base/status_with.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/oid.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/cannot_implicitly_create_collection_info.h" -#include "mongo/db/global_catalog/router_role_api/ns_targeter.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #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/operation_context.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/query/canonical_query.h" +#include "mongo/db/router_role/ns_targeter.h" +#include "mongo/db/router_role/router_role.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/db/versioning_protocol/stale_exception.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/global_catalog/router_role_api/collection_routing_info_targeter_test.cpp b/src/mongo/db/router_role/collection_routing_info_targeter_test.cpp similarity index 99% rename from src/mongo/db/global_catalog/router_role_api/collection_routing_info_targeter_test.cpp rename to src/mongo/db/router_role/collection_routing_info_targeter_test.cpp index f01be5c30a7..0376dbfff8f 100644 --- a/src/mongo/db/global_catalog/router_role_api/collection_routing_info_targeter_test.cpp +++ b/src/mongo/db/router_role/collection_routing_info_targeter_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" @@ -36,9 +36,6 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/json.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_mock.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_test_fixture.h" #include "mongo/db/global_catalog/chunk.h" #include "mongo/db/global_catalog/type_collection_common_types_gen.h" #include "mongo/db/hasher.h" @@ -46,6 +43,9 @@ #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_mock.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_test_fixture.h" #include "mongo/db/timeseries/timeseries_constants.h" #include "mongo/db/timeseries/timeseries_index_schema_conversion_functions.h" #include "mongo/db/timeseries/timeseries_options.h" diff --git a/src/mongo/db/global_catalog/router_role_api/collection_uuid_mismatch.cpp b/src/mongo/db/router_role/collection_uuid_mismatch.cpp similarity index 93% rename from src/mongo/db/global_catalog/router_role_api/collection_uuid_mismatch.cpp rename to src/mongo/db/router_role/collection_uuid_mismatch.cpp index 75cc7aad48e..513f5a217a7 100644 --- a/src/mongo/db/global_catalog/router_role_api/collection_uuid_mismatch.cpp +++ b/src/mongo/db/router_role/collection_uuid_mismatch.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/global_catalog/router_role_api/collection_uuid_mismatch.h" +#include "mongo/db/router_role/collection_uuid_mismatch.h" #include "mongo/base/error_codes.h" #include "mongo/base/status_with.h" @@ -37,11 +37,11 @@ #include "mongo/bson/dotted_path/dotted_path_support.h" #include "mongo/client/read_preference.h" #include "mongo/db/client.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch_info.h" -#include "mongo/db/local_catalog/ddl/list_collections_gen.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" +#include "mongo/db/shard_role/ddl/list_collections_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/executor/remote_command_response.h" diff --git a/src/mongo/db/global_catalog/router_role_api/collection_uuid_mismatch.h b/src/mongo/db/router_role/collection_uuid_mismatch.h similarity index 100% rename from src/mongo/db/global_catalog/router_role_api/collection_uuid_mismatch.h rename to src/mongo/db/router_role/collection_uuid_mismatch.h diff --git a/src/mongo/db/global_catalog/router_role_api/gossiped_routing_cache.idl b/src/mongo/db/router_role/gossiped_routing_cache.idl similarity index 100% rename from src/mongo/db/global_catalog/router_role_api/gossiped_routing_cache.idl rename to src/mongo/db/router_role/gossiped_routing_cache.idl diff --git a/src/mongo/db/global_catalog/router_role_api/mock_ns_targeter.cpp b/src/mongo/db/router_role/mock_ns_targeter.cpp similarity index 98% rename from src/mongo/db/global_catalog/router_role_api/mock_ns_targeter.cpp rename to src/mongo/db/router_role/mock_ns_targeter.cpp index a737919a5f6..9bee90eb35e 100644 --- a/src/mongo/db/global_catalog/router_role_api/mock_ns_targeter.cpp +++ b/src/mongo/db/router_role/mock_ns_targeter.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/global_catalog/router_role_api/mock_ns_targeter.h" +#include "mongo/db/router_role/mock_ns_targeter.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" diff --git a/src/mongo/db/global_catalog/router_role_api/mock_ns_targeter.h b/src/mongo/db/router_role/mock_ns_targeter.h similarity index 99% rename from src/mongo/db/global_catalog/router_role_api/mock_ns_targeter.h rename to src/mongo/db/router_role/mock_ns_targeter.h index a2050617a1d..c71a9c0d092 100644 --- a/src/mongo/db/global_catalog/router_role_api/mock_ns_targeter.h +++ b/src/mongo/db/router_role/mock_ns_targeter.h @@ -31,9 +31,9 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/ns_targeter.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/router_role/ns_targeter.h" #include "mongo/db/versioning_protocol/stale_exception.h" #include "mongo/unittest/unittest.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/global_catalog/router_role_api/ns_targeter.h b/src/mongo/db/router_role/ns_targeter.h similarity index 100% rename from src/mongo/db/global_catalog/router_role_api/ns_targeter.h rename to src/mongo/db/router_role/ns_targeter.h diff --git a/src/mongo/db/global_catalog/router_role_api/router_role.cpp b/src/mongo/db/router_role/router_role.cpp similarity index 99% rename from src/mongo/db/global_catalog/router_role_api/router_role.cpp rename to src/mongo/db/router_role/router_role.cpp index 33062d79753..41f642aedef 100644 --- a/src/mongo/db/global_catalog/router_role_api/router_role.cpp +++ b/src/mongo/db/router_role/router_role.cpp @@ -27,11 +27,11 @@ * it in the license file. */ -#include "mongo/db/global_catalog/router_role_api/router_role.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/base/error_codes.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/mongod_and_mongos_server_parameters_gen.h" #include "mongo/db/topology/sharding_state.h" diff --git a/src/mongo/db/global_catalog/router_role_api/router_role.h b/src/mongo/db/router_role/router_role.h similarity index 97% rename from src/mongo/db/global_catalog/router_role_api/router_role.h rename to src/mongo/db/router_role/router_role.h index 070892bd51d..e6fd3c04df1 100644 --- a/src/mongo/db/global_catalog/router_role_api/router_role.h +++ b/src/mongo/db/router_role/router_role.h @@ -32,13 +32,13 @@ #include "mongo/base/status.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/router_role_api/routing_context.h" #include "mongo/db/global_catalog/type_database_gen.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/global_catalog/router_role_api/router_role_test.cpp b/src/mongo/db/router_role/router_role_test.cpp similarity index 99% rename from src/mongo/db/global_catalog/router_role_api/router_role_test.cpp rename to src/mongo/db/router_role/router_role_test.cpp index 81358bcd305..0981eb5c7dd 100644 --- a/src/mongo/db/global_catalog/router_role_api/router_role_test.cpp +++ b/src/mongo/db/router_role/router_role_test.cpp @@ -27,17 +27,17 @@ * it in the license file. */ -#include "mongo/db/global_catalog/router_role_api/router_role.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/base/status.h" #include "mongo/db/commands.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_test_fixture.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/client_cursor/cursor_response.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_test_fixture.h" #include "mongo/db/service_context_test_fixture.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_mongos_test_fixture.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/versioning_protocol/shard_version_factory.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/s/session_catalog_router.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/BUILD.bazel b/src/mongo/db/router_role/routing_cache/BUILD.bazel similarity index 100% rename from src/mongo/db/global_catalog/catalog_cache/BUILD.bazel rename to src/mongo/db/router_role/routing_cache/BUILD.bazel diff --git a/src/mongo/db/global_catalog/catalog_cache/OWNERS.yml b/src/mongo/db/router_role/routing_cache/OWNERS.yml similarity index 100% rename from src/mongo/db/global_catalog/catalog_cache/OWNERS.yml rename to src/mongo/db/router_role/routing_cache/OWNERS.yml diff --git a/src/mongo/db/global_catalog/catalog_cache/README_routing_info_cache_consistency_model.md b/src/mongo/db/router_role/routing_cache/README_routing_info_cache_consistency_model.md similarity index 95% rename from src/mongo/db/global_catalog/catalog_cache/README_routing_info_cache_consistency_model.md rename to src/mongo/db/router_role/routing_cache/README_routing_info_cache_consistency_model.md index de545cfa6cb..105121a7510 100644 --- a/src/mongo/db/global_catalog/catalog_cache/README_routing_info_cache_consistency_model.md +++ b/src/mongo/db/router_role/routing_cache/README_routing_info_cache_consistency_model.md @@ -1,6 +1,6 @@ # Consistency Model of the Routing Info Cache -This section builds upon the definitions of the sharding catalog in [this section](../../local_catalog/README_sharding_catalog.md#catalog-containers) and elaborates on the consistency model of the [CatalogCache](https://github.com/mongodb/mongo/blob/r6.0.0/src/mongo/s/catalog_cache.h#L134), which is what backs the [Router role](../../local_catalog/README_sharding_catalog.md#router-role). +This section builds upon the definitions of the sharding catalog in [this section](../../shard_role/shard_catalog/README_sharding_catalog.md#catalog-containers) and elaborates on the consistency model of the [CatalogCache](https://github.com/mongodb/mongo/blob/r6.0.0/src/mongo/s/catalog_cache.h#L134), which is what backs the [Router role](../../shard_role/shard_catalog/README_sharding_catalog.md#router-role). ## Timelines diff --git a/src/mongo/db/global_catalog/catalog_cache/catalog_cache.cpp b/src/mongo/db/router_role/routing_cache/catalog_cache.cpp similarity index 99% rename from src/mongo/db/global_catalog/catalog_cache/catalog_cache.cpp rename to src/mongo/db/router_role/routing_cache/catalog_cache.cpp index 45acc16cee8..c5d3a05de92 100644 --- a/src/mongo/db/global_catalog/catalog_cache/catalog_cache.cpp +++ b/src/mongo/db/router_role/routing_cache/catalog_cache.cpp @@ -27,21 +27,21 @@ * it in the license file. */ -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/base/error_codes.h" #include "mongo/base/status.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/curop.h" -#include "mongo/db/global_catalog/catalog_cache/shard_cannot_refresh_due_to_locks_held_exception.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/logical_time.h" #include "mongo/db/query/collation/collator_factory_interface.h" #include "mongo/db/query/collation/collator_interface.h" +#include "mongo/db/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/mongod_and_mongos_server_parameters_gen.h" #include "mongo/db/topology/shard_registry.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/catalog_cache.h b/src/mongo/db/router_role/routing_cache/catalog_cache.h similarity index 99% rename from src/mongo/db/global_catalog/catalog_cache/catalog_cache.h rename to src/mongo/db/router_role/routing_cache/catalog_cache.h index a97c392027d..b07ca486b63 100644 --- a/src/mongo/db/global_catalog/catalog_cache/catalog_cache.h +++ b/src/mongo/db/router_role/routing_cache/catalog_cache.h @@ -33,11 +33,11 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_loader.h" #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/operation_context.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_loader.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/versioning_protocol/database_version.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/catalog_cache_loader.cpp b/src/mongo/db/router_role/routing_cache/catalog_cache_loader.cpp similarity index 97% rename from src/mongo/db/global_catalog/catalog_cache/catalog_cache_loader.cpp rename to src/mongo/db/router_role/routing_cache/catalog_cache_loader.cpp index 4893eb01e9f..13edf304305 100644 --- a/src/mongo/db/global_catalog/catalog_cache/catalog_cache_loader.cpp +++ b/src/mongo/db/router_role/routing_cache/catalog_cache_loader.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_loader.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_loader.h" #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/catalog_cache_loader.h b/src/mongo/db/router_role/routing_cache/catalog_cache_loader.h similarity index 100% rename from src/mongo/db/global_catalog/catalog_cache/catalog_cache_loader.h rename to src/mongo/db/router_role/routing_cache/catalog_cache_loader.h diff --git a/src/mongo/db/global_catalog/catalog_cache/catalog_cache_loader_mock.cpp b/src/mongo/db/router_role/routing_cache/catalog_cache_loader_mock.cpp similarity index 98% rename from src/mongo/db/global_catalog/catalog_cache/catalog_cache_loader_mock.cpp rename to src/mongo/db/router_role/routing_cache/catalog_cache_loader_mock.cpp index 602b848b2f3..765a0d8b8ee 100644 --- a/src/mongo/db/global_catalog/catalog_cache/catalog_cache_loader_mock.cpp +++ b/src/mongo/db/router_role/routing_cache/catalog_cache_loader_mock.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_loader_mock.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_loader_mock.h" #include "mongo/base/error_codes.h" #include "mongo/db/global_catalog/type_chunk.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/catalog_cache_loader_mock.h b/src/mongo/db/router_role/routing_cache/catalog_cache_loader_mock.h similarity index 98% rename from src/mongo/db/global_catalog/catalog_cache/catalog_cache_loader_mock.h rename to src/mongo/db/router_role/routing_cache/catalog_cache_loader_mock.h index 6caeb84e7c8..d5aeac6e20a 100644 --- a/src/mongo/db/global_catalog/catalog_cache/catalog_cache_loader_mock.h +++ b/src/mongo/db/router_role/routing_cache/catalog_cache_loader_mock.h @@ -31,11 +31,11 @@ #include "mongo/base/status.h" #include "mongo/base/status_with.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_loader.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_loader.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/s/resharding/type_collection_fields_gen.h" #include "mongo/stdx/unordered_map.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/catalog_cache_mock.cpp b/src/mongo/db/router_role/routing_cache/catalog_cache_mock.cpp similarity index 98% rename from src/mongo/db/global_catalog/catalog_cache/catalog_cache_mock.cpp rename to src/mongo/db/router_role/routing_cache/catalog_cache_mock.cpp index 796691df2d6..848c2ed6002 100644 --- a/src/mongo/db/global_catalog/catalog_cache/catalog_cache_mock.cpp +++ b/src/mongo/db/router_role/routing_cache/catalog_cache_mock.cpp @@ -27,10 +27,10 @@ * it in the license file. */ -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_mock.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_mock.h" #include "mongo/base/error_codes.h" -#include "mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_mock.h" +#include "mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_mock.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/sharding_test_fixture_common.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/catalog_cache_mock.h b/src/mongo/db/router_role/routing_cache/catalog_cache_mock.h similarity index 98% rename from src/mongo/db/global_catalog/catalog_cache/catalog_cache_mock.h rename to src/mongo/db/router_role/routing_cache/catalog_cache_mock.h index 13be9511853..e285179cf05 100644 --- a/src/mongo/db/global_catalog/catalog_cache/catalog_cache_mock.h +++ b/src/mongo/db/router_role/routing_cache/catalog_cache_mock.h @@ -31,11 +31,11 @@ #include "mongo/base/status.h" #include "mongo/base/status_with.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/service_context.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/catalog_cache_refresh_test.cpp b/src/mongo/db/router_role/routing_cache/catalog_cache_refresh_test.cpp similarity index 99% rename from src/mongo/db/global_catalog/catalog_cache/catalog_cache_refresh_test.cpp rename to src/mongo/db/router_role/routing_cache/catalog_cache_refresh_test.cpp index e9a464fd403..062248db0aa 100644 --- a/src/mongo/db/global_catalog/catalog_cache/catalog_cache_refresh_test.cpp +++ b/src/mongo/db/router_role/routing_cache/catalog_cache_refresh_test.cpp @@ -43,20 +43,20 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/oid.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_test_fixture.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/aggregation_request_helper.h" #include "mongo/db/query/collation/collator_interface.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.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" diff --git a/src/mongo/db/global_catalog/catalog_cache/catalog_cache_test.cpp b/src/mongo/db/router_role/routing_cache/catalog_cache_test.cpp similarity index 98% rename from src/mongo/db/global_catalog/catalog_cache/catalog_cache_test.cpp rename to src/mongo/db/router_role/routing_cache/catalog_cache_test.cpp index 871fe18c7fb..af7120eb862 100644 --- a/src/mongo/db/global_catalog/catalog_cache/catalog_cache_test.cpp +++ b/src/mongo/db/router_role/routing_cache/catalog_cache_test.cpp @@ -29,7 +29,7 @@ // IWYU pragma: no_include "cxxabi.h" // IWYU pragma: no_include "ext/alloc_traits.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/base/error_codes.h" #include "mongo/base/status.h" @@ -37,9 +37,6 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/oid.h" #include "mongo/client/remote_command_targeter_mock.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_loader_mock.h" -#include "mongo/db/global_catalog/catalog_cache/shard_cannot_refresh_due_to_locks_held_exception.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_collection.h" @@ -48,6 +45,9 @@ #include "mongo/db/keypattern.h" #include "mongo/db/query/client_cursor/cursor_id.h" #include "mongo/db/query/client_cursor/cursor_response.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_loader_mock.h" +#include "mongo/db/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.h" #include "mongo/db/sharding_environment/sharding_mongos_test_fixture.h" #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/db/versioning_protocol/chunk_version.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/catalog_cache_test_fixture.cpp b/src/mongo/db/router_role/routing_cache/catalog_cache_test_fixture.cpp similarity index 98% rename from src/mongo/db/global_catalog/catalog_cache/catalog_cache_test_fixture.cpp rename to src/mongo/db/router_role/routing_cache/catalog_cache_test_fixture.cpp index 69d136a948f..269986104c5 100644 --- a/src/mongo/db/global_catalog/catalog_cache/catalog_cache_test_fixture.cpp +++ b/src/mongo/db/router_role/routing_cache/catalog_cache_test_fixture.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_test_fixture.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_test_fixture.h" #include #include @@ -42,7 +42,6 @@ #include "mongo/client/remote_command_targeter_mock.h" #include "mongo/db/basic_types_gen.h" #include "mongo/db/feature_flag.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/global_catalog/type_database_gen.h" @@ -52,6 +51,7 @@ #include "mongo/db/query/client_cursor/cursor_response.h" #include "mongo/db/query/collation/collator_factory_interface.h" #include "mongo/db/query/collation/collator_factory_mock.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/catalog_cache_test_fixture.h b/src/mongo/db/router_role/routing_cache/catalog_cache_test_fixture.h similarity index 99% rename from src/mongo/db/global_catalog/catalog_cache/catalog_cache_test_fixture.h rename to src/mongo/db/router_role/routing_cache/catalog_cache_test_fixture.h index 84c8262e0fe..4ef7033e8b7 100644 --- a/src/mongo/db/global_catalog/catalog_cache/catalog_cache_test_fixture.h +++ b/src/mongo/db/router_role/routing_cache/catalog_cache_test_fixture.h @@ -32,7 +32,6 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/oid.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/global_catalog/type_chunk.h" @@ -40,6 +39,7 @@ #include "mongo/db/global_catalog/type_shard.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/collation/collator_interface.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/sharding_environment/sharding_mongos_test_fixture.h" #include "mongo/executor/network_test_env.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader.h b/src/mongo/db/router_role/routing_cache/config_server_catalog_cache_loader.h similarity index 95% rename from src/mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader.h rename to src/mongo/db/router_role/routing_cache/config_server_catalog_cache_loader.h index a0da0048d04..abf89e1c1f2 100644 --- a/src/mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader.h +++ b/src/mongo/db/router_role/routing_cache/config_server_catalog_cache_loader.h @@ -29,7 +29,7 @@ #pragma once -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_loader.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_loader.h" #include "mongo/util/modules.h" namespace mongo { diff --git a/src/mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_impl.cpp b/src/mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_impl.cpp similarity index 97% rename from src/mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_impl.cpp rename to src/mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_impl.cpp index 6a167b40ef3..6a40c8f7f15 100644 --- a/src/mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_impl.cpp +++ b/src/mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_impl.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_impl.h" +#include "mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_impl.h" #include "mongo/db/client.h" #include "mongo/db/feature_flag.h" @@ -44,7 +44,7 @@ #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/cluster_role.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/s/resharding/type_collection_fields_gen.h" #include "mongo/util/assert_util.h" #include "mongo/util/future_impl.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_impl.h b/src/mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_impl.h similarity index 96% rename from src/mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_impl.h rename to src/mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_impl.h index f7036f84482..81b43f72944 100644 --- a/src/mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_impl.h +++ b/src/mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_impl.h @@ -29,9 +29,9 @@ #pragma once -#include "mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader.h" #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/router_role/routing_cache/config_server_catalog_cache_loader.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/util/concurrency/thread_pool.h" #include "mongo/util/future.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_mock.cpp b/src/mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_mock.cpp similarity index 98% rename from src/mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_mock.cpp rename to src/mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_mock.cpp index a494478cf67..70e642a898b 100644 --- a/src/mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_mock.cpp +++ b/src/mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_mock.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_mock.h" +#include "mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_mock.h" #include "mongo/base/error_codes.h" #include "mongo/db/global_catalog/type_chunk.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_mock.h b/src/mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_mock.h similarity index 98% rename from src/mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_mock.h rename to src/mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_mock.h index a9306609e8d..f477d2e0951 100644 --- a/src/mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_mock.h +++ b/src/mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_mock.h @@ -31,11 +31,11 @@ #include "mongo/base/status.h" #include "mongo/base/status_with.h" -#include "mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/router_role/routing_cache/config_server_catalog_cache_loader.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/s/resharding/type_collection_fields_gen.h" #include "mongo/stdx/unordered_map.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/flush_router_config_cmd.cpp b/src/mongo/db/router_role/routing_cache/flush_router_config_cmd.cpp similarity index 97% rename from src/mongo/db/global_catalog/catalog_cache/flush_router_config_cmd.cpp rename to src/mongo/db/router_role/routing_cache/flush_router_config_cmd.cpp index 69d74210307..cbc17d13b57 100644 --- a/src/mongo/db/global_catalog/catalog_cache/flush_router_config_cmd.cpp +++ b/src/mongo/db/router_role/routing_cache/flush_router_config_cmd.cpp @@ -39,10 +39,10 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/routing_information_cache.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/routing_information_cache.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/namespace_metadata_change_notifications.cpp b/src/mongo/db/router_role/routing_cache/namespace_metadata_change_notifications.cpp similarity index 97% rename from src/mongo/db/global_catalog/catalog_cache/namespace_metadata_change_notifications.cpp rename to src/mongo/db/router_role/routing_cache/namespace_metadata_change_notifications.cpp index acad69a6616..6fa20379393 100644 --- a/src/mongo/db/global_catalog/catalog_cache/namespace_metadata_change_notifications.cpp +++ b/src/mongo/db/router_role/routing_cache/namespace_metadata_change_notifications.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/global_catalog/catalog_cache/namespace_metadata_change_notifications.h" +#include "mongo/db/router_role/routing_cache/namespace_metadata_change_notifications.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/namespace_metadata_change_notifications.h b/src/mongo/db/router_role/routing_cache/namespace_metadata_change_notifications.h similarity index 100% rename from src/mongo/db/global_catalog/catalog_cache/namespace_metadata_change_notifications.h rename to src/mongo/db/router_role/routing_cache/namespace_metadata_change_notifications.h diff --git a/src/mongo/db/global_catalog/catalog_cache/namespace_metadata_change_notifications_test.cpp b/src/mongo/db/router_role/routing_cache/namespace_metadata_change_notifications_test.cpp similarity index 98% rename from src/mongo/db/global_catalog/catalog_cache/namespace_metadata_change_notifications_test.cpp rename to src/mongo/db/router_role/routing_cache/namespace_metadata_change_notifications_test.cpp index d69c14d4655..f740f32e706 100644 --- a/src/mongo/db/global_catalog/catalog_cache/namespace_metadata_change_notifications_test.cpp +++ b/src/mongo/db/router_role/routing_cache/namespace_metadata_change_notifications_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/global_catalog/catalog_cache/namespace_metadata_change_notifications.h" +#include "mongo/db/router_role/routing_cache/namespace_metadata_change_notifications.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/read_only_catalog_cache_loader.cpp b/src/mongo/db/router_role/routing_cache/read_only_catalog_cache_loader.cpp similarity index 96% rename from src/mongo/db/global_catalog/catalog_cache/read_only_catalog_cache_loader.cpp rename to src/mongo/db/router_role/routing_cache/read_only_catalog_cache_loader.cpp index 9bf6348c5d3..4f3c2f924c7 100644 --- a/src/mongo/db/global_catalog/catalog_cache/read_only_catalog_cache_loader.cpp +++ b/src/mongo/db/router_role/routing_cache/read_only_catalog_cache_loader.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/global_catalog/catalog_cache/read_only_catalog_cache_loader.h" +#include "mongo/db/router_role/routing_cache/read_only_catalog_cache_loader.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/read_only_catalog_cache_loader.h b/src/mongo/db/router_role/routing_cache/read_only_catalog_cache_loader.h similarity index 94% rename from src/mongo/db/global_catalog/catalog_cache/read_only_catalog_cache_loader.h rename to src/mongo/db/router_role/routing_cache/read_only_catalog_cache_loader.h index 0427aa5fc92..0fad56e37b1 100644 --- a/src/mongo/db/global_catalog/catalog_cache/read_only_catalog_cache_loader.h +++ b/src/mongo/db/router_role/routing_cache/read_only_catalog_cache_loader.h @@ -29,11 +29,11 @@ #pragma once -#include "mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_impl.h" -#include "mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader.h" #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_impl.h" +#include "mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/util/future.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/routing_information_cache.cpp b/src/mongo/db/router_role/routing_cache/routing_information_cache.cpp similarity index 95% rename from src/mongo/db/global_catalog/catalog_cache/routing_information_cache.cpp rename to src/mongo/db/router_role/routing_cache/routing_information_cache.cpp index 4426e254288..f3333167c43 100644 --- a/src/mongo/db/global_catalog/catalog_cache/routing_information_cache.cpp +++ b/src/mongo/db/router_role/routing_cache/routing_information_cache.cpp @@ -27,9 +27,9 @@ * it in the license file. */ -#include "mongo/db/global_catalog/catalog_cache/routing_information_cache.h" +#include "mongo/db/router_role/routing_cache/routing_information_cache.h" -#include "mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_impl.h" +#include "mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_impl.h" #include "mongo/util/decorable.h" namespace mongo { diff --git a/src/mongo/db/global_catalog/catalog_cache/routing_information_cache.h b/src/mongo/db/router_role/routing_cache/routing_information_cache.h similarity index 97% rename from src/mongo/db/global_catalog/catalog_cache/routing_information_cache.h rename to src/mongo/db/router_role/routing_cache/routing_information_cache.h index 7889b8e384a..3a707ebb3ac 100644 --- a/src/mongo/db/global_catalog/catalog_cache/routing_information_cache.h +++ b/src/mongo/db/router_role/routing_cache/routing_information_cache.h @@ -29,7 +29,7 @@ #pragma once -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/util/modules.h" namespace mongo { diff --git a/src/mongo/db/global_catalog/catalog_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 similarity index 96% rename from src/mongo/db/global_catalog/catalog_cache/shard_cannot_refresh_due_to_locks_held_exception.cpp rename to src/mongo/db/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.cpp index fdde043e38d..fba74b13fdb 100644 --- a/src/mongo/db/global_catalog/catalog_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 @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/global_catalog/catalog_cache/shard_cannot_refresh_due_to_locks_held_exception.h" +#include "mongo/db/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.h" #include "mongo/base/init.h" // IWYU pragma: keep #include "mongo/bson/bsonelement.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/shard_cannot_refresh_due_to_locks_held_exception.h b/src/mongo/db/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.h similarity index 100% rename from src/mongo/db/global_catalog/catalog_cache/shard_cannot_refresh_due_to_locks_held_exception.h rename to src/mongo/db/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.h diff --git a/src/mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader.h b/src/mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader.h similarity index 98% rename from src/mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader.h rename to src/mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader.h index 9be6176be5a..36a7500ea6a 100644 --- a/src/mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader.h +++ b/src/mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader.h @@ -30,7 +30,7 @@ #pragma once #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_loader.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_loader.h" #include "mongo/util/modules.h" namespace mongo { diff --git a/src/mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_impl.cpp b/src/mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_impl.cpp similarity index 99% rename from src/mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_impl.cpp rename to src/mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_impl.cpp index a023c01136c..a619a4e5425 100644 --- a/src/mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_impl.cpp +++ b/src/mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_impl.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_impl.h" +#include "mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_impl.h" #include "mongo/base/error_codes.h" #include "mongo/base/status.h" @@ -50,8 +50,6 @@ #include "mongo/db/global_catalog/type_shard_database.h" #include "mongo/db/global_catalog/type_shard_database_gen.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" #include "mongo/db/logical_time.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" @@ -59,6 +57,8 @@ #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_impl.h b/src/mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_impl.h similarity index 98% rename from src/mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_impl.h rename to src/mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_impl.h index 04a18c56882..350bcddd749 100644 --- a/src/mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_impl.h +++ b/src/mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_impl.h @@ -30,13 +30,13 @@ #pragma once #include "mongo/base/status_with.h" -#include "mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader.h" -#include "mongo/db/global_catalog/catalog_cache/namespace_metadata_change_notifications.h" -#include "mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader.h" #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/operation_context_group.h" +#include "mongo/db/router_role/routing_cache/config_server_catalog_cache_loader.h" +#include "mongo/db/router_role/routing_cache/namespace_metadata_change_notifications.h" +#include "mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/stdx/condition_variable.h" #include "mongo/stdx/mutex.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_mock.cpp b/src/mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_mock.cpp similarity index 98% rename from src/mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_mock.cpp rename to src/mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_mock.cpp index 20ab7ec8809..1f5ad291f6b 100644 --- a/src/mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_mock.cpp +++ b/src/mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_mock.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_mock.h" +#include "mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_mock.h" #include "mongo/base/error_codes.h" #include "mongo/db/global_catalog/type_chunk.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_mock.h b/src/mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_mock.h similarity index 98% rename from src/mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_mock.h rename to src/mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_mock.h index d0d5d5cc3af..4ae09592b51 100644 --- a/src/mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_mock.h +++ b/src/mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_mock.h @@ -31,12 +31,12 @@ #include "mongo/base/status.h" #include "mongo/base/status_with.h" -#include "mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/s/resharding/type_collection_fields_gen.h" #include "mongo/stdx/unordered_map.h" diff --git a/src/mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_test.cpp b/src/mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_test.cpp similarity index 99% rename from src/mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_test.cpp rename to src/mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_test.cpp index 113f5ae73fd..c5320d1dd74 100644 --- a/src/mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_test.cpp +++ b/src/mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_test.cpp @@ -34,8 +34,6 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/oid.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_mock.h" -#include "mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_impl.h" #include "mongo/db/global_catalog/ddl/shard_metadata_util.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_collection.h" @@ -43,6 +41,8 @@ #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/global_catalog/type_shard_collection.h" #include "mongo/db/keypattern.h" +#include "mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_mock.h" +#include "mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_impl.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/timeseries/timeseries_gen.h" diff --git a/src/mongo/db/global_catalog/router_role_api/routing_context.cpp b/src/mongo/db/router_role/routing_context.cpp similarity index 99% rename from src/mongo/db/global_catalog/router_role_api/routing_context.cpp rename to src/mongo/db/router_role/routing_context.cpp index 5396cf51a09..ae52f0c1501 100644 --- a/src/mongo/db/global_catalog/router_role_api/routing_context.cpp +++ b/src/mongo/db/router_role/routing_context.cpp @@ -28,7 +28,7 @@ */ -#include "mongo/db/global_catalog/router_role_api/routing_context.h" +#include "mongo/db/router_role/routing_context.h" #include "mongo/bson/timestamp.h" #include "mongo/db/repl/read_concern_args.h" diff --git a/src/mongo/db/global_catalog/router_role_api/routing_context.h b/src/mongo/db/router_role/routing_context.h similarity index 98% rename from src/mongo/db/global_catalog/router_role_api/routing_context.h rename to src/mongo/db/router_role/routing_context.h index f0162b2ea97..ac48646cf9e 100644 --- a/src/mongo/db/global_catalog/router_role_api/routing_context.h +++ b/src/mongo/db/router_role/routing_context.h @@ -30,10 +30,10 @@ #pragma once #include "mongo/base/status.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/util/modules.h" MONGO_MOD_PUBLIC; diff --git a/src/mongo/db/global_catalog/router_role_api/routing_table_cache_gossip_metadata_hook.cpp b/src/mongo/db/router_role/routing_table_cache_gossip_metadata_hook.cpp similarity index 94% rename from src/mongo/db/global_catalog/router_role_api/routing_table_cache_gossip_metadata_hook.cpp rename to src/mongo/db/router_role/routing_table_cache_gossip_metadata_hook.cpp index 53ce2631522..160e911782f 100644 --- a/src/mongo/db/global_catalog/router_role_api/routing_table_cache_gossip_metadata_hook.cpp +++ b/src/mongo/db/router_role/routing_table_cache_gossip_metadata_hook.cpp @@ -27,9 +27,9 @@ * it in the license file. */ -#include "mongo/db/global_catalog/router_role_api/routing_table_cache_gossip_metadata_hook.h" +#include "mongo/db/router_role/routing_table_cache_gossip_metadata_hook.h" -#include "mongo/db/global_catalog/router_role_api/gossiped_routing_cache_gen.h" +#include "mongo/db/router_role/gossiped_routing_cache_gen.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/idl/generic_argument_gen.h" diff --git a/src/mongo/db/global_catalog/router_role_api/routing_table_cache_gossip_metadata_hook.h b/src/mongo/db/router_role/routing_table_cache_gossip_metadata_hook.h similarity index 100% rename from src/mongo/db/global_catalog/router_role_api/routing_table_cache_gossip_metadata_hook.h rename to src/mongo/db/router_role/routing_table_cache_gossip_metadata_hook.h diff --git a/src/mongo/db/global_catalog/router_role_api/routing_table_cache_gossip_metadata_hook_test.cpp b/src/mongo/db/router_role/routing_table_cache_gossip_metadata_hook_test.cpp similarity index 96% rename from src/mongo/db/global_catalog/router_role_api/routing_table_cache_gossip_metadata_hook_test.cpp rename to src/mongo/db/router_role/routing_table_cache_gossip_metadata_hook_test.cpp index 9ebafb4dba9..1a0d93648e2 100644 --- a/src/mongo/db/global_catalog/router_role_api/routing_table_cache_gossip_metadata_hook_test.cpp +++ b/src/mongo/db/router_role/routing_table_cache_gossip_metadata_hook_test.cpp @@ -27,9 +27,9 @@ * it in the license file. */ -#include "mongo/db/global_catalog/router_role_api/routing_table_cache_gossip_metadata_hook.h" +#include "mongo/db/router_role/routing_table_cache_gossip_metadata_hook.h" -#include "mongo/db/global_catalog/router_role_api/gossiped_routing_cache_gen.h" +#include "mongo/db/router_role/gossiped_routing_cache_gen.h" #include "mongo/db/sharding_environment/sharding_mongos_test_fixture.h" #include "mongo/idl/generic_argument_gen.h" diff --git a/src/mongo/db/global_catalog/router_role_api/routing_table_history_test.cpp b/src/mongo/db/router_role/routing_table_history_test.cpp similarity index 100% rename from src/mongo/db/global_catalog/router_role_api/routing_table_history_test.cpp rename to src/mongo/db/router_role/routing_table_history_test.cpp diff --git a/src/mongo/db/global_catalog/router_role_api/sharding_write_router.cpp b/src/mongo/db/router_role/sharding_write_router.cpp similarity index 94% rename from src/mongo/db/global_catalog/router_role_api/sharding_write_router.cpp rename to src/mongo/db/router_role/sharding_write_router.cpp index 98df6c898f0..18eaffd7fb7 100644 --- a/src/mongo/db/global_catalog/router_role_api/sharding_write_router.cpp +++ b/src/mongo/db/router_role/sharding_write_router.cpp @@ -27,12 +27,12 @@ * it in the license file. */ -#include "mongo/db/global_catalog/router_role_api/sharding_write_router.h" +#include "mongo/db/router_role/sharding_write_router.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/s/resharding/type_collection_fields_gen.h" diff --git a/src/mongo/db/global_catalog/router_role_api/sharding_write_router.h b/src/mongo/db/router_role/sharding_write_router.h similarity index 97% rename from src/mongo/db/global_catalog/router_role_api/sharding_write_router.h rename to src/mongo/db/router_role/sharding_write_router.h index 861ad04b46a..1fec063d2b8 100644 --- a/src/mongo/db/global_catalog/router_role_api/sharding_write_router.h +++ b/src/mongo/db/router_role/sharding_write_router.h @@ -32,9 +32,9 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/shard_key_pattern.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/global_catalog/router_role_api/sharding_write_router_bm.cpp b/src/mongo/db/router_role/sharding_write_router_bm.cpp similarity index 94% rename from src/mongo/db/global_catalog/router_role_api/sharding_write_router_bm.cpp rename to src/mongo/db/router_role/sharding_write_router_bm.cpp index 399efe0b524..5a159700db5 100644 --- a/src/mongo/db/global_catalog/router_role_api/sharding_write_router_bm.cpp +++ b/src/mongo/db/router_role/sharding_write_router_bm.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/global_catalog/router_role_api/sharding_write_router.h" +#include "mongo/db/router_role/sharding_write_router.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonmisc.h" @@ -35,26 +35,26 @@ #include "mongo/bson/oid.h" #include "mongo/bson/timestamp.h" #include "mongo/db/client.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_mock.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/sharding_catalog_client_impl.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_collection_common_types_gen.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state_factory_shard.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_mock.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/collation/collator_interface.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_mock.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state_factory_shard.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state_factory_mock.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/topology/cluster_role.h" diff --git a/src/mongo/db/rs_local_client.cpp b/src/mongo/db/rs_local_client.cpp index c134ecc3cac..0325e5470d5 100644 --- a/src/mongo/db/rs_local_client.cpp +++ b/src/mongo/db/rs_local_client.cpp @@ -33,13 +33,13 @@ #include "mongo/bson/timestamp.h" #include "mongo/client/dbclient_cursor.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/query/find_command.h" #include "mongo/db/read_concern.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/repl_client_info.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/scoped_read_concern.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/rpc/get_status_from_command_result.h" #include "mongo/rpc/op_msg.h" diff --git a/src/mongo/db/s/BUILD.bazel b/src/mongo/db/s/BUILD.bazel index 5c8aa0ba145..9ecf67c0ebd 100644 --- a/src/mongo/db/s/BUILD.bazel +++ b/src/mongo/db/s/BUILD.bazel @@ -175,8 +175,8 @@ mongo_cc_library( mongo_cc_library( name = "user_writes_recoverable_critical_section", srcs = [ - "//src/mongo/db/user_write_block:user_writes_critical_section_document_gen", - "//src/mongo/db/user_write_block:user_writes_recoverable_critical_section_service.cpp", + "//src/mongo/db/topology/user_write_block:user_writes_critical_section_document_gen", + "//src/mongo/db/topology/user_write_block:user_writes_recoverable_critical_section_service.cpp", ], deps = [ "//src/mongo/db:dbdirectclient", @@ -270,7 +270,6 @@ mongo_cc_library( "//src/mongo/db/global_catalog/ddl:create_database_util.cpp", "//src/mongo/db/global_catalog/ddl:ddl_lock_manager.cpp", "//src/mongo/db/global_catalog/ddl:placement_history_cleaner.cpp", - "//src/mongo/db/global_catalog/ddl:remove_tags_gen", "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager.cpp", "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_chunk_operations.cpp", "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_collection_operations.cpp", @@ -282,7 +281,7 @@ mongo_cc_library( "//src/mongo/db/global_catalog/ddl:sharding_util.cpp", "//src/mongo/db/global_catalog/ddl:split_chunk_request_type.cpp", "//src/mongo/db/global_catalog/metadata_consistency_validation:periodic_sharded_index_consistency_checker.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:participant_block_gen", + "//src/mongo/db/s:remove_tags_gen", "//src/mongo/db/s/balancer:auto_merger_policy.cpp", "//src/mongo/db/s/balancer:balance_stats.cpp", "//src/mongo/db/s/balancer:balancer.cpp", @@ -294,6 +293,7 @@ mongo_cc_library( "//src/mongo/db/s/balancer:cluster_statistics_impl.cpp", "//src/mongo/db/s/balancer:move_unsharded_policy.cpp", "//src/mongo/db/s/config:initial_split_policy.cpp", + "//src/mongo/db/shard_role/shard_catalog:participant_block_gen", "//src/mongo/db/sharding_environment:sharding_config_server_parameters_gen", "//src/mongo/db/topology:periodic_replica_set_configshard_maintenance_mode_checker.cpp", "//src/mongo/db/topology:sharding_catalog_manager_shard_operations.cpp", @@ -328,9 +328,6 @@ mongo_cc_library( "//src/mongo/db/global_catalog:sharding_catalog_client_impl", "//src/mongo/db/global_catalog/ddl:notify_sharding_event_idl", "//src/mongo/db/index_builds:index_builds_coordinator", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:collection_options", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/pipeline:sharded_agg_helpers", "//src/mongo/db/pipeline/process_interface:shardsvr_process_interface", "//src/mongo/db/repl:change_stream_oplog_notification", @@ -338,11 +335,14 @@ mongo_cc_library( "//src/mongo/db/repl:repl_coordinator_interface", "//src/mongo/db/repl:replica_set_aware_service", "//src/mongo/db/repl/hello:hello_command", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:collection_options", "//src/mongo/db/storage:snapshot_window_options", "//src/mongo/db/timeseries:timeseries_options", + "//src/mongo/db/topology/user_write_block:set_user_write_block_mode_idl", "//src/mongo/db/transaction", "//src/mongo/db/transaction:transaction_api", - "//src/mongo/db/user_write_block:set_user_write_block_mode_idl", "//src/mongo/executor:async_rpc", "//src/mongo/executor:async_rpc_util", "//src/mongo/executor:inline_executor", @@ -429,9 +429,6 @@ mongo_cc_library( "//src/mongo/db/global_catalog/ddl:notify_sharding_event_idl", "//src/mongo/db/index_builds:index_builds_coordinator", "//src/mongo/db/index_builds:multi_index_block", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:index_key_validate", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/op_observer", "//src/mongo/db/op_observer:batched_write_context", "//src/mongo/db/op_observer:op_observer_impl", @@ -450,6 +447,9 @@ mongo_cc_library( "//src/mongo/db/repl:wait_for_majority_service", "//src/mongo/db/session:kill_sessions_local", "//src/mongo/db/session:session_catalog_mongod", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:index_key_validate", "//src/mongo/db/sharding_environment:sharding_runtime_d_params_idl", "//src/mongo/db/timeseries/bucket_catalog", "//src/mongo/db/transaction", @@ -512,9 +512,6 @@ mongo_cc_library( "//src/mongo/db/global_catalog:type_shard_collection_gen", "//src/mongo/db/global_catalog:type_shard_database.cpp", "//src/mongo/db/global_catalog:type_shard_database_gen", - "//src/mongo/db/global_catalog/catalog_cache:namespace_metadata_change_notifications.cpp", - "//src/mongo/db/global_catalog/catalog_cache:read_only_catalog_cache_loader.cpp", - "//src/mongo/db/global_catalog/catalog_cache:shard_server_catalog_cache_loader_impl.cpp", "//src/mongo/db/global_catalog/ddl:commit_chunk_migration_gen", "//src/mongo/db/global_catalog/ddl:drop_agg_temp_collections.cpp", "//src/mongo/db/global_catalog/ddl:shard_key_util.cpp", @@ -522,17 +519,9 @@ mongo_cc_library( "//src/mongo/db/global_catalog/ddl:sharding_recovery_service.cpp", "//src/mongo/db/global_catalog/ddl:split_chunk.cpp", "//src/mongo/db/global_catalog/metadata_consistency_validation:metadata_consistency_util.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:collection_critical_section_document_gen", - "//src/mongo/db/local_catalog/shard_role_catalog:collection_sharding_runtime.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:collection_sharding_state_factory_shard.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:database_sharding_metadata_accessor.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:database_sharding_runtime.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:database_sharding_state_factory_shard.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:metadata_manager.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:shard_authoritative_catalog_gen", - "//src/mongo/db/local_catalog/shard_role_catalog:shard_filtering_metadata_refresh.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:stale_shard_exception_handler.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:type_oplog_catalog_metadata_gen", + "//src/mongo/db/router_role/routing_cache:namespace_metadata_change_notifications.cpp", + "//src/mongo/db/router_role/routing_cache:read_only_catalog_cache_loader.cpp", + "//src/mongo/db/router_role/routing_cache:shard_server_catalog_cache_loader_impl.cpp", "//src/mongo/db/s/metrics:phase_duration.cpp", "//src/mongo/db/s/primary_only_service_helpers:cancel_state.cpp", "//src/mongo/db/s/primary_only_service_helpers:phase_transition_progress_gen", @@ -576,6 +565,17 @@ mongo_cc_library( "//src/mongo/db/s/resharding:resharding_txn_cloner.cpp", "//src/mongo/db/s/resharding:resharding_txn_cloner_progress_gen", "//src/mongo/db/s/resharding:resharding_util.cpp", + "//src/mongo/db/shard_role/shard_catalog:collection_critical_section_document_gen", + "//src/mongo/db/shard_role/shard_catalog:collection_sharding_runtime.cpp", + "//src/mongo/db/shard_role/shard_catalog:collection_sharding_state_factory_shard.cpp", + "//src/mongo/db/shard_role/shard_catalog:database_sharding_metadata_accessor.cpp", + "//src/mongo/db/shard_role/shard_catalog:database_sharding_runtime.cpp", + "//src/mongo/db/shard_role/shard_catalog:database_sharding_state_factory_shard.cpp", + "//src/mongo/db/shard_role/shard_catalog:metadata_manager.cpp", + "//src/mongo/db/shard_role/shard_catalog:shard_authoritative_catalog_gen", + "//src/mongo/db/shard_role/shard_catalog:shard_filtering_metadata_refresh.cpp", + "//src/mongo/db/shard_role/shard_catalog:stale_shard_exception_handler.cpp", + "//src/mongo/db/shard_role/shard_catalog:type_oplog_catalog_metadata_gen", "//src/mongo/db/sharding_environment:config_server_op_observer.cpp", "//src/mongo/db/sharding_environment:shard_local.cpp", "//src/mongo/db/sharding_environment:shard_server_op_observer.cpp", @@ -616,9 +616,6 @@ mongo_cc_library( "//src/mongo/db/global_catalog/ddl:notify_sharding_event_idl", "//src/mongo/db/index_builds:index_builds_coordinator", "//src/mongo/db/index_builds:multi_index_block", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:index_key_validate", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/op_observer", "//src/mongo/db/op_observer:batched_write_context", "//src/mongo/db/op_observer:op_observer_impl", @@ -636,6 +633,9 @@ mongo_cc_library( "//src/mongo/db/repl:replica_set_aware_service", "//src/mongo/db/repl:wait_for_majority_service", "//src/mongo/db/session:session_catalog_mongod", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:index_key_validate", "//src/mongo/db/sharding_environment:sharding_runtime_d_params_idl", "//src/mongo/db/timeseries/bucket_catalog", "//src/mongo/db/transaction", @@ -724,19 +724,14 @@ mongo_cc_library( "split_vector_command.cpp", "txn_two_phase_commit_cmds.cpp", ":resharding_test_commands_gen", - "//src/mongo/db/cluster_parameters:configsvr_set_cluster_parameter_command.cpp", - "//src/mongo/db/cluster_parameters:set_cluster_parameter_configsvr_impl.cpp", - "//src/mongo/db/cluster_parameters:set_cluster_parameter_coordinator.cpp", - "//src/mongo/db/cluster_parameters:set_cluster_parameter_coordinator_document_gen", - "//src/mongo/db/cluster_parameters:shardsvr_set_cluster_parameter_command.cpp", - "//src/mongo/db/global_catalog/ddl:cleanup_structured_encryption_data_coordinator.cpp", - "//src/mongo/db/global_catalog/ddl:cleanup_structured_encryption_data_coordinator_gen", + "//src/mongo/db:cleanup_structured_encryption_data_coordinator.cpp", + "//src/mongo/db:cleanup_structured_encryption_data_coordinator_gen", + "//src/mongo/db:compact_structured_encryption_data_coordinator.cpp", + "//src/mongo/db:compact_structured_encryption_data_coordinator_gen", "//src/mongo/db/global_catalog/ddl:clone_authoritative_metadata_coordinator.cpp", "//src/mongo/db/global_catalog/ddl:clone_authoritative_metadata_coordinator_gen", "//src/mongo/db/global_catalog/ddl:collmod_coordinator.cpp", "//src/mongo/db/global_catalog/ddl:collmod_coordinator_document_gen", - "//src/mongo/db/global_catalog/ddl:compact_structured_encryption_data_coordinator.cpp", - "//src/mongo/db/global_catalog/ddl:compact_structured_encryption_data_coordinator_gen", "//src/mongo/db/global_catalog/ddl:configsvr_add_shard_to_zone_command.cpp", "//src/mongo/db/global_catalog/ddl:configsvr_collmod_command.cpp", "//src/mongo/db/global_catalog/ddl:configsvr_commit_chunk_migration_command.cpp", @@ -833,13 +828,6 @@ mongo_cc_library( "//src/mongo/db/global_catalog/metadata_consistency_validation:sharded_index_consistency_server_status.cpp", "//src/mongo/db/global_catalog/metadata_consistency_validation:shardsvr_check_metadata_consistency_command.cpp", "//src/mongo/db/global_catalog/metadata_consistency_validation:shardsvr_check_metadata_consistency_participant_command.cpp", - "//src/mongo/db/local_catalog:shardsvr_cleanup_structured_encryption_data_command.cpp", - "//src/mongo/db/local_catalog:shardsvr_compact_structured_encryption_data_command.cpp", - "//src/mongo/db/local_catalog/ddl:clone_catalog_data_command.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:flush_database_cache_updates_command.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:flush_routing_table_cache_updates_command.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:shardsvr_clone_authoritative_metadata_command.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:shardsvr_fetch_coll_metadata_command.cpp", "//src/mongo/db/s/config:configsvr_abort_reshard_collection_command.cpp", "//src/mongo/db/s/config:configsvr_balancer_collection_status_command.cpp", "//src/mongo/db/s/config:configsvr_cleanup_reshard_collection_command.cpp", @@ -868,6 +856,13 @@ mongo_cc_library( "//src/mongo/db/s/resharding:reshard_collection_coordinator_document_gen", "//src/mongo/db/s/resharding:shardsvr_commit_reshard_collection_command.cpp", "//src/mongo/db/s/resharding:shardsvr_reshard_collection_command.cpp", + "//src/mongo/db/shard_role/ddl:clone_catalog_data_command.cpp", + "//src/mongo/db/shard_role/shard_catalog:flush_database_cache_updates_command.cpp", + "//src/mongo/db/shard_role/shard_catalog:flush_routing_table_cache_updates_command.cpp", + "//src/mongo/db/shard_role/shard_catalog:shardsvr_cleanup_structured_encryption_data_command.cpp", + "//src/mongo/db/shard_role/shard_catalog:shardsvr_clone_authoritative_metadata_command.cpp", + "//src/mongo/db/shard_role/shard_catalog:shardsvr_compact_structured_encryption_data_command.cpp", + "//src/mongo/db/shard_role/shard_catalog:shardsvr_fetch_coll_metadata_command.cpp", "//src/mongo/db/sharding_environment:get_sharding_ready_command.cpp", "//src/mongo/db/sharding_environment:sharding_server_status.cpp", "//src/mongo/db/sharding_environment:sharding_state_command.cpp", @@ -886,10 +881,15 @@ mongo_cc_library( "//src/mongo/db/topology:shardsvr_check_can_connect_to_config_server_cmd.cpp", "//src/mongo/db/topology:transition_to_sharded_cluster_command.cpp", "//src/mongo/db/topology:transition_to_sharded_cluster_gen", - "//src/mongo/db/user_write_block:configsvr_set_user_write_block_mode_command.cpp", - "//src/mongo/db/user_write_block:set_user_write_block_mode_coordinator.cpp", - "//src/mongo/db/user_write_block:set_user_write_block_mode_coordinator_document_gen", - "//src/mongo/db/user_write_block:shardsvr_set_user_write_block_mode_command.cpp", + "//src/mongo/db/topology/cluster_parameters:configsvr_set_cluster_parameter_command.cpp", + "//src/mongo/db/topology/cluster_parameters:set_cluster_parameter_configsvr_impl.cpp", + "//src/mongo/db/topology/cluster_parameters:set_cluster_parameter_coordinator.cpp", + "//src/mongo/db/topology/cluster_parameters:set_cluster_parameter_coordinator_document_gen", + "//src/mongo/db/topology/cluster_parameters:shardsvr_set_cluster_parameter_command.cpp", + "//src/mongo/db/topology/user_write_block:configsvr_set_user_write_block_mode_command.cpp", + "//src/mongo/db/topology/user_write_block:set_user_write_block_mode_coordinator.cpp", + "//src/mongo/db/topology/user_write_block:set_user_write_block_mode_coordinator_document_gen", + "//src/mongo/db/topology/user_write_block:shardsvr_set_user_write_block_mode_command.cpp", "//src/mongo/db/versioning_protocol:get_database_version_command.cpp", "//src/mongo/db/versioning_protocol:get_shard_version_command.cpp", ], @@ -919,10 +919,6 @@ mongo_cc_library( "//src/mongo/db/commands/server_status:server_status_core", "//src/mongo/db/global_catalog/ddl:notify_sharding_event_idl", "//src/mongo/db/index_builds:index_builds_coordinator", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:collection_uuid_mismatch_info", - "//src/mongo/db/local_catalog:database_holder", - "//src/mongo/db/local_catalog/ddl:rename_collection_idl", "//src/mongo/db/pipeline/process_interface:shardsvr_process_interface", "//src/mongo/db/query/query_settings:query_settings_service", "//src/mongo/db/repl:change_stream_oplog_notification", @@ -931,12 +927,16 @@ mongo_cc_library( "//src/mongo/db/repl:replica_set_messages", "//src/mongo/db/repl:wait_for_majority_service", "//src/mongo/db/session:session_catalog_mongod", + "//src/mongo/db/shard_role/ddl:rename_collection_idl", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:collection_uuid_mismatch_info", + "//src/mongo/db/shard_role/shard_catalog:database_holder", "//src/mongo/db/timeseries:catalog_helper", "//src/mongo/db/timeseries:timeseries_collmod", "//src/mongo/db/timeseries:timeseries_conversion_util", "//src/mongo/db/timeseries:timeseries_options", + "//src/mongo/db/topology/user_write_block:set_user_write_block_mode_idl", "//src/mongo/db/transaction:transaction_api", - "//src/mongo/db/user_write_block:set_user_write_block_mode_idl", "//src/mongo/executor:async_rpc", "//src/mongo/executor:inline_executor", "//src/mongo/idl:cluster_server_parameter", @@ -990,8 +990,6 @@ mongo_cc_library( "//src/mongo/db/exec/document_value:document_value_test_util", "//src/mongo/db/global_catalog:sharding_catalog_client_mock", "//src/mongo/db/index_builds:index_builds_coordinator_mock", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:catalog_test_fixture", "//src/mongo/db/op_observer", "//src/mongo/db/op_observer:op_observer_impl", "//src/mongo/db/op_observer:op_observer_util", @@ -1014,6 +1012,8 @@ mongo_cc_library( "//src/mongo/db/session:logical_session_cache_impl", "//src/mongo/db/session:logical_session_cache_noop", "//src/mongo/db/session:session_catalog_mongod", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", "//src/mongo/db/timeseries:timeseries_options", "//src/mongo/executor:thread_pool_task_executor_test_fixture", "//src/mongo/s:sharding_mongos_test_fixture", @@ -1048,21 +1048,21 @@ mongo_cc_unit_test( "range_deletion_util_test.cpp", "session_catalog_migration_destination_test.cpp", "session_catalog_migration_source_test.cpp", - "//src/mongo/db/global_catalog/catalog_cache:namespace_metadata_change_notifications_test.cpp", - "//src/mongo/db/global_catalog/catalog_cache:shard_server_catalog_cache_loader_test.cpp", "//src/mongo/db/global_catalog/ddl:ddl_lock_manager_test.cpp", "//src/mongo/db/global_catalog/ddl:shard_key_index_util_test.cpp", "//src/mongo/db/global_catalog/ddl:shard_metadata_util_test.cpp", "//src/mongo/db/global_catalog/metadata_consistency_validation:metadata_consistency_util_test.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:collection_metadata_filtering_test.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:collection_metadata_test.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:collection_sharding_runtime_test.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:database_sharding_metadata_accessor_test.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:database_sharding_runtime_test.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:implicit_collection_creation_test.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:metadata_manager_test.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:op_observer_sharding_test.cpp", - "//src/mongo/db/local_catalog/shard_role_catalog:operation_sharding_state_test.cpp", + "//src/mongo/db/router_role/routing_cache:namespace_metadata_change_notifications_test.cpp", + "//src/mongo/db/router_role/routing_cache:shard_server_catalog_cache_loader_test.cpp", + "//src/mongo/db/shard_role/shard_catalog:collection_metadata_filtering_test.cpp", + "//src/mongo/db/shard_role/shard_catalog:collection_metadata_test.cpp", + "//src/mongo/db/shard_role/shard_catalog:collection_sharding_runtime_test.cpp", + "//src/mongo/db/shard_role/shard_catalog:database_sharding_metadata_accessor_test.cpp", + "//src/mongo/db/shard_role/shard_catalog:database_sharding_runtime_test.cpp", + "//src/mongo/db/shard_role/shard_catalog:implicit_collection_creation_test.cpp", + "//src/mongo/db/shard_role/shard_catalog:metadata_manager_test.cpp", + "//src/mongo/db/shard_role/shard_catalog:op_observer_sharding_test.cpp", + "//src/mongo/db/shard_role/shard_catalog:operation_sharding_state_test.cpp", "//src/mongo/db/sharding_environment:range_arithmetic_test.cpp", "//src/mongo/db/sharding_environment:shard_local_test.cpp", ], @@ -1112,7 +1112,7 @@ mongo_cc_unit_test( "//src/mongo/db/s/migration_blocking_operation:multi_update_coordinator_test.cpp", "//src/mongo/db/s/primary_only_service_helpers:cancel_state_test.cpp", "//src/mongo/db/s/primary_only_service_helpers:with_automatic_retry_test.cpp", - "//src/mongo/db/vector_clock:vector_clock_shard_server_test.cpp", + "//src/mongo/db/topology/vector_clock:vector_clock_shard_server_test.cpp", ], tags = [ "mongo_unittest_sixth_group", @@ -1197,7 +1197,6 @@ mongo_cc_unit_test( srcs = [ "query_analysis_coordinator_test.cpp", "query_analysis_op_observer_configsvr_test.cpp", - "//src/mongo/db/cluster_parameters:set_cluster_parameter_coordinator_test.cpp", "//src/mongo/db/global_catalog:index_on_config_test.cpp", "//src/mongo/db/global_catalog/ddl:configsvr_coordinator_service_test.cpp", "//src/mongo/db/global_catalog/ddl:create_database_util_test.cpp", @@ -1237,8 +1236,9 @@ mongo_cc_unit_test( "//src/mongo/db/sharding_environment:config_server_op_observer_test.cpp", "//src/mongo/db/topology:sharding_catalog_manager_add_shard_test.cpp", "//src/mongo/db/topology:sharding_catalog_manager_remove_shard_test.cpp", - "//src/mongo/db/vector_clock:topology_time_ticker_test.cpp", - "//src/mongo/db/vector_clock:vector_clock_config_server_test.cpp", + "//src/mongo/db/topology/cluster_parameters:set_cluster_parameter_coordinator_test.cpp", + "//src/mongo/db/topology/vector_clock:topology_time_ticker_test.cpp", + "//src/mongo/db/topology/vector_clock:vector_clock_config_server_test.cpp", ], tags = [ "mongo_unittest_seventh_group", @@ -1253,7 +1253,6 @@ mongo_cc_unit_test( "//src/mongo/db/commands:cluster_server_parameter_commands_invocation", "//src/mongo/db/commands:set_feature_compatibility_version_idl", "//src/mongo/db/global_catalog:sharding_catalog_client_mock", - "//src/mongo/db/local_catalog:collection_mock", "//src/mongo/db/op_observer", "//src/mongo/db/pipeline:aggregation_context_fixture", "//src/mongo/db/pipeline:document_source_mock", @@ -1264,6 +1263,7 @@ mongo_cc_unit_test( "//src/mongo/db/repl:wait_for_majority_service", "//src/mongo/db/session:logical_session_cache_noop", "//src/mongo/db/session:session_catalog_mongod", + "//src/mongo/db/shard_role/shard_catalog:collection_mock", "//src/mongo/db/timeseries:timeseries_options", "//src/mongo/db/transaction", "//src/mongo/db/transaction:transaction_api", @@ -1290,7 +1290,7 @@ mongo_cc_benchmark( mongo_cc_benchmark( name = "sharding_write_router_bm", srcs = [ - "//src/mongo/db/global_catalog/router_role_api:sharding_write_router_bm.cpp", + "//src/mongo/db/router_role:sharding_write_router_bm.cpp", ], tags = ["sharding_bm"], deps = [ @@ -1332,3 +1332,15 @@ mongo_cc_benchmark( "//src/mongo/db/auth:authorization_manager_global", ], ) + +# Auto-generated exports for moved files +exports_files(["remove_tags.idl"]) + +idl_generator( + name = "remove_tags_gen", + src = "//src/mongo/db/s:remove_tags.idl", + deps = [ + "//src/mongo/db:basic_types_gen", + "//src/mongo/idl:generic_argument_gen", + ], +) diff --git a/src/mongo/db/s/active_migrations_registry.cpp b/src/mongo/db/s/active_migrations_registry.cpp index bc465312f93..38f333800b0 100644 --- a/src/mongo/db/s/active_migrations_registry.cpp +++ b/src/mongo/db/s/active_migrations_registry.cpp @@ -31,13 +31,13 @@ #include "mongo/base/error_codes.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/s/migration_destination_manager.h" #include "mongo/db/s/migration_source_manager.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" diff --git a/src/mongo/db/s/active_migrations_registry.h b/src/mongo/db/s/active_migrations_registry.h index d5c8052394c..3f8294f903b 100644 --- a/src/mongo/db/s/active_migrations_registry.h +++ b/src/mongo/db/s/active_migrations_registry.h @@ -34,11 +34,11 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" #include "mongo/db/global_catalog/type_chunk.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/s/migration_session_id.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/s/request_types/move_range_request_gen.h" #include "mongo/stdx/condition_variable.h" diff --git a/src/mongo/db/s/analyze_shard_key_cmd.cpp b/src/mongo/db/s/analyze_shard_key_cmd.cpp index 3a46f33a2b5..48fc1f24000 100644 --- a/src/mongo/db/s/analyze_shard_key_cmd.cpp +++ b/src/mongo/db/s/analyze_shard_key_cmd.cpp @@ -32,7 +32,6 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" -#include "mongo/db/local_catalog/db_raii.h" #include "mongo/db/multitenancy_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -41,6 +40,7 @@ #include "mongo/db/s/analyze_shard_key_cmd_util.h" #include "mongo/db/s/analyze_shard_key_util.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" #include "mongo/logv2/log.h" #include "mongo/platform/compiler.h" #include "mongo/rpc/op_msg.h" diff --git a/src/mongo/db/s/analyze_shard_key_cmd_util.cpp b/src/mongo/db/s/analyze_shard_key_cmd_util.cpp index 5687f223f51..6760aa71abb 100644 --- a/src/mongo/db/s/analyze_shard_key_cmd_util.cpp +++ b/src/mongo/db/s/analyze_shard_key_cmd_util.cpp @@ -47,17 +47,11 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/exec/agg/pipeline_builder.h" #include "mongo/db/exec/document_value/document.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/shard_key_index_util.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/global_catalog/type_tags.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch_info.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/logical_time.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/expression_context.h" @@ -76,6 +70,7 @@ #include "mongo/db/record_id.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/read_concern_level.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/s/analyze_shard_key_read_write_distribution.h" #include "mongo/db/s/analyze_shard_key_util.h" #include "mongo/db/s/config/initial_split_policy.h" @@ -83,6 +78,11 @@ #include "mongo/db/s/document_source_analyze_shard_key_read_write_distribution_gen.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/storage/storage_options.h" #include "mongo/db/topology/cluster_role.h" diff --git a/src/mongo/db/s/analyze_shard_key_read_write_distribution.cpp b/src/mongo/db/s/analyze_shard_key_read_write_distribution.cpp index 8075ef4a13a..c678b0f0980 100644 --- a/src/mongo/db/s/analyze_shard_key_read_write_distribution.cpp +++ b/src/mongo/db/s/analyze_shard_key_read_write_distribution.cpp @@ -32,7 +32,6 @@ #include "mongo/base/status_with.h" #include "mongo/db/commands/query_cmd/bulk_write_crud_op.h" #include "mongo/db/feature_flag.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" #include "mongo/db/global_catalog/shard_key_pattern_query_util.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/expression_context_builder.h" @@ -40,6 +39,7 @@ #include "mongo/db/query/collation/collator_factory_interface.h" #include "mongo/db/query/write_ops/write_ops.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" #include "mongo/db/s/analyze_shard_key_util.h" #include "mongo/db/server_options.h" #include "mongo/db/sharding_environment/shard_id.h" diff --git a/src/mongo/db/s/analyze_shard_key_read_write_distribution.h b/src/mongo/db/s/analyze_shard_key_read_write_distribution.h index 0623e673493..c762eb7a4ec 100644 --- a/src/mongo/db/s/analyze_shard_key_read_write_distribution.h +++ b/src/mongo/db/s/analyze_shard_key_read_write_distribution.h @@ -32,9 +32,7 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" #include "mongo/db/commands/query_cmd/bulk_write_gen.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/global_catalog/shard_key_pattern_query_util.h" #include "mongo/db/global_catalog/type_chunk.h" @@ -42,6 +40,8 @@ #include "mongo/db/pipeline/legacy_runtime_constants_gen.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/query/write_ops/write_ops_gen.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/platform/atomic_word.h" #include "mongo/s/analyze_shard_key_cmd_gen.h" #include "mongo/s/analyze_shard_key_common_gen.h" diff --git a/src/mongo/db/s/analyze_shard_key_read_write_distribution_stage.cpp b/src/mongo/db/s/analyze_shard_key_read_write_distribution_stage.cpp index 910447155ab..d4df236a10b 100644 --- a/src/mongo/db/s/analyze_shard_key_read_write_distribution_stage.cpp +++ b/src/mongo/db/s/analyze_shard_key_read_write_distribution_stage.cpp @@ -31,13 +31,13 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/exec/agg/document_source_to_stage_registry.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/pipeline/aggregate_command_gen.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" #include "mongo/db/s/analyze_shard_key_read_write_distribution.h" #include "mongo/db/s/document_source_analyze_shard_key_read_write_distribution.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/sharding_environment/grid.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/s/analyze_shard_key_documents_gen.h" namespace mongo { diff --git a/src/mongo/db/s/analyze_shard_key_util.cpp b/src/mongo/db/s/analyze_shard_key_util.cpp index c7fab9418e4..aa8b119a0ec 100644 --- a/src/mongo/db/s/analyze_shard_key_util.cpp +++ b/src/mongo/db/s/analyze_shard_key_util.cpp @@ -33,7 +33,7 @@ #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsontypes.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/s/analyze_shard_key_common_gen.h" #include "mongo/transport/session.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/s/auto_split_vector.cpp b/src/mongo/db/s/auto_split_vector.cpp index 5bb6de8e0f6..ad618e468f5 100644 --- a/src/mongo/db/s/auto_split_vector.cpp +++ b/src/mongo/db/s/auto_split_vector.cpp @@ -35,14 +35,14 @@ #include "mongo/db/dbhelpers.h" #include "mongo/db/global_catalog/ddl/shard_key_index_util.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/internal_plans.h" #include "mongo/db/query/plan_executor.h" #include "mongo/db/query/plan_yield_policy.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/logv2/log.h" #include "mongo/platform/atomic_word.h" #include "mongo/util/duration.h" diff --git a/src/mongo/db/s/auto_split_vector.h b/src/mongo/db/s/auto_split_vector.h index 2550d75b527..c36b654d987 100644 --- a/src/mongo/db/s/auto_split_vector.h +++ b/src/mongo/db/s/auto_split_vector.h @@ -33,9 +33,9 @@ #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsontypes.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/util/assert_util.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/s/auto_split_vector_command.cpp b/src/mongo/db/s/auto_split_vector_command.cpp index 3699f037d45..78f5667e5a6 100644 --- a/src/mongo/db/s/auto_split_vector_command.cpp +++ b/src/mongo/db/s/auto_split_vector_command.cpp @@ -35,12 +35,12 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/s/auto_split_vector.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/rpc/op_msg.h" diff --git a/src/mongo/db/s/auto_split_vector_test.cpp b/src/mongo/db/s/auto_split_vector_test.cpp index 3eea3844dee..84f65f9cec7 100644 --- a/src/mongo/db/s/auto_split_vector_test.cpp +++ b/src/mongo/db/s/auto_split_vector_test.cpp @@ -34,8 +34,8 @@ #include "mongo/bson/bsonmisc.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/logv2/log.h" #include "mongo/platform/random.h" diff --git a/src/mongo/db/s/balancer/auto_merger_policy_test.cpp b/src/mongo/db/s/balancer/auto_merger_policy_test.cpp index aa14004c484..f1838fdae20 100644 --- a/src/mongo/db/s/balancer/auto_merger_policy_test.cpp +++ b/src/mongo/db/s/balancer/auto_merger_policy_test.cpp @@ -51,7 +51,7 @@ #include "mongo/db/session/logical_session_cache_noop.h" #include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/sharding_environment/config_server_test_fixture.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/unittest/unittest.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/s/balancer/balancer.cpp b/src/mongo/db/s/balancer/balancer.cpp index ce372ba1764..339fd7f4b13 100644 --- a/src/mongo/db/s/balancer/balancer.cpp +++ b/src/mongo/db/s/balancer/balancer.cpp @@ -48,8 +48,6 @@ #include "mongo/client/read_preference.h" #include "mongo/db/client.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/routing_information_cache.h" #include "mongo/db/global_catalog/chunk.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/shard_util.h" @@ -63,6 +61,8 @@ #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/repl/repl_client_info.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/routing_information_cache.h" #include "mongo/db/s/balancer/actions_stream_policy.h" #include "mongo/db/s/balancer/auto_merger_policy.h" #include "mongo/db/s/balancer/balancer_commands_scheduler.h" diff --git a/src/mongo/db/s/balancer/balancer_chunk_selection_policy.cpp b/src/mongo/db/s/balancer/balancer_chunk_selection_policy.cpp index 0cfb4159d70..9577e928361 100644 --- a/src/mongo/db/s/balancer/balancer_chunk_selection_policy.cpp +++ b/src/mongo/db/s/balancer/balancer_chunk_selection_policy.cpp @@ -41,8 +41,6 @@ #include "mongo/bson/simple_bsonobj_comparator.h" #include "mongo/db/client.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/routing_information_cache.h" #include "mongo/db/global_catalog/chunk.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" @@ -55,6 +53,8 @@ #include "mongo/db/keypattern.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/read_concern_level.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/routing_information_cache.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_config_server_parameters_gen.h" #include "mongo/db/topology/shard_registry.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 1b581dba2db..63e99527cff 100644 --- a/src/mongo/db/s/balancer/balancer_commands_scheduler_impl.h +++ b/src/mongo/db/s/balancer/balancer_commands_scheduler_impl.h @@ -39,12 +39,12 @@ #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/merge_chunk_request_gen.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/keypattern.h" #include "mongo/db/namespace_string.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" #include "mongo/db/s/balancer/balancer_commands_scheduler.h" #include "mongo/db/s/balancer/balancer_policy.h" diff --git a/src/mongo/db/s/balancer/balancer_defragmentation_policy.cpp b/src/mongo/db/s/balancer/balancer_defragmentation_policy.cpp index d12826df20c..250483c96c8 100644 --- a/src/mongo/db/s/balancer/balancer_defragmentation_policy.cpp +++ b/src/mongo/db/s/balancer/balancer_defragmentation_policy.cpp @@ -40,8 +40,6 @@ #include "mongo/db/client.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/routing_information_cache.h" #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_chunk.h" @@ -52,6 +50,8 @@ #include "mongo/db/query/write_ops/write_ops_parsers.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/repl/repl_client_info.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/routing_information_cache.h" #include "mongo/db/s/balancer/cluster_statistics.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" diff --git a/src/mongo/db/s/balancer/move_unsharded_policy.cpp b/src/mongo/db/s/balancer/move_unsharded_policy.cpp index 7b714a4fbc7..a9bb409543b 100644 --- a/src/mongo/db/s/balancer/move_unsharded_policy.cpp +++ b/src/mongo/db/s/balancer/move_unsharded_policy.cpp @@ -33,10 +33,10 @@ #include "mongo/bson/util/bson_extract.h" #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" -#include "mongo/db/local_catalog/ddl/list_collections_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/s/balancer/balancer_chunk_selection_policy.h" #include "mongo/db/s/resharding/resharding_server_parameters_gen.h" +#include "mongo/db/shard_role/ddl/list_collections_gen.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/topology/shard_registry.h" diff --git a/src/mongo/db/s/balancer_stats_registry.cpp b/src/mongo/db/s/balancer_stats_registry.cpp index f46feb78d85..e4515ae725c 100644 --- a/src/mongo/db/s/balancer_stats_registry.cpp +++ b/src/mongo/db/s/balancer_stats_registry.cpp @@ -39,14 +39,14 @@ #include "mongo/client/dbclient_cursor.h" #include "mongo/db/client.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/s/range_deleter_service.h" #include "mongo/db/s/range_deletion_task_gen.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" #include "mongo/logv2/log.h" #include "mongo/platform/compiler.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/s/chunk_operation_precondition_checks.cpp b/src/mongo/db/s/chunk_operation_precondition_checks.cpp index 98472aae312..581c6a2cacc 100644 --- a/src/mongo/db/s/chunk_operation_precondition_checks.cpp +++ b/src/mongo/db/s/chunk_operation_precondition_checks.cpp @@ -32,12 +32,12 @@ #include "mongo/bson/oid.h" #include "mongo/bson/timestamp.h" #include "mongo/db/global_catalog/type_chunk.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/db/versioning_protocol/chunk_version.h" diff --git a/src/mongo/db/s/chunk_operation_precondition_checks.h b/src/mongo/db/s/chunk_operation_precondition_checks.h index fe10568c829..caa42f12179 100644 --- a/src/mongo/db/s/chunk_operation_precondition_checks.h +++ b/src/mongo/db/s/chunk_operation_precondition_checks.h @@ -30,9 +30,9 @@ #pragma once #include "mongo/bson/oid.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" #include "mongo/util/modules.h" MONGO_MOD_PUBLIC; diff --git a/src/mongo/db/s/cleanup_orphaned_cmd.cpp b/src/mongo/db/s/cleanup_orphaned_cmd.cpp index ea4e70dc1b7..82ce42d378f 100644 --- a/src/mongo/db/s/cleanup_orphaned_cmd.cpp +++ b/src/mongo/db/s/cleanup_orphaned_cmd.cpp @@ -40,16 +40,16 @@ #include "mongo/db/database_name.h" #include "mongo/db/field_parser.h" #include "mongo/db/global_catalog/type_chunk.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/s/range_deletion_util.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/logv2/log.h" 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 c9ea7792385..3e61315eeda 100644 --- a/src/mongo/db/s/config/configsvr_remove_tags_command.cpp +++ b/src/mongo/db/s/config/configsvr_remove_tags_command.cpp @@ -41,7 +41,6 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/global_catalog/ddl/remove_tags_gen.h" #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_tags.h" @@ -49,6 +48,7 @@ #include "mongo/db/operation_context.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/read_concern_level.h" +#include "mongo/db/s/remove_tags_gen.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/grid.h" diff --git a/src/mongo/db/s/config/configsvr_reshard_collection_cmd.cpp b/src/mongo/db/s/config/configsvr_reshard_collection_cmd.cpp index 17a3d73ef16..124e90ddeea 100644 --- a/src/mongo/db/s/config/configsvr_reshard_collection_cmd.cpp +++ b/src/mongo/db/s/config/configsvr_reshard_collection_cmd.cpp @@ -41,14 +41,12 @@ #include "mongo/db/commands/test_commands_enabled.h" #include "mongo/db/database_name.h" #include "mongo/db/feature_flag.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/shard_key_util.h" #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_collection.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/collation/collator_factory_interface.h" @@ -58,6 +56,7 @@ #include "mongo/db/repl/repl_client_info.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/replication_state_transition_lock_guard.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/s/resharding/coordinator_document_gen.h" #include "mongo/db/s/resharding/resharding_coordinator.h" #include "mongo/db/s/resharding/resharding_coordinator_service.h" @@ -65,6 +64,7 @@ #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/timeseries/timeseries_index_schema_conversion_functions.h" #include "mongo/db/topology/cluster_role.h" diff --git a/src/mongo/db/s/config/initial_split_policy.cpp b/src/mongo/db/s/config/initial_split_policy.cpp index 421a3a55feb..4eb1100c494 100644 --- a/src/mongo/db/s/config/initial_split_policy.cpp +++ b/src/mongo/db/s/config/initial_split_policy.cpp @@ -60,7 +60,7 @@ #include "mongo/db/storage/storage_options.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/topology/shard_registry.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/executor/task_executor_pool.h" #include "mongo/stdx/unordered_map.h" #include "mongo/stdx/unordered_set.h" diff --git a/src/mongo/db/s/config/initial_split_policy.h b/src/mongo/db/s/config/initial_split_policy.h index 401500e5ed1..8982f72c972 100644 --- a/src/mongo/db/s/config/initial_split_policy.h +++ b/src/mongo/db/s/config/initial_split_policy.h @@ -37,11 +37,11 @@ #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_tags.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/pipeline.h" #include "mongo/db/pipeline/pipeline_factory.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/s/resharding/common_types_gen.h" diff --git a/src/mongo/db/s/config/initial_split_policy_test.cpp b/src/mongo/db/s/config/initial_split_policy_test.cpp index 79a1c53bfc3..934478b642e 100644 --- a/src/mongo/db/s/config/initial_split_policy_test.cpp +++ b/src/mongo/db/s/config/initial_split_policy_test.cpp @@ -44,7 +44,7 @@ #include "mongo/db/logical_time.h" #include "mongo/db/sharding_environment/config_server_test_fixture.h" #include "mongo/db/topology/shard_registry.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/stdx/unordered_map.h" #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/s/configure_query_analyzer_cmd.cpp b/src/mongo/db/s/configure_query_analyzer_cmd.cpp index 25c17a6d5db..efb67b1e104 100644 --- a/src/mongo/db/s/configure_query_analyzer_cmd.cpp +++ b/src/mongo/db/s/configure_query_analyzer_cmd.cpp @@ -42,9 +42,6 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/ddl_lock_manager.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/multitenancy_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -56,6 +53,9 @@ #include "mongo/db/s/analyze_shard_key_util.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/cluster_role.h" diff --git a/src/mongo/db/s/flush_resharding_state_change_command.cpp b/src/mongo/db/s/flush_resharding_state_change_command.cpp index 9e1b28f0599..6ebea2d2fed 100644 --- a/src/mongo/db/s/flush_resharding_state_change_command.cpp +++ b/src/mongo/db/s/flush_resharding_state_change_command.cpp @@ -36,13 +36,13 @@ #include "mongo/db/client.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/s/primary_only_service_helpers/with_automatic_retry.h" #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_statistics.h" #include "mongo/db/topology/sharding_state.h" diff --git a/src/mongo/db/s/forwardable_operation_metadata.cpp b/src/mongo/db/s/forwardable_operation_metadata.cpp index 75cbbe45e28..a9d98ad6870 100644 --- a/src/mongo/db/s/forwardable_operation_metadata.cpp +++ b/src/mongo/db/s/forwardable_operation_metadata.cpp @@ -37,8 +37,8 @@ #include "mongo/db/auth/validated_tenancy_scope_factory.h" #include "mongo/db/basic_types.h" #include "mongo/db/client.h" -#include "mongo/db/raw_data_operation.h" -#include "mongo/db/user_write_block/write_block_bypass.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" +#include "mongo/db/topology/user_write_block/write_block_bypass.h" #include "mongo/idl/idl_parser.h" #include "mongo/otel/telemetry_context_holder.h" #include "mongo/otel/traces/telemetry_context_serialization.h" diff --git a/src/mongo/db/s/migration_batch_inserter.cpp b/src/mongo/db/s/migration_batch_inserter.cpp index 2dc40dd1fda..b930522c89d 100644 --- a/src/mongo/db/s/migration_batch_inserter.cpp +++ b/src/mongo/db/s/migration_batch_inserter.cpp @@ -34,8 +34,6 @@ #include "mongo/db/admission/execution_admission_context.h" #include "mongo/db/cancelable_operation_context.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/collection_operation_source.h" -#include "mongo/db/local_catalog/document_validation.h" #include "mongo/db/query/write_ops/single_write_result_gen.h" #include "mongo/db/query/write_ops/write_ops_exec.h" #include "mongo/db/query/write_ops/write_ops_gen.h" @@ -46,6 +44,8 @@ #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/session_catalog.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/shard_catalog/collection_operation_source.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_runtime_d_params_gen.h" #include "mongo/db/sharding_environment/sharding_statistics.h" diff --git a/src/mongo/db/s/migration_batch_inserter.h b/src/mongo/db/s/migration_batch_inserter.h index 005b165ff57..03cbc2edcc3 100644 --- a/src/mongo/db/s/migration_batch_inserter.h +++ b/src/mongo/db/s/migration_batch_inserter.h @@ -34,7 +34,6 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/cancelable_operation_context.h" #include "mongo/db/global_catalog/type_chunk.h" -#include "mongo/db/local_catalog/document_validation.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/write_ops_exec.h" @@ -45,6 +44,7 @@ #include "mongo/db/s/migration_session_id.h" #include "mongo/db/s/range_deletion_util.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_runtime_d_params_gen.h" #include "mongo/db/write_concern_options.h" diff --git a/src/mongo/db/s/migration_blocking_operation/multi_update_coordinator.cpp b/src/mongo/db/s/migration_blocking_operation/multi_update_coordinator.cpp index fd0b69d8f7e..acb5259a741 100644 --- a/src/mongo/db/s/migration_blocking_operation/multi_update_coordinator.cpp +++ b/src/mongo/db/s/migration_blocking_operation/multi_update_coordinator.cpp @@ -36,7 +36,6 @@ #include "mongo/db/dbmessage.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_util.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/persistent_task_store.h" @@ -45,6 +44,7 @@ #include "mongo/db/s/migration_blocking_operation/multi_update_coordinator_server_parameters_gen.h" #include "mongo/db/s/primary_only_service_helpers/pause_during_phase_transition_fail_point.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/rpc/factory.h" #include "mongo/rpc/get_status_from_command_result.h" #include "mongo/rpc/metadata/client_metadata.h" diff --git a/src/mongo/db/s/migration_blocking_operation/multi_update_coordinator_external_state.cpp b/src/mongo/db/s/migration_blocking_operation/multi_update_coordinator_external_state.cpp index 16435cd9eac..57a48d866e6 100644 --- a/src/mongo/db/s/migration_blocking_operation/multi_update_coordinator_external_state.cpp +++ b/src/mongo/db/s/migration_blocking_operation/multi_update_coordinator_external_state.cpp @@ -33,8 +33,8 @@ #include "mongo/db/global_catalog/ddl/cluster_ddl.h" #include "mongo/db/global_catalog/ddl/migration_blocking_operation_coordinator.h" #include "mongo/db/global_catalog/ddl/migration_blocking_operation_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/local_catalog/catalog_raii.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/s/query/planner/cluster_aggregate.h" diff --git a/src/mongo/db/s/migration_chunk_cloner_source.cpp b/src/mongo/db/s/migration_chunk_cloner_source.cpp index 6e8861b7199..0874878a118 100644 --- a/src/mongo/db/s/migration_chunk_cloner_source.cpp +++ b/src/mongo/db/s/migration_chunk_cloner_source.cpp @@ -51,14 +51,6 @@ #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" #include "mongo/db/query/plan_yield_policy.h" #include "mongo/db/query/query_knobs_gen.h" #include "mongo/db/query/write_ops/write_ops_retryability.h" @@ -69,6 +61,14 @@ #include "mongo/db/s/start_chunk_clone_request.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id_helpers.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/sharding_runtime_d_params_gen.h" diff --git a/src/mongo/db/s/migration_chunk_cloner_source.h b/src/mongo/db/s/migration_chunk_cloner_source.h index b4a1413382f..8a06addc832 100644 --- a/src/mongo/db/s/migration_chunk_cloner_source.h +++ b/src/mongo/db/s/migration_chunk_cloner_source.h @@ -36,7 +36,6 @@ #include "mongo/bson/timestamp.h" #include "mongo/client/connection_string.h" #include "mongo/db/global_catalog/shard_key_pattern.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer_util.h" #include "mongo/db/operation_context.h" @@ -50,6 +49,7 @@ #include "mongo/db/s/session_catalog_migration_source.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/write_concern_options.h" diff --git a/src/mongo/db/s/migration_chunk_cloner_source_commands.cpp b/src/mongo/db/s/migration_chunk_cloner_source_commands.cpp index f489ce84876..421beae1e8d 100644 --- a/src/mongo/db/s/migration_chunk_cloner_source_commands.cpp +++ b/src/mongo/db/s/migration_chunk_cloner_source_commands.cpp @@ -39,11 +39,6 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/optime.h" @@ -54,6 +49,11 @@ #include "mongo/db/s/migration_session_id.h" #include "mongo/db/s/migration_source_manager.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" #include "mongo/db/write_concern.h" #include "mongo/db/write_concern_options.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/s/migration_chunk_cloner_source_op_observer.cpp b/src/mongo/db/s/migration_chunk_cloner_source_op_observer.cpp index ae45411ab90..369dc4fa173 100644 --- a/src/mongo/db/s/migration_chunk_cloner_source_op_observer.cpp +++ b/src/mongo/db/s/migration_chunk_cloner_source_op_observer.cpp @@ -34,18 +34,18 @@ #include "mongo/base/string_data.h" #include "mongo/db/global_catalog/chunk.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/sharding_write_router.h" #include "mongo/db/global_catalog/shard_key_pattern.h" -#include "mongo/db/local_catalog/collection_operation_source.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h" #include "mongo/db/op_observer/op_observer_util.h" #include "mongo/db/repl/read_concern_args.h" +#include "mongo/db/router_role/sharding_write_router.h" #include "mongo/db/s/migration_chunk_cloner_source.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_operation_source.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/db/transaction/transaction_participant.h" diff --git a/src/mongo/db/s/migration_chunk_cloner_source_op_observer.h b/src/mongo/db/s/migration_chunk_cloner_source_op_observer.h index 4ed51aff6d0..205e1121915 100644 --- a/src/mongo/db/s/migration_chunk_cloner_source_op_observer.h +++ b/src/mongo/db/s/migration_chunk_cloner_source_op_observer.h @@ -30,8 +30,6 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" @@ -42,6 +40,8 @@ #include "mongo/db/repl/optime.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" #include "mongo/db/transaction/transaction_operations.h" #include "mongo/util/modules.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/s/migration_chunk_cloner_source_test.cpp b/src/mongo/db/s/migration_chunk_cloner_source_test.cpp index dcf4e40944d..bcfb501bee2 100644 --- a/src/mongo/db/s/migration_chunk_cloner_source_test.cpp +++ b/src/mongo/db/s/migration_chunk_cloner_source_test.cpp @@ -53,23 +53,6 @@ #include "mongo/db/global_catalog/type_collection_common_types_gen.h" #include "mongo/db/global_catalog/type_shard.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/collection_options_gen.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/durable_catalog_entry.h" -#include "mongo/db/local_catalog/durable_catalog_entry_metadata.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role_mock.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/change_stream_pre_and_post_images_options_gen.h" @@ -85,6 +68,23 @@ #include "mongo/db/session/logical_session_id_gen.h" #include "mongo/db/session/logical_session_id_helpers.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_role_mock.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" diff --git a/src/mongo/db/s/migration_coordinator.cpp b/src/mongo/db/s/migration_coordinator.cpp index 13f338f86dd..f90fa7eff23 100644 --- a/src/mongo/db/s/migration_coordinator.cpp +++ b/src/mongo/db/s/migration_coordinator.cpp @@ -33,9 +33,6 @@ #include "mongo/base/status.h" #include "mongo/bson/bsonmisc.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" #include "mongo/db/logical_time.h" #include "mongo/db/operation_context.h" #include "mongo/db/persistent_task_store.h" @@ -44,8 +41,11 @@ #include "mongo/db/s/range_deletion_task_gen.h" #include "mongo/db/s/range_deletion_util.h" #include "mongo/db/session/logical_session_id_helpers.h" -#include "mongo/db/vector_clock/vector_clock.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/db/write_concern_options.h" #include "mongo/logv2/log.h" #include "mongo/platform/atomic_word.h" diff --git a/src/mongo/db/s/migration_destination_manager.cpp b/src/mongo/db/s/migration_destination_manager.cpp index a91bcbc85e1..0c81f0eaa19 100644 --- a/src/mongo/db/s/migration_destination_manager.cpp +++ b/src/mongo/db/s/migration_destination_manager.cpp @@ -47,7 +47,6 @@ #include "mongo/db/feature_flag.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharding_recovery_service.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_chunk.h" @@ -55,26 +54,6 @@ #include "mongo/db/index/index_constants.h" #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/ddl/list_collections_gen.h" -#include "mongo/db/local_catalog/ddl/list_indexes_allowed_fields.h" -#include "mongo/db/local_catalog/ddl/list_indexes_gen.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/list_indexes.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -86,6 +65,7 @@ #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/repl/repl_client_info.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" #include "mongo/db/s/migration_batch_fetcher.h" #include "mongo/db/s/migration_destination_manager.h" #include "mongo/db/s/migration_util.h" @@ -98,6 +78,26 @@ #include "mongo/db/service_context.h" #include "mongo/db/session/session_catalog.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/ddl/list_collections_gen.h" +#include "mongo/db/shard_role/ddl/list_indexes_allowed_fields.h" +#include "mongo/db/shard_role/ddl/list_indexes_gen.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/list_indexes.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" @@ -105,9 +105,9 @@ #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/topology/shard_registry.h" #include "mongo/db/topology/sharding_state.h" +#include "mongo/db/topology/user_write_block/write_block_bypass.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/transaction/transaction_participant.h" -#include "mongo/db/user_write_block/write_block_bypass.h" -#include "mongo/db/vector_clock/vector_clock.h" #include "mongo/db/write_concern.h" #include "mongo/executor/task_executor_pool.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/s/migration_destination_manager.h b/src/mongo/db/s/migration_destination_manager.h index f705a79e0ff..177c3e7c3be 100644 --- a/src/mongo/db/s/migration_destination_manager.h +++ b/src/mongo/db/s/migration_destination_manager.h @@ -36,14 +36,13 @@ #include "mongo/bson/oid.h" #include "mongo/bson/timestamp.h" #include "mongo/client/connection_string.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/type_chunk.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/optime.h" #include "mongo/db/repl/replica_set_aware_service.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/s/active_migrations_registry.h" #include "mongo/db/s/migration_batch_fetcher.h" #include "mongo/db/s/migration_batch_inserter.h" @@ -53,6 +52,7 @@ #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/write_concern_options.h" #include "mongo/platform/atomic_word.h" diff --git a/src/mongo/db/s/migration_destination_manager_commands.cpp b/src/mongo/db/s/migration_destination_manager_commands.cpp index 177693e82b3..ffa5f55f6ae 100644 --- a/src/mongo/db/s/migration_destination_manager_commands.cpp +++ b/src/mongo/db/s/migration_destination_manager_commands.cpp @@ -40,11 +40,6 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/type_chunk.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/s/active_migrations_registry.h" @@ -53,6 +48,11 @@ #include "mongo/db/s/migration_session_id.h" #include "mongo/db/s/start_chunk_clone_request.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/tenant_id.h" #include "mongo/db/topology/sharding_state.h" diff --git a/src/mongo/db/s/migration_destination_manager_test.cpp b/src/mongo/db/s/migration_destination_manager_test.cpp index 4f4946519d0..c0830627715 100644 --- a/src/mongo/db/s/migration_destination_manager_test.cpp +++ b/src/mongo/db/s/migration_destination_manager_test.cpp @@ -34,8 +34,8 @@ #include "mongo/base/error_codes.h" #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsonmisc.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_test_fixture.h" #include "mongo/db/index/index_constants.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_test_fixture.h" #include "mongo/db/s/migration_destination_manager.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/executor/network_test_env.h" diff --git a/src/mongo/db/s/migration_source_manager.cpp b/src/mongo/db/s/migration_source_manager.cpp index db91dc822c8..604029b4479 100644 --- a/src/mongo/db/s/migration_source_manager.cpp +++ b/src/mongo/db/s/migration_source_manager.cpp @@ -49,11 +49,6 @@ #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/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/operation_context.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/read_concern.h" @@ -72,6 +67,11 @@ #include "mongo/db/s/random_migration_testing_utils.h" #include "mongo/db/s/range_deletion_util.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_logging.h" diff --git a/src/mongo/db/s/migration_source_manager.h b/src/mongo/db/s/migration_source_manager.h index b9ba9e1ecf5..2b7ab99a2f1 100644 --- a/src/mongo/db/s/migration_source_manager.h +++ b/src/mongo/db/s/migration_source_manager.h @@ -32,13 +32,13 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/oid.h" #include "mongo/client/connection_string.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/s/migration_chunk_cloner_source.h" #include "mongo/db/s/migration_coordinator.h" #include "mongo/db/s/move_timing_helper.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/db/write_concern_options.h" #include "mongo/s/request_types/move_range_request_gen.h" diff --git a/src/mongo/db/s/migration_util.cpp b/src/mongo/db/s/migration_util.cpp index abeab5f288b..c1f5788c537 100644 --- a/src/mongo/db/s/migration_util.cpp +++ b/src/mongo/db/s/migration_util.cpp @@ -48,13 +48,6 @@ #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/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.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" @@ -67,12 +60,19 @@ #include "mongo/db/s/migration_coordinator.h" #include "mongo/db/s/migration_destination_manager.h" #include "mongo/db/s/migration_source_manager.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_statistics.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/topology/shard_registry.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/executor/network_interface_factory.h" #include "mongo/executor/thread_pool_task_executor.h" diff --git a/src/mongo/db/s/migration_util.h b/src/mongo/db/s/migration_util.h index 3677f956063..6de2ed61103 100644 --- a/src/mongo/db/s/migration_util.h +++ b/src/mongo/db/s/migration_util.h @@ -32,7 +32,6 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/persistent_task_store.h" @@ -43,6 +42,7 @@ #include "mongo/db/s/migration_session_id.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/write_concern_options.h" #include "mongo/executor/thread_pool_task_executor.h" diff --git a/src/mongo/db/s/migration_util_test.cpp b/src/mongo/db/s/migration_util_test.cpp index 2510fbba928..4187b0e9237 100644 --- a/src/mongo/db/s/migration_util_test.cpp +++ b/src/mongo/db/s/migration_util_test.cpp @@ -34,14 +34,14 @@ #include "mongo/bson/bsonmisc.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/logical_time.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/s/range_deletion_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/unittest/unittest.h" #include diff --git a/src/mongo/db/s/query_analysis_op_observer.cpp b/src/mongo/db/s/query_analysis_op_observer.cpp index a1a8a5b6bf6..2207c0d5888 100644 --- a/src/mongo/db/s/query_analysis_op_observer.cpp +++ b/src/mongo/db/s/query_analysis_op_observer.cpp @@ -30,9 +30,9 @@ #include "mongo/db/s/query_analysis_op_observer.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/s/query_analysis_coordinator.h" #include "mongo/db/s/query_analysis_writer.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/idl/idl_parser.h" #include "mongo/s/analyze_shard_key_documents_gen.h" diff --git a/src/mongo/db/s/query_analysis_op_observer.h b/src/mongo/db/s/query_analysis_op_observer.h index 89a0ea5c843..93801c645df 100644 --- a/src/mongo/db/s/query_analysis_op_observer.h +++ b/src/mongo/db/s/query_analysis_op_observer.h @@ -30,13 +30,13 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_noop.h" #include "mongo/db/op_observer/op_observer_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include diff --git a/src/mongo/db/s/query_analysis_op_observer_configsvr.cpp b/src/mongo/db/s/query_analysis_op_observer_configsvr.cpp index 10a70529c5a..2650edae734 100644 --- a/src/mongo/db/s/query_analysis_op_observer_configsvr.cpp +++ b/src/mongo/db/s/query_analysis_op_observer_configsvr.cpp @@ -31,9 +31,9 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/global_catalog/type_mongos.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/s/query_analysis_op_observer.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" diff --git a/src/mongo/db/s/query_analysis_op_observer_configsvr.h b/src/mongo/db/s/query_analysis_op_observer_configsvr.h index 88fb3c47d0e..5b8e5308a27 100644 --- a/src/mongo/db/s/query_analysis_op_observer_configsvr.h +++ b/src/mongo/db/s/query_analysis_op_observer_configsvr.h @@ -30,13 +30,13 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/s/query_analysis_coordinator.h" #include "mongo/db/s/query_analysis_op_observer.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include diff --git a/src/mongo/db/s/query_analysis_op_observer_configsvr_test.cpp b/src/mongo/db/s/query_analysis_op_observer_configsvr_test.cpp index fdae45acb9e..fda4e4a8640 100644 --- a/src/mongo/db/s/query_analysis_op_observer_configsvr_test.cpp +++ b/src/mongo/db/s/query_analysis_op_observer_configsvr_test.cpp @@ -30,11 +30,11 @@ #include "mongo/db/s/query_analysis_op_observer_configsvr.h" #include "mongo/db/global_catalog/type_mongos.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" #include "mongo/db/s/query_analysis_coordinator.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/sharding_environment/config_server_test_fixture.h" #include "mongo/s/analyze_shard_key_documents_gen.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/s/query_analysis_op_observer_rs.h b/src/mongo/db/s/query_analysis_op_observer_rs.h index 0843cf820a1..10cf030dec9 100644 --- a/src/mongo/db/s/query_analysis_op_observer_rs.h +++ b/src/mongo/db/s/query_analysis_op_observer_rs.h @@ -30,12 +30,12 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/s/query_analysis_op_observer.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include diff --git a/src/mongo/db/s/query_analysis_op_observer_shardsvr.h b/src/mongo/db/s/query_analysis_op_observer_shardsvr.h index 045e364c21f..001b6108594 100644 --- a/src/mongo/db/s/query_analysis_op_observer_shardsvr.h +++ b/src/mongo/db/s/query_analysis_op_observer_shardsvr.h @@ -30,13 +30,13 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/s/query_analysis_op_observer.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include diff --git a/src/mongo/db/s/query_analysis_writer.cpp b/src/mongo/db/s/query_analysis_writer.cpp index a5b0f33674d..601f8a72e64 100644 --- a/src/mongo/db/s/query_analysis_writer.cpp +++ b/src/mongo/db/s/query_analysis_writer.cpp @@ -37,12 +37,12 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/client.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/collection_catalog.h" #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" #include "mongo/db/repl/replica_set_aware_service.h" #include "mongo/db/s/analyze_shard_key_util.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" #include "mongo/db/update/document_diff_calculator.h" #include "mongo/executor/network_interface_factory.h" #include "mongo/executor/thread_pool_task_executor.h" diff --git a/src/mongo/db/s/query_analysis_writer_test.cpp b/src/mongo/db/s/query_analysis_writer_test.cpp index 30d5d85ad00..677a6a53f5e 100644 --- a/src/mongo/db/s/query_analysis_writer_test.cpp +++ b/src/mongo/db/s/query_analysis_writer_test.cpp @@ -44,9 +44,9 @@ #include "mongo/crypto/fle_field_schema_gen.h" #include "mongo/db/client.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/collection_catalog.h" #include "mongo/db/query/find_command.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/update/document_diff_calculator.h" #include "mongo/idl/idl_parser.h" diff --git a/src/mongo/db/s/random_migration_testing_utils.h b/src/mongo/db/s/random_migration_testing_utils.h index bd5392a64c0..16402037e72 100644 --- a/src/mongo/db/s/random_migration_testing_utils.h +++ b/src/mongo/db/s/random_migration_testing_utils.h @@ -30,8 +30,8 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/s/range_deleter_service.cpp b/src/mongo/db/s/range_deleter_service.cpp index 1690511e047..1275449837e 100644 --- a/src/mongo/db/s/range_deleter_service.cpp +++ b/src/mongo/db/s/range_deleter_service.cpp @@ -40,11 +40,6 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_registry.h" @@ -53,6 +48,11 @@ #include "mongo/db/s/range_deleter_service_op_observer.h" #include "mongo/db/s/range_deletion.h" #include "mongo/db/s/range_deletion_util.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/sharding_runtime_d_params_gen.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/executor/network_interface_factory.h" diff --git a/src/mongo/db/s/range_deleter_service.h b/src/mongo/db/s/range_deleter_service.h index 53979572ec9..0e43da0f6ad 100644 --- a/src/mongo/db/s/range_deleter_service.h +++ b/src/mongo/db/s/range_deleter_service.h @@ -32,13 +32,13 @@ #include "mongo/base/status.h" #include "mongo/bson/bsonobj.h" #include "mongo/db/global_catalog/type_chunk.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/replica_set_aware_service.h" #include "mongo/db/s/range_deletion_task_tracker.h" #include "mongo/db/s/ready_range_deletions_processor.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/db/sharding_environment/sharding_runtime_d_params_gen.h" #include "mongo/executor/network_interface_factory.h" #include "mongo/executor/network_interface_thread_pool.h" diff --git a/src/mongo/db/s/range_deleter_service_op_observer.cpp b/src/mongo/db/s/range_deleter_service_op_observer.cpp index d2c8b1208e8..75225c8447a 100644 --- a/src/mongo/db/s/range_deleter_service_op_observer.cpp +++ b/src/mongo/db/s/range_deleter_service_op_observer.cpp @@ -36,15 +36,15 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/type_chunk.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/client_cursor/cursor_manager.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/s/range_deleter_service.h" #include "mongo/db/s/range_deletion_task_gen.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/update/update_oplog_entry_serialization.h" #include "mongo/idl/idl_parser.h" diff --git a/src/mongo/db/s/range_deleter_service_op_observer.h b/src/mongo/db/s/range_deleter_service_op_observer.h index 572b448b5a4..84bcba8e5bd 100644 --- a/src/mongo/db/s/range_deleter_service_op_observer.h +++ b/src/mongo/db/s/range_deleter_service_op_observer.h @@ -29,12 +29,12 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_noop.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/s/range_deleter_service_test.cpp b/src/mongo/db/s/range_deleter_service_test.cpp index d0036877591..35f848157d2 100644 --- a/src/mongo/db/s/range_deleter_service_test.cpp +++ b/src/mongo/db/s/range_deleter_service_test.cpp @@ -37,17 +37,17 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/type_collection_common_types_gen.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/repl/wait_for_majority_service.h" #include "mongo/db/s/range_deleter_service_test.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/sharding_runtime_d_params_gen.h" #include "mongo/db/versioning_protocol/chunk_version.h" diff --git a/src/mongo/db/s/range_deleter_service_test_util.cpp b/src/mongo/db/s/range_deleter_service_test_util.cpp index 4d78bf65020..d71877a87a6 100644 --- a/src/mongo/db/s/range_deleter_service_test_util.cpp +++ b/src/mongo/db/s/range_deleter_service_test_util.cpp @@ -36,15 +36,15 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/s/range_deleter_service.h" #include "mongo/db/s/range_deleter_service_test.h" #include "mongo/db/s/range_deletion_task_gen.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/s/range_deletion_util.cpp b/src/mongo/db/s/range_deletion_util.cpp index 085a37f59b9..f7c21e74a83 100644 --- a/src/mongo/db/s/range_deletion_util.cpp +++ b/src/mongo/db/s/range_deletion_util.cpp @@ -42,10 +42,6 @@ #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/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/query/explain_options.h" @@ -58,6 +54,10 @@ #include "mongo/db/s/balancer_stats_registry.h" #include "mongo/db/s/range_deleter_service.h" #include "mongo/db/s/range_deletion_task_gen.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/sharding_runtime_d_params_gen.h" #include "mongo/db/sharding_environment/sharding_statistics.h" #include "mongo/db/storage/exceptions.h" diff --git a/src/mongo/db/s/range_deletion_util_test.cpp b/src/mongo/db/s/range_deletion_util_test.cpp index 169dae2b336..2f25fbd1924 100644 --- a/src/mongo/db/s/range_deletion_util_test.cpp +++ b/src/mongo/db/s/range_deletion_util_test.cpp @@ -37,12 +37,6 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/type_collection_common_types_gen.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/logical_time.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/query/collation/collator_interface.h" @@ -51,9 +45,15 @@ #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/repl/wait_for_majority_service.h" #include "mongo/db/s/range_deletion_task_gen.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/executor/thread_pool_task_executor.h" diff --git a/src/mongo/db/s/ready_range_deletions_processor.cpp b/src/mongo/db/s/ready_range_deletions_processor.cpp index aa1f04b05b9..401b463e1b4 100644 --- a/src/mongo/db/s/ready_range_deletions_processor.cpp +++ b/src/mongo/db/s/ready_range_deletions_processor.cpp @@ -29,12 +29,12 @@ #include "mongo/db/s/ready_range_deletions_processor.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/repl/wait_for_majority_service.h" #include "mongo/db/s/range_deleter_service.h" #include "mongo/db/s/range_deletion_util.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/sharding_environment/sharding_runtime_d_params_gen.h" #include "mongo/logv2/log.h" #include "mongo/util/concurrency/idle_thread_block.h" diff --git a/src/mongo/db/global_catalog/ddl/remove_tags.idl b/src/mongo/db/s/remove_tags.idl similarity index 100% rename from src/mongo/db/global_catalog/ddl/remove_tags.idl rename to src/mongo/db/s/remove_tags.idl diff --git a/src/mongo/db/s/resharding/reshard_collection_coordinator.cpp b/src/mongo/db/s/resharding/reshard_collection_coordinator.cpp index 01ef3e77219..7964409bb47 100644 --- a/src/mongo/db/s/resharding/reshard_collection_coordinator.cpp +++ b/src/mongo/db/s/resharding/reshard_collection_coordinator.cpp @@ -39,24 +39,24 @@ #include "mongo/db/database_name.h" #include "mongo/db/feature_flag.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/sharding_util.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/optime.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/s/forwardable_operation_metadata.h" #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/s/resharding/resharding_change_streams_monitor_test.cpp b/src/mongo/db/s/resharding/resharding_change_streams_monitor_test.cpp index 8b71c84e526..811af7934fd 100644 --- a/src/mongo/db/s/resharding/resharding_change_streams_monitor_test.cpp +++ b/src/mongo/db/s/resharding/resharding_change_streams_monitor_test.cpp @@ -33,10 +33,6 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_catalog/sharding_catalog_client_mock.h" #include "mongo/db/global_settings.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" #include "mongo/db/logical_time.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/document_source_change_stream.h" @@ -47,6 +43,10 @@ #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/service_context_test_fixture.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/transaction/transaction_participant.h" #include "mongo/executor/network_interface_mock.h" diff --git a/src/mongo/db/s/resharding/resharding_collection_cloner.cpp b/src/mongo/db/s/resharding/resharding_collection_cloner.cpp index fe4691cc1cc..9e6646cf39e 100644 --- a/src/mongo/db/s/resharding/resharding_collection_cloner.cpp +++ b/src/mongo/db/s/resharding/resharding_collection_cloner.cpp @@ -43,18 +43,15 @@ #include "mongo/db/exec/document_value/value_comparator.h" #include "mongo/db/feature_flag.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role_loop.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/pipeline/pipeline_factory.h" #include "mongo/db/query/getmore_command_gen.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/read_concern_level.h" +#include "mongo/db/router_role/router_role.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/s/resharding/document_source_resharding_ownership_match.h" #include "mongo/db/s/resharding/resharding_clone_fetcher.h" #include "mongo/db/s/resharding/resharding_data_copy_util.h" @@ -65,6 +62,9 @@ #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id_helpers.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_role_loop.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/db/versioning_protocol/shard_version.h" diff --git a/src/mongo/db/s/resharding/resharding_collection_cloner.h b/src/mongo/db/s/resharding/resharding_collection_cloner.h index 4a842bc44a5..0bbd9e62c81 100644 --- a/src/mongo/db/s/resharding/resharding_collection_cloner.h +++ b/src/mongo/db/s/resharding/resharding_collection_cloner.h @@ -34,13 +34,13 @@ #include "mongo/db/cancelable_operation_context.h" #include "mongo/db/exec/document_value/value.h" #include "mongo/db/global_catalog/shard_key_pattern.h" -#include "mongo/db/local_catalog/collection_catalog.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/pipeline.h" #include "mongo/db/pipeline/process_interface/mongo_process_interface.h" #include "mongo/db/pipeline/sharded_agg_helpers.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/executor/task_executor.h" #include "mongo/util/cancellation.h" diff --git a/src/mongo/db/s/resharding/resharding_collection_cloner_test.cpp b/src/mongo/db/s/resharding/resharding_collection_cloner_test.cpp index 6a88c4be5ff..d7a022ce6a3 100644 --- a/src/mongo/db/s/resharding/resharding_collection_cloner_test.cpp +++ b/src/mongo/db/s/resharding/resharding_collection_cloner_test.cpp @@ -39,22 +39,17 @@ #include "mongo/db/dbhelpers.h" #include "mongo/db/exec/agg/pipeline_builder.h" #include "mongo/db/exec/document_value/document.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_mock.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_collection_common_types_gen.h" #include "mongo/db/hasher.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/document_source.h" #include "mongo/db/pipeline/document_source_mock.h" #include "mongo/db/pipeline/process_interface/stub_mongo_process_interface.h" #include "mongo/db/pipeline/sharded_agg_helpers_targeting_policy.h" #include "mongo/db/query/collation/collator_interface.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_mock.h" #include "mongo/db/s/resharding/recipient_resume_document_gen.h" #include "mongo/db/s/resharding/resharding_data_copy_util.h" #include "mongo/db/s/resharding/resharding_metrics.h" @@ -62,6 +57,11 @@ #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/service_context.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/versioning_protocol/chunk_version.h" diff --git a/src/mongo/db/s/resharding/resharding_coordinator.inl b/src/mongo/db/s/resharding/resharding_coordinator.inl index 532f3275853..3075ddf4bc6 100644 --- a/src/mongo/db/s/resharding/resharding_coordinator.inl +++ b/src/mongo/db/s/resharding/resharding_coordinator.inl @@ -27,12 +27,12 @@ * it in the license file. */ #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/routing_information_cache.h" #include "mongo/db/global_catalog/ddl/drop_collection_if_uuid_not_matching_gen.h" #include "mongo/db/global_catalog/ddl/notify_sharding_event_utils.h" #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/repl/wait_for_majority_service.h" +#include "mongo/db/router_role/router_role.h" +#include "mongo/db/router_role/routing_cache/routing_information_cache.h" #include "mongo/db/s/balancer/balance_stats.h" #include "mongo/db/s/balancer/balancer_policy.h" #include "mongo/db/s/resharding/resharding_coordinator.h" @@ -47,7 +47,7 @@ #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/sharding_environment/sharding_logging.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/otel/traces/telemetry_context_serialization.h" #include "mongo/s/request_types/abort_reshard_collection_gen.h" #include "mongo/s/request_types/commit_reshard_collection_gen.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 1f25471a71f..32daf0589f1 100644 --- a/src/mongo/db/s/resharding/resharding_coordinator_commit_monitor.cpp +++ b/src/mongo/db/s/resharding/resharding_coordinator_commit_monitor.cpp @@ -39,8 +39,8 @@ #include "mongo/db/cancelable_operation_context.h" #include "mongo/db/client.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielder.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" #include "mongo/executor/remote_command_response.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/s/resharding/resharding_coordinator_service_external_state.cpp b/src/mongo/db/s/resharding/resharding_coordinator_service_external_state.cpp index 292c79cab11..0b2c3a23f45 100644 --- a/src/mongo/db/s/resharding/resharding_coordinator_service_external_state.cpp +++ b/src/mongo/db/s/resharding/resharding_coordinator_service_external_state.cpp @@ -30,14 +30,14 @@ #include "mongo/db/s/resharding/resharding_coordinator_service_external_state.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/global_catalog/catalog_cache/routing_information_cache.h" #include "mongo/db/persistent_task_store.h" +#include "mongo/db/router_role/routing_cache/routing_information_cache.h" #include "mongo/db/s/config/initial_split_policy.h" #include "mongo/db/s/resharding/recipient_resume_document_gen.h" #include "mongo/db/s/resharding/resharding_coordinator_service_util.h" #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/server_feature_flags_gen.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/logv2/log.h" #include "mongo/s/resharding/resharding_feature_flag_gen.h" diff --git a/src/mongo/db/s/resharding/resharding_coordinator_service_external_state.h b/src/mongo/db/s/resharding/resharding_coordinator_service_external_state.h index e95435eeed0..bf5a5fb675e 100644 --- a/src/mongo/db/s/resharding/resharding_coordinator_service_external_state.h +++ b/src/mongo/db/s/resharding/resharding_coordinator_service_external_state.h @@ -31,11 +31,11 @@ #include "mongo/db/global_catalog/ddl/sharding_ddl_util.h" #include "mongo/db/global_catalog/type_chunk.h" -#include "mongo/db/local_catalog/shard_role_catalog/flush_routing_table_cache_updates_gen.h" #include "mongo/db/operation_context.h" #include "mongo/db/s/resharding/coordinator_document_gen.h" #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/flush_routing_table_cache_updates_gen.h" #include "mongo/executor/async_rpc.h" #include "mongo/s/resharding/common_types_gen.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/s/resharding/resharding_coordinator_service_test.cpp b/src/mongo/db/s/resharding/resharding_coordinator_service_test.cpp index 11fedd454fc..b2d094c49c1 100644 --- a/src/mongo/db/s/resharding/resharding_coordinator_service_test.cpp +++ b/src/mongo/db/s/resharding/resharding_coordinator_service_test.cpp @@ -42,7 +42,6 @@ #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/global_catalog/type_shard.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/op_observer/op_observer_registry.h" #include "mongo/db/query/find_command.h" #include "mongo/db/repl/member_state.h" @@ -63,6 +62,7 @@ #include "mongo/db/session/logical_session_cache.h" #include "mongo/db/session/logical_session_cache_noop.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/config_server_test_fixture.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/executor/mock_async_rpc.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 f4e688bfcfe..4d898e1804e 100644 --- a/src/mongo/db/s/resharding/resharding_coordinator_service_util.cpp +++ b/src/mongo/db/s/resharding/resharding_coordinator_service_util.cpp @@ -43,8 +43,6 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/feature_flag.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/routing_information_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/drop_collection_if_uuid_not_matching_gen.h" #include "mongo/db/global_catalog/ddl/notify_sharding_event_gen.h" @@ -56,8 +54,6 @@ #include "mongo/db/global_catalog/type_namespace_placement_gen.h" #include "mongo/db/global_catalog/type_tags.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/shard_role_catalog/flush_routing_table_cache_updates_gen.h" #include "mongo/db/logical_time.h" #include "mongo/db/query/collation/collation_spec.h" #include "mongo/db/repl/optime_with.h" @@ -65,6 +61,8 @@ #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/repl/repl_client_info.h" #include "mongo/db/repl/wait_for_majority_service.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/routing_information_cache.h" #include "mongo/db/s/balancer/balance_stats.h" #include "mongo/db/s/balancer/balancer_policy.h" #include "mongo/db/s/resharding/recipient_document_gen.h" @@ -72,12 +70,14 @@ #include "mongo/db/s/resharding/resharding_server_parameters_gen.h" #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/flush_routing_table_cache_updates_gen.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/sharding_environment/sharding_logging.h" #include "mongo/db/topology/shard_registry.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/write_concern_options.h" #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/s/resharding/resharding_coordinator_service_util.h b/src/mongo/db/s/resharding/resharding_coordinator_service_util.h index 386b6ed6960..3d04b430ad2 100644 --- a/src/mongo/db/s/resharding/resharding_coordinator_service_util.h +++ b/src/mongo/db/s/resharding/resharding_coordinator_service_util.h @@ -30,8 +30,8 @@ #pragma once #include "mongo/db/global_catalog/ddl/sharding_ddl_util.h" -#include "mongo/db/local_catalog/shard_role_catalog/flush_routing_table_cache_updates_gen.h" #include "mongo/db/s/resharding/resharding_coordinator_dao.h" +#include "mongo/db/shard_role/shard_catalog/flush_routing_table_cache_updates_gen.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/executor/async_rpc.h" #include "mongo/s/async_requests_sender.h" diff --git a/src/mongo/db/s/resharding/resharding_coordinator_test.cpp b/src/mongo/db/s/resharding/resharding_coordinator_test.cpp index 2859901c4db..c8b73831271 100644 --- a/src/mongo/db/s/resharding/resharding_coordinator_test.cpp +++ b/src/mongo/db/s/resharding/resharding_coordinator_test.cpp @@ -37,8 +37,6 @@ #include "mongo/bson/oid.h" #include "mongo/bson/timestamp.h" #include "mongo/client/dbclient_cursor.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_gen.h" -#include "mongo/db/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_catalog/index_on_config.h" #include "mongo/db/global_catalog/shard_key_pattern.h" @@ -65,6 +63,8 @@ #include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/sharding_environment/config_server_test_fixture.h" #include "mongo/db/sharding_environment/shard_id.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_gen.h" +#include "mongo/db/topology/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/idl/idl_parser.h" #include "mongo/s/resharding/common_types_gen.h" diff --git a/src/mongo/db/s/resharding/resharding_data_copy_util.cpp b/src/mongo/db/s/resharding/resharding_data_copy_util.cpp index 5f3e21fa699..4b5c8f72bf4 100644 --- a/src/mongo/db/s/resharding/resharding_data_copy_util.cpp +++ b/src/mongo/db/s/resharding/resharding_data_copy_util.cpp @@ -37,14 +37,6 @@ #include "mongo/db/curop.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/error_labels.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/rename_collection.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/persistent_task_store.h" @@ -66,6 +58,14 @@ #include "mongo/db/session/logical_session_id_helpers.h" #include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/session/session_txn_record_gen.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/rename_collection.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/transaction/transaction_participant.h" diff --git a/src/mongo/db/s/resharding/resharding_data_copy_util.h b/src/mongo/db/s/resharding/resharding_data_copy_util.h index e9aa1451daf..950e4570368 100644 --- a/src/mongo/db/s/resharding/resharding_data_copy_util.h +++ b/src/mongo/db/s/resharding/resharding_data_copy_util.h @@ -34,7 +34,6 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/document_value/value.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/pipeline.h" @@ -43,6 +42,7 @@ #include "mongo/db/s/resharding/recipient_resume_document_gen.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/s/resharding/common_types_gen.h" #include "mongo/util/assert_util.h" #include "mongo/util/functional.h" diff --git a/src/mongo/db/s/resharding/resharding_data_replication.cpp b/src/mongo/db/s/resharding/resharding_data_replication.cpp index a50fcecd316..bd9d69ccb00 100644 --- a/src/mongo/db/s/resharding/resharding_data_replication.cpp +++ b/src/mongo/db/s/resharding/resharding_data_replication.cpp @@ -38,9 +38,6 @@ #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/document_value/value.h" #include "mongo/db/global_catalog/shard_key_pattern.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/repl/oplog_entry.h" #include "mongo/db/s/resharding/resharding_collection_cloner.h" @@ -53,6 +50,9 @@ #include "mongo/db/s/resharding/resharding_server_parameters_gen.h" #include "mongo/db/s/resharding/resharding_txn_cloner.h" #include "mongo/db/s/resharding/resharding_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/executor/network_interface_factory.h" #include "mongo/executor/thread_pool_task_executor.h" #include "mongo/idl/idl_parser.h" diff --git a/src/mongo/db/s/resharding/resharding_data_replication_test.cpp b/src/mongo/db/s/resharding/resharding_data_replication_test.cpp index 3433e1c007a..99f083d1dc6 100644 --- a/src/mongo/db/s/resharding/resharding_data_replication_test.cpp +++ b/src/mongo/db/s/resharding/resharding_data_replication_test.cpp @@ -43,11 +43,6 @@ #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_collection_common_types_gen.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/query/collation/collator_factory_interface.h" #include "mongo/db/query/collation/collator_factory_mock.h" @@ -64,6 +59,11 @@ #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/db/versioning_protocol/chunk_version.h" diff --git a/src/mongo/db/s/resharding/resharding_destined_recipient_test.cpp b/src/mongo/db/s/resharding/resharding_destined_recipient_test.cpp index d9c99aa9c4a..e17a991c9f5 100644 --- a/src/mongo/db/s/resharding/resharding_destined_recipient_test.cpp +++ b/src/mongo/db/s/resharding/resharding_destined_recipient_test.cpp @@ -43,23 +43,12 @@ #include "mongo/db/curop.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/dbhelpers.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_loader.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_loader_mock.h" -#include "mongo/db/global_catalog/catalog_cache/shard_cannot_refresh_due_to_locks_held_exception.h" -#include "mongo/db/global_catalog/router_role_api/sharding_write_router.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/sharding_catalog_client_mock.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/global_catalog/type_shard.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" @@ -73,9 +62,20 @@ #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/repl/wait_for_majority_service.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_loader.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_loader_mock.h" +#include "mongo/db/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.h" +#include "mongo/db/router_role/sharding_write_router.h" #include "mongo/db/server_options.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/sharding_environment/sharding_mongod_test_fixture.h" diff --git a/src/mongo/db/s/resharding/resharding_donor_oplog_iterator.cpp b/src/mongo/db/s/resharding/resharding_donor_oplog_iterator.cpp index ba1fdc944c3..f437ec2efb0 100644 --- a/src/mongo/db/s/resharding/resharding_donor_oplog_iterator.cpp +++ b/src/mongo/db/s/resharding/resharding_donor_oplog_iterator.cpp @@ -38,7 +38,6 @@ #include "mongo/db/exec/agg/pipeline_builder.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/document_value/value.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/pipeline/document_source_match.h" #include "mongo/db/pipeline/document_source_sort.h" #include "mongo/db/pipeline/expression_context.h" @@ -46,6 +45,7 @@ #include "mongo/db/pipeline/process_interface/mongo_process_interface.h" #include "mongo/db/s/resharding/resharding_server_parameters_gen.h" #include "mongo/db/s/resharding/resharding_util.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/idl/idl_parser.h" #include "mongo/logv2/redaction.h" #include "mongo/platform/atomic_word.h" diff --git a/src/mongo/db/s/resharding/resharding_donor_recipient_common.cpp b/src/mongo/db/s/resharding/resharding_donor_recipient_common.cpp index 523249f4130..0ea374e71ca 100644 --- a/src/mongo/db/s/resharding/resharding_donor_recipient_common.cpp +++ b/src/mongo/db/s/resharding/resharding_donor_recipient_common.cpp @@ -34,25 +34,25 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" #include "mongo/db/client.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/s/resharding/resharding_donor_service.h" #include "mongo/db/s/resharding/resharding_recipient_service.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/storage/duplicate_key_error_info.h" #include "mongo/db/topology/sharding_state.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/executor/task_executor_pool.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/s/resharding/resharding_donor_recipient_common.h b/src/mongo/db/s/resharding/resharding_donor_recipient_common.h index af539a228e9..b77d13de0cb 100644 --- a/src/mongo/db/s/resharding/resharding_donor_recipient_common.h +++ b/src/mongo/db/s/resharding/resharding_donor_recipient_common.h @@ -29,12 +29,12 @@ #pragma once #include "mongo/bson/bsonmisc.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/primary_only_service.h" #include "mongo/db/s/resharding/donor_document_gen.h" #include "mongo/db/s/resharding/recipient_document_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" #include "mongo/s/resharding/type_collection_fields_gen.h" #include "mongo/stdx/unordered_set.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/s/resharding/resharding_donor_recipient_common_test.cpp b/src/mongo/db/s/resharding/resharding_donor_recipient_common_test.cpp index 3692425ab1e..c21d4c06bb0 100644 --- a/src/mongo/db/s/resharding/resharding_donor_recipient_common_test.cpp +++ b/src/mongo/db/s/resharding/resharding_donor_recipient_common_test.cpp @@ -42,10 +42,6 @@ #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/global_catalog/type_collection_common_types_gen.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/drop_database.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/repl/member_state.h" @@ -57,6 +53,10 @@ #include "mongo/db/s/resharding/resharding_donor_service.h" #include "mongo/db/s/resharding/resharding_recipient_service.h" #include "mongo/db/s/resharding/resharding_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/drop_database.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" diff --git a/src/mongo/db/s/resharding/resharding_donor_service.cpp b/src/mongo/db/s/resharding/resharding_donor_service.cpp index b4dccbc0d7e..8b1cec7f2af 100644 --- a/src/mongo/db/s/resharding/resharding_donor_service.cpp +++ b/src/mongo/db/s/resharding/resharding_donor_service.cpp @@ -37,19 +37,9 @@ #include "mongo/db/client.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/feature_flag.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #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/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/query/write_ops/delete.h" @@ -60,6 +50,7 @@ #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/repl_client_info.h" #include "mongo/db/repl/wait_for_majority_service.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/s/resharding/coordinator_document_gen.h" #include "mongo/db/s/resharding/resharding_change_event_o2_field_gen.h" #include "mongo/db/s/resharding/resharding_data_copy_util.h" @@ -70,12 +61,21 @@ #include "mongo/db/server_options.h" #include "mongo/db/session/kill_sessions_local.h" #include "mongo/db/session/session_killer.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/topology/sharding_state.h" -#include "mongo/db/user_write_block/write_block_bypass.h" +#include "mongo/db/topology/user_write_block/write_block_bypass.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/db/versioning_protocol/shard_version.h" #include "mongo/db/write_concern_options.h" diff --git a/src/mongo/db/s/resharding/resharding_donor_service_test.cpp b/src/mongo/db/s/resharding/resharding_donor_service_test.cpp index 110096bc3d3..2525b3e3079 100644 --- a/src/mongo/db/s/resharding/resharding_donor_service_test.cpp +++ b/src/mongo/db/s/resharding/resharding_donor_service_test.cpp @@ -39,8 +39,6 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_catalog/ddl/sharding_recovery_service.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_registry.h" #include "mongo/db/persistent_task_store.h" @@ -56,6 +54,8 @@ #include "mongo/db/s/resharding/resharding_test_util.h" #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/idl/idl_parser.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/s/resharding/resharding_manual_cleanup.cpp b/src/mongo/db/s/resharding/resharding_manual_cleanup.cpp index 4b3c6adf485..1afbe36f768 100644 --- a/src/mongo/db/s/resharding/resharding_manual_cleanup.cpp +++ b/src/mongo/db/s/resharding/resharding_manual_cleanup.cpp @@ -38,18 +38,18 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_collection.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielder.h" #include "mongo/db/repl/read_concern_level.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/s/resharding/resharding_coordinator.h" #include "mongo/db/s/resharding/resharding_data_copy_util.h" #include "mongo/db/s/resharding/resharding_donor_recipient_common.h" #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/resource_yielder.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" diff --git a/src/mongo/db/s/resharding/resharding_metrics_helpers.cpp b/src/mongo/db/s/resharding/resharding_metrics_helpers.cpp index 77a248aae08..e3a3d430961 100644 --- a/src/mongo/db/s/resharding/resharding_metrics_helpers.cpp +++ b/src/mongo/db/s/resharding/resharding_metrics_helpers.cpp @@ -29,14 +29,14 @@ #include "mongo/db/s/resharding/resharding_metrics_helpers.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/s/resharding/resharding_donor_recipient_common.h" #include "mongo/db/s/resharding/resharding_donor_service.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" #include "mongo/db/versioning_protocol/stale_exception.h" #include "mongo/logv2/log.h" #include "mongo/s/resharding/type_collection_fields_gen.h" diff --git a/src/mongo/db/s/resharding/resharding_op_observer.cpp b/src/mongo/db/s/resharding/resharding_op_observer.cpp index 5f48c719bd0..0a1d267fd9e 100644 --- a/src/mongo/db/s/resharding/resharding_op_observer.cpp +++ b/src/mongo/db/s/resharding/resharding_op_observer.cpp @@ -35,12 +35,6 @@ #include "mongo/bson/bsonmisc.h" #include "mongo/bson/bsonobj.h" #include "mongo/db/global_catalog/shard_key_pattern.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/primary_only_service.h" @@ -51,6 +45,12 @@ #include "mongo/db/s/resharding/resharding_coordinator_observer.h" #include "mongo/db/s/resharding/resharding_coordinator_service.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/recovery_unit.h" diff --git a/src/mongo/db/s/resharding/resharding_op_observer.h b/src/mongo/db/s/resharding/resharding_op_observer.h index f6696975e48..3db7eaa609e 100644 --- a/src/mongo/db/s/resharding/resharding_op_observer.h +++ b/src/mongo/db/s/resharding/resharding_op_observer.h @@ -31,12 +31,12 @@ #include "mongo/base/string_data.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_noop.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/storage/durable_history_pin.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/s/resharding/resharding_oplog_application.cpp b/src/mongo/db/s/resharding/resharding_oplog_application.cpp index 8733bce624a..513869ca337 100644 --- a/src/mongo/db/s/resharding/resharding_oplog_application.cpp +++ b/src/mongo/db/s/resharding/resharding_oplog_application.cpp @@ -35,13 +35,6 @@ #include "mongo/db/curop.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/global_catalog/shard_key_pattern.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/batched_write_context.h" #include "mongo/db/query/get_executor.h" @@ -60,6 +53,13 @@ #include "mongo/db/session/logical_session_cache.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/exceptions.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/s/resharding/resharding_oplog_application.h b/src/mongo/db/s/resharding/resharding_oplog_application.h index 795dd074d27..3ab090f9015 100644 --- a/src/mongo/db/s/resharding/resharding_oplog_application.h +++ b/src/mongo/db/s/resharding/resharding_oplog_application.h @@ -33,16 +33,16 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/timestamp.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog_entry.h" #include "mongo/db/repl/optime.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/s/resharding/resharding_oplog_applier_metrics.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/s/resharding/resharding_oplog_applier.h b/src/mongo/db/s/resharding/resharding_oplog_applier.h index 1fa5efb1372..27321938130 100644 --- a/src/mongo/db/s/resharding/resharding_oplog_applier.h +++ b/src/mongo/db/s/resharding/resharding_oplog_applier.h @@ -31,7 +31,6 @@ #include "mongo/db/cancelable_operation_context.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog_entry.h" @@ -45,6 +44,7 @@ #include "mongo/db/s/resharding/resharding_oplog_batch_preparer.h" #include "mongo/db/s/resharding/resharding_oplog_session_application.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/executor/task_executor.h" #include "mongo/s/resharding/common_types_gen.h" diff --git a/src/mongo/db/s/resharding/resharding_oplog_applier_test.cpp b/src/mongo/db/s/resharding/resharding_oplog_applier_test.cpp index 3a080078ad7..d93277d56cc 100644 --- a/src/mongo/db/s/resharding/resharding_oplog_applier_test.cpp +++ b/src/mongo/db/s/resharding/resharding_oplog_applier_test.cpp @@ -44,7 +44,6 @@ #include "mongo/db/client.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/exec/document_value/value.h" -#include "mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_mock.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/sharding_catalog_client_mock.h" #include "mongo/db/global_catalog/type_chunk.h" @@ -52,14 +51,13 @@ #include "mongo/db/global_catalog/type_collection_common_types_gen.h" #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/global_catalog/type_shard.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/repl/oplog_entry_gen.h" #include "mongo/db/repl/optime.h" #include "mongo/db/repl/optime_with.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/read_concern_level.h" +#include "mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_mock.h" #include "mongo/db/s/resharding/donor_oplog_id_gen.h" #include "mongo/db/s/resharding/resharding_donor_oplog_iterator.h" #include "mongo/db/s/resharding/resharding_metrics.h" @@ -70,12 +68,14 @@ #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/sharding_environment/sharding_mongod_test_fixture.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/topology/sharding_state.h" +#include "mongo/db/topology/vector_clock/vector_clock_metadata_hook.h" #include "mongo/db/update/document_diff_serialization.h" #include "mongo/db/update/update_oplog_entry_serialization.h" -#include "mongo/db/vector_clock/vector_clock_metadata_hook.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/executor/network_connection_hook.h" diff --git a/src/mongo/db/s/resharding/resharding_oplog_batch_applier.cpp b/src/mongo/db/s/resharding/resharding_oplog_batch_applier.cpp index 1c777bc2065..82496e4a093 100644 --- a/src/mongo/db/s/resharding/resharding_oplog_batch_applier.cpp +++ b/src/mongo/db/s/resharding/resharding_oplog_batch_applier.cpp @@ -32,8 +32,6 @@ #include "mongo/base/status.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role_loop.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/intent_guard.h" #include "mongo/db/repl/oplog_entry.h" @@ -43,6 +41,8 @@ #include "mongo/db/s/resharding/resharding_oplog_session_application.h" #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/server_feature_flags_gen.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_role_loop.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/db/versioning_protocol/shard_version.h" #include "mongo/db/versioning_protocol/shard_version_factory.h" diff --git a/src/mongo/db/s/resharding/resharding_oplog_batch_applier_test.cpp b/src/mongo/db/s/resharding/resharding_oplog_batch_applier_test.cpp index 4663ccb47b6..5916d133ddc 100644 --- a/src/mongo/db/s/resharding/resharding_oplog_batch_applier_test.cpp +++ b/src/mongo/db/s/resharding/resharding_oplog_batch_applier_test.cpp @@ -46,11 +46,6 @@ #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_collection_common_types_gen.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_impl.h" @@ -88,14 +83,19 @@ #include "mongo/db/session/logical_session_id_gen.h" #include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/session/session_txn_record_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/db/topology/cluster_role.h" +#include "mongo/db/topology/vector_clock/vector_clock_metadata_hook.h" #include "mongo/db/transaction/session_catalog_mongod_transaction_interface_impl.h" #include "mongo/db/transaction/transaction_participant.h" -#include "mongo/db/vector_clock/vector_clock_metadata_hook.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/executor/network_connection_hook.h" diff --git a/src/mongo/db/s/resharding/resharding_oplog_crud_application_test.cpp b/src/mongo/db/s/resharding/resharding_oplog_crud_application_test.cpp index 6b688d49a33..8ccb07cba71 100644 --- a/src/mongo/db/s/resharding/resharding_oplog_crud_application_test.cpp +++ b/src/mongo/db/s/resharding/resharding_oplog_crud_application_test.cpp @@ -39,12 +39,6 @@ #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_collection_common_types_gen.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_impl.h" @@ -79,6 +73,12 @@ #include "mongo/db/session/logical_session_cache.h" #include "mongo/db/session/logical_session_cache_noop.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/timeseries/timeseries_gen.h" diff --git a/src/mongo/db/s/resharding/resharding_oplog_fetcher.cpp b/src/mongo/db/s/resharding/resharding_oplog_fetcher.cpp index ed7832d9c29..6fb20de1f83 100644 --- a/src/mongo/db/s/resharding/resharding_oplog_fetcher.cpp +++ b/src/mongo/db/s/resharding/resharding_oplog_fetcher.cpp @@ -44,18 +44,6 @@ #include "mongo/db/dbhelpers.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/document_value/value.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/logical_time.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/aggregate_command_gen.h" @@ -73,6 +61,18 @@ #include "mongo/db/s/resharding/resharding_oplog_fetcher_progress_gen.h" #include "mongo/db/s/resharding/resharding_server_parameters_gen.h" #include "mongo/db/s/resharding/resharding_util.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/topology/shard_registry.h" diff --git a/src/mongo/db/s/resharding/resharding_oplog_fetcher_test.cpp b/src/mongo/db/s/resharding/resharding_oplog_fetcher_test.cpp index 6925981d237..75c92e09ee2 100644 --- a/src/mongo/db/s/resharding/resharding_oplog_fetcher_test.cpp +++ b/src/mongo/db/s/resharding/resharding_oplog_fetcher_test.cpp @@ -53,13 +53,6 @@ #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/sharding_catalog_client_mock.h" #include "mongo/db/global_catalog/type_shard.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context_for_test.h" @@ -84,6 +77,13 @@ #include "mongo/db/session/logical_session_cache.h" #include "mongo/db/session/logical_session_cache_noop.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/recovery_unit.h" diff --git a/src/mongo/db/s/resharding/resharding_oplog_session_application.cpp b/src/mongo/db/s/resharding/resharding_oplog_session_application.cpp index 8ac3f125b92..e81ecc6683b 100644 --- a/src/mongo/db/s/resharding/resharding_oplog_session_application.cpp +++ b/src/mongo/db/s/resharding/resharding_oplog_session_application.cpp @@ -36,8 +36,6 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/document_value/value.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/oplog_entry.h" @@ -47,6 +45,8 @@ #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_helpers.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/transaction/transaction_participant.h" #include "mongo/idl/idl_parser.h" diff --git a/src/mongo/db/s/resharding/resharding_oplog_session_application_test.cpp b/src/mongo/db/s/resharding/resharding_oplog_session_application_test.cpp index eb28d463ce5..09731dd4175 100644 --- a/src/mongo/db/s/resharding/resharding_oplog_session_application_test.cpp +++ b/src/mongo/db/s/resharding/resharding_oplog_session_application_test.cpp @@ -47,9 +47,6 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/document_value/value.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/repl/member_state.h" @@ -70,6 +67,9 @@ #include "mongo/db/session/logical_session_id_gen.h" #include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/session/session_txn_record_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/s/resharding/resharding_recipient_service.cpp b/src/mongo/db/s/resharding/resharding_recipient_service.cpp index 4c97ca90a23..e07c3ffc67b 100644 --- a/src/mongo/db/s/resharding/resharding_recipient_service.cpp +++ b/src/mongo/db/s/resharding/resharding_recipient_service.cpp @@ -37,7 +37,6 @@ #include "mongo/db/client.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/feature_flag.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/ddl/notify_sharding_event_gen.h" #include "mongo/db/global_catalog/ddl/shard_key_util.h" #include "mongo/db/global_catalog/ddl/sharding_recovery_service.h" @@ -47,13 +46,6 @@ #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/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/list_indexes.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/query/collation/collation_spec.h" #include "mongo/db/query/write_ops/delete.h" @@ -65,6 +57,7 @@ #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/repl_client_info.h" #include "mongo/db/repl/wait_for_majority_service.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/s/migration_destination_manager.h" #include "mongo/db/s/resharding/coordinator_document_gen.h" #include "mongo/db/s/resharding/resharding_change_event_o2_field_gen.h" @@ -78,12 +71,19 @@ #include "mongo/db/s/resharding/resharding_server_parameters_gen.h" #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/list_indexes.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_parameters_gen.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/topology/sharding_state.h" -#include "mongo/db/user_write_block/write_block_bypass.h" +#include "mongo/db/topology/user_write_block/write_block_bypass.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/db/versioning_protocol/shard_version.h" #include "mongo/db/write_concern_options.h" diff --git a/src/mongo/db/s/resharding/resharding_recipient_service_external_state.cpp b/src/mongo/db/s/resharding/resharding_recipient_service_external_state.cpp index d1c510a0052..b505c9c4b5f 100644 --- a/src/mongo/db/s/resharding/resharding_recipient_service_external_state.cpp +++ b/src/mongo/db/s/resharding/resharding_recipient_service_external_state.cpp @@ -31,13 +31,13 @@ #include "mongo/bson/bsonmisc.h" #include "mongo/db/feature_flag.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/s/resharding/resharding_donor_recipient_common.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/topology/sharding_state.h" diff --git a/src/mongo/db/s/resharding/resharding_recipient_service_external_state.h b/src/mongo/db/s/resharding/resharding_recipient_service_external_state.h index f47c0ca2894..2ad80fcc49f 100644 --- a/src/mongo/db/s/resharding/resharding_recipient_service_external_state.h +++ b/src/mongo/db/s/resharding/resharding_recipient_service_external_state.h @@ -32,14 +32,14 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/s/migration_destination_manager.h" #include "mongo/db/s/resharding/resharding_recipient_service.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/s/resharding/common_types_gen.h" #include "mongo/util/functional.h" diff --git a/src/mongo/db/s/resharding/resharding_recipient_service_external_state_test.cpp b/src/mongo/db/s/resharding/resharding_recipient_service_external_state_test.cpp index 2528376d602..e140cfd3d33 100644 --- a/src/mongo/db/s/resharding/resharding_recipient_service_external_state_test.cpp +++ b/src/mongo/db/s/resharding/resharding_recipient_service_external_state_test.cpp @@ -38,22 +38,22 @@ #include "mongo/bson/oid.h" #include "mongo/bson/unordered_fields_bsonobj_comparator.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_test_fixture.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/index/index_constants.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/repl/storage_interface.h" #include "mongo/db/repl/storage_interface_impl.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_test_fixture.h" #include "mongo/db/service_context_d_test_fixture.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" #include "mongo/db/transaction/session_catalog_mongod_transaction_interface_impl.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/db/versioning_protocol/database_version.h" diff --git a/src/mongo/db/s/resharding/resharding_recipient_service_test.cpp b/src/mongo/db/s/resharding/resharding_recipient_service_test.cpp index e165dc5b2b3..c9eb8a16120 100644 --- a/src/mongo/db/s/resharding/resharding_recipient_service_test.cpp +++ b/src/mongo/db/s/resharding/resharding_recipient_service_test.cpp @@ -41,16 +41,11 @@ #include "mongo/client/dbclient_cursor.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/dbhelpers.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_collection_common_types_gen.h" #include "mongo/db/index_builds/index_builds_coordinator_mock.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/lock_manager/locker.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_registry.h" #include "mongo/db/persistent_task_store.h" @@ -63,6 +58,7 @@ #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/repl/storage_interface.h" #include "mongo/db/repl/storage_interface_mock.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/s/migration_destination_manager.h" #include "mongo/db/s/resharding/donor_oplog_id_gen.h" #include "mongo/db/s/resharding/resharding_change_event_o2_field_gen.h" @@ -74,6 +70,10 @@ #include "mongo/db/s/resharding/resharding_service_test_helpers.h" #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/locker.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/sharding_environment/sharding_test_fixture_common.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/db/versioning_protocol/database_version.h" diff --git a/src/mongo/db/s/resharding/resharding_txn_cloner_test.cpp b/src/mongo/db/s/resharding/resharding_txn_cloner_test.cpp index 7e546020feb..5bbca86e084 100644 --- a/src/mongo/db/s/resharding/resharding_txn_cloner_test.cpp +++ b/src/mongo/db/s/resharding/resharding_txn_cloner_test.cpp @@ -48,16 +48,11 @@ #include "mongo/db/client.h" #include "mongo/db/database_name.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_loader.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_loader_mock.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/sharding_catalog_client_mock.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/global_catalog/type_shard.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/pipeline/process_interface/shardsvr_process_interface.h" @@ -75,6 +70,8 @@ #include "mongo/db/repl/storage_interface.h" #include "mongo/db/repl/storage_interface_impl.h" #include "mongo/db/repl/wait_for_majority_service.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_loader.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_loader_mock.h" #include "mongo/db/s/resharding/resharding_txn_cloner_progress_gen.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" @@ -83,6 +80,9 @@ #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/session/session_txn_record_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" @@ -92,8 +92,8 @@ #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/topology/shard_registry.h" +#include "mongo/db/topology/vector_clock/vector_clock_metadata_hook.h" #include "mongo/db/transaction/transaction_participant.h" -#include "mongo/db/vector_clock/vector_clock_metadata_hook.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/executor/network_connection_hook.h" #include "mongo/executor/network_interface_factory.h" diff --git a/src/mongo/db/s/resharding/resharding_util.cpp b/src/mongo/db/s/resharding/resharding_util.cpp index 0397b443697..5573bd53810 100644 --- a/src/mongo/db/s/resharding/resharding_util.cpp +++ b/src/mongo/db/s/resharding/resharding_util.cpp @@ -38,15 +38,12 @@ #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/document_value/value.h" #include "mongo/db/feature_flag.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_tags.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" @@ -57,12 +54,15 @@ #include "mongo/db/repl/oplog_entry_gen.h" #include "mongo/db/repl/optime.h" #include "mongo/db/repl/wait_for_majority_service.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/s/resharding/document_source_resharding_add_resume_id.h" #include "mongo/db/s/resharding/document_source_resharding_iterate_transaction.h" #include "mongo/db/s/resharding/resharding_noop_o2_field_gen.h" #include "mongo/db/s/resharding/resharding_server_parameters_gen.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/topology/shard_registry.h" diff --git a/src/mongo/db/s/resharding/shardsvr_commit_reshard_collection_command.cpp b/src/mongo/db/s/resharding/shardsvr_commit_reshard_collection_command.cpp index 2997029714a..4028fbed6db 100644 --- a/src/mongo/db/s/resharding/shardsvr_commit_reshard_collection_command.cpp +++ b/src/mongo/db/s/resharding/shardsvr_commit_reshard_collection_command.cpp @@ -47,7 +47,7 @@ #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/topology/cluster_role.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/logv2/log.h" #include "mongo/rpc/op_msg.h" #include "mongo/s/request_types/commit_reshard_collection_gen.h" diff --git a/src/mongo/db/s/resharding/shardsvr_reshard_collection_command.cpp b/src/mongo/db/s/resharding/shardsvr_reshard_collection_command.cpp index e77b2247c78..2c5ab854e5d 100644 --- a/src/mongo/db/s/resharding/shardsvr_reshard_collection_command.cpp +++ b/src/mongo/db/s/resharding/shardsvr_reshard_collection_command.cpp @@ -33,7 +33,6 @@ #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/resource_pattern.h" -#include "mongo/db/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/commands.h" #include "mongo/db/commands/feature_compatibility_version.h" #include "mongo/db/database_name.h" @@ -47,6 +46,7 @@ #include "mongo/db/s/resharding/reshard_collection_coordinator_document_gen.h" #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/service_context.h" +#include "mongo/db/topology/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/rpc/op_msg.h" #include "mongo/s/resharding/resharding_feature_flag_gen.h" diff --git a/src/mongo/db/s/resharding_test_commands.cpp b/src/mongo/db/s/resharding_test_commands.cpp index cb4225824ad..c49cf4da301 100644 --- a/src/mongo/db/s/resharding_test_commands.cpp +++ b/src/mongo/db/s/resharding_test_commands.cpp @@ -44,7 +44,7 @@ #include "mongo/db/s/resharding_test_commands_gen.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/grid.h" -#include "mongo/db/vector_clock/vector_clock_metadata_hook.h" +#include "mongo/db/topology/vector_clock/vector_clock_metadata_hook.h" #include "mongo/executor/network_connection_hook.h" #include "mongo/executor/network_interface_factory.h" #include "mongo/executor/thread_pool_task_executor.h" diff --git a/src/mongo/db/s/session_catalog_migration_destination.cpp b/src/mongo/db/s/session_catalog_migration_destination.cpp index 87c2249e0bc..65fbcf24ac0 100644 --- a/src/mongo/db/s/session_catalog_migration_destination.cpp +++ b/src/mongo/db/s/session_catalog_migration_destination.cpp @@ -39,9 +39,6 @@ #include "mongo/client/read_preference.h" #include "mongo/db/cancelable_operation_context.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/write_ops_retryability.h" #include "mongo/db/repl/oplog.h" @@ -56,6 +53,9 @@ #include "mongo/db/session/logical_session_id_helpers.h" #include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/session/session_txn_record_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" diff --git a/src/mongo/db/s/session_catalog_migration_destination_test.cpp b/src/mongo/db/s/session_catalog_migration_destination_test.cpp index 1ef5587ba6c..ebb1017841e 100644 --- a/src/mongo/db/s/session_catalog_migration_destination_test.cpp +++ b/src/mongo/db/s/session_catalog_migration_destination_test.cpp @@ -45,12 +45,6 @@ #include "mongo/db/global_catalog/sharding_catalog_client_mock.h" #include "mongo/db/global_catalog/type_shard.h" #include "mongo/db/initialize_operation_session_info.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/write_ops_exec.h" #include "mongo/db/query/write_ops/write_ops_gen.h" @@ -68,6 +62,12 @@ #include "mongo/db/session/logical_session_cache_noop.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/s/session_catalog_migration_source.cpp b/src/mongo/db/s/session_catalog_migration_source.cpp index 7b56c8f3786..994f16da52d 100644 --- a/src/mongo/db/s/session_catalog_migration_source.cpp +++ b/src/mongo/db/s/session_catalog_migration_source.cpp @@ -41,10 +41,6 @@ #include "mongo/db/exec/document_value/value.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/global_catalog/type_chunk.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/query/find_command.h" @@ -62,6 +58,10 @@ #include "mongo/db/session/logical_session_id_gen.h" #include "mongo/db/session/logical_session_id_helpers.h" #include "mongo/db/session/session_txn_record_gen.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/transaction/transaction_history_iterator.h" diff --git a/src/mongo/db/s/shardsvr_abort_reshard_collection_command.cpp b/src/mongo/db/s/shardsvr_abort_reshard_collection_command.cpp index c768c0d46f7..03d949bb10f 100644 --- a/src/mongo/db/s/shardsvr_abort_reshard_collection_command.cpp +++ b/src/mongo/db/s/shardsvr_abort_reshard_collection_command.cpp @@ -47,7 +47,7 @@ #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/topology/cluster_role.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/logv2/log.h" #include "mongo/rpc/op_msg.h" #include "mongo/s/request_types/abort_reshard_collection_gen.h" diff --git a/src/mongo/db/s/shardsvr_get_stats_for_balancing_command.cpp b/src/mongo/db/s/shardsvr_get_stats_for_balancing_command.cpp index c5b24b05fbd..ac088f7dace 100644 --- a/src/mongo/db/s/shardsvr_get_stats_for_balancing_command.cpp +++ b/src/mongo/db/s/shardsvr_get_stats_for_balancing_command.cpp @@ -33,13 +33,13 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/profile_settings.h" #include "mongo/db/s/balancer_stats_registry.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/topology/sharding_state.h" #include "mongo/rpc/op_msg.h" #include "mongo/s/request_types/get_stats_for_balancing_gen.h" diff --git a/src/mongo/db/s/shardsvr_move_range_command.cpp b/src/mongo/db/s/shardsvr_move_range_command.cpp index d9a12b027d0..4e8f6d5ff4a 100644 --- a/src/mongo/db/s/shardsvr_move_range_command.cpp +++ b/src/mongo/db/s/shardsvr_move_range_command.cpp @@ -39,8 +39,6 @@ #include "mongo/db/database_name.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_util.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/member_state.h" @@ -49,6 +47,8 @@ #include "mongo/db/s/active_migrations_registry.h" #include "mongo/db/s/migration_source_manager.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" diff --git a/src/mongo/db/s/shardsvr_reshard_recipient_clone_cmd.cpp b/src/mongo/db/s/shardsvr_reshard_recipient_clone_cmd.cpp index 5da5fac4262..743d9a875d0 100644 --- a/src/mongo/db/s/shardsvr_reshard_recipient_clone_cmd.cpp +++ b/src/mongo/db/s/shardsvr_reshard_recipient_clone_cmd.cpp @@ -35,7 +35,6 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/s/resharding/resharding_donor_recipient_common.h" @@ -43,6 +42,7 @@ #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/logv2/log.h" #include "mongo/logv2/log_attr.h" diff --git a/src/mongo/db/s/shardsvr_resolve_view_command_test.cpp b/src/mongo/db/s/shardsvr_resolve_view_command_test.cpp index 49ff6a0b763..59cc61cedb0 100644 --- a/src/mongo/db/s/shardsvr_resolve_view_command_test.cpp +++ b/src/mongo/db/s/shardsvr_resolve_view_command_test.cpp @@ -32,9 +32,9 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/commands/shardsvr_resolve_view_command_gen.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state_mock.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state_mock.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/s/split_vector.cpp b/src/mongo/db/s/split_vector.cpp index 8870f53ddad..cbdd0f22354 100644 --- a/src/mongo/db/s/split_vector.cpp +++ b/src/mongo/db/s/split_vector.cpp @@ -36,13 +36,13 @@ #include "mongo/db/dbhelpers.h" #include "mongo/db/global_catalog/ddl/shard_key_index_util.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/internal_plans.h" #include "mongo/db/query/plan_executor.h" #include "mongo/db/query/plan_yield_policy.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" #include "mongo/util/duration.h" diff --git a/src/mongo/db/s/split_vector.h b/src/mongo/db/s/split_vector.h index ab756deae1d..89b846d49ed 100644 --- a/src/mongo/db/s/split_vector.h +++ b/src/mongo/db/s/split_vector.h @@ -30,7 +30,7 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/s/split_vector_command.cpp b/src/mongo/db/s/split_vector_command.cpp index 0a19a6a4455..64e5ba10975 100644 --- a/src/mongo/db/s/split_vector_command.cpp +++ b/src/mongo/db/s/split_vector_command.cpp @@ -38,11 +38,11 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.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" diff --git a/src/mongo/db/s/split_vector_test.cpp b/src/mongo/db/s/split_vector_test.cpp index 72f003f8c27..9250254b91c 100644 --- a/src/mongo/db/s/split_vector_test.cpp +++ b/src/mongo/db/s/split_vector_test.cpp @@ -36,14 +36,14 @@ #include "mongo/bson/util/builder.h" #include "mongo/bson/util/builder_fwd.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/s/transaction_coordinator.cpp b/src/mongo/db/s/transaction_coordinator.cpp index 252d61f612c..c5936424c8f 100644 --- a/src/mongo/db/s/transaction_coordinator.cpp +++ b/src/mongo/db/s/transaction_coordinator.cpp @@ -47,7 +47,7 @@ #include "mongo/db/s/transaction_coordinator_util.h" #include "mongo/db/server_options.h" #include "mongo/db/sharding_environment/grid.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/executor/task_executor_pool.h" #include "mongo/logv2/attribute_storage.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/s/transaction_coordinator_util.cpp b/src/mongo/db/s/transaction_coordinator_util.cpp index d4f15bbf858..65bc6cfb180 100644 --- a/src/mongo/db/s/transaction_coordinator_util.cpp +++ b/src/mongo/db/s/transaction_coordinator_util.cpp @@ -46,7 +46,6 @@ #include "mongo/db/database_name.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/query/collation/collator_factory_interface.h" #include "mongo/db/query/find_command.h" #include "mongo/db/query/write_ops/write_ops_gen.h" @@ -58,6 +57,7 @@ #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" #include "mongo/db/session/logical_session_id_helpers.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/write_concern_options.h" #include "mongo/executor/task_executor.h" #include "mongo/idl/idl_parser.h" diff --git a/src/mongo/db/s/txn_two_phase_commit_cmds.cpp b/src/mongo/db/s/txn_two_phase_commit_cmds.cpp index 0e05503a4f5..dbddba607d1 100644 --- a/src/mongo/db/s/txn_two_phase_commit_cmds.cpp +++ b/src/mongo/db/s/txn_two_phase_commit_cmds.cpp @@ -41,8 +41,6 @@ #include "mongo/db/commands/test_commands_enabled.h" #include "mongo/db/commands/txn_two_phase_commit_cmds_gen.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/uncommitted_catalog_updates.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/optime.h" @@ -57,6 +55,8 @@ #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/shard_catalog/uncommitted_catalog_updates.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/storage/recovery_unit.h" diff --git a/src/mongo/db/scoped_read_concern.cpp b/src/mongo/db/scoped_read_concern.cpp index e520cda8057..70886db291b 100644 --- a/src/mongo/db/scoped_read_concern.cpp +++ b/src/mongo/db/scoped_read_concern.cpp @@ -29,9 +29,9 @@ #include "mongo/db/scoped_read_concern.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/read_concern_args.h" +#include "mongo/db/shard_role/transaction_resources.h" namespace mongo { diff --git a/src/mongo/db/service_context_d_test_fixture.cpp b/src/mongo/db/service_context_d_test_fixture.cpp index 3b6dea1939c..1572bd7bae0 100644 --- a/src/mongo/db/service_context_d_test_fixture.cpp +++ b/src/mongo/db/service_context_d_test_fixture.cpp @@ -33,21 +33,21 @@ #include "mongo/db/global_settings.h" #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/index_builds/index_builds_coordinator_mongod.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog_helper.h" -#include "mongo/db/local_catalog/collection_impl.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/database_holder_impl.h" -#include "mongo/db/local_catalog/ddl/replica_set_ddl_tracker.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state_factory_shard.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_mock.h" #include "mongo/db/repl/repl_settings.h" #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/service_context.h" #include "mongo/db/service_entry_point_shard_role.h" +#include "mongo/db/shard_role/ddl/replica_set_ddl_tracker.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/collection_impl.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state_factory_shard.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/database_holder_impl.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state_factory_mock.h" #include "mongo/db/storage/control/storage_control.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/db/storage/storage_options.h" diff --git a/src/mongo/db/service_entry_point_rs_endpoint.cpp b/src/mongo/db/service_entry_point_rs_endpoint.cpp index 15fb84ba383..97bccc5f1c0 100644 --- a/src/mongo/db/service_entry_point_rs_endpoint.cpp +++ b/src/mongo/db/service_entry_point_rs_endpoint.cpp @@ -38,11 +38,6 @@ #include "mongo/db/commands.h" #include "mongo/db/commands/fsync.h" #include "mongo/db/curop.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/shard_cannot_refresh_due_to_locks_held_exception.h" -#include "mongo/db/global_catalog/router_role_api/gossiped_routing_cache_gen.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/read_concern.h" @@ -53,9 +48,14 @@ #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/repl/speculative_majority_read_info.h" #include "mongo/db/replica_set_endpoint_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/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.h" #include "mongo/db/s/resharding/resharding_metrics_helpers.h" #include "mongo/db/server_options.h" #include "mongo/db/service_entry_point_shard_role.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/topology/cluster_role.h" diff --git a/src/mongo/db/service_entry_point_shard_role.cpp b/src/mongo/db/service_entry_point_shard_role.cpp index deebb13a0ef..a932ddcf58e 100644 --- a/src/mongo/db/service_entry_point_shard_role.cpp +++ b/src/mongo/db/service_entry_point_shard_role.cpp @@ -49,7 +49,6 @@ #include "mongo/db/auth/security_token_authentication_guard.h" #include "mongo/db/auth/validated_tenancy_scope.h" #include "mongo/db/client.h" -#include "mongo/db/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/command_can_run_here.h" #include "mongo/db/commands.h" #include "mongo/db/commands/fsync.h" @@ -64,12 +63,6 @@ #include "mongo/db/feature_flag.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/initialize_operation_session_info.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role_loop.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" #include "mongo/db/not_primary_error_tracker.h" @@ -98,6 +91,12 @@ #include "mongo/db/session/logical_session_id_gen.h" #include "mongo/db/session/session_catalog.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_role_loop.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/sharding_initialization_waiter.h" #include "mongo/db/sharding_environment/sharding_statistics.h" @@ -107,12 +106,13 @@ #include "mongo/db/stats/server_read_concern_metrics.h" #include "mongo/db/stats/top.h" #include "mongo/db/tenant_id.h" +#include "mongo/db/topology/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/topology/sharding_state.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/transaction/transaction_participant.h" #include "mongo/db/transaction_validation.h" #include "mongo/db/validate_api_parameters.h" -#include "mongo/db/vector_clock/vector_clock.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/db/versioning_protocol/shard_version.h" #include "mongo/db/write_concern.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 074d66a2607..69083ecdf09 100644 --- a/src/mongo/db/service_entry_point_shard_role_helpers.cpp +++ b/src/mongo/db/service_entry_point_shard_role_helpers.cpp @@ -29,8 +29,8 @@ #include "mongo/db/service_entry_point_shard_role_helpers.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/router_role_api/gossiped_routing_cache_gen.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" diff --git a/src/mongo/db/service_entry_point_shard_role_helpers.h b/src/mongo/db/service_entry_point_shard_role_helpers.h index 583ad62b732..552caee479e 100644 --- a/src/mongo/db/service_entry_point_shard_role_helpers.h +++ b/src/mongo/db/service_entry_point_shard_role_helpers.h @@ -35,7 +35,6 @@ #include "mongo/db/client.h" #include "mongo/db/commands.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/read_concern.h" #include "mongo/db/repl/optime.h" @@ -43,6 +42,7 @@ #include "mongo/db/repl/repl_client_info.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/repl/speculative_majority_read_info.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/write_concern.h" #include "mongo/idl/generic_argument_gen.h" diff --git a/src/mongo/db/session/BUILD.bazel b/src/mongo/db/session/BUILD.bazel index a462e96316b..bb4d21b2669 100644 --- a/src/mongo/db/session/BUILD.bazel +++ b/src/mongo/db/session/BUILD.bazel @@ -145,7 +145,7 @@ mongo_cc_library( ":logical_session_id_helpers", # TODO(SERVER-93876): Remove. "//src/mongo/db:internal_transactions_feature_flag", # TODO(SERVER-93876): Remove. "//src/mongo/db:service_context", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/util/concurrency:spin_lock", # TODO(SERVER-93876): Remove. ], ) @@ -202,8 +202,8 @@ mongo_cc_library( "//src/mongo/client:authentication", "//src/mongo/client:remote_command_targeter", "//src/mongo/db:dbdirectclient", - "//src/mongo/db/local_catalog/lock_manager", "//src/mongo/db/repl:repl_coordinator_interface", + "//src/mongo/db/shard_role/lock_manager", ], ) @@ -263,11 +263,11 @@ mongo_cc_library( "//src/mongo/db:shard_role", "//src/mongo/db/commands:mongod_fcv", "//src/mongo/db/index_builds:index_builds_coordinator", - "//src/mongo/db/local_catalog:collection_options", "//src/mongo/db/repl:repl_coordinator_interface", "//src/mongo/db/repl:repl_server_parameters", "//src/mongo/db/repl:replica_set_aware_service", "//src/mongo/db/repl:storage_interface", + "//src/mongo/db/shard_role/shard_catalog:collection_options", "//src/mongo/util/concurrency:thread_pool", ], ) diff --git a/src/mongo/db/session/logical_session_cache_impl.cpp b/src/mongo/db/session/logical_session_cache_impl.cpp index c820d6e755a..272ed2f7b31 100644 --- a/src/mongo/db/session/logical_session_cache_impl.cpp +++ b/src/mongo/db/session/logical_session_cache_impl.cpp @@ -31,7 +31,6 @@ #include "mongo/db/session/logical_session_cache_impl.h" #include "mongo/base/error_codes.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/repl_settings.h" @@ -42,6 +41,7 @@ #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_helpers.h" #include "mongo/db/session/session_killer.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/storage/storage_options.h" #include "mongo/logv2/log.h" #include "mongo/logv2/log_severity_suppressor.h" diff --git a/src/mongo/db/session/session_catalog.cpp b/src/mongo/db/session/session_catalog.cpp index f3bc7326146..54876b86338 100644 --- a/src/mongo/db/session/session_catalog.cpp +++ b/src/mongo/db/session/session_catalog.cpp @@ -30,9 +30,9 @@ #include "mongo/db/session/session_catalog.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id_helpers.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/logv2/log.h" #include "mongo/platform/compiler.h" #include "mongo/stdx/unordered_map.h" diff --git a/src/mongo/db/session/session_catalog_mongod.cpp b/src/mongo/db/session/session_catalog_mongod.cpp index 2409cd4169f..39f21947f5e 100644 --- a/src/mongo/db/session/session_catalog_mongod.cpp +++ b/src/mongo/db/session/session_catalog_mongod.cpp @@ -47,15 +47,6 @@ #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/index_builds/index_builds_manager.h" #include "mongo/db/internal_transactions_feature_flag_gen.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/ddl/create_indexes_gen.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/find_command.h" @@ -71,6 +62,15 @@ #include "mongo/db/session/session_killer.h" #include "mongo/db/session/session_txn_record_gen.h" #include "mongo/db/session/sessions_collection.h" +#include "mongo/db/shard_role/ddl/create_indexes_gen.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/transaction/transaction_participant.h" #include "mongo/idl/idl_parser.h" diff --git a/src/mongo/db/session/sessions_collection.cpp b/src/mongo/db/session/sessions_collection.cpp index 361e4c367d0..7c8d550c088 100644 --- a/src/mongo/db/session/sessions_collection.cpp +++ b/src/mongo/db/session/sessions_collection.cpp @@ -34,11 +34,11 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/util/builder.h" #include "mongo/client/dbclient_base.h" -#include "mongo/db/local_catalog/ddl/create_indexes_gen.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/session/logical_session_cache_gen.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/sessions_server_parameters_gen.h" +#include "mongo/db/shard_role/ddl/create_indexes_gen.h" #include "mongo/db/write_concern_options.h" #include "mongo/idl/idl_parser.h" #include "mongo/rpc/get_status_from_command_result_write_util.h" diff --git a/src/mongo/db/session/sessions_collection_rs.cpp b/src/mongo/db/session/sessions_collection_rs.cpp index 1d7bf4e59a2..3ed94f3cc09 100644 --- a/src/mongo/db/session/sessions_collection_rs.cpp +++ b/src/mongo/db/session/sessions_collection_rs.cpp @@ -40,13 +40,13 @@ #include "mongo/client/remote_command_targeter_factory_impl.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/repl_set_config.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/rpc/get_status_from_command_result.h" #include "mongo/util/assert_util.h" #include "mongo/util/net/hostandport.h" diff --git a/src/mongo/db/local_catalog/shard_role_api/BUILD.bazel b/src/mongo/db/shard_role/BUILD.bazel similarity index 100% rename from src/mongo/db/local_catalog/shard_role_api/BUILD.bazel rename to src/mongo/db/shard_role/BUILD.bazel diff --git a/src/mongo/db/local_catalog/lock_manager/OWNERS.yml b/src/mongo/db/shard_role/OWNERS.yml similarity index 100% rename from src/mongo/db/local_catalog/lock_manager/OWNERS.yml rename to src/mongo/db/shard_role/OWNERS.yml diff --git a/src/mongo/db/local_catalog/shard_role_api/README_shard_role_api.md b/src/mongo/db/shard_role/README_shard_role_api.md similarity index 99% rename from src/mongo/db/local_catalog/shard_role_api/README_shard_role_api.md rename to src/mongo/db/shard_role/README_shard_role_api.md index 16de46b6b03..08538e5a354 100644 --- a/src/mongo/db/local_catalog/shard_role_api/README_shard_role_api.md +++ b/src/mongo/db/shard_role/README_shard_role_api.md @@ -224,7 +224,7 @@ The Shard Role Loop helper provides automatic retry logic for shard role operati Use `withStaleShardRetry` to automatically handle stale metadata errors: ```cpp -#include "mongo/db/local_catalog/shard_role_api/shard_role_loop.h" +#include "mongo/db/shard_role/shard_role_loop.h" auto result = shard_role_loop::withStaleShardRetry(opCtx, [&]() { CollectionAcquisition coll = acquireCollection(opCtx, request, MODE_IS); diff --git a/src/mongo/db/local_catalog/shard_role_api/collection_acquisition_bm.cpp b/src/mongo/db/shard_role/collection_acquisition_bm.cpp similarity index 99% rename from src/mongo/db/local_catalog/shard_role_api/collection_acquisition_bm.cpp rename to src/mongo/db/shard_role/collection_acquisition_bm.cpp index dc48725fb6c..1454fc7b914 100644 --- a/src/mongo/db/local_catalog/shard_role_api/collection_acquisition_bm.cpp +++ b/src/mongo/db/shard_role/collection_acquisition_bm.cpp @@ -28,9 +28,9 @@ */ #include "mongo/base/init.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/logv2/log.h" #include "mongo/logv2/log_domain_global.h" #include "mongo/stdx/mutex.h" diff --git a/src/mongo/db/local_catalog/ddl/BUILD.bazel b/src/mongo/db/shard_role/ddl/BUILD.bazel similarity index 93% rename from src/mongo/db/local_catalog/ddl/BUILD.bazel rename to src/mongo/db/shard_role/ddl/BUILD.bazel index 38b2398b285..1514d98d233 100644 --- a/src/mongo/db/local_catalog/ddl/BUILD.bazel +++ b/src/mongo/db/shard_role/ddl/BUILD.bazel @@ -16,8 +16,8 @@ idl_generator( "//src/mongo/db:basic_types_gen", "//src/mongo/db/auth:access_checks_gen", "//src/mongo/db/auth:action_type_gen", - "//src/mongo/db/local_catalog:collection_options_gen", "//src/mongo/db/pipeline:change_stream_pre_and_post_images_options_gen", + "//src/mongo/db/shard_role/shard_catalog:collection_options_gen", "//src/mongo/db/timeseries:timeseries_gen", "//src/mongo/idl:generic_argument_gen", ], @@ -30,9 +30,9 @@ idl_generator( "//src/mongo/crypto:encryption_fields_gen", "//src/mongo/db/auth:access_checks_gen", "//src/mongo/db/auth:action_type_gen", - "//src/mongo/db/local_catalog:clustered_collection_options_gen", - "//src/mongo/db/local_catalog:collection_options_gen", "//src/mongo/db/pipeline:change_stream_pre_and_post_images_options_gen", + "//src/mongo/db/shard_role/shard_catalog:clustered_collection_options_gen", + "//src/mongo/db/shard_role/shard_catalog:collection_options_gen", "//src/mongo/db/timeseries:timeseries_gen", "//src/mongo/idl:generic_argument_gen", ], @@ -142,7 +142,7 @@ idl_generator( "//src/mongo/db:basic_types_gen", "//src/mongo/db/auth:access_checks_gen", "//src/mongo/db/auth:action_type_gen", - "//src/mongo/db/local_catalog/ddl:create_indexes_gen", + "//src/mongo/db/shard_role/ddl:create_indexes_gen", "//src/mongo/idl:generic_argument_gen", ], ) @@ -192,9 +192,7 @@ mongo_cc_unit_test( srcs = [ "direct_connection_ddl_hook_test.cpp", ], - tags = [ - "mongo_unittest_seventh_group", - ], + tags = ["mongo_unittest_seventh_group"], deps = [ "//src/mongo/db:shard_role", "//src/mongo/db/auth:authorization_session_test_fixture", diff --git a/src/mongo/db/local_catalog/ddl/OWNERS.yml b/src/mongo/db/shard_role/ddl/OWNERS.yml similarity index 100% rename from src/mongo/db/local_catalog/ddl/OWNERS.yml rename to src/mongo/db/shard_role/ddl/OWNERS.yml diff --git a/src/mongo/db/local_catalog/ddl/clone_catalog_data.idl b/src/mongo/db/shard_role/ddl/clone_catalog_data.idl similarity index 100% rename from src/mongo/db/local_catalog/ddl/clone_catalog_data.idl rename to src/mongo/db/shard_role/ddl/clone_catalog_data.idl diff --git a/src/mongo/db/local_catalog/ddl/clone_catalog_data_command.cpp b/src/mongo/db/shard_role/ddl/clone_catalog_data_command.cpp similarity index 97% rename from src/mongo/db/local_catalog/ddl/clone_catalog_data_command.cpp rename to src/mongo/db/shard_role/ddl/clone_catalog_data_command.cpp index 7b5bb4b0c9d..26abdbaa3c3 100644 --- a/src/mongo/db/local_catalog/ddl/clone_catalog_data_command.cpp +++ b/src/mongo/db/shard_role/ddl/clone_catalog_data_command.cpp @@ -42,18 +42,18 @@ #include "mongo/db/database_name.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" -#include "mongo/db/local_catalog/ddl/clone_catalog_data_gen.h" -#include "mongo/db/local_catalog/document_validation.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/clone_catalog_data_gen.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/topology/sharding_state.h" +#include "mongo/db/topology/user_write_block/write_block_bypass.h" #include "mongo/db/transaction/transaction_participant.h" -#include "mongo/db/user_write_block/write_block_bypass.h" #include "mongo/db/version_context.h" #include "mongo/idl/idl_parser.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/local_catalog/ddl/coll_mod.idl b/src/mongo/db/shard_role/ddl/coll_mod.idl similarity index 98% rename from src/mongo/db/local_catalog/ddl/coll_mod.idl rename to src/mongo/db/shard_role/ddl/coll_mod.idl index 8c066503648..b04e1d5fee1 100644 --- a/src/mongo/db/local_catalog/ddl/coll_mod.idl +++ b/src/mongo/db/shard_role/ddl/coll_mod.idl @@ -28,13 +28,13 @@ global: cpp_namespace: "mongo" cpp_includes: - - "mongo/db/local_catalog/ddl/create_command_validation.h" + - "mongo/db/shard_role/ddl/create_command_validation.h" imports: - "mongo/db/auth/action_type.idl" - "mongo/db/auth/access_checks.idl" - "mongo/db/basic_types.idl" - - "mongo/db/local_catalog/collection_options.idl" + - "mongo/db/shard_role/shard_catalog/collection_options.idl" - "mongo/db/timeseries/timeseries.idl" - "mongo/db/pipeline/change_stream_pre_and_post_images_options.idl" diff --git a/src/mongo/db/local_catalog/ddl/coll_mod_reply_validation.cpp b/src/mongo/db/shard_role/ddl/coll_mod_reply_validation.cpp similarity index 97% rename from src/mongo/db/local_catalog/ddl/coll_mod_reply_validation.cpp rename to src/mongo/db/shard_role/ddl/coll_mod_reply_validation.cpp index 58c1b2cb9fa..69345978949 100644 --- a/src/mongo/db/local_catalog/ddl/coll_mod_reply_validation.cpp +++ b/src/mongo/db/shard_role/ddl/coll_mod_reply_validation.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/ddl/coll_mod_reply_validation.h" +#include "mongo/db/shard_role/ddl/coll_mod_reply_validation.h" #include "mongo/base/error_codes.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/local_catalog/ddl/coll_mod_reply_validation.h b/src/mongo/db/shard_role/ddl/coll_mod_reply_validation.h similarity index 97% rename from src/mongo/db/local_catalog/ddl/coll_mod_reply_validation.h rename to src/mongo/db/shard_role/ddl/coll_mod_reply_validation.h index cefc746d6e6..1f73ca4348d 100644 --- a/src/mongo/db/local_catalog/ddl/coll_mod_reply_validation.h +++ b/src/mongo/db/shard_role/ddl/coll_mod_reply_validation.h @@ -29,7 +29,7 @@ #pragma once -#include "mongo/db/local_catalog/ddl/coll_mod_gen.h" +#include "mongo/db/shard_role/ddl/coll_mod_gen.h" namespace mongo::coll_mod_reply_validation { /** diff --git a/src/mongo/db/local_catalog/ddl/collmod_cmd.cpp b/src/mongo/db/shard_role/ddl/collmod_cmd.cpp similarity index 97% rename from src/mongo/db/local_catalog/ddl/collmod_cmd.cpp rename to src/mongo/db/shard_role/ddl/collmod_cmd.cpp index 376b7adb112..529e6dfad83 100644 --- a/src/mongo/db/local_catalog/ddl/collmod_cmd.cpp +++ b/src/mongo/db/shard_role/ddl/collmod_cmd.cpp @@ -40,10 +40,6 @@ #include "mongo/db/commands/test_commands_enabled.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/global_catalog/type_collection.h" -#include "mongo/db/local_catalog/coll_mod.h" -#include "mongo/db/local_catalog/ddl/coll_mod_gen.h" -#include "mongo/db/local_catalog/ddl/coll_mod_reply_validation.h" -#include "mongo/db/local_catalog/ddl/replica_set_ddl_tracker.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/profile_settings.h" @@ -51,6 +47,10 @@ #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/coll_mod_gen.h" +#include "mongo/db/shard_role/ddl/coll_mod_reply_validation.h" +#include "mongo/db/shard_role/ddl/replica_set_ddl_tracker.h" +#include "mongo/db/shard_role/shard_catalog/coll_mod.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/storage_engine.h" diff --git a/src/mongo/db/local_catalog/ddl/create.idl b/src/mongo/db/shard_role/ddl/create.idl similarity index 97% rename from src/mongo/db/local_catalog/ddl/create.idl rename to src/mongo/db/shard_role/ddl/create.idl index 27e23385dd4..6774769e3c4 100644 --- a/src/mongo/db/local_catalog/ddl/create.idl +++ b/src/mongo/db/shard_role/ddl/create.idl @@ -29,14 +29,14 @@ global: cpp_namespace: "mongo" cpp_includes: - - "mongo/db/local_catalog/ddl/create_command_validation.h" + - "mongo/db/shard_role/ddl/create_command_validation.h" imports: - "mongo/crypto/encryption_fields.idl" - "mongo/db/auth/access_checks.idl" - "mongo/db/auth/action_type.idl" - - "mongo/db/local_catalog/collection_options.idl" - - "mongo/db/local_catalog/clustered_collection_options.idl" + - "mongo/db/shard_role/shard_catalog/collection_options.idl" + - "mongo/db/shard_role/shard_catalog/clustered_collection_options.idl" - "mongo/db/timeseries/timeseries.idl" - "mongo/db/pipeline/change_stream_pre_and_post_images_options.idl" diff --git a/src/mongo/db/local_catalog/ddl/create_command.cpp b/src/mongo/db/shard_role/ddl/create_command.cpp similarity index 97% rename from src/mongo/db/local_catalog/ddl/create_command.cpp rename to src/mongo/db/shard_role/ddl/create_command.cpp index 3505ca64b69..f1f277df6f3 100644 --- a/src/mongo/db/local_catalog/ddl/create_command.cpp +++ b/src/mongo/db/shard_role/ddl/create_command.cpp @@ -41,16 +41,7 @@ #include "mongo/db/client.h" #include "mongo/db/commands.h" #include "mongo/db/commands/test_commands_enabled.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/ddl/create_gen.h" -#include "mongo/db/local_catalog/ddl/replica_set_ddl_tracker.h" -#include "mongo/db/local_catalog/index_key_validate.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" +#include "mongo/db/index_key_validate.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/collation/collator_factory_interface.h" @@ -58,6 +49,15 @@ #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/create_gen.h" +#include "mongo/db/shard_role/ddl/replica_set_ddl_tracker.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/timeseries/timeseries_constants.h" #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/db/timeseries/timeseries_options.h" diff --git a/src/mongo/db/local_catalog/ddl/create_command_test.cpp b/src/mongo/db/shard_role/ddl/create_command_test.cpp similarity index 93% rename from src/mongo/db/local_catalog/ddl/create_command_test.cpp rename to src/mongo/db/shard_role/ddl/create_command_test.cpp index b0e5d4d4da3..121f36d53a2 100644 --- a/src/mongo/db/local_catalog/ddl/create_command_test.cpp +++ b/src/mongo/db/shard_role/ddl/create_command_test.cpp @@ -34,11 +34,11 @@ #include "mongo/crypto/encryption_fields_gen.h" #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/idl/server_parameter_test_controller.h" diff --git a/src/mongo/db/local_catalog/ddl/create_command_validation.h b/src/mongo/db/shard_role/ddl/create_command_validation.h similarity index 100% rename from src/mongo/db/local_catalog/ddl/create_command_validation.h rename to src/mongo/db/shard_role/ddl/create_command_validation.h diff --git a/src/mongo/db/local_catalog/ddl/create_indexes.idl b/src/mongo/db/shard_role/ddl/create_indexes.idl similarity index 100% rename from src/mongo/db/local_catalog/ddl/create_indexes.idl rename to src/mongo/db/shard_role/ddl/create_indexes.idl diff --git a/src/mongo/db/local_catalog/ddl/direct_connection_ddl_hook.cpp b/src/mongo/db/shard_role/ddl/direct_connection_ddl_hook.cpp similarity index 97% rename from src/mongo/db/local_catalog/ddl/direct_connection_ddl_hook.cpp rename to src/mongo/db/shard_role/ddl/direct_connection_ddl_hook.cpp index e824cef5b5f..e04e5ab0def 100644 --- a/src/mongo/db/local_catalog/ddl/direct_connection_ddl_hook.cpp +++ b/src/mongo/db/shard_role/ddl/direct_connection_ddl_hook.cpp @@ -27,9 +27,9 @@ * it in the license file. */ -#include "mongo/db/local_catalog/ddl/direct_connection_ddl_hook.h" +#include "mongo/db/shard_role/ddl/direct_connection_ddl_hook.h" -#include "mongo/db/local_catalog/shard_role_api/direct_connection_util.h" +#include "mongo/db/shard_role/direct_connection_util.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" namespace mongo { diff --git a/src/mongo/db/local_catalog/ddl/direct_connection_ddl_hook.h b/src/mongo/db/shard_role/ddl/direct_connection_ddl_hook.h similarity index 98% rename from src/mongo/db/local_catalog/ddl/direct_connection_ddl_hook.h rename to src/mongo/db/shard_role/ddl/direct_connection_ddl_hook.h index 82c01dec0d5..259d82c6b89 100644 --- a/src/mongo/db/local_catalog/ddl/direct_connection_ddl_hook.h +++ b/src/mongo/db/shard_role/ddl/direct_connection_ddl_hook.h @@ -29,10 +29,10 @@ #pragma once -#include "mongo/db/local_catalog/ddl/replica_set_ddl_tracker.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/operation_id.h" +#include "mongo/db/shard_role/ddl/replica_set_ddl_tracker.h" #include "mongo/stdx/mutex.h" #include "mongo/stdx/unordered_map.h" #include "mongo/util/future.h" diff --git a/src/mongo/db/local_catalog/ddl/direct_connection_ddl_hook_test.cpp b/src/mongo/db/shard_role/ddl/direct_connection_ddl_hook_test.cpp similarity index 99% rename from src/mongo/db/local_catalog/ddl/direct_connection_ddl_hook_test.cpp rename to src/mongo/db/shard_role/ddl/direct_connection_ddl_hook_test.cpp index 21d7cb1e7bf..5a153157a96 100644 --- a/src/mongo/db/local_catalog/ddl/direct_connection_ddl_hook_test.cpp +++ b/src/mongo/db/shard_role/ddl/direct_connection_ddl_hook_test.cpp @@ -27,12 +27,12 @@ * it in the license file. */ -#include "mongo/db/local_catalog/ddl/direct_connection_ddl_hook.h" +#include "mongo/db/shard_role/ddl/direct_connection_ddl_hook.h" #include "mongo/db/auth/authorization_session_for_test.h" #include "mongo/db/auth/authz_session_external_state_mock.h" -#include "mongo/db/local_catalog/ddl/replica_set_ddl_tracker.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/shard_role/ddl/replica_set_ddl_tracker.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/unittest/assert.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/local_catalog/ddl/drop.idl b/src/mongo/db/shard_role/ddl/drop.idl similarity index 100% rename from src/mongo/db/local_catalog/ddl/drop.idl rename to src/mongo/db/shard_role/ddl/drop.idl diff --git a/src/mongo/db/local_catalog/ddl/drop_database.idl b/src/mongo/db/shard_role/ddl/drop_database.idl similarity index 100% rename from src/mongo/db/local_catalog/ddl/drop_database.idl rename to src/mongo/db/shard_role/ddl/drop_database.idl diff --git a/src/mongo/db/local_catalog/ddl/drop_indexes.idl b/src/mongo/db/shard_role/ddl/drop_indexes.idl similarity index 100% rename from src/mongo/db/local_catalog/ddl/drop_indexes.idl rename to src/mongo/db/shard_role/ddl/drop_indexes.idl diff --git a/src/mongo/db/local_catalog/ddl/drop_indexes_cmd.cpp b/src/mongo/db/shard_role/ddl/drop_indexes_cmd.cpp similarity index 95% rename from src/mongo/db/local_catalog/ddl/drop_indexes_cmd.cpp rename to src/mongo/db/shard_role/ddl/drop_indexes_cmd.cpp index 36bc3eede0f..fb1d59c8198 100644 --- a/src/mongo/db/local_catalog/ddl/drop_indexes_cmd.cpp +++ b/src/mongo/db/shard_role/ddl/drop_indexes_cmd.cpp @@ -41,24 +41,24 @@ #include "mongo/db/index_builds/index_builds_common.h" #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/index_builds/multi_index_block.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/ddl/drop_indexes_gen.h" -#include "mongo/db/local_catalog/ddl/replica_set_ddl_tracker.h" -#include "mongo/db/local_catalog/drop_indexes.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/index_key_validate.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" +#include "mongo/db/index_key_validate.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/profile_settings.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/drop_indexes_gen.h" +#include "mongo/db/shard_role/ddl/replica_set_ddl_tracker.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/drop_indexes.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/timeseries/catalog_helper.h" #include "mongo/db/timeseries/timeseries_request_util.h" diff --git a/src/mongo/db/local_catalog/ddl/internal_rename_if_options_and_indexes_match.idl b/src/mongo/db/shard_role/ddl/internal_rename_if_options_and_indexes_match.idl similarity index 100% rename from src/mongo/db/local_catalog/ddl/internal_rename_if_options_and_indexes_match.idl rename to src/mongo/db/shard_role/ddl/internal_rename_if_options_and_indexes_match.idl diff --git a/src/mongo/db/local_catalog/ddl/internal_rename_if_options_and_indexes_match_cmd.cpp b/src/mongo/db/shard_role/ddl/internal_rename_if_options_and_indexes_match_cmd.cpp similarity index 97% rename from src/mongo/db/local_catalog/ddl/internal_rename_if_options_and_indexes_match_cmd.cpp rename to src/mongo/db/shard_role/ddl/internal_rename_if_options_and_indexes_match_cmd.cpp index ab31e9d8b05..8d8df46b5bd 100644 --- a/src/mongo/db/local_catalog/ddl/internal_rename_if_options_and_indexes_match_cmd.cpp +++ b/src/mongo/db/shard_role/ddl/internal_rename_if_options_and_indexes_match_cmd.cpp @@ -37,12 +37,12 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/local_catalog/ddl/internal_rename_if_options_and_indexes_match_gen.h" -#include "mongo/db/local_catalog/rename_collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/internal_rename_if_options_and_indexes_match_gen.h" +#include "mongo/db/shard_role/shard_catalog/rename_collection.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/platform/compiler.h" #include "mongo/rpc/op_msg.h" diff --git a/src/mongo/db/local_catalog/ddl/list_collections.cpp b/src/mongo/db/shard_role/ddl/list_collections.cpp similarity index 97% rename from src/mongo/db/local_catalog/ddl/list_collections.cpp rename to src/mongo/db/shard_role/ddl/list_collections.cpp index e5c3fc2f54a..a635149af04 100644 --- a/src/mongo/db/local_catalog/ddl/list_collections.cpp +++ b/src/mongo/db/shard_role/ddl/list_collections.cpp @@ -47,18 +47,6 @@ #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/matcher/matcher.h" #include "mongo/db/global_catalog/ddl/shuffle_list_command_results.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_catalog_helper.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/ddl/list_collections_filter.h" -#include "mongo/db/local_catalog/ddl/list_collections_gen.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/matcher/expression_leaf.h" #include "mongo/db/namespace_string.h" @@ -74,10 +62,22 @@ #include "mongo/db/query/plan_executor.h" #include "mongo/db/query/plan_executor_factory.h" #include "mongo/db/query/plan_yield_policy.h" -#include "mongo/db/raw_data_operation.h" #include "mongo/db/record_id.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/list_collections_filter.h" +#include "mongo/db/shard_role/ddl/list_collections_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/timeseries/timeseries_constants.h" #include "mongo/db/views/view.h" diff --git a/src/mongo/db/local_catalog/ddl/list_collections.idl b/src/mongo/db/shard_role/ddl/list_collections.idl similarity index 100% rename from src/mongo/db/local_catalog/ddl/list_collections.idl rename to src/mongo/db/shard_role/ddl/list_collections.idl diff --git a/src/mongo/db/local_catalog/ddl/list_collections_filter.cpp b/src/mongo/db/shard_role/ddl/list_collections_filter.cpp similarity index 97% rename from src/mongo/db/local_catalog/ddl/list_collections_filter.cpp rename to src/mongo/db/shard_role/ddl/list_collections_filter.cpp index 50dbab95f0a..bcc6564ac21 100644 --- a/src/mongo/db/local_catalog/ddl/list_collections_filter.cpp +++ b/src/mongo/db/shard_role/ddl/list_collections_filter.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/ddl/list_collections_filter.h" +#include "mongo/db/shard_role/ddl/list_collections_filter.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonmisc.h" diff --git a/src/mongo/db/local_catalog/ddl/list_collections_filter.h b/src/mongo/db/shard_role/ddl/list_collections_filter.h similarity index 100% rename from src/mongo/db/local_catalog/ddl/list_collections_filter.h rename to src/mongo/db/shard_role/ddl/list_collections_filter.h diff --git a/src/mongo/db/local_catalog/ddl/list_collections_filter_test.cpp b/src/mongo/db/shard_role/ddl/list_collections_filter_test.cpp similarity index 97% rename from src/mongo/db/local_catalog/ddl/list_collections_filter_test.cpp rename to src/mongo/db/shard_role/ddl/list_collections_filter_test.cpp index 88583241ddd..1ede1f2cb49 100644 --- a/src/mongo/db/local_catalog/ddl/list_collections_filter_test.cpp +++ b/src/mongo/db/shard_role/ddl/list_collections_filter_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/ddl/list_collections_filter.h" +#include "mongo/db/shard_role/ddl/list_collections_filter.h" #include "mongo/base/string_data.h" #include "mongo/bson/json.h" diff --git a/src/mongo/db/local_catalog/ddl/list_databases.cpp b/src/mongo/db/shard_role/ddl/list_databases.cpp similarity index 96% rename from src/mongo/db/local_catalog/ddl/list_databases.cpp rename to src/mongo/db/shard_role/ddl/list_databases.cpp index 1454622cd34..b593e435e61 100644 --- a/src/mongo/db/local_catalog/ddl/list_databases.cpp +++ b/src/mongo/db/shard_role/ddl/list_databases.cpp @@ -35,15 +35,15 @@ #include "mongo/db/curop_failpoint_helpers.h" #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/ddl/shuffle_list_command_results.h" -#include "mongo/db/local_catalog/collection_catalog_helper.h" -#include "mongo/db/local_catalog/ddl/list_databases_common.h" -#include "mongo/db/local_catalog/ddl/list_databases_gen.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/list_databases_common.h" +#include "mongo/db/shard_role/ddl/list_databases_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog_helper.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/local_catalog/ddl/list_databases.idl b/src/mongo/db/shard_role/ddl/list_databases.idl similarity index 100% rename from src/mongo/db/local_catalog/ddl/list_databases.idl rename to src/mongo/db/shard_role/ddl/list_databases.idl diff --git a/src/mongo/db/local_catalog/ddl/list_databases_common.h b/src/mongo/db/shard_role/ddl/list_databases_common.h similarity index 92% rename from src/mongo/db/local_catalog/ddl/list_databases_common.h rename to src/mongo/db/shard_role/ddl/list_databases_common.h index 996fc878948..e2c17bf445c 100644 --- a/src/mongo/db/local_catalog/ddl/list_databases_common.h +++ b/src/mongo/db/shard_role/ddl/list_databases_common.h @@ -31,18 +31,18 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/client.h" #include "mongo/db/exec/matcher/matcher.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/ddl/list_databases_for_all_tenants_gen.h" -#include "mongo/db/local_catalog/ddl/list_databases_gen.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/list_databases_for_all_tenants_gen.h" +#include "mongo/db/shard_role/ddl/list_databases_gen.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#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" diff --git a/src/mongo/db/local_catalog/ddl/list_databases_for_all_tenants.cpp b/src/mongo/db/shard_role/ddl/list_databases_for_all_tenants.cpp similarity index 95% rename from src/mongo/db/local_catalog/ddl/list_databases_for_all_tenants.cpp rename to src/mongo/db/shard_role/ddl/list_databases_for_all_tenants.cpp index 7e400b38cc5..d2b8c5e6ee4 100644 --- a/src/mongo/db/local_catalog/ddl/list_databases_for_all_tenants.cpp +++ b/src/mongo/db/shard_role/ddl/list_databases_for_all_tenants.cpp @@ -33,16 +33,16 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/ddl/list_databases_common.h" -#include "mongo/db/local_catalog/ddl/list_databases_for_all_tenants_gen.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/multitenancy_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/explain_verbosity_gen.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/list_databases_common.h" +#include "mongo/db/shard_role/ddl/list_databases_for_all_tenants_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/local_catalog/ddl/list_databases_for_all_tenants.idl b/src/mongo/db/shard_role/ddl/list_databases_for_all_tenants.idl similarity index 100% rename from src/mongo/db/local_catalog/ddl/list_databases_for_all_tenants.idl rename to src/mongo/db/shard_role/ddl/list_databases_for_all_tenants.idl diff --git a/src/mongo/db/local_catalog/ddl/list_indexes.cpp b/src/mongo/db/shard_role/ddl/list_indexes.cpp similarity index 97% rename from src/mongo/db/local_catalog/ddl/list_indexes.cpp rename to src/mongo/db/shard_role/ddl/list_indexes.cpp index 3d995562f59..08062d71c17 100644 --- a/src/mongo/db/local_catalog/ddl/list_indexes.cpp +++ b/src/mongo/db/shard_role/ddl/list_indexes.cpp @@ -28,7 +28,7 @@ */ -#include "mongo/db/local_catalog/list_indexes.h" +#include "mongo/db/shard_role/shard_catalog/list_indexes.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" @@ -43,12 +43,7 @@ #include "mongo/db/exec/classic/queued_data_stage.h" #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/global_catalog/ddl/shuffle_list_command_results.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/ddl/list_indexes_allowed_fields.h" -#include "mongo/db/local_catalog/ddl/list_indexes_gen.h" -#include "mongo/db/local_catalog/index_key_validate.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" +#include "mongo/db/index_key_validate.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" @@ -64,6 +59,11 @@ #include "mongo/db/record_id.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/list_indexes_allowed_fields.h" +#include "mongo/db/shard_role/ddl/list_indexes_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/timeseries/catalog_helper.h" #include "mongo/db/timeseries/timeseries_index_schema_conversion_functions.h" diff --git a/src/mongo/db/local_catalog/ddl/list_indexes.idl b/src/mongo/db/shard_role/ddl/list_indexes.idl similarity index 99% rename from src/mongo/db/local_catalog/ddl/list_indexes.idl rename to src/mongo/db/shard_role/ddl/list_indexes.idl index 0aad2e49dc8..fadc2958418 100644 --- a/src/mongo/db/local_catalog/ddl/list_indexes.idl +++ b/src/mongo/db/shard_role/ddl/list_indexes.idl @@ -35,7 +35,7 @@ imports: - "mongo/db/auth/access_checks.idl" - "mongo/db/auth/action_type.idl" - "mongo/db/basic_types.idl" - - "mongo/db/local_catalog/ddl/create_indexes.idl" + - "mongo/db/shard_role/ddl/create_indexes.idl" structs: ListIndexesReplyItem: diff --git a/src/mongo/db/local_catalog/ddl/list_indexes_allowed_fields.h b/src/mongo/db/shard_role/ddl/list_indexes_allowed_fields.h similarity index 98% rename from src/mongo/db/local_catalog/ddl/list_indexes_allowed_fields.h rename to src/mongo/db/shard_role/ddl/list_indexes_allowed_fields.h index 1b72f993c6d..8eab71d597b 100644 --- a/src/mongo/db/local_catalog/ddl/list_indexes_allowed_fields.h +++ b/src/mongo/db/shard_role/ddl/list_indexes_allowed_fields.h @@ -31,7 +31,7 @@ #include "mongo/base/string_data.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/ddl/list_indexes_gen.h" +#include "mongo/db/shard_role/ddl/list_indexes_gen.h" #include diff --git a/src/mongo/db/local_catalog/ddl/rename_collection.idl b/src/mongo/db/shard_role/ddl/rename_collection.idl similarity index 100% rename from src/mongo/db/local_catalog/ddl/rename_collection.idl rename to src/mongo/db/shard_role/ddl/rename_collection.idl diff --git a/src/mongo/db/local_catalog/ddl/rename_collection_cmd.cpp b/src/mongo/db/shard_role/ddl/rename_collection_cmd.cpp similarity index 95% rename from src/mongo/db/local_catalog/ddl/rename_collection_cmd.cpp rename to src/mongo/db/shard_role/ddl/rename_collection_cmd.cpp index 3788294781d..6aed6cbd3c6 100644 --- a/src/mongo/db/local_catalog/ddl/rename_collection_cmd.cpp +++ b/src/mongo/db/shard_role/ddl/rename_collection_cmd.cpp @@ -30,13 +30,13 @@ #include "mongo/base/error_codes.h" #include "mongo/db/commands.h" -#include "mongo/db/local_catalog/ddl/rename_collection_common.h" -#include "mongo/db/local_catalog/ddl/rename_collection_gen.h" -#include "mongo/db/local_catalog/ddl/replica_set_ddl_tracker.h" -#include "mongo/db/local_catalog/rename_collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/rename_collection_common.h" +#include "mongo/db/shard_role/ddl/rename_collection_gen.h" +#include "mongo/db/shard_role/ddl/replica_set_ddl_tracker.h" +#include "mongo/db/shard_role/shard_catalog/rename_collection.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/local_catalog/ddl/rename_collection_common.cpp b/src/mongo/db/shard_role/ddl/rename_collection_common.cpp similarity index 98% rename from src/mongo/db/local_catalog/ddl/rename_collection_common.cpp rename to src/mongo/db/shard_role/ddl/rename_collection_common.cpp index 6079f9c7110..056aba4bc33 100644 --- a/src/mongo/db/local_catalog/ddl/rename_collection_common.cpp +++ b/src/mongo/db/shard_role/ddl/rename_collection_common.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/ddl/rename_collection_common.h" +#include "mongo/db/shard_role/ddl/rename_collection_common.h" #include "mongo/base/error_codes.h" #include "mongo/db/auth/action_set.h" diff --git a/src/mongo/db/local_catalog/ddl/rename_collection_common.h b/src/mongo/db/shard_role/ddl/rename_collection_common.h similarity index 96% rename from src/mongo/db/local_catalog/ddl/rename_collection_common.h rename to src/mongo/db/shard_role/ddl/rename_collection_common.h index 0aa7a58b0ca..00f246074ef 100644 --- a/src/mongo/db/local_catalog/ddl/rename_collection_common.h +++ b/src/mongo/db/shard_role/ddl/rename_collection_common.h @@ -32,7 +32,7 @@ #include "mongo/base/status.h" #include "mongo/bson/bsonobj.h" #include "mongo/db/auth/validated_tenancy_scope.h" -#include "mongo/db/local_catalog/ddl/rename_collection_gen.h" +#include "mongo/db/shard_role/ddl/rename_collection_gen.h" #include diff --git a/src/mongo/db/local_catalog/ddl/replica_set_ddl_tracker.cpp b/src/mongo/db/shard_role/ddl/replica_set_ddl_tracker.cpp similarity index 98% rename from src/mongo/db/local_catalog/ddl/replica_set_ddl_tracker.cpp rename to src/mongo/db/shard_role/ddl/replica_set_ddl_tracker.cpp index 8e853e90da5..733657db79e 100644 --- a/src/mongo/db/local_catalog/ddl/replica_set_ddl_tracker.cpp +++ b/src/mongo/db/shard_role/ddl/replica_set_ddl_tracker.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/ddl/replica_set_ddl_tracker.h" +#include "mongo/db/shard_role/ddl/replica_set_ddl_tracker.h" #include "mongo/db/service_context.h" diff --git a/src/mongo/db/local_catalog/ddl/replica_set_ddl_tracker.h b/src/mongo/db/shard_role/ddl/replica_set_ddl_tracker.h similarity index 100% rename from src/mongo/db/local_catalog/ddl/replica_set_ddl_tracker.h rename to src/mongo/db/shard_role/ddl/replica_set_ddl_tracker.h diff --git a/src/mongo/db/local_catalog/ddl/server_parameters.idl b/src/mongo/db/shard_role/ddl/server_parameters.idl similarity index 100% rename from src/mongo/db/local_catalog/ddl/server_parameters.idl rename to src/mongo/db/shard_role/ddl/server_parameters.idl diff --git a/src/mongo/db/local_catalog/shard_role_api/direct_connection_util.cpp b/src/mongo/db/shard_role/direct_connection_util.cpp similarity index 97% rename from src/mongo/db/local_catalog/shard_role_api/direct_connection_util.cpp rename to src/mongo/db/shard_role/direct_connection_util.cpp index b7ff459dd41..2fb2b822c23 100644 --- a/src/mongo/db/local_catalog/shard_role_api/direct_connection_util.cpp +++ b/src/mongo/db/shard_role/direct_connection_util.cpp @@ -27,16 +27,16 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_api/direct_connection_util.h" +#include "mongo/db/shard_role/direct_connection_util.h" #include "mongo/db/auth/authorization_manager.h" #include "mongo/db/auth/authorization_session.h" -#include "mongo/db/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/sharding_environment/sharding_api_d_params_gen.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/sharding_environment/sharding_statistics.h" +#include "mongo/db/topology/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/local_catalog/shard_role_api/direct_connection_util.h b/src/mongo/db/shard_role/direct_connection_util.h similarity index 100% rename from src/mongo/db/local_catalog/shard_role_api/direct_connection_util.h rename to src/mongo/db/shard_role/direct_connection_util.h diff --git a/src/mongo/db/local_catalog/shard_role_api/direct_shard_client_tracker.cpp b/src/mongo/db/shard_role/direct_shard_client_tracker.cpp similarity index 98% rename from src/mongo/db/local_catalog/shard_role_api/direct_shard_client_tracker.cpp rename to src/mongo/db/shard_role/direct_shard_client_tracker.cpp index 199c27182aa..95d378c0470 100644 --- a/src/mongo/db/local_catalog/shard_role_api/direct_shard_client_tracker.cpp +++ b/src/mongo/db/shard_role/direct_shard_client_tracker.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_api/direct_shard_client_tracker.h" +#include "mongo/db/shard_role/direct_shard_client_tracker.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/commands/server_status/server_status.h" diff --git a/src/mongo/db/local_catalog/shard_role_api/direct_shard_client_tracker.h b/src/mongo/db/shard_role/direct_shard_client_tracker.h similarity index 100% rename from src/mongo/db/local_catalog/shard_role_api/direct_shard_client_tracker.h rename to src/mongo/db/shard_role/direct_shard_client_tracker.h diff --git a/src/mongo/db/local_catalog/shard_role_api/direct_shard_client_tracker_test.cpp b/src/mongo/db/shard_role/direct_shard_client_tracker_test.cpp similarity index 98% rename from src/mongo/db/local_catalog/shard_role_api/direct_shard_client_tracker_test.cpp rename to src/mongo/db/shard_role/direct_shard_client_tracker_test.cpp index d60e618ae53..1e52bb9a613 100644 --- a/src/mongo/db/local_catalog/shard_role_api/direct_shard_client_tracker_test.cpp +++ b/src/mongo/db/shard_role/direct_shard_client_tracker_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_api/direct_shard_client_tracker.h" +#include "mongo/db/shard_role/direct_shard_client_tracker.h" #include "mongo/db/service_context_test_fixture.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/local_catalog/lock_manager/BUILD.bazel b/src/mongo/db/shard_role/lock_manager/BUILD.bazel similarity index 98% rename from src/mongo/db/local_catalog/lock_manager/BUILD.bazel rename to src/mongo/db/shard_role/lock_manager/BUILD.bazel index 70bcd553239..409f38de3be 100644 --- a/src/mongo/db/local_catalog/lock_manager/BUILD.bazel +++ b/src/mongo/db/shard_role/lock_manager/BUILD.bazel @@ -75,7 +75,7 @@ mongo_cc_unit_test( "exception_util_test.cpp", ], tags = [ - "mongo_unittest_fourth_group", + "mongo_unittest_sixth_group", "server-programmability", "server-storage-engine-integration", ], diff --git a/src/mongo/db/local_catalog/shard_role_api/OWNERS.yml b/src/mongo/db/shard_role/lock_manager/OWNERS.yml similarity index 100% rename from src/mongo/db/local_catalog/shard_role_api/OWNERS.yml rename to src/mongo/db/shard_role/lock_manager/OWNERS.yml diff --git a/src/mongo/db/local_catalog/lock_manager/README.md b/src/mongo/db/shard_role/lock_manager/README.md similarity index 100% rename from src/mongo/db/local_catalog/lock_manager/README.md rename to src/mongo/db/shard_role/lock_manager/README.md diff --git a/src/mongo/db/local_catalog/lock_manager/cluster_lock_info_cmd.cpp b/src/mongo/db/shard_role/lock_manager/cluster_lock_info_cmd.cpp similarity index 97% rename from src/mongo/db/local_catalog/lock_manager/cluster_lock_info_cmd.cpp rename to src/mongo/db/shard_role/lock_manager/cluster_lock_info_cmd.cpp index 0ae14c94fa8..e5021e34b87 100644 --- a/src/mongo/db/local_catalog/lock_manager/cluster_lock_info_cmd.cpp +++ b/src/mongo/db/shard_role/lock_manager/cluster_lock_info_cmd.cpp @@ -39,10 +39,10 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/dbcommands_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/local_catalog/lock_manager/lock_info_gen.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/shard_role/lock_manager/lock_info_gen.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/executor/remote_command_response.h" diff --git a/src/mongo/db/local_catalog/lock_manager/cond_var_lock_grant_notification.cpp b/src/mongo/db/shard_role/lock_manager/cond_var_lock_grant_notification.cpp similarity index 97% rename from src/mongo/db/local_catalog/lock_manager/cond_var_lock_grant_notification.cpp rename to src/mongo/db/shard_role/lock_manager/cond_var_lock_grant_notification.cpp index 62890bcf50f..09a2cdd9a23 100644 --- a/src/mongo/db/local_catalog/lock_manager/cond_var_lock_grant_notification.cpp +++ b/src/mongo/db/shard_role/lock_manager/cond_var_lock_grant_notification.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/lock_manager/cond_var_lock_grant_notification.h" +#include "mongo/db/shard_role/lock_manager/cond_var_lock_grant_notification.h" #include "mongo/db/operation_context.h" diff --git a/src/mongo/db/local_catalog/lock_manager/cond_var_lock_grant_notification.h b/src/mongo/db/shard_role/lock_manager/cond_var_lock_grant_notification.h similarity index 97% rename from src/mongo/db/local_catalog/lock_manager/cond_var_lock_grant_notification.h rename to src/mongo/db/shard_role/lock_manager/cond_var_lock_grant_notification.h index b51f10b3163..d2978f5eda3 100644 --- a/src/mongo/db/local_catalog/lock_manager/cond_var_lock_grant_notification.h +++ b/src/mongo/db/shard_role/lock_manager/cond_var_lock_grant_notification.h @@ -29,7 +29,7 @@ #pragma once -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/stdx/condition_variable.h" #include "mongo/stdx/mutex.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/local_catalog/lock_manager/d_concurrency.cpp b/src/mongo/db/shard_role/lock_manager/d_concurrency.cpp similarity index 98% rename from src/mongo/db/local_catalog/lock_manager/d_concurrency.cpp rename to src/mongo/db/shard_role/lock_manager/d_concurrency.cpp index 9ddbea7c759..b953d358c93 100644 --- a/src/mongo/db/local_catalog/lock_manager/d_concurrency.cpp +++ b/src/mongo/db/shard_role/lock_manager/d_concurrency.cpp @@ -27,16 +27,16 @@ * it in the license file. */ -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" #include "mongo/base/error_codes.h" #include "mongo/base/status.h" #include "mongo/base/string_data.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/intent_registry.h" #include "mongo/db/server_feature_flags_gen.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/util/assert_util.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/local_catalog/lock_manager/d_concurrency.h b/src/mongo/db/shard_role/lock_manager/d_concurrency.h similarity index 99% rename from src/mongo/db/local_catalog/lock_manager/d_concurrency.h rename to src/mongo/db/shard_role/lock_manager/d_concurrency.h index 9bd41f71a88..b1d4115bdcd 100644 --- a/src/mongo/db/local_catalog/lock_manager/d_concurrency.h +++ b/src/mongo/db/shard_role/lock_manager/d_concurrency.h @@ -30,12 +30,12 @@ #pragma once #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/lock_manager/locker.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/intent_guard.h" #include "mongo/db/repl/intent_registry.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/locker.h" #include "mongo/db/tenant_id.h" #include "mongo/util/modules.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/local_catalog/lock_manager/d_concurrency_bm.cpp b/src/mongo/db/shard_role/lock_manager/d_concurrency_bm.cpp similarity index 98% rename from src/mongo/db/local_catalog/lock_manager/d_concurrency_bm.cpp rename to src/mongo/db/shard_role/lock_manager/d_concurrency_bm.cpp index af114b4ff6e..1ed2b2e6983 100644 --- a/src/mongo/db/local_catalog/lock_manager/d_concurrency_bm.cpp +++ b/src/mongo/db/shard_role/lock_manager/d_concurrency_bm.cpp @@ -27,13 +27,13 @@ * it in the license file. */ -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" #include "mongo/db/client.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/db/tenant_id.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/local_catalog/lock_manager/d_concurrency_test.cpp b/src/mongo/db/shard_role/lock_manager/d_concurrency_test.cpp similarity index 99% rename from src/mongo/db/local_catalog/lock_manager/d_concurrency_test.cpp rename to src/mongo/db/shard_role/lock_manager/d_concurrency_test.cpp index f0730738327..0b031faea2c 100644 --- a/src/mongo/db/local_catalog/lock_manager/d_concurrency_test.cpp +++ b/src/mongo/db/shard_role/lock_manager/d_concurrency_test.cpp @@ -29,7 +29,7 @@ // IWYU pragma: no_include "cxxabi.h" // IWYU pragma: no_include "ext/alloc_traits.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" @@ -39,14 +39,14 @@ #include "mongo/db/admission/ticketing_system.h" #include "mongo/db/client.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/locker.h" -#include "mongo/db/local_catalog/lock_manager/resource_catalog.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/replication_state_transition_lock_guard.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/locker.h" +#include "mongo/db/shard_role/lock_manager/resource_catalog.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/recovery_unit_noop.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/local_catalog/lock_manager/dump_lock_manager.cpp b/src/mongo/db/shard_role/lock_manager/dump_lock_manager.cpp similarity index 96% rename from src/mongo/db/local_catalog/lock_manager/dump_lock_manager.cpp rename to src/mongo/db/shard_role/lock_manager/dump_lock_manager.cpp index 7194f430c47..86cbe6f953c 100644 --- a/src/mongo/db/local_catalog/lock_manager/dump_lock_manager.cpp +++ b/src/mongo/db/shard_role/lock_manager/dump_lock_manager.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/lock_manager/dump_lock_manager.h" +#include "mongo/db/shard_role/lock_manager/dump_lock_manager.h" #include "mongo/base/shim.h" diff --git a/src/mongo/db/local_catalog/lock_manager/dump_lock_manager.h b/src/mongo/db/shard_role/lock_manager/dump_lock_manager.h similarity index 100% rename from src/mongo/db/local_catalog/lock_manager/dump_lock_manager.h rename to src/mongo/db/shard_role/lock_manager/dump_lock_manager.h diff --git a/src/mongo/db/local_catalog/lock_manager/dump_lock_manager_impl.cpp b/src/mongo/db/shard_role/lock_manager/dump_lock_manager_impl.cpp similarity index 94% rename from src/mongo/db/local_catalog/lock_manager/dump_lock_manager_impl.cpp rename to src/mongo/db/shard_role/lock_manager/dump_lock_manager_impl.cpp index 3b3a547959c..5092d9dd993 100644 --- a/src/mongo/db/local_catalog/lock_manager/dump_lock_manager_impl.cpp +++ b/src/mongo/db/shard_role/lock_manager/dump_lock_manager_impl.cpp @@ -27,14 +27,14 @@ * it in the license file. */ -#include "mongo/db/local_catalog/lock_manager/dump_lock_manager_impl.h" +#include "mongo/db/shard_role/lock_manager/dump_lock_manager_impl.h" #include "mongo/base/shim.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/logv2/log.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kDefault diff --git a/src/mongo/db/local_catalog/lock_manager/dump_lock_manager_impl.h b/src/mongo/db/shard_role/lock_manager/dump_lock_manager_impl.h similarity index 96% rename from src/mongo/db/local_catalog/lock_manager/dump_lock_manager_impl.h rename to src/mongo/db/shard_role/lock_manager/dump_lock_manager_impl.h index 8af420ad410..597420d8664 100644 --- a/src/mongo/db/local_catalog/lock_manager/dump_lock_manager_impl.h +++ b/src/mongo/db/shard_role/lock_manager/dump_lock_manager_impl.h @@ -30,8 +30,8 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/local_catalog/lock_manager/exception_util.cpp b/src/mongo/db/shard_role/lock_manager/exception_util.cpp similarity index 98% rename from src/mongo/db/local_catalog/lock_manager/exception_util.cpp rename to src/mongo/db/shard_role/lock_manager/exception_util.cpp index a789da892be..56916b79191 100644 --- a/src/mongo/db/local_catalog/lock_manager/exception_util.cpp +++ b/src/mongo/db/shard_role/lock_manager/exception_util.cpp @@ -27,12 +27,12 @@ * it in the license file. */ -#include "mongo/db/local_catalog/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" #include "mongo/db/commands/server_status/server_status_metric.h" -#include "mongo/db/local_catalog/lock_manager/exception_util_gen.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/shard_role/lock_manager/exception_util_gen.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/exceptions.h" #include "mongo/db/storage/execution_context.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/local_catalog/lock_manager/exception_util.h b/src/mongo/db/shard_role/lock_manager/exception_util.h similarity index 98% rename from src/mongo/db/local_catalog/lock_manager/exception_util.h rename to src/mongo/db/shard_role/lock_manager/exception_util.h index b25f496cba0..5b61a71933d 100644 --- a/src/mongo/db/local_catalog/lock_manager/exception_util.h +++ b/src/mongo/db/shard_role/lock_manager/exception_util.h @@ -32,10 +32,10 @@ #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/lock_manager/exception_util_gen.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util_gen.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/logv2/log_severity_suppressor.h" #include "mongo/platform/compiler.h" diff --git a/src/mongo/db/local_catalog/lock_manager/exception_util.idl b/src/mongo/db/shard_role/lock_manager/exception_util.idl similarity index 100% rename from src/mongo/db/local_catalog/lock_manager/exception_util.idl rename to src/mongo/db/shard_role/lock_manager/exception_util.idl diff --git a/src/mongo/db/local_catalog/lock_manager/exception_util_test.cpp b/src/mongo/db/shard_role/lock_manager/exception_util_test.cpp similarity index 99% rename from src/mongo/db/local_catalog/lock_manager/exception_util_test.cpp rename to src/mongo/db/shard_role/lock_manager/exception_util_test.cpp index 4889f2525aa..989c474df4c 100644 --- a/src/mongo/db/local_catalog/lock_manager/exception_util_test.cpp +++ b/src/mongo/db/shard_role/lock_manager/exception_util_test.cpp @@ -28,11 +28,11 @@ */ -#include "mongo/db/local_catalog/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/lock_manager/exception_util_gen.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/exception_util_gen.h" #include "mongo/db/storage/exceptions.h" #include "mongo/transport/transport_layer_mock.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/local_catalog/lock_manager/fast_map_noalloc.h b/src/mongo/db/shard_role/lock_manager/fast_map_noalloc.h similarity index 100% rename from src/mongo/db/local_catalog/lock_manager/fast_map_noalloc.h rename to src/mongo/db/shard_role/lock_manager/fast_map_noalloc.h diff --git a/src/mongo/db/local_catalog/lock_manager/fast_map_noalloc_test.cpp b/src/mongo/db/shard_role/lock_manager/fast_map_noalloc_test.cpp similarity index 97% rename from src/mongo/db/local_catalog/lock_manager/fast_map_noalloc_test.cpp rename to src/mongo/db/shard_role/lock_manager/fast_map_noalloc_test.cpp index b5b5e59f225..5eb47d15551 100644 --- a/src/mongo/db/local_catalog/lock_manager/fast_map_noalloc_test.cpp +++ b/src/mongo/db/shard_role/lock_manager/fast_map_noalloc_test.cpp @@ -27,10 +27,10 @@ * it in the license file. */ -#include "mongo/db/local_catalog/lock_manager/fast_map_noalloc.h" +#include "mongo/db/shard_role/lock_manager/fast_map_noalloc.h" #include "mongo/base/string_data.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/stdx/unordered_map.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/local_catalog/lock_manager/fill_locker_info.cpp b/src/mongo/db/shard_role/lock_manager/fill_locker_info.cpp similarity index 96% rename from src/mongo/db/local_catalog/lock_manager/fill_locker_info.cpp rename to src/mongo/db/shard_role/lock_manager/fill_locker_info.cpp index 4ace0eb1650..958a163c6be 100644 --- a/src/mongo/db/local_catalog/lock_manager/fill_locker_info.cpp +++ b/src/mongo/db/shard_role/lock_manager/fill_locker_info.cpp @@ -28,10 +28,10 @@ */ -#include "mongo/db/local_catalog/lock_manager/fill_locker_info.h" +#include "mongo/db/shard_role/lock_manager/fill_locker_info.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/lock_manager/lock_stats.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/lock_stats.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/local_catalog/lock_manager/fill_locker_info.h b/src/mongo/db/shard_role/lock_manager/fill_locker_info.h similarity index 97% rename from src/mongo/db/local_catalog/lock_manager/fill_locker_info.h rename to src/mongo/db/shard_role/lock_manager/fill_locker_info.h index f6f141b192d..c9dd0bf0356 100644 --- a/src/mongo/db/local_catalog/lock_manager/fill_locker_info.h +++ b/src/mongo/db/shard_role/lock_manager/fill_locker_info.h @@ -30,7 +30,7 @@ #pragma once #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/local_catalog/lock_manager/locker.h" +#include "mongo/db/shard_role/lock_manager/locker.h" #include "mongo/util/modules.h" namespace mongo { diff --git a/src/mongo/db/local_catalog/lock_manager/fill_locker_info_test.cpp b/src/mongo/db/shard_role/lock_manager/fill_locker_info_test.cpp similarity index 96% rename from src/mongo/db/local_catalog/lock_manager/fill_locker_info_test.cpp rename to src/mongo/db/shard_role/lock_manager/fill_locker_info_test.cpp index 5698765ee30..412294f4161 100644 --- a/src/mongo/db/local_catalog/lock_manager/fill_locker_info_test.cpp +++ b/src/mongo/db/shard_role/lock_manager/fill_locker_info_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/lock_manager/fill_locker_info.h" +#include "mongo/db/shard_role/lock_manager/fill_locker_info.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonelement.h" @@ -35,8 +35,8 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/bsontypes.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/lock_manager/lock_stats.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/lock_stats.h" #include "mongo/db/tenant_id.h" #include "mongo/unittest/death_test.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/local_catalog/lock_manager/lock_gdb_test.py b/src/mongo/db/shard_role/lock_manager/lock_gdb_test.py similarity index 100% rename from src/mongo/db/local_catalog/lock_manager/lock_gdb_test.py rename to src/mongo/db/shard_role/lock_manager/lock_gdb_test.py diff --git a/src/mongo/db/local_catalog/lock_manager/lock_info.cpp b/src/mongo/db/shard_role/lock_manager/lock_info.cpp similarity index 94% rename from src/mongo/db/local_catalog/lock_manager/lock_info.cpp rename to src/mongo/db/shard_role/lock_manager/lock_info.cpp index f795198df67..153d01ccad1 100644 --- a/src/mongo/db/local_catalog/lock_manager/lock_info.cpp +++ b/src/mongo/db/shard_role/lock_manager/lock_info.cpp @@ -37,13 +37,13 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/lock_manager/dump_lock_manager_impl.h" -#include "mongo/db/local_catalog/lock_manager/lock_info_gen.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager.h" #include "mongo/db/operation_context.h" #include "mongo/db/profile_settings.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/dump_lock_manager_impl.h" +#include "mongo/db/shard_role/lock_manager/lock_info_gen.h" +#include "mongo/db/shard_role/lock_manager/lock_manager.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" #include "mongo/db/storage/storage_engine.h" #include diff --git a/src/mongo/db/local_catalog/lock_manager/lock_info.idl b/src/mongo/db/shard_role/lock_manager/lock_info.idl similarity index 100% rename from src/mongo/db/local_catalog/lock_manager/lock_info.idl rename to src/mongo/db/shard_role/lock_manager/lock_info.idl diff --git a/src/mongo/db/local_catalog/lock_manager/lock_manager.cpp b/src/mongo/db/shard_role/lock_manager/lock_manager.cpp similarity index 99% rename from src/mongo/db/local_catalog/lock_manager/lock_manager.cpp rename to src/mongo/db/shard_role/lock_manager/lock_manager.cpp index 0553a595533..221354024a1 100644 --- a/src/mongo/db/local_catalog/lock_manager/lock_manager.cpp +++ b/src/mongo/db/shard_role/lock_manager/lock_manager.cpp @@ -27,15 +27,15 @@ * it in the license file. */ -#include "mongo/db/local_catalog/lock_manager/lock_manager.h" +#include "mongo/db/shard_role/lock_manager/lock_manager.h" #include "mongo/base/static_assert.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/local_catalog/lock_manager/lock_request_list.h" -#include "mongo/db/local_catalog/lock_manager/locker.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_request_list.h" +#include "mongo/db/shard_role/lock_manager/locker.h" #include "mongo/logv2/log.h" #include "mongo/stdx/mutex.h" #include "mongo/stdx/thread.h" diff --git a/src/mongo/db/local_catalog/lock_manager/lock_manager.h b/src/mongo/db/shard_role/lock_manager/lock_manager.h similarity index 99% rename from src/mongo/db/local_catalog/lock_manager/lock_manager.h rename to src/mongo/db/shard_role/lock_manager/lock_manager.h index e54c17d2143..3aff151d1a2 100644 --- a/src/mongo/db/local_catalog/lock_manager/lock_manager.h +++ b/src/mongo/db/shard_role/lock_manager/lock_manager.h @@ -32,8 +32,8 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/auth/cluster_auth_mode.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/stdx/mutex.h" #include "mongo/stdx/unordered_map.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/local_catalog/lock_manager/lock_manager_bm.cpp b/src/mongo/db/shard_role/lock_manager/lock_manager_bm.cpp similarity index 96% rename from src/mongo/db/local_catalog/lock_manager/lock_manager_bm.cpp rename to src/mongo/db/shard_role/lock_manager/lock_manager_bm.cpp index 25d855e1d9f..a47b24e2035 100644 --- a/src/mongo/db/local_catalog/lock_manager/lock_manager_bm.cpp +++ b/src/mongo/db/shard_role/lock_manager/lock_manager_bm.cpp @@ -27,12 +27,12 @@ * it in the license file. */ -#include "mongo/db/local_catalog/lock_manager/lock_manager.h" +#include "mongo/db/shard_role/lock_manager/lock_manager.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/lock_manager/locker.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/locker.h" #include "mongo/util/str.h" #include diff --git a/src/mongo/db/local_catalog/lock_manager/lock_manager_defs.cpp b/src/mongo/db/shard_role/lock_manager/lock_manager_defs.cpp similarity index 96% rename from src/mongo/db/local_catalog/lock_manager/lock_manager_defs.cpp rename to src/mongo/db/shard_role/lock_manager/lock_manager_defs.cpp index 4169de71e79..aa930ae12f2 100644 --- a/src/mongo/db/local_catalog/lock_manager/lock_manager_defs.cpp +++ b/src/mongo/db/shard_role/lock_manager/lock_manager_defs.cpp @@ -27,11 +27,11 @@ * it in the license file. */ -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/bson/util/builder.h" #include "mongo/bson/util/builder_fwd.h" -#include "mongo/db/local_catalog/lock_manager/resource_catalog.h" +#include "mongo/db/shard_role/lock_manager/resource_catalog.h" #include diff --git a/src/mongo/db/local_catalog/lock_manager/lock_manager_defs.h b/src/mongo/db/shard_role/lock_manager/lock_manager_defs.h similarity index 100% rename from src/mongo/db/local_catalog/lock_manager/lock_manager_defs.h rename to src/mongo/db/shard_role/lock_manager/lock_manager_defs.h diff --git a/src/mongo/db/local_catalog/lock_manager/lock_manager_test.cpp b/src/mongo/db/shard_role/lock_manager/lock_manager_test.cpp similarity index 99% rename from src/mongo/db/local_catalog/lock_manager/lock_manager_test.cpp rename to src/mongo/db/shard_role/lock_manager/lock_manager_test.cpp index 0c2a5a0990d..38faab168d7 100644 --- a/src/mongo/db/local_catalog/lock_manager/lock_manager_test.cpp +++ b/src/mongo/db/shard_role/lock_manager/lock_manager_test.cpp @@ -27,14 +27,14 @@ * it in the license file. */ -#include "mongo/db/local_catalog/lock_manager/lock_manager.h" +#include "mongo/db/shard_role/lock_manager/lock_manager.h" #include "mongo/base/string_data.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/lock_manager/locker.h" #include "mongo/db/namespace_string.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/locker.h" #include "mongo/db/tenant_id.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/local_catalog/lock_manager/lock_request_list.h b/src/mongo/db/shard_role/lock_manager/lock_request_list.h similarity index 98% rename from src/mongo/db/local_catalog/lock_manager/lock_request_list.h rename to src/mongo/db/shard_role/lock_manager/lock_request_list.h index e53a4c80cc1..a38cd389852 100644 --- a/src/mongo/db/local_catalog/lock_manager/lock_request_list.h +++ b/src/mongo/db/shard_role/lock_manager/lock_request_list.h @@ -29,7 +29,7 @@ #pragma once -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/util/assert_util.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/local_catalog/lock_manager/lock_stats.cpp b/src/mongo/db/shard_role/lock_manager/lock_stats.cpp similarity index 99% rename from src/mongo/db/local_catalog/lock_manager/lock_stats.cpp rename to src/mongo/db/shard_role/lock_manager/lock_stats.cpp index 5d996efcdc0..e99e4d69bd9 100644 --- a/src/mongo/db/local_catalog/lock_manager/lock_stats.cpp +++ b/src/mongo/db/shard_role/lock_manager/lock_stats.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/lock_manager/lock_stats.h" +#include "mongo/db/shard_role/lock_manager/lock_stats.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/stats/counter_ops.h" diff --git a/src/mongo/db/local_catalog/lock_manager/lock_stats.h b/src/mongo/db/shard_role/lock_manager/lock_stats.h similarity index 99% rename from src/mongo/db/local_catalog/lock_manager/lock_stats.h rename to src/mongo/db/shard_role/lock_manager/lock_stats.h index a898636b93b..0342271eb20 100644 --- a/src/mongo/db/local_catalog/lock_manager/lock_stats.h +++ b/src/mongo/db/shard_role/lock_manager/lock_stats.h @@ -30,8 +30,8 @@ #pragma once #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/db/stats/counter_ops.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/local_catalog/lock_manager/lock_stats_test.cpp b/src/mongo/db/shard_role/lock_manager/lock_stats_test.cpp similarity index 98% rename from src/mongo/db/local_catalog/lock_manager/lock_stats_test.cpp rename to src/mongo/db/shard_role/lock_manager/lock_stats_test.cpp index ecf013fef1c..aa2c808486b 100644 --- a/src/mongo/db/local_catalog/lock_manager/lock_stats_test.cpp +++ b/src/mongo/db/shard_role/lock_manager/lock_stats_test.cpp @@ -27,17 +27,17 @@ * it in the license file. */ -#include "mongo/db/local_catalog/lock_manager/lock_stats.h" +#include "mongo/db/shard_role/lock_manager/lock_stats.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/lock_manager/locker.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/locker.h" #include "mongo/db/tenant_id.h" #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/local_catalog/lock_manager/locker.cpp b/src/mongo/db/shard_role/lock_manager/locker.cpp similarity index 99% rename from src/mongo/db/local_catalog/lock_manager/locker.cpp rename to src/mongo/db/shard_role/lock_manager/locker.cpp index 44bbb95d2f2..3f2a9412819 100644 --- a/src/mongo/db/local_catalog/lock_manager/locker.cpp +++ b/src/mongo/db/shard_role/lock_manager/locker.cpp @@ -27,15 +27,15 @@ * it in the license file. */ -#include "mongo/db/local_catalog/lock_manager/locker.h" +#include "mongo/db/shard_role/lock_manager/locker.h" #include "mongo/bson/json.h" #include "mongo/db/admission/ticketing_system.h" -#include "mongo/db/local_catalog/lock_manager/dump_lock_manager.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager.h" -#include "mongo/db/local_catalog/lock_manager/locker.h" -#include "mongo/db/local_catalog/lock_manager/resource_catalog.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/lock_manager/dump_lock_manager.h" +#include "mongo/db/shard_role/lock_manager/lock_manager.h" +#include "mongo/db/shard_role/lock_manager/locker.h" +#include "mongo/db/shard_role/lock_manager/resource_catalog.h" #include "mongo/logv2/log.h" #include "mongo/stdx/unordered_map.h" #include "mongo/stdx/unordered_set.h" diff --git a/src/mongo/db/local_catalog/lock_manager/locker.h b/src/mongo/db/shard_role/lock_manager/locker.h similarity index 99% rename from src/mongo/db/local_catalog/lock_manager/locker.h rename to src/mongo/db/shard_role/lock_manager/locker.h index df0bc085900..4f8563844ef 100644 --- a/src/mongo/db/local_catalog/lock_manager/locker.h +++ b/src/mongo/db/shard_role/lock_manager/locker.h @@ -32,12 +32,12 @@ #include "mongo/db/admission/execution_admission_context.h" #include "mongo/db/database_name.h" #include "mongo/db/flow_control_ticketholder.h" -#include "mongo/db/local_catalog/lock_manager/cond_var_lock_grant_notification.h" -#include "mongo/db/local_catalog/lock_manager/fast_map_noalloc.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/lock_manager/lock_stats.h" #include "mongo/db/namespace_string.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/cond_var_lock_grant_notification.h" +#include "mongo/db/shard_role/lock_manager/fast_map_noalloc.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/lock_stats.h" #include "mongo/platform/atomic_word.h" #include "mongo/stdx/thread.h" #include "mongo/util/concurrency/admission_context.h" diff --git a/src/mongo/db/local_catalog/lock_manager/locker_test.cpp b/src/mongo/db/shard_role/lock_manager/locker_test.cpp similarity index 99% rename from src/mongo/db/local_catalog/lock_manager/locker_test.cpp rename to src/mongo/db/shard_role/lock_manager/locker_test.cpp index f322bda1fd9..f62fa0f4ecf 100644 --- a/src/mongo/db/local_catalog/lock_manager/locker_test.cpp +++ b/src/mongo/db/shard_role/lock_manager/locker_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/lock_manager/locker.h" +#include "mongo/db/shard_role/lock_manager/locker.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" @@ -36,13 +36,13 @@ #include "mongo/db/client.h" #include "mongo/db/curop.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/lock_manager/fast_map_noalloc.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/lock_manager/lock_stats.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/fast_map_noalloc.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/lock_stats.h" #include "mongo/db/storage/recovery_unit_noop.h" #include "mongo/db/tenant_id.h" #include "mongo/transport/session.h" diff --git a/src/mongo/db/local_catalog/lock_manager/resource_catalog.cpp b/src/mongo/db/shard_role/lock_manager/resource_catalog.cpp similarity index 98% rename from src/mongo/db/local_catalog/lock_manager/resource_catalog.cpp rename to src/mongo/db/shard_role/lock_manager/resource_catalog.cpp index a4097527e43..1165c5cafd6 100644 --- a/src/mongo/db/local_catalog/lock_manager/resource_catalog.cpp +++ b/src/mongo/db/shard_role/lock_manager/resource_catalog.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/lock_manager/resource_catalog.h" +#include "mongo/db/shard_role/lock_manager/resource_catalog.h" #include "mongo/util/assert_util.h" #include "mongo/util/database_name_util.h" diff --git a/src/mongo/db/local_catalog/lock_manager/resource_catalog.h b/src/mongo/db/shard_role/lock_manager/resource_catalog.h similarity index 97% rename from src/mongo/db/local_catalog/lock_manager/resource_catalog.h rename to src/mongo/db/shard_role/lock_manager/resource_catalog.h index 5828a44beea..1e24729d1a0 100644 --- a/src/mongo/db/local_catalog/lock_manager/resource_catalog.h +++ b/src/mongo/db/shard_role/lock_manager/resource_catalog.h @@ -30,8 +30,8 @@ #pragma once #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/stdx/mutex.h" #include "mongo/stdx/unordered_map.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/local_catalog/lock_manager/resource_catalog_test.cpp b/src/mongo/db/shard_role/lock_manager/resource_catalog_test.cpp similarity index 99% rename from src/mongo/db/local_catalog/lock_manager/resource_catalog_test.cpp rename to src/mongo/db/shard_role/lock_manager/resource_catalog_test.cpp index f74b79d6281..94cc8e295ad 100644 --- a/src/mongo/db/local_catalog/lock_manager/resource_catalog_test.cpp +++ b/src/mongo/db/shard_role/lock_manager/resource_catalog_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/lock_manager/resource_catalog.h" +#include "mongo/db/shard_role/lock_manager/resource_catalog.h" #include "mongo/base/string_data.h" #include "mongo/db/tenant_id.h" diff --git a/src/mongo/db/local_catalog/shard_role_api/post_resharding_placement.cpp b/src/mongo/db/shard_role/post_resharding_placement.cpp similarity index 98% rename from src/mongo/db/local_catalog/shard_role_api/post_resharding_placement.cpp rename to src/mongo/db/shard_role/post_resharding_placement.cpp index 0bf0a5d68d5..f4b4dc517ea 100644 --- a/src/mongo/db/local_catalog/shard_role_api/post_resharding_placement.cpp +++ b/src/mongo/db/shard_role/post_resharding_placement.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_api/post_resharding_placement.h" +#include "mongo/db/shard_role/post_resharding_placement.h" #include "mongo/db/sharding_environment/grid.h" diff --git a/src/mongo/db/local_catalog/shard_role_api/post_resharding_placement.h b/src/mongo/db/shard_role/post_resharding_placement.h similarity index 97% rename from src/mongo/db/local_catalog/shard_role_api/post_resharding_placement.h rename to src/mongo/db/shard_role/post_resharding_placement.h index 9b7cc25385c..2dc8d9a64c3 100644 --- a/src/mongo/db/local_catalog/shard_role_api/post_resharding_placement.h +++ b/src/mongo/db/shard_role/post_resharding_placement.h @@ -29,7 +29,7 @@ #pragma once #include "mongo/db/global_catalog/shard_key_pattern.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" #include "mongo/db/sharding_environment/shard_id.h" namespace mongo { diff --git a/src/mongo/db/local_catalog/shard_role_api/resource_yielder.h b/src/mongo/db/shard_role/resource_yielder.h similarity index 100% rename from src/mongo/db/local_catalog/shard_role_api/resource_yielder.h rename to src/mongo/db/shard_role/resource_yielder.h diff --git a/src/mongo/db/local_catalog/shard_role_api/resource_yielder_test.cpp b/src/mongo/db/shard_role/resource_yielder_test.cpp similarity index 98% rename from src/mongo/db/local_catalog/shard_role_api/resource_yielder_test.cpp rename to src/mongo/db/shard_role/resource_yielder_test.cpp index 8e4979f43d0..bac55d75960 100644 --- a/src/mongo/db/local_catalog/shard_role_api/resource_yielder_test.cpp +++ b/src/mongo/db/shard_role/resource_yielder_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_api/resource_yielder.h" +#include "mongo/db/shard_role/resource_yielder.h" #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/local_catalog/shard_role_api/resource_yielders.cpp b/src/mongo/db/shard_role/resource_yielders.cpp similarity index 96% rename from src/mongo/db/local_catalog/shard_role_api/resource_yielders.cpp rename to src/mongo/db/shard_role/resource_yielders.cpp index 1786faae299..0c56dfcab8a 100644 --- a/src/mongo/db/local_catalog/shard_role_api/resource_yielders.cpp +++ b/src/mongo/db/shard_role/resource_yielders.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_api/resource_yielders.h" +#include "mongo/db/shard_role/resource_yielders.h" namespace mongo { diff --git a/src/mongo/db/local_catalog/shard_role_api/resource_yielders.h b/src/mongo/db/shard_role/resource_yielders.h similarity index 98% rename from src/mongo/db/local_catalog/shard_role_api/resource_yielders.h rename to src/mongo/db/shard_role/resource_yielders.h index 1bd7088b344..f3e332296d6 100644 --- a/src/mongo/db/local_catalog/shard_role_api/resource_yielders.h +++ b/src/mongo/db/shard_role/resource_yielders.h @@ -30,8 +30,8 @@ #pragma once #include "mongo/base/string_data.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielder.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/resource_yielder.h" #include "mongo/db/transaction/transaction_participant_resource_yielder.h" #include "mongo/s/transaction_router_resource_yielder.h" diff --git a/src/mongo/db/local_catalog/BUILD.bazel b/src/mongo/db/shard_role/shard_catalog/BUILD.bazel similarity index 90% rename from src/mongo/db/local_catalog/BUILD.bazel rename to src/mongo/db/shard_role/shard_catalog/BUILD.bazel index 1fe074f0a8f..e3277ee25f2 100644 --- a/src/mongo/db/local_catalog/BUILD.bazel +++ b/src/mongo/db/shard_role/shard_catalog/BUILD.bazel @@ -70,7 +70,7 @@ mongo_cc_library( mongo_cc_library( name = "local_oplog_info", srcs = [ - "local_oplog_info.cpp", + "//src/mongo/db/repl:local_oplog_info.cpp", ], deps = [ "//src/mongo/db:server_base", # TODO(SERVER-93876): Remove. @@ -163,14 +163,6 @@ mongo_cc_library( ], ) -idl_generator( - name = "import_collection_oplog_entry_gen", - src = "import_collection_oplog_entry.idl", - deps = [ - "//src/mongo/db:basic_types_gen", - ], -) - mongo_cc_library( name = "collection_uuid_mismatch_info", srcs = [ @@ -184,7 +176,7 @@ mongo_cc_library( mongo_cc_library( name = "import_collection_oplog_entry", srcs = [ - ":import_collection_oplog_entry_gen", + "//src/mongo/db:import_collection_oplog_entry_gen", ], deps = [ "//src/mongo/db:server_base", @@ -236,7 +228,7 @@ mongo_cc_library( mongo_cc_library( name = "index_key_validate", srcs = [ - "index_key_validate.cpp", + "//src/mongo/db:index_key_validate.cpp", ], deps = [ "//src/mongo/db:common", @@ -251,7 +243,7 @@ mongo_cc_library( mongo_cc_library( name = "throttle_cursor", srcs = [ - "throttle_cursor.cpp", + "//src/mongo/db:throttle_cursor.cpp", ], deps = [ "//src/mongo/db/index:index_access_method", @@ -278,15 +270,15 @@ mongo_cc_library( mongo_cc_library( name = "index_repair", srcs = [ - "index_repair.cpp", + "//src/mongo/db:index_repair.cpp", ], deps = [ ":collection_options", "//src/mongo/db:shard_role", "//src/mongo/db/collection_crud", "//src/mongo/db/index:index_access_method", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/query/query_stats", + "//src/mongo/db/shard_role/lock_manager:exception_util", "//src/mongo/db/storage:duplicate_key_error_info", "//src/mongo/db/storage/key_string", "//src/mongo/db/validate:validate_state", @@ -313,7 +305,6 @@ mongo_cc_library( "coll_mod.cpp", "coll_mod_index.cpp", "collection_catalog_helper.cpp", - "collection_compact.cpp", "create_collection.cpp", "drop_collection.cpp", "drop_database.cpp", @@ -322,6 +313,7 @@ mongo_cc_library( "list_indexes.cpp", "rename_collection.cpp", "unique_collection_name.cpp", + "//src/mongo/db:collection_compact.cpp", "//src/mongo/db/collection_crud:capped_utils.cpp", ], deps = [ @@ -347,9 +339,9 @@ mongo_cc_library( "//src/mongo/db/index:index_access_method", "//src/mongo/db/index_builds:index_builds_coordinator", "//src/mongo/db/index_builds:multi_index_block", - "//src/mongo/db/local_catalog/ddl:server_parameters_idl", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/query/write_ops", + "//src/mongo/db/shard_role/ddl:server_parameters_idl", + "//src/mongo/db/shard_role/lock_manager:exception_util", "//src/mongo/db/stats:top", "//src/mongo/db/storage:index_entry_comparison", "//src/mongo/db/storage:record_store_base", @@ -384,8 +376,8 @@ mongo_cc_library( "//src/mongo/db:service_context", "//src/mongo/db:shard_role", "//src/mongo/db/index_builds:index_builds_coordinator", - "//src/mongo/db/local_catalog/lock_manager", "//src/mongo/db/repl:oplog", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/db/storage:write_unit_of_work", "//src/mongo/db/timeseries:timeseries_extended_range", ], @@ -511,7 +503,7 @@ mongo_cc_benchmark( ":collection_mock", "//src/mongo/db:multitenancy", "//src/mongo/db:service_context_non_d", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", ], ) @@ -564,7 +556,6 @@ mongo_cc_unit_test( "//src/mongo/db/index_builds:index_builds_coordinator", "//src/mongo/db/index_builds:index_builds_coordinator_mongod", "//src/mongo/db/index_builds:multi_index_block", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/op_observer", "//src/mongo/db/op_observer:op_observer_impl", "//src/mongo/db/op_observer:operation_logger_impl", @@ -576,6 +567,7 @@ mongo_cc_unit_test( "//src/mongo/db/repl:repl_coordinator_interface", "//src/mongo/db/repl:replmocks", "//src/mongo/db/repl:storage_interface_impl", + "//src/mongo/db/shard_role/lock_manager:exception_util", "//src/mongo/db/timeseries:timeseries_collmod", "//src/mongo/db/timeseries:timeseries_options", "//src/mongo/db/validate:collection_validation", @@ -590,11 +582,11 @@ mongo_cc_unit_test( mongo_cc_unit_test( name = "index_validate_test", srcs = [ - "index_key_validate_test.cpp", - "index_spec_validate_test.cpp", + "//src/mongo/db:index_key_validate_test.cpp", + "//src/mongo/db:index_spec_validate_test.cpp", ], tags = [ - "mongo_unittest_sixth_group", + "mongo_unittest_seventh_group", "server-index-builds", ], deps = [ @@ -609,10 +601,10 @@ mongo_cc_unit_test( mongo_cc_unit_test( name = "throttle_cursor_test", srcs = [ - "throttle_cursor_test.cpp", + "//src/mongo/db:throttle_cursor_test.cpp", ], tags = [ - "mongo_unittest_fourth_group", + "mongo_unittest_seventh_group", "server-integration-smoke", ], deps = [ @@ -648,7 +640,7 @@ mongo_cc_unit_test( srcs = [ "collection_record_store_options_test.cpp", ], - tags = ["mongo_unittest_sixth_group"], + tags = ["mongo_unittest_first_group"], deps = [ ":collection_record_store_options", "//src/mongo/db:server_base", @@ -666,8 +658,8 @@ mongo_cc_benchmark( ":collection_catalog", ":collection_mock", "//src/mongo/db:service_context_d_test_fixture", - "//src/mongo/db/local_catalog:catalog_control", "//src/mongo/db/repl:storage_interface_impl", + "//src/mongo/db/shard_role/shard_catalog:catalog_control", ], ) @@ -689,3 +681,55 @@ mongo_cc_library( "//src/mongo/db:server_base", ], ) + +idl_generator( + name = "shard_authoritative_catalog_gen", + src = "shard_authoritative_catalog.idl", + deps = [ + "//src/mongo/db:basic_types_gen", + ], +) + +idl_generator( + name = "type_oplog_catalog_metadata_gen", + src = "type_oplog_catalog_metadata.idl", + deps = [ + "//src/mongo/db:basic_types_gen", + "//src/mongo/db/global_catalog:type_database_gen", + ], +) + +idl_generator( + name = "collection_critical_section_document_gen", + src = "collection_critical_section_document.idl", + deps = [ + "//src/mongo/db:basic_types_gen", + ], +) + +idl_generator( + name = "participant_block_gen", + src = "participant_block.idl", + deps = [ + "//src/mongo/db:basic_types_gen", + "//src/mongo/idl:generic_argument_gen", + ], +) + +idl_generator( + name = "flush_database_cache_updates_gen", + src = "flush_database_cache_updates.idl", + deps = [ + "//src/mongo/db:basic_types_gen", + "//src/mongo/idl:generic_argument_gen", + ], +) + +idl_generator( + name = "flush_routing_table_cache_updates_gen", + src = "flush_routing_table_cache_updates.idl", + deps = [ + "//src/mongo/db:basic_types_gen", + "//src/mongo/idl:generic_argument_gen", + ], +) diff --git a/src/mongo/db/shard_role/shard_catalog/OWNERS.yml b/src/mongo/db/shard_role/shard_catalog/OWNERS.yml new file mode 100644 index 00000000000..7976e9c9124 --- /dev/null +++ b/src/mongo/db/shard_role/shard_catalog/OWNERS.yml @@ -0,0 +1,18 @@ +version: 1.0.0 +filters: + - "*": + approvers: + - 10gen/server-catalog-and-routing-shard-catalog + - "durable_catalog*": + approvers: + - 10gen/server-catalog-and-routing-shard-catalog + - 10gen/server-storage-engine-integration + - "index_catalog_entry_helpers*": + approvers: + - 10gen/query-execution-write-exec + - "document_validation*": + approvers: + - 10gen/query-execution + - "external_data_source_scope_guard*": + approvers: + - 10gen/query-integration-features diff --git a/src/mongo/db/local_catalog/README.md b/src/mongo/db/shard_role/shard_catalog/README.md similarity index 98% rename from src/mongo/db/local_catalog/README.md rename to src/mongo/db/shard_role/shard_catalog/README.md index 5122da9537e..f7dfe5a6c2c 100644 --- a/src/mongo/db/local_catalog/README.md +++ b/src/mongo/db/shard_role/shard_catalog/README.md @@ -8,11 +8,11 @@ caches this data for more efficient access. The catalog provides a mapping from logical user-level namespaces to durable storage engine entities and provides a concurrency control layer to safely modify collections and indexes metadata for DDL operations. -See the [Storage Engine API](../storage/README.md) for relevant information. +See the [Storage Engine API](../../storage/README.md) for relevant information. ## Durable Catalog -Catalog information is persisted as storage table with the `_mdb_catalog` [ident](../storage/README.md#idents). Each entry in this table is indexed with a 64-bit `RecordId`, referred to as the `Catalog ID`, and contains a BSON document that describes the properties of a collection and its indexes. +Catalog information is persisted as storage table with the `_mdb_catalog` [ident](../../storage/README.md#idents). Each entry in this table is indexed with a 64-bit `RecordId`, referred to as the `Catalog ID`, and contains a BSON document that describes the properties of a collection and its indexes. To manage the `_mdb_catalog` data efficiently and maintain correct layering between components, the server divides responsibilities between two key modules: @@ -347,7 +347,7 @@ cache of the [durable catalog](#durable-catalog) state. It provides the followin ### Concurrency Control -See [Concurrency Control](lock_manager/README.md) +See [Concurrency Control](../lock_manager/README.md) ### Synchronization @@ -401,9 +401,9 @@ In addition `Collection` objects have shared ownership of: - A `RecordStore` - an interface to access and manipulate the documents in the collection as stored by the storage engine. -A writable `Collection` may only be requested in an active [WriteUnitOfWork](../storage/README.md#WriteUnitOfWork). The +A writable `Collection` may only be requested in an active [WriteUnitOfWork](../../storage/README.md#WriteUnitOfWork). The new `Collection` instance is installed in the catalog when the storage transaction commits as the -first `onCommit` [Changes](../storage/README.md#changes) that run. This means that it is not allowed +first `onCommit` [Changes](../../storage/README.md#changes) that run. This means that it is not allowed to perform any modification to catalog, collection or index instances in `onCommit` handlers. Such modifications would break the immutability property of these instances for readers. If the storage transaction rolls back then the writable `Collection` object is simply discarded and no change is @@ -527,7 +527,7 @@ The `CollectionCatalog` contains a mapping of `Namespace` and `UUID` to the `cat timestamps back to the oldest timestamp. These are used for efficient lookups into the durable catalog, and are resilient to create, drop and rename operations. -Operations that use collection locks (in any [lock mode](lock_manager/README.md#lock-modes)) can +Operations that use collection locks (in any [lock mode](../lock_manager/README.md#lock-modes)) can rely on the catalog information of the collection not changing. However, when unlocking and then re-locking, not only should operations recheck catalog information to ensure it is still valid, they should also make sure to abandon the storage snapshot, so it is consistent with the in memory @@ -622,7 +622,7 @@ The oplog applier applies entries out-of-order to provide parallelism for data r exposes readers with no set read timestamp to the possibility of seeing inconsistent states of data. Because of this, reads on secondaries are generally required to read at replication's -[lastApplied](../repl/README.md#replication-timestamp-glossary) optime instead (see +[lastApplied](../../repl/README.md#replication-timestamp-glossary) optime instead (see [SERVER-34192](https://jira.mongodb.org/browse/SERVER-34192)). LastApplied is used because on secondaries it is only updated after each oplog batch, which is a known consistent state of data. @@ -635,7 +635,7 @@ to read at Operations that write to collections and indexes must take collection locks. Storage engines require all operations to hold at least a collection IX lock to provide document-level concurrency. -Operations must perform writes in the scope of a [WriteUnitOfWork](../storage/README.md#writeunitofwork). +Operations must perform writes in the scope of a [WriteUnitOfWork](../../storage/README.md#writeunitofwork). ## Collection and Index Writes diff --git a/src/mongo/db/local_catalog/README_sharding_catalog.md b/src/mongo/db/shard_role/shard_catalog/README_sharding_catalog.md similarity index 94% rename from src/mongo/db/local_catalog/README_sharding_catalog.md rename to src/mongo/db/shard_role/shard_catalog/README_sharding_catalog.md index db604ddaed4..efdd8878301 100644 --- a/src/mongo/db/local_catalog/README_sharding_catalog.md +++ b/src/mongo/db/shard_role/shard_catalog/README_sharding_catalog.md @@ -44,7 +44,7 @@ Based on the above, as it stands, different containers on different nodes are au The most important requirement of any sharded feature is that it scales linearly with the size of the data or the workload. -In order to scale, sharding utilises "optimistic" distributed synchronisation protocols to avoid creating nodes which are a bottleneck (i.e., the CSRS). One of these protocols, named [shard versioning](../versioning_protocol/README_versioning_protocols.md), allows the routers to use cached information to send queries to one or more shards, and only read from the CSRS if the state of the world changes (e.g. chunk migration). +In order to scale, sharding utilises "optimistic" distributed synchronisation protocols to avoid creating nodes which are a bottleneck (i.e., the CSRS). One of these protocols, named [shard versioning](../../versioning_protocol/README_versioning_protocols.md), allows the routers to use cached information to send queries to one or more shards, and only read from the CSRS if the state of the world changes (e.g. chunk migration). The main goal of these protocols is to maintain certain causal relationships between the different catalog containers, where _routers_ operate on cached information and rely on the _shards_ to "correct" them if the data is no longer where the router thinks it is. @@ -68,4 +68,4 @@ When a piece of code is running in a router loop, it is also said that it is exe ### Shard role -For a piece of code to be executing in the shard role, it must be holding some kind of synchronisation which guarantees the stability of the catalog for that scope. See [here](/src/mongo/db/local_catalog/shard_role_api/README_shard_role_api.md) for details about the Shard Role API. +For a piece of code to be executing in the shard role, it must be holding some kind of synchronisation which guarantees the stability of the catalog for that scope. See [here](../README_shard_role_api.md) for details about the Shard Role API. diff --git a/src/mongo/db/local_catalog/README_terminology.md b/src/mongo/db/shard_role/shard_catalog/README_terminology.md similarity index 100% rename from src/mongo/db/local_catalog/README_terminology.md rename to src/mongo/db/shard_role/shard_catalog/README_terminology.md diff --git a/src/mongo/db/local_catalog/backwards_compatible_collection_options_util.cpp b/src/mongo/db/shard_role/shard_catalog/backwards_compatible_collection_options_util.cpp similarity index 97% rename from src/mongo/db/local_catalog/backwards_compatible_collection_options_util.cpp rename to src/mongo/db/shard_role/shard_catalog/backwards_compatible_collection_options_util.cpp index 779f4ad9026..a71aa90c7ce 100644 --- a/src/mongo/db/local_catalog/backwards_compatible_collection_options_util.cpp +++ b/src/mongo/db/shard_role/shard_catalog/backwards_compatible_collection_options_util.cpp @@ -29,7 +29,7 @@ // TODO SERVER-92265 evaluate getting rid of this util -#include "mongo/db/local_catalog/backwards_compatible_collection_options_util.h" +#include "mongo/db/shard_role/shard_catalog/backwards_compatible_collection_options_util.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/simple_bsonobj_comparator.h" diff --git a/src/mongo/db/local_catalog/backwards_compatible_collection_options_util.h b/src/mongo/db/shard_role/shard_catalog/backwards_compatible_collection_options_util.h similarity index 100% rename from src/mongo/db/local_catalog/backwards_compatible_collection_options_util.h rename to src/mongo/db/shard_role/shard_catalog/backwards_compatible_collection_options_util.h diff --git a/src/mongo/db/local_catalog/backwards_compatible_collection_options_util_test.cpp b/src/mongo/db/shard_role/shard_catalog/backwards_compatible_collection_options_util_test.cpp similarity index 96% rename from src/mongo/db/local_catalog/backwards_compatible_collection_options_util_test.cpp rename to src/mongo/db/shard_role/shard_catalog/backwards_compatible_collection_options_util_test.cpp index f57ddbdbbff..db57ebd3531 100644 --- a/src/mongo/db/local_catalog/backwards_compatible_collection_options_util_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/backwards_compatible_collection_options_util_test.cpp @@ -28,18 +28,18 @@ */ -#include "mongo/db/local_catalog/backwards_compatible_collection_options_util.h" +#include "mongo/db/shard_role/shard_catalog/backwards_compatible_collection_options_util.h" #include "mongo/db/dbhelpers.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/ddl/coll_mod_gen.h" -#include "mongo/db/local_catalog/ddl/create_gen.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_impl.h" #include "mongo/db/op_observer/op_observer_registry.h" #include "mongo/db/op_observer/operation_logger_impl.h" #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/ddl/coll_mod_gen.h" +#include "mongo/db/shard_role/ddl/create_gen.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" #include "mongo/db/timeseries/timeseries_collmod.h" #include "mongo/db/timeseries/timeseries_gen.h" diff --git a/src/mongo/db/local_catalog/cannot_convert_index_to_unique_info.cpp b/src/mongo/db/shard_role/shard_catalog/cannot_convert_index_to_unique_info.cpp similarity index 96% rename from src/mongo/db/local_catalog/cannot_convert_index_to_unique_info.cpp rename to src/mongo/db/shard_role/shard_catalog/cannot_convert_index_to_unique_info.cpp index 6df6e63c4c3..3bc8c1f3e46 100644 --- a/src/mongo/db/local_catalog/cannot_convert_index_to_unique_info.cpp +++ b/src/mongo/db/shard_role/shard_catalog/cannot_convert_index_to_unique_info.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/cannot_convert_index_to_unique_info.h" +#include "mongo/db/shard_role/shard_catalog/cannot_convert_index_to_unique_info.h" #include "mongo/base/init.h" // IWYU pragma: keep #include "mongo/bson/bsonelement.h" diff --git a/src/mongo/db/local_catalog/cannot_convert_index_to_unique_info.h b/src/mongo/db/shard_role/shard_catalog/cannot_convert_index_to_unique_info.h similarity index 100% rename from src/mongo/db/local_catalog/cannot_convert_index_to_unique_info.h rename to src/mongo/db/shard_role/shard_catalog/cannot_convert_index_to_unique_info.h diff --git a/src/mongo/db/local_catalog/catalog_control.cpp b/src/mongo/db/shard_role/shard_catalog/catalog_control.cpp similarity index 96% rename from src/mongo/db/local_catalog/catalog_control.cpp rename to src/mongo/db/shard_role/shard_catalog/catalog_control.cpp index 9e82d56c957..13d9d6ca013 100644 --- a/src/mongo/db/local_catalog/catalog_control.cpp +++ b/src/mongo/db/shard_role/shard_catalog/catalog_control.cpp @@ -30,7 +30,7 @@ #define LOGV2_FOR_RECOVERY(ID, DLEVEL, MESSAGE, ...) \ LOGV2_DEBUG_OPTIONS(ID, DLEVEL, {logv2::LogComponent::kStorageRecovery}, MESSAGE, ##__VA_ARGS__) -#include "mongo/db/local_catalog/catalog_control.h" +#include "mongo/db/shard_role/shard_catalog/catalog_control.h" #include "mongo/base/error_codes.h" #include "mongo/base/status_with.h" @@ -38,16 +38,16 @@ #include "mongo/db/database_name.h" #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/index_builds/rebuild_indexes.h" -#include "mongo/db/local_catalog/catalog_repair.h" -#include "mongo/db/local_catalog/catalog_stats.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/historical_catalogid_tracker.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/catalog_repair.h" +#include "mongo/db/shard_role/shard_catalog/catalog_stats.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/historical_catalogid_tracker.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/timeseries/timeseries_extended_range.h" diff --git a/src/mongo/db/local_catalog/catalog_control.h b/src/mongo/db/shard_role/shard_catalog/catalog_control.h similarity index 100% rename from src/mongo/db/local_catalog/catalog_control.h rename to src/mongo/db/shard_role/shard_catalog/catalog_control.h diff --git a/src/mongo/db/local_catalog/catalog_control_bm.cpp b/src/mongo/db/shard_role/shard_catalog/catalog_control_bm.cpp similarity index 96% rename from src/mongo/db/local_catalog/catalog_control_bm.cpp rename to src/mongo/db/shard_role/shard_catalog/catalog_control_bm.cpp index e14af22335e..f97e3b1600e 100644 --- a/src/mongo/db/local_catalog/catalog_control_bm.cpp +++ b/src/mongo/db/shard_role/shard_catalog/catalog_control_bm.cpp @@ -27,13 +27,13 @@ * it in the license file. */ -#include "mongo/db/local_catalog/catalog_control.h" +#include "mongo/db/shard_role/shard_catalog/catalog_control.h" -#include "mongo/db/local_catalog/durable_catalog.h" #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/repl/storage_interface.h" #include "mongo/db/repl/storage_interface_impl.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog.h" #include "mongo/db/storage/mdb_catalog.h" #include diff --git a/src/mongo/db/local_catalog/catalog_helper.cpp b/src/mongo/db/shard_role/shard_catalog/catalog_helper.cpp similarity index 94% rename from src/mongo/db/local_catalog/catalog_helper.cpp rename to src/mongo/db/shard_role/shard_catalog/catalog_helper.cpp index 0e750e5a1d1..f913e202691 100644 --- a/src/mongo/db/local_catalog/catalog_helper.cpp +++ b/src/mongo/db/shard_role/shard_catalog/catalog_helper.cpp @@ -27,10 +27,10 @@ * it in the license file. */ -#include "mongo/db/local_catalog/catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/catalog_helper.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" #include "mongo/util/assert_util.h" #include "mongo/util/fail_point.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/local_catalog/catalog_helper.h b/src/mongo/db/shard_role/shard_catalog/catalog_helper.h similarity index 94% rename from src/mongo/db/local_catalog/catalog_helper.h rename to src/mongo/db/shard_role/shard_catalog/catalog_helper.h index 0be4b241a56..9cfcbc2ea76 100644 --- a/src/mongo/db/local_catalog/catalog_helper.h +++ b/src/mongo/db/shard_role/shard_catalog/catalog_helper.h @@ -30,10 +30,10 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" #include "mongo/util/time_support.h" #include diff --git a/src/mongo/db/local_catalog/catalog_raii.cpp b/src/mongo/db/shard_role/shard_catalog/catalog_raii.cpp similarity index 97% rename from src/mongo/db/local_catalog/catalog_raii.cpp rename to src/mongo/db/shard_role/shard_catalog/catalog_raii.cpp index e8de4e2739d..c057e3a6a7f 100644 --- a/src/mongo/db/local_catalog/catalog_raii.cpp +++ b/src/mongo/db/shard_role/shard_catalog/catalog_raii.cpp @@ -27,25 +27,25 @@ * it in the license file. */ -#include "mongo/db/local_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" #include "mongo/base/error_codes.h" #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/catalog_helper.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch.h" -#include "mongo/db/local_catalog/collection_yield_restore.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/shard_role_api/direct_connection_util.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/repl/collection_utils.h" #include "mongo/db/repl/intent_registry.h" +#include "mongo/db/shard_role/direct_connection_util.h" +#include "mongo/db/shard_role/shard_catalog/catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch.h" +#include "mongo/db/shard_role/shard_catalog/collection_yield_restore.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/exceptions.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/db/versioning_protocol/shard_version.h" diff --git a/src/mongo/db/local_catalog/catalog_raii.h b/src/mongo/db/shard_role/shard_catalog/catalog_raii.h similarity index 98% rename from src/mongo/db/local_catalog/catalog_raii.h rename to src/mongo/db/shard_role/shard_catalog/catalog_raii.h index a3a12483691..2c59b17c44b 100644 --- a/src/mongo/db/local_catalog/catalog_raii.h +++ b/src/mongo/db/shard_role/shard_catalog/catalog_raii.h @@ -31,15 +31,15 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/local_oplog_info.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/intent_registry.h" +#include "mongo/db/repl/local_oplog_info.h" #include "mongo/db/repl/oplog.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/database.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/tenant_id.h" #include "mongo/db/views/view.h" diff --git a/src/mongo/db/local_catalog/catalog_raii_test.cpp b/src/mongo/db/shard_role/shard_catalog/catalog_raii_test.cpp similarity index 97% rename from src/mongo/db/local_catalog/catalog_raii_test.cpp rename to src/mongo/db/shard_role/shard_catalog/catalog_raii_test.cpp index e09d9b3e8af..deba6bee801 100644 --- a/src/mongo/db/local_catalog/catalog_raii_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/catalog_raii_test.cpp @@ -27,19 +27,19 @@ * it in the license file. */ -#include "mongo/db/local_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" #include "mongo/bson/oid.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/database_holder_mock.h" -#include "mongo/db/local_catalog/lock_manager/locker.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_mock.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/locker.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/database_holder_mock.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state_factory_mock.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit_noop.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/topology/sharding_state.h" diff --git a/src/mongo/db/local_catalog/catalog_repair.cpp b/src/mongo/db/shard_role/shard_catalog/catalog_repair.cpp similarity index 98% rename from src/mongo/db/local_catalog/catalog_repair.cpp rename to src/mongo/db/shard_role/shard_catalog/catalog_repair.cpp index fbc9a108de6..e9bf398e3f2 100644 --- a/src/mongo/db/local_catalog/catalog_repair.cpp +++ b/src/mongo/db/shard_role/shard_catalog/catalog_repair.cpp @@ -27,11 +27,11 @@ * it in the license file. */ -#include "mongo/db/local_catalog/catalog_repair.h" +#include "mongo/db/shard_role/shard_catalog/catalog_repair.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/durable_catalog.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/storage/kv/kv_engine.h" #include "mongo/db/storage/mdb_catalog.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/local_catalog/catalog_repair.h b/src/mongo/db/shard_role/shard_catalog/catalog_repair.h similarity index 100% rename from src/mongo/db/local_catalog/catalog_repair.h rename to src/mongo/db/shard_role/shard_catalog/catalog_repair.h diff --git a/src/mongo/db/local_catalog/catalog_stats.cpp b/src/mongo/db/shard_role/shard_catalog/catalog_stats.cpp similarity index 96% rename from src/mongo/db/local_catalog/catalog_stats.cpp rename to src/mongo/db/shard_role/shard_catalog/catalog_stats.cpp index 5d9e2f2ffc4..a93cb49833b 100644 --- a/src/mongo/db/local_catalog/catalog_stats.cpp +++ b/src/mongo/db/shard_role/shard_catalog/catalog_stats.cpp @@ -28,15 +28,15 @@ */ -#include "mongo/db/local_catalog/catalog_stats.h" +#include "mongo/db/shard_role/shard_catalog/catalog_stats.h" #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/commands/server_status/server_status.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/views_for_database.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/views_for_database.h" #include "mongo/util/assert_util.h" #include diff --git a/src/mongo/db/local_catalog/catalog_stats.h b/src/mongo/db/shard_role/shard_catalog/catalog_stats.h similarity index 100% rename from src/mongo/db/local_catalog/catalog_stats.h rename to src/mongo/db/shard_role/shard_catalog/catalog_stats.h diff --git a/src/mongo/db/local_catalog/catalog_test_fixture.cpp b/src/mongo/db/shard_role/shard_catalog/catalog_test_fixture.cpp similarity index 98% rename from src/mongo/db/local_catalog/catalog_test_fixture.cpp rename to src/mongo/db/shard_role/shard_catalog/catalog_test_fixture.cpp index a985fc6b326..b6f98f1ef78 100644 --- a/src/mongo/db/local_catalog/catalog_test_fixture.cpp +++ b/src/mongo/db/shard_role/shard_catalog/catalog_test_fixture.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" #include "mongo/db/client.h" #include "mongo/db/repl/member_state.h" diff --git a/src/mongo/db/local_catalog/catalog_test_fixture.h b/src/mongo/db/shard_role/shard_catalog/catalog_test_fixture.h similarity index 100% rename from src/mongo/db/local_catalog/catalog_test_fixture.h rename to src/mongo/db/shard_role/shard_catalog/catalog_test_fixture.h diff --git a/src/mongo/db/local_catalog/catalogtests.cpp b/src/mongo/db/shard_role/shard_catalog/catalogtests.cpp similarity index 92% rename from src/mongo/db/local_catalog/catalogtests.cpp rename to src/mongo/db/shard_role/shard_catalog/catalogtests.cpp index 6b3f3783ca6..01099b30f17 100644 --- a/src/mongo/db/local_catalog/catalogtests.cpp +++ b/src/mongo/db/shard_role/shard_catalog/catalogtests.cpp @@ -28,15 +28,15 @@ */ #include "mongo/db/client.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/uncommitted_catalog_updates.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/uncommitted_catalog_updates.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/dbtests/dbtests.h" // IWYU pragma: keep #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/local_catalog/cluster_coll_stats_cmd.cpp b/src/mongo/db/shard_role/shard_catalog/cluster_coll_stats_cmd.cpp similarity index 98% rename from src/mongo/db/local_catalog/cluster_coll_stats_cmd.cpp rename to src/mongo/db/shard_role/shard_catalog/cluster_coll_stats_cmd.cpp index 2cb8cf8788b..d6be3a7b3cc 100644 --- a/src/mongo/db/local_catalog/cluster_coll_stats_cmd.cpp +++ b/src/mongo/db/shard_role/shard_catalog/cluster_coll_stats_cmd.cpp @@ -40,14 +40,14 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/namespace_string.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" +#include "mongo/db/router_role/collection_routing_info_targeter.h" +#include "mongo/db/router_role/router_role.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/shard_id.h" diff --git a/src/mongo/db/local_catalog/cluster_db_stats_cmd.cpp b/src/mongo/db/shard_role/shard_catalog/cluster_db_stats_cmd.cpp similarity index 98% rename from src/mongo/db/local_catalog/cluster_db_stats_cmd.cpp rename to src/mongo/db/shard_role/shard_catalog/cluster_db_stats_cmd.cpp index e257c48e12f..18fac3b79e0 100644 --- a/src/mongo/db/local_catalog/cluster_db_stats_cmd.cpp +++ b/src/mongo/db/shard_role/shard_catalog/cluster_db_stats_cmd.cpp @@ -39,8 +39,8 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/dbcommands_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.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/executor/remote_command_response.h" diff --git a/src/mongo/db/local_catalog/cluster_validate_db_metadata_cmd.cpp b/src/mongo/db/shard_role/shard_catalog/cluster_validate_db_metadata_cmd.cpp similarity index 96% rename from src/mongo/db/local_catalog/cluster_validate_db_metadata_cmd.cpp rename to src/mongo/db/shard_role/shard_catalog/cluster_validate_db_metadata_cmd.cpp index 33a94e96c94..e7e4bb9f12a 100644 --- a/src/mongo/db/local_catalog/cluster_validate_db_metadata_cmd.cpp +++ b/src/mongo/db/shard_role/shard_catalog/cluster_validate_db_metadata_cmd.cpp @@ -35,12 +35,12 @@ #include "mongo/bson/bsontypes.h" #include "mongo/client/read_preference.h" #include "mongo/db/commands.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/local_catalog/validate_db_metadata_common.h" -#include "mongo/db/local_catalog/validate_db_metadata_gen.h" #include "mongo/db/namespace_string.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/shard_role/shard_catalog/validate_db_metadata_common.h" +#include "mongo/db/shard_role/shard_catalog/validate_db_metadata_gen.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/executor/remote_command_response.h" diff --git a/src/mongo/db/local_catalog/cluster_validate_db_metadata_cmd_test.cpp b/src/mongo/db/shard_role/shard_catalog/cluster_validate_db_metadata_cmd_test.cpp similarity index 100% rename from src/mongo/db/local_catalog/cluster_validate_db_metadata_cmd_test.cpp rename to src/mongo/db/shard_role/shard_catalog/cluster_validate_db_metadata_cmd_test.cpp diff --git a/src/mongo/db/local_catalog/clustered_collection_options.idl b/src/mongo/db/shard_role/shard_catalog/clustered_collection_options.idl similarity index 100% rename from src/mongo/db/local_catalog/clustered_collection_options.idl rename to src/mongo/db/shard_role/shard_catalog/clustered_collection_options.idl diff --git a/src/mongo/db/local_catalog/clustered_collection_util.cpp b/src/mongo/db/shard_role/shard_catalog/clustered_collection_util.cpp similarity index 99% rename from src/mongo/db/local_catalog/clustered_collection_util.cpp rename to src/mongo/db/shard_role/shard_catalog/clustered_collection_util.cpp index 01303e215de..1f8df7ec489 100644 --- a/src/mongo/db/local_catalog/clustered_collection_util.cpp +++ b/src/mongo/db/shard_role/shard_catalog/clustered_collection_util.cpp @@ -28,7 +28,7 @@ */ -#include "mongo/db/local_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" #include "mongo/bson/bsonmisc.h" #include "mongo/bson/bsonobjbuilder.h" diff --git a/src/mongo/db/local_catalog/clustered_collection_util.h b/src/mongo/db/shard_role/shard_catalog/clustered_collection_util.h similarity index 95% rename from src/mongo/db/local_catalog/clustered_collection_util.h rename to src/mongo/db/shard_role/shard_catalog/clustered_collection_util.h index 50e66db2a37..bddd42e04d0 100644 --- a/src/mongo/db/local_catalog/clustered_collection_util.h +++ b/src/mongo/db/shard_role/shard_catalog/clustered_collection_util.h @@ -32,11 +32,11 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/ddl/create_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/ddl/create_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include diff --git a/src/mongo/db/local_catalog/coll_mod.cpp b/src/mongo/db/shard_role/shard_catalog/coll_mod.cpp similarity index 97% rename from src/mongo/db/local_catalog/coll_mod.cpp rename to src/mongo/db/shard_role/shard_catalog/coll_mod.cpp index f9865353524..9ce75cc9a93 100644 --- a/src/mongo/db/local_catalog/coll_mod.cpp +++ b/src/mongo/db/shard_role/shard_catalog/coll_mod.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/coll_mod.h" +#include "mongo/db/shard_role/shard_catalog/coll_mod.h" #include "mongo/base/error_codes.h" #include "mongo/base/status_with.h" @@ -43,27 +43,7 @@ #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/index_builds/index_builds_coordinator.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/coll_mod_index.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/collection_options_gen.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/ddl/coll_mod_gen.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/index_key_validate.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" +#include "mongo/db/index_key_validate.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" @@ -72,6 +52,26 @@ #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/coll_mod_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/coll_mod_index.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/stats/counters.h" #include "mongo/db/storage/key_format.h" diff --git a/src/mongo/db/local_catalog/coll_mod.h b/src/mongo/db/shard_role/shard_catalog/coll_mod.h similarity index 96% rename from src/mongo/db/local_catalog/coll_mod.h rename to src/mongo/db/shard_role/shard_catalog/coll_mod.h index 82af0b8f996..28926c69d51 100644 --- a/src/mongo/db/local_catalog/coll_mod.h +++ b/src/mongo/db/shard_role/shard_catalog/coll_mod.h @@ -32,12 +32,12 @@ #include "mongo/base/status.h" #include "mongo/base/status_with.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/ddl/coll_mod_gen.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" +#include "mongo/db/shard_role/ddl/coll_mod_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_role.h" namespace mongo { class BSONObj; diff --git a/src/mongo/db/local_catalog/coll_mod_index.cpp b/src/mongo/db/shard_role/shard_catalog/coll_mod_index.cpp similarity index 98% rename from src/mongo/db/local_catalog/coll_mod_index.cpp rename to src/mongo/db/shard_role/shard_catalog/coll_mod_index.cpp index f6c9c764f89..54fe71e4b1b 100644 --- a/src/mongo/db/local_catalog/coll_mod_index.cpp +++ b/src/mongo/db/shard_role/shard_catalog/coll_mod_index.cpp @@ -28,7 +28,7 @@ */ -#include "mongo/db/local_catalog/coll_mod_index.h" +#include "mongo/db/shard_role/shard_catalog/coll_mod_index.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonelement.h" @@ -37,11 +37,11 @@ #include "mongo/bson/timestamp.h" #include "mongo/bson/util/builder.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/cannot_convert_index_to_unique_info.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_key_validate.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" +#include "mongo/db/index_key_validate.h" +#include "mongo/db/shard_role/shard_catalog/cannot_convert_index_to_unique_info.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/index_entry_comparison.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/snapshot.h" diff --git a/src/mongo/db/local_catalog/coll_mod_index.h b/src/mongo/db/shard_role/shard_catalog/coll_mod_index.h similarity index 96% rename from src/mongo/db/local_catalog/coll_mod_index.h rename to src/mongo/db/shard_role/shard_catalog/coll_mod_index.h index f3bad48d063..34346a3c3d9 100644 --- a/src/mongo/db/local_catalog/coll_mod_index.h +++ b/src/mongo/db/shard_role/shard_catalog/coll_mod_index.h @@ -31,12 +31,12 @@ #include "mongo/base/status.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" #include "mongo/db/repl/oplog.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include #include diff --git a/src/mongo/db/local_catalog/coll_mod_test.cpp b/src/mongo/db/shard_role/shard_catalog/coll_mod_test.cpp similarity index 96% rename from src/mongo/db/local_catalog/coll_mod_test.cpp rename to src/mongo/db/shard_role/shard_catalog/coll_mod_test.cpp index 9d9fe2e761f..fe1a5b45c66 100644 --- a/src/mongo/db/local_catalog/coll_mod_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/coll_mod_test.cpp @@ -27,32 +27,32 @@ * it in the license file. */ -#include "mongo/db/local_catalog/coll_mod.h" +#include "mongo/db/shard_role/shard_catalog/coll_mod.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/json.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/backwards_compatible_collection_options_util.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/ddl/coll_mod_gen.h" -#include "mongo/db/local_catalog/ddl/create_gen.h" -#include "mongo/db/local_catalog/durable_catalog.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/ddl/coll_mod_gen.h" +#include "mongo/db/shard_role/ddl/create_gen.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/backwards_compatible_collection_options_util.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog.h" #include "mongo/db/storage/mdb_catalog.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/timeseries/timeseries_collmod.h" #include "mongo/db/timeseries/timeseries_gen.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/idl/idl_parser.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/local_catalog/collection.cpp b/src/mongo/db/shard_role/shard_catalog/collection.cpp similarity index 98% rename from src/mongo/db/local_catalog/collection.cpp rename to src/mongo/db/shard_role/shard_catalog/collection.cpp index 636277fc260..49001c230bd 100644 --- a/src/mongo/db/local_catalog/collection.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection.cpp @@ -27,9 +27,9 @@ * it in the license file. */ -#include "mongo/db/local_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" +#include "mongo/db/shard_role/transaction_resources.h" #include #include diff --git a/src/mongo/db/local_catalog/collection.h b/src/mongo/db/shard_role/shard_catalog/collection.h similarity index 98% rename from src/mongo/db/local_catalog/collection.h rename to src/mongo/db/shard_role/shard_catalog/collection.h index 6367f3ea4f5..dd3ee60e1fd 100644 --- a/src/mongo/db/local_catalog/collection.h +++ b/src/mongo/db/shard_role/shard_catalog/collection.h @@ -37,15 +37,6 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection_operation_source.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/collection_options_gen.h" -#include "mongo/db/local_catalog/durable_catalog_entry.h" -#include "mongo/db/local_catalog/durable_catalog_entry_metadata.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -58,6 +49,15 @@ #include "mongo/db/repl/oplog.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_operation_source.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/ident.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/snapshot.h" diff --git a/src/mongo/db/local_catalog/collection_catalog.cpp b/src/mongo/db/shard_role/shard_catalog/collection_catalog.cpp similarity index 99% rename from src/mongo/db/local_catalog/collection_catalog.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_catalog.cpp index be1e7f6bd7c..98ed32e30da 100644 --- a/src/mongo/db/local_catalog/collection_catalog.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_catalog.cpp @@ -48,16 +48,16 @@ #include "mongo/crypto/fle_stats.h" #include "mongo/db/client.h" #include "mongo/db/commands/server_status/server_status.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/collection_record_store_options.h" -#include "mongo/db/local_catalog/durable_catalog.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/lock_manager/resource_catalog.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/uncommitted_catalog_updates.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" +#include "mongo/db/shard_role/lock_manager/resource_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_record_store_options.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog.h" +#include "mongo/db/shard_role/shard_catalog/uncommitted_catalog_updates.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/exceptions.h" #include "mongo/db/storage/kv/kv_engine.h" #include "mongo/db/storage/mdb_catalog.h" diff --git a/src/mongo/db/local_catalog/collection_catalog.h b/src/mongo/db/shard_role/shard_catalog/collection_catalog.h similarity index 99% rename from src/mongo/db/local_catalog/collection_catalog.h rename to src/mongo/db/shard_role/shard_catalog/collection_catalog.h index 8fc4d68d780..55e565320c0 100644 --- a/src/mongo/db/local_catalog/collection_catalog.h +++ b/src/mongo/db/shard_role/shard_catalog/collection_catalog.h @@ -34,14 +34,14 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/timestamp.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/durable_catalog_entry.h" -#include "mongo/db/local_catalog/historical_catalogid_tracker.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/views_for_database.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/historical_catalogid_tracker.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/views_for_database.h" #include "mongo/db/tenant_id.h" #include "mongo/db/views/view.h" #include "mongo/stdx/unordered_map.h" diff --git a/src/mongo/db/local_catalog/collection_catalog_bm.cpp b/src/mongo/db/shard_role/shard_catalog/collection_catalog_bm.cpp similarity index 96% rename from src/mongo/db/local_catalog/collection_catalog_bm.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_catalog_bm.cpp index 616b13a0161..61c7a9a5daa 100644 --- a/src/mongo/db/local_catalog/collection_catalog_bm.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_catalog_bm.cpp @@ -27,18 +27,18 @@ * it in the license file. */ -#include "mongo/db/local_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" #include "mongo/bson/timestamp.h" #include "mongo/db/client.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_mock.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_mock.h" #include "mongo/db/tenant_id.h" #include "mongo/util/assert_util.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/local_catalog/collection_catalog_helper.cpp b/src/mongo/db/shard_role/shard_catalog/collection_catalog_helper.cpp similarity index 97% rename from src/mongo/db/local_catalog/collection_catalog_helper.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_catalog_helper.cpp index 5647025a882..3611d771c2d 100644 --- a/src/mongo/db/local_catalog/collection_catalog_helper.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_catalog_helper.cpp @@ -27,18 +27,18 @@ * it in the license file. */ -#include "mongo/db/local_catalog/collection_catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog_helper.h" #include "mongo/base/error_codes.h" #include "mongo/db/audit.h" #include "mongo/db/global_settings.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/durable_catalog.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/repl/repl_set_member_in_standalone_mode.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/storage/control/storage_control.h" #include "mongo/db/storage/kv/kv_engine.h" diff --git a/src/mongo/db/local_catalog/collection_catalog_helper.h b/src/mongo/db/shard_role/shard_catalog/collection_catalog_helper.h similarity index 98% rename from src/mongo/db/local_catalog/collection_catalog_helper.h rename to src/mongo/db/shard_role/shard_catalog/collection_catalog_helper.h index 317b57f3322..7e6eabb47db 100644 --- a/src/mongo/db/local_catalog/collection_catalog_helper.h +++ b/src/mongo/db/shard_role/shard_catalog/collection_catalog_helper.h @@ -31,10 +31,10 @@ #include "mongo/base/status.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" namespace mongo { diff --git a/src/mongo/db/local_catalog/collection_catalog_test.cpp b/src/mongo/db/shard_role/shard_catalog/collection_catalog_test.cpp similarity index 99% rename from src/mongo/db/local_catalog/collection_catalog_test.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_catalog_test.cpp index 4eb64fd889c..b7145d0f57c 100644 --- a/src/mongo/db/local_catalog/collection_catalog_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_catalog_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" #include #include @@ -46,26 +46,26 @@ #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/index_builds/resumable_index_builds_gen.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/collection_catalog_helper.h" -#include "mongo/db/local_catalog/collection_mock.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/collection_yield_restore.h" -#include "mongo/db/local_catalog/durable_catalog.h" -#include "mongo/db/local_catalog/durable_catalog_entry_metadata.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/lock_manager/resource_catalog.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/uncommitted_catalog_updates.h" #include "mongo/db/record_id.h" #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/repl/storage_interface.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/resource_catalog.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/collection_mock.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_yield_restore.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/uncommitted_catalog_updates.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/ident.h" #include "mongo/db/storage/mdb_catalog.h" #include "mongo/db/storage/record_store.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/collection_critical_section_document.idl b/src/mongo/db/shard_role/shard_catalog/collection_critical_section_document.idl similarity index 100% rename from src/mongo/db/local_catalog/shard_role_catalog/collection_critical_section_document.idl rename to src/mongo/db/shard_role/shard_catalog/collection_critical_section_document.idl diff --git a/src/mongo/db/local_catalog/collection_impl.cpp b/src/mongo/db/shard_role/shard_catalog/collection_impl.cpp similarity index 99% rename from src/mongo/db/local_catalog/collection_impl.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_impl.cpp index 8ea5afcab3a..a229a6f625f 100644 --- a/src/mongo/db/local_catalog/collection_impl.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_impl.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/collection_impl.h" +#include "mongo/db/shard_role/shard_catalog/collection_impl.h" #include @@ -58,19 +58,8 @@ #include "mongo/db/exec/matcher/matcher.h" #include "mongo/db/feature_flag.h" #include "mongo/db/index/index_access_method.h" +#include "mongo/db/index_key_validate.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/backwards_compatible_collection_options_util.h" -#include "mongo/db/local_catalog/catalog_stats.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/durable_catalog.h" -#include "mongo/db/local_catalog/index_catalog_impl.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/index_key_validate.h" -#include "mongo/db/local_catalog/local_oplog_info.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/uncommitted_multikey.h" #include "mongo/db/matcher/doc_validation/doc_validation_error.h" #include "mongo/db/matcher/doc_validation/doc_validation_util.h" #include "mongo/db/matcher/expression.h" @@ -86,9 +75,20 @@ #include "mongo/db/query/compiler/parsers/matcher/expression_parser.h" #include "mongo/db/query/fle/implicit_validator.h" #include "mongo/db/query/util/make_data_structure.h" +#include "mongo/db/repl/local_oplog_info.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/backwards_compatible_collection_options_util.h" +#include "mongo/db/shard_role/shard_catalog/catalog_stats.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_impl.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/uncommitted_multikey.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/mdb_catalog.h" #include "mongo/db/storage/oplog_truncate_markers.h" #include "mongo/db/storage/storage_engine.h" diff --git a/src/mongo/db/local_catalog/collection_impl.h b/src/mongo/db/shard_role/shard_catalog/collection_impl.h similarity index 96% rename from src/mongo/db/local_catalog/collection_impl.h rename to src/mongo/db/shard_role/shard_catalog/collection_impl.h index 0f8ddb534ff..55a4bb2b3b5 100644 --- a/src/mongo/db/local_catalog/collection_impl.h +++ b/src/mongo/db/shard_role/shard_catalog/collection_impl.h @@ -37,22 +37,22 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/timestamp.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/collection_options_gen.h" -#include "mongo/db/local_catalog/durable_catalog_entry.h" -#include "mongo/db/local_catalog/durable_catalog_entry_metadata.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/change_stream_pre_and_post_images_options_gen.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/query/compiler/parsers/matcher/expression_parser.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/ident.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/collection_metadata.cpp b/src/mongo/db/shard_role/shard_catalog/collection_metadata.cpp similarity index 99% rename from src/mongo/db/local_catalog/shard_role_catalog/collection_metadata.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_metadata.cpp index 55f3d102435..0918348f23c 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/collection_metadata.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_metadata.cpp @@ -28,7 +28,7 @@ */ -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" #include "mongo/base/error_codes.h" #include "mongo/bson/bsonelement.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/collection_metadata.h b/src/mongo/db/shard_role/shard_catalog/collection_metadata.h similarity index 100% rename from src/mongo/db/local_catalog/shard_role_catalog/collection_metadata.h rename to src/mongo/db/shard_role/shard_catalog/collection_metadata.h diff --git a/src/mongo/db/local_catalog/shard_role_catalog/collection_metadata_filtering_test.cpp b/src/mongo/db/shard_role/shard_catalog/collection_metadata_filtering_test.cpp similarity index 95% rename from src/mongo/db/local_catalog/shard_role_catalog/collection_metadata_filtering_test.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_metadata_filtering_test.cpp index e51244e5327..e38867c1863 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/collection_metadata_filtering_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_metadata_filtering_test.cpp @@ -39,17 +39,17 @@ #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_collection_common_types_gen.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/metadata_manager.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/repl/read_concern_args.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/metadata_manager.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/versioning_protocol/chunk_version.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/collection_metadata_test.cpp b/src/mongo/db/shard_role/shard_catalog/collection_metadata_test.cpp similarity index 99% rename from src/mongo/db/local_catalog/shard_role_catalog/collection_metadata_test.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_metadata_test.cpp index 6e41316d24f..60d89904352 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/collection_metadata_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_metadata_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" diff --git a/src/mongo/db/local_catalog/collection_mock.h b/src/mongo/db/shard_role/shard_catalog/collection_mock.h similarity index 99% rename from src/mongo/db/local_catalog/collection_mock.h rename to src/mongo/db/shard_role/shard_catalog/collection_mock.h index 6c9166abf7b..a9e847c2a3a 100644 --- a/src/mongo/db/local_catalog/collection_mock.h +++ b/src/mongo/db/shard_role/shard_catalog/collection_mock.h @@ -29,10 +29,10 @@ #pragma once -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" #include "mongo/db/query/plan_executor.h" #include "mongo/db/query/plan_yield_policy.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" #include "mongo/platform/atomic_word.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/local_catalog/collection_operation_source.cpp b/src/mongo/db/shard_role/shard_catalog/collection_operation_source.cpp similarity index 97% rename from src/mongo/db/local_catalog/collection_operation_source.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_operation_source.cpp index 1fd7ef0f28c..f64abd57641 100644 --- a/src/mongo/db/local_catalog/collection_operation_source.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_operation_source.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/collection_operation_source.h" +#include "mongo/db/shard_role/shard_catalog/collection_operation_source.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/local_catalog/collection_operation_source.h b/src/mongo/db/shard_role/shard_catalog/collection_operation_source.h similarity index 100% rename from src/mongo/db/local_catalog/collection_operation_source.h rename to src/mongo/db/shard_role/shard_catalog/collection_operation_source.h diff --git a/src/mongo/db/local_catalog/collection_options.cpp b/src/mongo/db/shard_role/shard_catalog/collection_options.cpp similarity index 98% rename from src/mongo/db/local_catalog/collection_options.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_options.cpp index cb2947d74ea..b44b7a324e3 100644 --- a/src/mongo/db/local_catalog/collection_options.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_options.cpp @@ -27,19 +27,19 @@ * it in the license file. */ -#include "mongo/db/local_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsontypes.h" #include "mongo/db/basic_types_gen.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection_options_validation.h" -#include "mongo/db/local_catalog/ddl/create_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/collation/collator_factory_interface.h" #include "mongo/db/query/collation/collator_interface.h" +#include "mongo/db/shard_role/ddl/create_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection_options_validation.h" #include "mongo/idl/command_generic_argument.h" #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/local_catalog/collection_options.h b/src/mongo/db/shard_role/shard_catalog/collection_options.h similarity index 97% rename from src/mongo/db/local_catalog/collection_options.h rename to src/mongo/db/shard_role/shard_catalog/collection_options.h index 1719b110971..544034f894d 100644 --- a/src/mongo/db/local_catalog/collection_options.h +++ b/src/mongo/db/shard_role/shard_catalog/collection_options.h @@ -34,10 +34,10 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/crypto/encryption_fields_gen.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection_options_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/change_stream_pre_and_post_images_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_options_gen.h" #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/util/string_map.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/local_catalog/collection_options.idl b/src/mongo/db/shard_role/shard_catalog/collection_options.idl similarity index 97% rename from src/mongo/db/local_catalog/collection_options.idl rename to src/mongo/db/shard_role/shard_catalog/collection_options.idl index ce3e7a29b07..bb21bf60db1 100644 --- a/src/mongo/db/local_catalog/collection_options.idl +++ b/src/mongo/db/shard_role/shard_catalog/collection_options.idl @@ -29,7 +29,7 @@ global: cpp_namespace: "mongo" cpp_includes: - - "mongo/db/local_catalog/collection_options_validation.h" + - "mongo/db/shard_role/shard_catalog/collection_options_validation.h" imports: - "mongo/db/basic_types.idl" diff --git a/src/mongo/db/local_catalog/collection_options_test.cpp b/src/mongo/db/shard_role/shard_catalog/collection_options_test.cpp similarity index 99% rename from src/mongo/db/local_catalog/collection_options_test.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_options_test.cpp index 855dee7724c..17c91bf39a7 100644 --- a/src/mongo/db/local_catalog/collection_options_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_options_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" diff --git a/src/mongo/db/local_catalog/collection_options_validation.cpp b/src/mongo/db/shard_role/shard_catalog/collection_options_validation.cpp similarity index 96% rename from src/mongo/db/local_catalog/collection_options_validation.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_options_validation.cpp index bfd0dc27cc7..7c9dd0b322d 100644 --- a/src/mongo/db/local_catalog/collection_options_validation.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_options_validation.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/collection_options_validation.h" +#include "mongo/db/shard_role/shard_catalog/collection_options_validation.h" #include "mongo/base/error_codes.h" #include "mongo/bson/bsonelement.h" diff --git a/src/mongo/db/local_catalog/collection_options_validation.h b/src/mongo/db/shard_role/shard_catalog/collection_options_validation.h similarity index 100% rename from src/mongo/db/local_catalog/collection_options_validation.h rename to src/mongo/db/shard_role/shard_catalog/collection_options_validation.h diff --git a/src/mongo/db/local_catalog/collection_record_store_options.cpp b/src/mongo/db/shard_role/shard_catalog/collection_record_store_options.cpp similarity index 94% rename from src/mongo/db/local_catalog/collection_record_store_options.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_record_store_options.cpp index efe7ced7132..85782375fe8 100644 --- a/src/mongo/db/local_catalog/collection_record_store_options.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_record_store_options.cpp @@ -26,10 +26,10 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -#include "mongo/db/local_catalog/collection_record_store_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_record_store_options.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/storage/record_store.h" namespace mongo { diff --git a/src/mongo/db/local_catalog/collection_record_store_options.h b/src/mongo/db/shard_role/shard_catalog/collection_record_store_options.h similarity index 96% rename from src/mongo/db/local_catalog/collection_record_store_options.h rename to src/mongo/db/shard_role/shard_catalog/collection_record_store_options.h index abdf843c14c..00bc019614e 100644 --- a/src/mongo/db/local_catalog/collection_record_store_options.h +++ b/src/mongo/db/shard_role/shard_catalog/collection_record_store_options.h @@ -28,8 +28,8 @@ */ #pragma once -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/storage/record_store.h" namespace mongo { diff --git a/src/mongo/db/local_catalog/collection_record_store_options_test.cpp b/src/mongo/db/shard_role/shard_catalog/collection_record_store_options_test.cpp similarity index 97% rename from src/mongo/db/local_catalog/collection_record_store_options_test.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_record_store_options_test.cpp index ff1ac78a4db..ef521ed8100 100644 --- a/src/mongo/db/local_catalog/collection_record_store_options_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_record_store_options_test.cpp @@ -27,11 +27,11 @@ * it in the license file. */ -#include "mongo/db/local_catalog/collection_record_store_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_record_store_options.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/storage/key_format.h" #include "mongo/db/storage/record_store.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.cpp b/src/mongo/db/shard_role/shard_catalog/collection_sharding_runtime.cpp similarity index 99% rename from src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_sharding_runtime.cpp index b2999c57054..8a236de1d92 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_sharding_runtime.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" #include "mongo/base/error_codes.h" #include "mongo/base/status_with.h" @@ -36,10 +36,6 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/client.h" #include "mongo/db/feature_flag.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/plan_cache/plan_cache.h" #include "mongo/db/query/plan_cache/sbe_plan_cache.h" @@ -47,6 +43,10 @@ #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/s/range_deleter_service.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/topology/sharding_state.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h b/src/mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h similarity index 98% rename from src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h rename to src/mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h index e20b4b0ba09..4c7b248d0df 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h +++ b/src/mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h @@ -35,14 +35,14 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/global_catalog/ddl/sharding_migration_critical_section.h" #include "mongo/db/global_catalog/type_chunk.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/metadata_manager.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/metadata_manager.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" #include "mongo/db/versioning_protocol/shard_version.h" #include "mongo/stdx/mutex.h" #include "mongo/util/cancellation.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime_test.cpp b/src/mongo/db/shard_role/shard_catalog/collection_sharding_runtime_test.cpp similarity index 98% rename from src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime_test.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_sharding_runtime_test.cpp index 4eb230a1741..16de0cede53 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_sharding_runtime_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" #include "mongo/base/error_codes.h" #include "mongo/base/status_with.h" @@ -39,19 +39,12 @@ #include "mongo/client/remote_command_targeter_factory_mock.h" #include "mongo/client/remote_command_targeter_mock.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_loader.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_loader_mock.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/sharding_catalog_client_mock.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/global_catalog/type_collection_common_types_gen.h" #include "mongo/db/global_catalog/type_shard.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/optime.h" @@ -61,15 +54,22 @@ #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/repl/wait_for_majority_service.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_loader.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_loader_mock.h" #include "mongo/db/s/range_deleter_service.h" #include "mongo/db/s/range_deleter_service_test.h" #include "mongo/db/s/range_deletion_task_gen.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/sharding_environment/sharding_mongod_test_fixture.h" #include "mongo/db/topology/sharding_state.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/db/versioning_protocol/shard_version_factory.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.cpp b/src/mongo/db/shard_role/shard_catalog/collection_sharding_state.cpp similarity index 98% rename from src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_sharding_state.cpp index e063b531d2b..0846c43f2b5 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_sharding_state.cpp @@ -27,10 +27,10 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/platform/rwmutex.h" #include "mongo/stdx/mutex.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h b/src/mongo/db/shard_role/shard_catalog/collection_sharding_state.h similarity index 98% rename from src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h rename to src/mongo/db/shard_role/shard_catalog/collection_sharding_state.h index da17b5ea203..130a7ca8292 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h +++ b/src/mongo/db/shard_role/shard_catalog/collection_sharding_state.h @@ -30,11 +30,11 @@ #pragma once #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" #include "mongo/db/versioning_protocol/shard_version.h" #include diff --git a/src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_state_factory_shard.cpp b/src/mongo/db/shard_role/shard_catalog/collection_sharding_state_factory_shard.cpp similarity index 92% rename from src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_state_factory_shard.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_sharding_state_factory_shard.cpp index b9b26f117d9..191785d3fd6 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_state_factory_shard.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_sharding_state_factory_shard.cpp @@ -27,9 +27,9 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state_factory_shard.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state_factory_shard.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kSharding diff --git a/src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_state_factory_shard.h b/src/mongo/db/shard_role/shard_catalog/collection_sharding_state_factory_shard.h similarity index 92% rename from src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_state_factory_shard.h rename to src/mongo/db/shard_role/shard_catalog/collection_sharding_state_factory_shard.h index e574a9aab75..5c0ed70915c 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_state_factory_shard.h +++ b/src/mongo/db/shard_role/shard_catalog/collection_sharding_state_factory_shard.h @@ -29,10 +29,10 @@ #pragma once -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/stale_shard_exception_handler.h" #include "mongo/db/namespace_string.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/stale_shard_exception_handler.h" namespace mongo { diff --git a/src/mongo/db/local_catalog/collection_test.cpp b/src/mongo/db/shard_role/shard_catalog/collection_test.cpp similarity index 98% rename from src/mongo/db/local_catalog/collection_test.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_test.cpp index 6cf43d858b1..c0f3bcbc0e4 100644 --- a/src/mongo/db/local_catalog/collection_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/base/error_codes.h" #include "mongo/base/status_with.h" @@ -40,24 +40,24 @@ #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection_mock.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/storage_interface.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection_mock.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/stats/counters.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" diff --git a/src/mongo/db/local_catalog/collection_type.h b/src/mongo/db/shard_role/shard_catalog/collection_type.h similarity index 100% rename from src/mongo/db/local_catalog/collection_type.h rename to src/mongo/db/shard_role/shard_catalog/collection_type.h diff --git a/src/mongo/db/local_catalog/collection_uuid_mismatch.cpp b/src/mongo/db/shard_role/shard_catalog/collection_uuid_mismatch.cpp similarity index 94% rename from src/mongo/db/local_catalog/collection_uuid_mismatch.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_uuid_mismatch.cpp index 0b0c6b3b243..12a1361c418 100644 --- a/src/mongo/db/local_catalog/collection_uuid_mismatch.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_uuid_mismatch.cpp @@ -27,11 +27,11 @@ * it in the license file. */ -#include "mongo/db/local_catalog/collection_uuid_mismatch.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch.h" #include "mongo/base/string_data.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch_info.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h" #include "mongo/util/assert_util.h" #include diff --git a/src/mongo/db/local_catalog/collection_uuid_mismatch.h b/src/mongo/db/shard_role/shard_catalog/collection_uuid_mismatch.h similarity index 95% rename from src/mongo/db/local_catalog/collection_uuid_mismatch.h rename to src/mongo/db/shard_role/shard_catalog/collection_uuid_mismatch.h index e4ffa05b1f8..7ef523e38bf 100644 --- a/src/mongo/db/local_catalog/collection_uuid_mismatch.h +++ b/src/mongo/db/shard_role/shard_catalog/collection_uuid_mismatch.h @@ -29,10 +29,10 @@ #pragma once -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" #include "mongo/util/uuid.h" #include diff --git a/src/mongo/db/local_catalog/collection_uuid_mismatch_info.cpp b/src/mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.cpp similarity index 97% rename from src/mongo/db/local_catalog/collection_uuid_mismatch_info.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.cpp index 45e03bd0902..1fc24b67270 100644 --- a/src/mongo/db/local_catalog/collection_uuid_mismatch_info.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/collection_uuid_mismatch_info.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h" #include "mongo/base/init.h" // IWYU pragma: keep #include "mongo/base/status_with.h" diff --git a/src/mongo/db/local_catalog/collection_uuid_mismatch_info.h b/src/mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h similarity index 100% rename from src/mongo/db/local_catalog/collection_uuid_mismatch_info.h rename to src/mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h diff --git a/src/mongo/db/local_catalog/collection_writer_test.cpp b/src/mongo/db/shard_role/shard_catalog/collection_writer_test.cpp similarity index 96% rename from src/mongo/db/local_catalog/collection_writer_test.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_writer_test.cpp index 6be44bed777..380b776e454 100644 --- a/src/mongo/db/local_catalog/collection_writer_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_writer_test.cpp @@ -30,15 +30,15 @@ #include "mongo/base/string_data.h" #include "mongo/bson/timestamp.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_mock.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_mock.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/platform/atomic_word.h" #include "mongo/stdx/mutex.h" diff --git a/src/mongo/db/local_catalog/collection_yield_restore.cpp b/src/mongo/db/shard_role/shard_catalog/collection_yield_restore.cpp similarity index 91% rename from src/mongo/db/local_catalog/collection_yield_restore.cpp rename to src/mongo/db/shard_role/shard_catalog/collection_yield_restore.cpp index f3e8f81a8d0..ce02307bbe9 100644 --- a/src/mongo/db/local_catalog/collection_yield_restore.cpp +++ b/src/mongo/db/shard_role/shard_catalog/collection_yield_restore.cpp @@ -27,13 +27,13 @@ * it in the license file. */ -#include "mongo/db/local_catalog/collection_yield_restore.h" +#include "mongo/db/shard_role/shard_catalog/collection_yield_restore.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/direct_connection_util.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/snapshot_helper.h" +#include "mongo/db/shard_role/direct_connection_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/snapshot_helper.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/util/assert_util.h" #include diff --git a/src/mongo/db/local_catalog/collection_yield_restore.h b/src/mongo/db/shard_role/shard_catalog/collection_yield_restore.h similarity index 97% rename from src/mongo/db/local_catalog/collection_yield_restore.h rename to src/mongo/db/shard_role/shard_catalog/collection_yield_restore.h index e2583b4209b..436935fcbd2 100644 --- a/src/mongo/db/local_catalog/collection_yield_restore.h +++ b/src/mongo/db/shard_role/shard_catalog/collection_yield_restore.h @@ -29,9 +29,9 @@ #pragma once -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/uuid.h" namespace mongo { diff --git a/src/mongo/db/local_catalog/create_collection.cpp b/src/mongo/db/shard_role/shard_catalog/create_collection.cpp similarity index 97% rename from src/mongo/db/local_catalog/create_collection.cpp rename to src/mongo/db/shard_role/shard_catalog/create_collection.cpp index 1f1451168aa..e68a7fb3cf1 100644 --- a/src/mongo/db/local_catalog/create_collection.cpp +++ b/src/mongo/db/shard_role/shard_catalog/create_collection.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" #include "mongo/base/error_codes.h" #include "mongo/base/status_with.h" @@ -41,26 +41,7 @@ #include "mongo/db/database_name.h" #include "mongo/db/feature_flag.h" #include "mongo/db/index_builds/index_builds_coordinator.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_catalog_helper.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/ddl/create_gen.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/index_key_validate.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/unique_collection_name.h" -#include "mongo/db/local_catalog/virtual_collection_options.h" +#include "mongo/db/index_key_validate.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" @@ -73,6 +54,25 @@ #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/create_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/unique_collection_name.h" +#include "mongo/db/shard_role/shard_catalog/virtual_collection_options.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/stats/top.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_parameters_gen.h" diff --git a/src/mongo/db/local_catalog/create_collection.h b/src/mongo/db/shard_role/shard_catalog/create_collection.h similarity index 94% rename from src/mongo/db/local_catalog/create_collection.h rename to src/mongo/db/shard_role/shard_catalog/create_collection.h index ac9c93092b5..d7898bbee28 100644 --- a/src/mongo/db/local_catalog/create_collection.h +++ b/src/mongo/db/shard_role/shard_catalog/create_collection.h @@ -32,12 +32,12 @@ #include "mongo/base/status.h" #include "mongo/bson/bsonobj.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/ddl/create_gen.h" -#include "mongo/db/local_catalog/virtual_collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/ddl/create_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/virtual_collection_options.h" #include "mongo/util/uuid.h" #include diff --git a/src/mongo/db/local_catalog/create_collection_test.cpp b/src/mongo/db/shard_role/shard_catalog/create_collection_test.cpp similarity index 98% rename from src/mongo/db/local_catalog/create_collection_test.cpp rename to src/mongo/db/shard_role/shard_catalog/create_collection_test.cpp index d62930e639c..c878f17241f 100644 --- a/src/mongo/db/local_catalog/create_collection_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/create_collection_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" @@ -37,16 +37,6 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/client.h" #include "mongo/db/collection_crud/collection_write_path.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/ddl/create_gen.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/virtual_collection_impl.h" -#include "mongo/db/local_catalog/virtual_collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/external_data_source_option_gen.h" #include "mongo/db/query/query_knobs_gen.h" @@ -59,6 +49,16 @@ #include "mongo/db/repl/storage_interface_impl.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/ddl/create_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/virtual_collection_impl.h" +#include "mongo/db/shard_role/shard_catalog/virtual_collection_options.h" #include "mongo/db/storage/kv/kv_engine.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/timeseries/timeseries_gen.h" diff --git a/src/mongo/db/local_catalog/database.h b/src/mongo/db/shard_role/shard_catalog/database.h similarity index 97% rename from src/mongo/db/local_catalog/database.h rename to src/mongo/db/shard_role/shard_catalog/database.h index 28d6c4edb23..ff1c1b580c3 100644 --- a/src/mongo/db/local_catalog/database.h +++ b/src/mongo/db/shard_role/shard_catalog/database.h @@ -33,12 +33,12 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/database_name.h" #include "mongo/db/dbcommands_gen.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/virtual_collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/optime.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/virtual_collection_options.h" #include "mongo/util/decorable.h" namespace mongo { diff --git a/src/mongo/db/local_catalog/database_holder.cpp b/src/mongo/db/shard_role/shard_catalog/database_holder.cpp similarity index 97% rename from src/mongo/db/local_catalog/database_holder.cpp rename to src/mongo/db/shard_role/shard_catalog/database_holder.cpp index 0e8b2214943..314d0e36f88 100644 --- a/src/mongo/db/local_catalog/database_holder.cpp +++ b/src/mongo/db/shard_role/shard_catalog/database_holder.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" #include "mongo/util/decorable.h" diff --git a/src/mongo/db/local_catalog/database_holder.h b/src/mongo/db/shard_role/shard_catalog/database_holder.h similarity index 98% rename from src/mongo/db/local_catalog/database_holder.h rename to src/mongo/db/shard_role/shard_catalog/database_holder.h index 7e12cb69059..b4a2e3394a5 100644 --- a/src/mongo/db/local_catalog/database_holder.h +++ b/src/mongo/db/shard_role/shard_catalog/database_holder.h @@ -31,9 +31,9 @@ #include "mongo/base/string_data.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/database.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/database.h" #include #include diff --git a/src/mongo/db/local_catalog/database_holder_impl.cpp b/src/mongo/db/shard_role/shard_catalog/database_holder_impl.cpp similarity index 96% rename from src/mongo/db/local_catalog/database_holder_impl.cpp rename to src/mongo/db/shard_role/shard_catalog/database_holder_impl.cpp index 2e5a189e944..091098c2356 100644 --- a/src/mongo/db/local_catalog/database_holder_impl.cpp +++ b/src/mongo/db/shard_role/shard_catalog/database_holder_impl.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/database_holder_impl.h" +#include "mongo/db/shard_role/shard_catalog/database_holder_impl.h" #include "mongo/base/error_codes.h" #include "mongo/base/status.h" @@ -35,20 +35,20 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/audit.h" #include "mongo/db/index_builds/index_builds_coordinator.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_catalog_helper.h" -#include "mongo/db/local_catalog/database_impl.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" #include "mongo/db/profile_settings.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/database_impl.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/stats/top.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_engine.h" diff --git a/src/mongo/db/local_catalog/database_holder_impl.h b/src/mongo/db/shard_role/shard_catalog/database_holder_impl.h similarity index 97% rename from src/mongo/db/local_catalog/database_holder_impl.h rename to src/mongo/db/shard_role/shard_catalog/database_holder_impl.h index b9b3d11ab2a..f94f13464d4 100644 --- a/src/mongo/db/local_catalog/database_holder_impl.h +++ b/src/mongo/db/shard_role/shard_catalog/database_holder_impl.h @@ -30,9 +30,9 @@ #pragma once #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" #include "mongo/stdx/mutex.h" #include "mongo/stdx/unordered_map.h" #include "mongo/util/string_map.h" diff --git a/src/mongo/db/local_catalog/database_holder_mock.h b/src/mongo/db/shard_role/shard_catalog/database_holder_mock.h similarity index 97% rename from src/mongo/db/local_catalog/database_holder_mock.h rename to src/mongo/db/shard_role/shard_catalog/database_holder_mock.h index b02b3a08bea..ae247dedced 100644 --- a/src/mongo/db/local_catalog/database_holder_mock.h +++ b/src/mongo/db/shard_role/shard_catalog/database_holder_mock.h @@ -29,7 +29,7 @@ #pragma once -#include "mongo/db/local_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" #include diff --git a/src/mongo/db/local_catalog/database_impl.cpp b/src/mongo/db/shard_role/shard_catalog/database_impl.cpp similarity index 97% rename from src/mongo/db/local_catalog/database_impl.cpp rename to src/mongo/db/shard_role/shard_catalog/database_impl.cpp index c3a1c5ccbac..e3ad7f72d81 100644 --- a/src/mongo/db/local_catalog/database_impl.cpp +++ b/src/mongo/db/shard_role/shard_catalog/database_impl.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/database_impl.h" +#include "mongo/db/shard_role/shard_catalog/database_impl.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" @@ -37,22 +37,6 @@ #include "mongo/db/basic_types_gen.h" #include "mongo/db/index_builds/index_build_block.h" #include "mongo/db/index_builds/index_builds_common.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_catalog_helper.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/collection_options_gen.h" -#include "mongo/db/local_catalog/drop_collection.h" -#include "mongo/db/local_catalog/durable_catalog.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h" -#include "mongo/db/local_catalog/uncommitted_catalog_updates.h" -#include "mongo/db/local_catalog/virtual_collection_impl.h" -#include "mongo/db/local_catalog/virtual_collection_options.h" #include "mongo/db/matcher/extensions_callback_noop.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" @@ -69,6 +53,22 @@ #include "mongo/db/server_options.h" #include "mongo/db/server_parameter.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/drop_collection.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/uncommitted_catalog_updates.h" +#include "mongo/db/shard_role/shard_catalog/virtual_collection_impl.h" +#include "mongo/db/shard_role/shard_catalog/virtual_collection_options.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/stats/counters.h" #include "mongo/db/stats/top.h" #include "mongo/db/storage/exceptions.h" diff --git a/src/mongo/db/local_catalog/database_impl.h b/src/mongo/db/shard_role/shard_catalog/database_impl.h similarity index 96% rename from src/mongo/db/local_catalog/database_impl.h rename to src/mongo/db/shard_role/shard_catalog/database_impl.h index 5304f905dc5..9b4e8c6f1d0 100644 --- a/src/mongo/db/local_catalog/database_impl.h +++ b/src/mongo/db/shard_role/shard_catalog/database_impl.h @@ -34,14 +34,14 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/database_name.h" #include "mongo/db/dbcommands_gen.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/virtual_collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/repl/optime.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/virtual_collection_options.h" #include diff --git a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_metadata_accessor.cpp b/src/mongo/db/shard_role/shard_catalog/database_sharding_metadata_accessor.cpp similarity index 98% rename from src/mongo/db/local_catalog/shard_role_catalog/database_sharding_metadata_accessor.cpp rename to src/mongo/db/shard_role/shard_catalog/database_sharding_metadata_accessor.cpp index c9bb0696fb3..0e5ca02e77c 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_metadata_accessor.cpp +++ b/src/mongo/db/shard_role/shard_catalog/database_sharding_metadata_accessor.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_metadata_accessor.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_metadata_accessor.h" #include "mongo/db/operation_context.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_metadata_accessor.h b/src/mongo/db/shard_role/shard_catalog/database_sharding_metadata_accessor.h similarity index 100% rename from src/mongo/db/local_catalog/shard_role_catalog/database_sharding_metadata_accessor.h rename to src/mongo/db/shard_role/shard_catalog/database_sharding_metadata_accessor.h diff --git a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_metadata_accessor_test.cpp b/src/mongo/db/shard_role/shard_catalog/database_sharding_metadata_accessor_test.cpp similarity index 97% rename from src/mongo/db/local_catalog/shard_role_catalog/database_sharding_metadata_accessor_test.cpp rename to src/mongo/db/shard_role/shard_catalog/database_sharding_metadata_accessor_test.cpp index 581137d99ed..a5f9659bb8d 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_metadata_accessor_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/database_sharding_metadata_accessor_test.cpp @@ -27,12 +27,12 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_metadata_accessor.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_metadata_accessor.h" #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/type_database_gen.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_runtime.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/unittest/death_test.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.cpp b/src/mongo/db/shard_role/shard_catalog/database_sharding_runtime.cpp similarity index 98% rename from src/mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.cpp rename to src/mongo/db/shard_role/shard_catalog/database_sharding_runtime.cpp index bb39a718bfa..2d4336c140c 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.cpp +++ b/src/mongo/db/shard_role/shard_catalog/database_sharding_runtime.cpp @@ -27,16 +27,16 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_runtime.h" #include "mongo/base/error_codes.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/topology/sharding_state.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h b/src/mongo/db/shard_role/shard_catalog/database_sharding_runtime.h similarity index 98% rename from src/mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h rename to src/mongo/db/shard_role/shard_catalog/database_sharding_runtime.h index 97212fb7a29..08f45ca31de 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h +++ b/src/mongo/db/shard_role/shard_catalog/database_sharding_runtime.h @@ -33,9 +33,9 @@ #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/ddl/sharding_migration_critical_section.h" #include "mongo/db/global_catalog/type_database_gen.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_metadata_accessor.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_metadata_accessor.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/util/cancellation.h" #include "mongo/util/future.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime_test.cpp b/src/mongo/db/shard_role/shard_catalog/database_sharding_runtime_test.cpp similarity index 98% rename from src/mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime_test.cpp rename to src/mongo/db/shard_role/shard_catalog/database_sharding_runtime_test.cpp index d9b1b7bd86a..6fe4974d473 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/database_sharding_runtime_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_runtime.h" #include "mongo/base/status_with.h" #include "mongo/base/string_data.h" @@ -39,11 +39,11 @@ #include "mongo/db/global_catalog/sharding_catalog_client_mock.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/global_catalog/type_shard.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_shard.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/repl/optime_with.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/repl/wait_for_majority_service.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state_factory_shard.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/tenant_id.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state.cpp b/src/mongo/db/shard_role/shard_catalog/database_sharding_state.cpp similarity index 97% rename from src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state.cpp rename to src/mongo/db/shard_role/shard_catalog/database_sharding_state.cpp index cb97516156c..dc542711435 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state.cpp +++ b/src/mongo/db/shard_role/shard_catalog/database_sharding_state.cpp @@ -27,9 +27,9 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/platform/rwmutex.h" #include "mongo/stdx/mutex.h" #include "mongo/stdx/unordered_map.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h b/src/mongo/db/shard_role/shard_catalog/database_sharding_state.h similarity index 100% rename from src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h rename to src/mongo/db/shard_role/shard_catalog/database_sharding_state.h diff --git a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_mock.cpp b/src/mongo/db/shard_role/shard_catalog/database_sharding_state_factory_mock.cpp similarity index 91% rename from src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_mock.cpp rename to src/mongo/db/shard_role/shard_catalog/database_sharding_state_factory_mock.cpp index 36db131c17c..392e4c8f345 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_mock.cpp +++ b/src/mongo/db/shard_role/shard_catalog/database_sharding_state_factory_mock.cpp @@ -27,9 +27,9 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_mock.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state_factory_mock.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state_mock.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state_mock.h" namespace mongo { diff --git a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_mock.h b/src/mongo/db/shard_role/shard_catalog/database_sharding_state_factory_mock.h similarity index 96% rename from src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_mock.h rename to src/mongo/db/shard_role/shard_catalog/database_sharding_state_factory_mock.h index f8eff39da9d..d44a70e188e 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_mock.h +++ b/src/mongo/db/shard_role/shard_catalog/database_sharding_state_factory_mock.h @@ -30,7 +30,7 @@ #pragma once #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state.h" #include diff --git a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_shard.cpp b/src/mongo/db/shard_role/shard_catalog/database_sharding_state_factory_shard.cpp similarity index 91% rename from src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_shard.cpp rename to src/mongo/db/shard_role/shard_catalog/database_sharding_state_factory_shard.cpp index 3acb49885e0..287c9c0ea25 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_shard.cpp +++ b/src/mongo/db/shard_role/shard_catalog/database_sharding_state_factory_shard.cpp @@ -27,9 +27,9 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_shard.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state_factory_shard.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_runtime.h" namespace mongo { diff --git a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_shard.h b/src/mongo/db/shard_role/shard_catalog/database_sharding_state_factory_shard.h similarity index 92% rename from src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_shard.h rename to src/mongo/db/shard_role/shard_catalog/database_sharding_state_factory_shard.h index 3ba7208fdc7..85e78064f2b 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_shard.h +++ b/src/mongo/db/shard_role/shard_catalog/database_sharding_state_factory_shard.h @@ -30,8 +30,8 @@ #pragma once #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/stale_shard_exception_handler.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/stale_shard_exception_handler.h" #include diff --git a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state_mock.cpp b/src/mongo/db/shard_role/shard_catalog/database_sharding_state_mock.cpp similarity index 96% rename from src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state_mock.cpp rename to src/mongo/db/shard_role/shard_catalog/database_sharding_state_mock.cpp index b4963e1d61d..04992acf8c8 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state_mock.cpp +++ b/src/mongo/db/shard_role/shard_catalog/database_sharding_state_mock.cpp @@ -27,10 +27,10 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state_mock.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state_mock.h" #include "mongo/base/error_codes.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/util/assert_util.h" namespace mongo { diff --git a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state_mock.h b/src/mongo/db/shard_role/shard_catalog/database_sharding_state_mock.h similarity index 98% rename from src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state_mock.h rename to src/mongo/db/shard_role/shard_catalog/database_sharding_state_mock.h index f47e911eb5e..b2da9c22b23 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state_mock.h +++ b/src/mongo/db/shard_role/shard_catalog/database_sharding_state_mock.h @@ -32,8 +32,8 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/type_database_gen.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_runtime.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/db/versioning_protocol/stale_exception.h" diff --git a/src/mongo/db/local_catalog/database_test.cpp b/src/mongo/db/shard_role/shard_catalog/database_test.cpp similarity index 96% rename from src/mongo/db/local_catalog/database_test.cpp rename to src/mongo/db/shard_role/shard_catalog/database_test.cpp index 50c0e95aef3..4780c4a0697 100644 --- a/src/mongo/db/local_catalog/database_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/database_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database.h" #include "mongo/base/error_codes.h" #include "mongo/base/status.h" @@ -40,23 +40,6 @@ #include "mongo/crypto/encryption_fields_gen.h" #include "mongo/db/client.h" #include "mongo/db/index_builds/index_build_block.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database_holder_impl.h" -#include "mongo/db/local_catalog/database_impl.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/durable_catalog.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/unique_collection_name.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_impl.h" @@ -74,6 +57,23 @@ #include "mongo/db/repl/storage_interface_mock.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database_holder_impl.h" +#include "mongo/db/shard_role/shard_catalog/database_impl.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/unique_collection_name.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/local_catalog/db_raii.cpp b/src/mongo/db/shard_role/shard_catalog/db_raii.cpp similarity index 95% rename from src/mongo/db/local_catalog/db_raii.cpp rename to src/mongo/db/shard_role/shard_catalog/db_raii.cpp index 133f938bd01..a61809d0f33 100644 --- a/src/mongo/db/local_catalog/db_raii.cpp +++ b/src/mongo/db/shard_role/shard_catalog/db_raii.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" #include "mongo/base/error_codes.h" #include "mongo/bson/bsonelement.h" @@ -35,19 +35,6 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/client.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/catalog_helper.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch.h" -#include "mongo/db/local_catalog/collection_yield_restore.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/shard_role_api/direct_connection_util.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" -#include "mongo/db/local_catalog/snapshot_helper.h" #include "mongo/db/logical_time.h" #include "mongo/db/profile_settings.h" #include "mongo/db/repl/read_concern_args.h" @@ -56,6 +43,19 @@ #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/direct_connection_util.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch.h" +#include "mongo/db/shard_role/shard_catalog/collection_yield_restore.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/snapshot_helper.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/db/storage/storage_options.h" #include "mongo/db/topology/sharding_state.h" diff --git a/src/mongo/db/local_catalog/db_raii.h b/src/mongo/db/shard_role/shard_catalog/db_raii.h similarity index 95% rename from src/mongo/db/local_catalog/db_raii.h rename to src/mongo/db/shard_role/shard_catalog/db_raii.h index a69741adebf..e1a39e0eb3a 100644 --- a/src/mongo/db/local_catalog/db_raii.h +++ b/src/mongo/db/shard_role/shard_catalog/db_raii.h @@ -31,15 +31,15 @@ #include "mongo/base/string_data.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_type.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_type.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/stats/top.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/views/view.h" diff --git a/src/mongo/db/local_catalog/document_validation.cpp b/src/mongo/db/shard_role/shard_catalog/document_validation.cpp similarity index 96% rename from src/mongo/db/local_catalog/document_validation.cpp rename to src/mongo/db/shard_role/shard_catalog/document_validation.cpp index bd9aa4eb4f4..c538603f97d 100644 --- a/src/mongo/db/local_catalog/document_validation.cpp +++ b/src/mongo/db/shard_role/shard_catalog/document_validation.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" #include diff --git a/src/mongo/db/local_catalog/document_validation.h b/src/mongo/db/shard_role/shard_catalog/document_validation.h similarity index 100% rename from src/mongo/db/local_catalog/document_validation.h rename to src/mongo/db/shard_role/shard_catalog/document_validation.h diff --git a/src/mongo/db/local_catalog/drop_collection.cpp b/src/mongo/db/shard_role/shard_catalog/drop_collection.cpp similarity index 96% rename from src/mongo/db/local_catalog/drop_collection.cpp rename to src/mongo/db/shard_role/shard_catalog/drop_collection.cpp index 8faa253e198..5d08fd2d345 100644 --- a/src/mongo/db/local_catalog/drop_collection.cpp +++ b/src/mongo/db/shard_role/shard_catalog/drop_collection.cpp @@ -27,36 +27,36 @@ * it in the license file. */ -#include "mongo/db/local_catalog/drop_collection.h" +#include "mongo/db/shard_role/shard_catalog/drop_collection.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" #include "mongo/crypto/encryption_fields_gen.h" #include "mongo/db/audit.h" #include "mongo/db/index_builds/index_builds_coordinator.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_catalog_helper.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch_info.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/views_for_database.h" #include "mongo/db/operation_context.h" #include "mongo/db/profile_settings.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/views_for_database.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/stats/top.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/local_catalog/drop_collection.h b/src/mongo/db/shard_role/shard_catalog/drop_collection.h similarity index 98% rename from src/mongo/db/local_catalog/drop_collection.h rename to src/mongo/db/shard_role/shard_catalog/drop_collection.h index 4656fbe6812..c49e097db5f 100644 --- a/src/mongo/db/local_catalog/drop_collection.h +++ b/src/mongo/db/shard_role/shard_catalog/drop_collection.h @@ -31,10 +31,10 @@ #include "mongo/base/status.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/ddl/drop_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/optime.h" +#include "mongo/db/shard_role/ddl/drop_gen.h" #include "mongo/util/uuid.h" #include diff --git a/src/mongo/db/local_catalog/drop_database.cpp b/src/mongo/db/shard_role/shard_catalog/drop_database.cpp similarity index 97% rename from src/mongo/db/local_catalog/drop_database.cpp rename to src/mongo/db/shard_role/shard_catalog/drop_database.cpp index 2d5e2500814..63528897c87 100644 --- a/src/mongo/db/local_catalog/drop_database.cpp +++ b/src/mongo/db/shard_role/shard_catalog/drop_database.cpp @@ -28,7 +28,7 @@ */ -#include "mongo/db/local_catalog/drop_database.h" +#include "mongo/db/shard_role/shard_catalog/drop_database.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" @@ -37,14 +37,6 @@ #include "mongo/db/curop.h" #include "mongo/db/database_name.h" #include "mongo/db/index_builds/index_builds_coordinator.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" @@ -53,6 +45,14 @@ #include "mongo/db/repl/repl_client_info.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/exceptions.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/local_catalog/drop_database.h b/src/mongo/db/shard_role/shard_catalog/drop_database.h similarity index 100% rename from src/mongo/db/local_catalog/drop_database.h rename to src/mongo/db/shard_role/shard_catalog/drop_database.h diff --git a/src/mongo/db/local_catalog/drop_database_test.cpp b/src/mongo/db/shard_role/shard_catalog/drop_database_test.cpp similarity index 97% rename from src/mongo/db/local_catalog/drop_database_test.cpp rename to src/mongo/db/shard_role/shard_catalog/drop_database_test.cpp index 07c9d4b7feb..cd49f28a8e0 100644 --- a/src/mongo/db/local_catalog/drop_database_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/drop_database_test.cpp @@ -27,21 +27,13 @@ * it in the license file. */ -#include "mongo/db/local_catalog/drop_database.h" +#include "mongo/db/shard_role/shard_catalog/drop_database.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" #include "mongo/bson/timestamp.h" #include "mongo/db/client.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_noop.h" @@ -56,6 +48,14 @@ #include "mongo/db/repl/storage_interface_mock.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/tenant_id.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/local_catalog/drop_indexes.cpp b/src/mongo/db/shard_role/shard_catalog/drop_indexes.cpp similarity index 97% rename from src/mongo/db/local_catalog/drop_indexes.cpp rename to src/mongo/db/shard_role/shard_catalog/drop_indexes.cpp index 1ccfb66dffc..ec49b8b0d73 100644 --- a/src/mongo/db/local_catalog/drop_indexes.cpp +++ b/src/mongo/db/shard_role/shard_catalog/drop_indexes.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/drop_indexes.h" +#include "mongo/db/shard_role/shard_catalog/drop_indexes.h" #include #include @@ -43,29 +43,29 @@ #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/ddl/shard_key_index_util.h" #include "mongo/db/index_builds/index_builds_coordinator.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/ddl/server_parameters_gen.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/profile_settings.h" -#include "mongo/db/raw_data_operation.h" #include "mongo/db/repl/repl_set_member_in_standalone_mode.h" #include "mongo/db/repl/repl_settings.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/server_parameters_gen.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_parameters_gen.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/local_catalog/drop_indexes.h b/src/mongo/db/shard_role/shard_catalog/drop_indexes.h similarity index 98% rename from src/mongo/db/local_catalog/drop_indexes.h rename to src/mongo/db/shard_role/shard_catalog/drop_indexes.h index ced46ece676..7f4cfece266 100644 --- a/src/mongo/db/local_catalog/drop_indexes.h +++ b/src/mongo/db/shard_role/shard_catalog/drop_indexes.h @@ -31,9 +31,9 @@ #include "mongo/base/status.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/ddl/drop_indexes_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/ddl/drop_indexes_gen.h" #include "mongo/util/uuid.h" #include diff --git a/src/mongo/db/local_catalog/durable_catalog.cpp b/src/mongo/db/shard_role/shard_catalog/durable_catalog.cpp similarity index 98% rename from src/mongo/db/local_catalog/durable_catalog.cpp rename to src/mongo/db/shard_role/shard_catalog/durable_catalog.cpp index 4dbbca9b1f7..e5acc9b23b3 100644 --- a/src/mongo/db/local_catalog/durable_catalog.cpp +++ b/src/mongo/db/shard_role/shard_catalog/durable_catalog.cpp @@ -27,19 +27,19 @@ * it in the license file. */ -#include "mongo/db/local_catalog/durable_catalog.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog.h" #include "mongo/base/error_codes.h" #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/bsontypes.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection_record_store_options.h" -#include "mongo/db/local_catalog/durable_catalog_entry_metadata.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/op_observer/op_observer_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/rss/replicated_storage_service.h" +#include "mongo/db/shard_role/shard_catalog/collection_record_store_options.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/feature_document_util.h" #include "mongo/db/storage/kv/kv_engine.h" #include "mongo/db/storage/mdb_catalog.h" diff --git a/src/mongo/db/local_catalog/durable_catalog.h b/src/mongo/db/shard_role/shard_catalog/durable_catalog.h similarity index 98% rename from src/mongo/db/local_catalog/durable_catalog.h rename to src/mongo/db/shard_role/shard_catalog/durable_catalog.h index f9cee643561..17a88dabf95 100644 --- a/src/mongo/db/local_catalog/durable_catalog.h +++ b/src/mongo/db/shard_role/shard_catalog/durable_catalog.h @@ -33,12 +33,12 @@ #include "mongo/base/status_with.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/durable_catalog_entry.h" -#include "mongo/db/local_catalog/durable_catalog_entry_metadata.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.h" #include "mongo/db/storage/mdb_catalog.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/sorted_data_interface.h" diff --git a/src/mongo/db/local_catalog/durable_catalog_entry.h b/src/mongo/db/shard_role/shard_catalog/durable_catalog_entry.h similarity index 96% rename from src/mongo/db/local_catalog/durable_catalog_entry.h rename to src/mongo/db/shard_role/shard_catalog/durable_catalog_entry.h index f5d6eadfa6e..85ae85d112b 100644 --- a/src/mongo/db/local_catalog/durable_catalog_entry.h +++ b/src/mongo/db/shard_role/shard_catalog/durable_catalog_entry.h @@ -30,8 +30,8 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/durable_catalog_entry_metadata.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.h" #include diff --git a/src/mongo/db/local_catalog/durable_catalog_entry_metadata.cpp b/src/mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.cpp similarity index 99% rename from src/mongo/db/local_catalog/durable_catalog_entry_metadata.cpp rename to src/mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.cpp index 7cf9531dab7..39f7498cc28 100644 --- a/src/mongo/db/local_catalog/durable_catalog_entry_metadata.cpp +++ b/src/mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/durable_catalog_entry_metadata.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.h" #include #include diff --git a/src/mongo/db/local_catalog/durable_catalog_entry_metadata.h b/src/mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.h similarity index 99% rename from src/mongo/db/local_catalog/durable_catalog_entry_metadata.h rename to src/mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.h index b0f039a69a6..9923589caf7 100644 --- a/src/mongo/db/local_catalog/durable_catalog_entry_metadata.h +++ b/src/mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.h @@ -33,8 +33,8 @@ #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsonobj.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/platform/atomic_word.h" #include "mongo/stdx/mutex.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/local_catalog/external_data_source_scope_guard.cpp b/src/mongo/db/shard_role/shard_catalog/external_data_source_scope_guard.cpp similarity index 92% rename from src/mongo/db/local_catalog/external_data_source_scope_guard.cpp rename to src/mongo/db/shard_role/shard_catalog/external_data_source_scope_guard.cpp index f6a3d337ecf..9c336a3e52f 100644 --- a/src/mongo/db/local_catalog/external_data_source_scope_guard.cpp +++ b/src/mongo/db/shard_role/shard_catalog/external_data_source_scope_guard.cpp @@ -27,15 +27,15 @@ * it in the license file. */ -#include "mongo/db/local_catalog/external_data_source_scope_guard.h" +#include "mongo/db/shard_role/shard_catalog/external_data_source_scope_guard.h" #include "mongo/base/status.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/ddl/drop_gen.h" -#include "mongo/db/local_catalog/drop_collection.h" -#include "mongo/db/local_catalog/virtual_collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/external_data_source_option_gen.h" +#include "mongo/db/shard_role/ddl/drop_gen.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/drop_collection.h" +#include "mongo/db/shard_role/shard_catalog/virtual_collection_options.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/local_catalog/external_data_source_scope_guard.h b/src/mongo/db/shard_role/shard_catalog/external_data_source_scope_guard.h similarity index 100% rename from src/mongo/db/local_catalog/external_data_source_scope_guard.h rename to src/mongo/db/shard_role/shard_catalog/external_data_source_scope_guard.h diff --git a/src/mongo/db/local_catalog/shard_role_catalog/flush_database_cache_updates.idl b/src/mongo/db/shard_role/shard_catalog/flush_database_cache_updates.idl similarity index 100% rename from src/mongo/db/local_catalog/shard_role_catalog/flush_database_cache_updates.idl rename to src/mongo/db/shard_role/shard_catalog/flush_database_cache_updates.idl diff --git a/src/mongo/db/local_catalog/shard_role_catalog/flush_database_cache_updates_command.cpp b/src/mongo/db/shard_role/shard_catalog/flush_database_cache_updates_command.cpp similarity index 96% rename from src/mongo/db/local_catalog/shard_role_catalog/flush_database_cache_updates_command.cpp rename to src/mongo/db/shard_role/shard_catalog/flush_database_cache_updates_command.cpp index 6d4a1c07783..fe3c49906c7 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/flush_database_cache_updates_command.cpp +++ b/src/mongo/db/shard_role/shard_catalog/flush_database_cache_updates_command.cpp @@ -42,16 +42,16 @@ #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" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/flush_database_cache_updates_gen.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/repl/repl_client_info.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/flush_database_cache_updates_gen.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/flush_routing_table_cache_updates.idl b/src/mongo/db/shard_role/shard_catalog/flush_routing_table_cache_updates.idl similarity index 100% rename from src/mongo/db/local_catalog/shard_role_catalog/flush_routing_table_cache_updates.idl rename to src/mongo/db/shard_role/shard_catalog/flush_routing_table_cache_updates.idl diff --git a/src/mongo/db/local_catalog/shard_role_catalog/flush_routing_table_cache_updates_command.cpp b/src/mongo/db/shard_role/shard_catalog/flush_routing_table_cache_updates_command.cpp similarity index 95% rename from src/mongo/db/local_catalog/shard_role_catalog/flush_routing_table_cache_updates_command.cpp rename to src/mongo/db/shard_role/shard_catalog/flush_routing_table_cache_updates_command.cpp index e02c4e531a1..bce2917732f 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/flush_routing_table_cache_updates_command.cpp +++ b/src/mongo/db/shard_role/shard_catalog/flush_routing_table_cache_updates_command.cpp @@ -35,15 +35,15 @@ #include "mongo/db/client.h" #include "mongo/db/commands.h" #include "mongo/db/global_catalog/ddl/sharding_migration_critical_section.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/flush_routing_table_cache_updates_gen.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/repl_client_info.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/flush_routing_table_cache_updates_gen.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/topology/sharding_state.h" diff --git a/src/mongo/db/local_catalog/historical_catalogid_tracker.cpp b/src/mongo/db/shard_role/shard_catalog/historical_catalogid_tracker.cpp similarity index 99% rename from src/mongo/db/local_catalog/historical_catalogid_tracker.cpp rename to src/mongo/db/shard_role/shard_catalog/historical_catalogid_tracker.cpp index bc0ff45e898..80dd3f66691 100644 --- a/src/mongo/db/local_catalog/historical_catalogid_tracker.cpp +++ b/src/mongo/db/shard_role/shard_catalog/historical_catalogid_tracker.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/historical_catalogid_tracker.h" +#include "mongo/db/shard_role/shard_catalog/historical_catalogid_tracker.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/local_catalog/historical_catalogid_tracker.h b/src/mongo/db/shard_role/shard_catalog/historical_catalogid_tracker.h similarity index 100% rename from src/mongo/db/local_catalog/historical_catalogid_tracker.h rename to src/mongo/db/shard_role/shard_catalog/historical_catalogid_tracker.h diff --git a/src/mongo/db/local_catalog/historical_catalogid_tracker_test.cpp b/src/mongo/db/shard_role/shard_catalog/historical_catalogid_tracker_test.cpp similarity index 99% rename from src/mongo/db/local_catalog/historical_catalogid_tracker_test.cpp rename to src/mongo/db/shard_role/shard_catalog/historical_catalogid_tracker_test.cpp index 48ea2472443..93e9d6e24d9 100644 --- a/src/mongo/db/local_catalog/historical_catalogid_tracker_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/historical_catalogid_tracker_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/historical_catalogid_tracker.h" +#include "mongo/db/shard_role/shard_catalog/historical_catalogid_tracker.h" #include "mongo/base/string_data.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/implicit_collection_creation_test.cpp b/src/mongo/db/shard_role/shard_catalog/implicit_collection_creation_test.cpp similarity index 90% rename from src/mongo/db/local_catalog/shard_role_catalog/implicit_collection_creation_test.cpp rename to src/mongo/db/shard_role/shard_catalog/implicit_collection_creation_test.cpp index 2142eed422b..f61d689e7e2 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/implicit_collection_creation_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/implicit_collection_creation_test.cpp @@ -31,14 +31,14 @@ #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" #include "mongo/crypto/encryption_fields_gen.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/timeseries/timeseries_gen.h" diff --git a/src/mongo/db/local_catalog/index_catalog.cpp b/src/mongo/db/shard_role/shard_catalog/index_catalog.cpp similarity index 97% rename from src/mongo/db/local_catalog/index_catalog.cpp rename to src/mongo/db/shard_role/shard_catalog/index_catalog.cpp index 0d433f29530..c1dc646c88c 100644 --- a/src/mongo/db/local_catalog/index_catalog.cpp +++ b/src/mongo/db/shard_role/shard_catalog/index_catalog.cpp @@ -28,9 +28,9 @@ */ -#include "mongo/db/local_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" -#include "mongo/db/local_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/assert_util.h" #include diff --git a/src/mongo/db/local_catalog/index_catalog.h b/src/mongo/db/shard_role/shard_catalog/index_catalog.h similarity index 99% rename from src/mongo/db/local_catalog/index_catalog.h rename to src/mongo/db/shard_role/shard_catalog/index_catalog.h index 3892c7897c0..cf6a51c62b8 100644 --- a/src/mongo/db/local_catalog/index_catalog.h +++ b/src/mongo/db/shard_role/shard_catalog/index_catalog.h @@ -38,12 +38,12 @@ #include "mongo/db/index/multikey_paths.h" #include "mongo/db/index_builds/resumable_index_builds_gen.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/record_store.h" diff --git a/src/mongo/db/local_catalog/index_catalog_entry.cpp b/src/mongo/db/shard_role/shard_catalog/index_catalog_entry.cpp similarity index 93% rename from src/mongo/db/local_catalog/index_catalog_entry.cpp rename to src/mongo/db/shard_role/shard_catalog/index_catalog_entry.cpp index 33e5a50bc4d..56bd4b7ff81 100644 --- a/src/mongo/db/local_catalog/index_catalog_entry.cpp +++ b/src/mongo/db/shard_role/shard_catalog/index_catalog_entry.cpp @@ -27,9 +27,9 @@ * it in the license file. */ -#include "mongo/db/local_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" namespace mongo { diff --git a/src/mongo/db/local_catalog/index_catalog_entry.h b/src/mongo/db/shard_role/shard_catalog/index_catalog_entry.h similarity index 100% rename from src/mongo/db/local_catalog/index_catalog_entry.h rename to src/mongo/db/shard_role/shard_catalog/index_catalog_entry.h diff --git a/src/mongo/db/local_catalog/index_catalog_entry_helpers.cpp b/src/mongo/db/shard_role/shard_catalog/index_catalog_entry_helpers.cpp similarity index 98% rename from src/mongo/db/local_catalog/index_catalog_entry_helpers.cpp rename to src/mongo/db/shard_role/shard_catalog/index_catalog_entry_helpers.cpp index 2612da0beef..8838f5abc9b 100644 --- a/src/mongo/db/local_catalog/index_catalog_entry_helpers.cpp +++ b/src/mongo/db/shard_role/shard_catalog/index_catalog_entry_helpers.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/index_catalog_entry_helpers.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry_helpers.h" #include "mongo/db/index/wildcard_access_method.h" #include "mongo/db/query/planner_ixselect.h" diff --git a/src/mongo/db/local_catalog/index_catalog_entry_helpers.h b/src/mongo/db/shard_role/shard_catalog/index_catalog_entry_helpers.h similarity index 96% rename from src/mongo/db/local_catalog/index_catalog_entry_helpers.h rename to src/mongo/db/shard_role/shard_catalog/index_catalog_entry_helpers.h index 94f43cba459..6e9f457fb29 100644 --- a/src/mongo/db/local_catalog/index_catalog_entry_helpers.h +++ b/src/mongo/db/shard_role/shard_catalog/index_catalog_entry_helpers.h @@ -30,7 +30,7 @@ #pragma once #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/db/update_index_data.h" namespace mongo::index_catalog_helpers { diff --git a/src/mongo/db/local_catalog/index_catalog_entry_impl.cpp b/src/mongo/db/shard_role/shard_catalog/index_catalog_entry_impl.cpp similarity index 98% rename from src/mongo/db/local_catalog/index_catalog_entry_impl.cpp rename to src/mongo/db/shard_role/shard_catalog/index_catalog_entry_impl.cpp index e8842af7d54..9eec8cfc2cb 100644 --- a/src/mongo/db/local_catalog/index_catalog_entry_impl.cpp +++ b/src/mongo/db/shard_role/shard_catalog/index_catalog_entry_impl.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/index_catalog_entry_impl.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry_impl.h" #include "mongo/base/error_codes.h" #include "mongo/base/init.h" // IWYU pragma: keep @@ -40,13 +40,6 @@ #include "mongo/db/client.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/index_builds/index_build_interceptor.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/durable_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry_helpers.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/matcher/extensions_callback_noop.h" #include "mongo/db/multi_key_path_tracker.h" @@ -59,6 +52,13 @@ #include "mongo/db/query/compiler/parsers/matcher/expression_parser.h" #include "mongo/db/repl/optime.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry_helpers.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/mdb_catalog.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_engine.h" diff --git a/src/mongo/db/local_catalog/index_catalog_entry_impl.h b/src/mongo/db/shard_role/shard_catalog/index_catalog_entry_impl.h similarity index 97% rename from src/mongo/db/local_catalog/index_catalog_entry_impl.h rename to src/mongo/db/shard_role/shard_catalog/index_catalog_entry_impl.h index 94d424f3d79..ce0498da4cd 100644 --- a/src/mongo/db/local_catalog/index_catalog_entry_impl.h +++ b/src/mongo/db/shard_role/shard_catalog/index_catalog_entry_impl.h @@ -32,13 +32,13 @@ #include "mongo/base/status.h" #include "mongo/bson/ordering.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/ident.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/update_index_data.h" diff --git a/src/mongo/db/local_catalog/index_catalog_entry_impl_test.cpp b/src/mongo/db/shard_role/shard_catalog/index_catalog_entry_impl_test.cpp similarity index 98% rename from src/mongo/db/local_catalog/index_catalog_entry_impl_test.cpp rename to src/mongo/db/shard_role/shard_catalog/index_catalog_entry_impl_test.cpp index cf929f70e79..16f763374ee 100644 --- a/src/mongo/db/local_catalog/index_catalog_entry_impl_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/index_catalog_entry_impl_test.cpp @@ -28,8 +28,8 @@ */ #include "mongo/db/index/wildcard_access_method.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/index_catalog_entry_helpers.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry_helpers.h" #include "mongo/db/storage/devnull/devnull_kv_engine.h" #include "mongo/db/storage/recovery_unit_noop.h" diff --git a/src/mongo/db/local_catalog/index_catalog_entry_mock.h b/src/mongo/db/shard_role/shard_catalog/index_catalog_entry_mock.h similarity index 97% rename from src/mongo/db/local_catalog/index_catalog_entry_mock.h rename to src/mongo/db/shard_role/shard_catalog/index_catalog_entry_mock.h index 906bd25ec2e..b09b300c8ff 100644 --- a/src/mongo/db/local_catalog/index_catalog_entry_mock.h +++ b/src/mongo/db/shard_role/shard_catalog/index_catalog_entry_mock.h @@ -29,8 +29,8 @@ #pragma once -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" namespace mongo { diff --git a/src/mongo/db/local_catalog/index_catalog_impl.cpp b/src/mongo/db/shard_role/shard_catalog/index_catalog_impl.cpp similarity index 99% rename from src/mongo/db/local_catalog/index_catalog_impl.cpp rename to src/mongo/db/shard_role/shard_catalog/index_catalog_impl.cpp index 6091e46fcc3..bf9e8ba99fb 100644 --- a/src/mongo/db/local_catalog/index_catalog_impl.cpp +++ b/src/mongo/db/shard_role/shard_catalog/index_catalog_impl.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/index_catalog_impl.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_impl.h" #include "mongo/base/error_codes.h" #include "mongo/base/init.h" // IWYU pragma: keep @@ -52,18 +52,8 @@ #include "mongo/db/index/wildcard_validation.h" #include "mongo/db/index_builds/index_build_block.h" #include "mongo/db/index_builds/index_builds_common.h" +#include "mongo/db/index_key_validate.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_catalog_helper.h" -#include "mongo/db/local_catalog/durable_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry_impl.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/index_key_validate.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/matcher/extensions_callback_noop.h" #include "mongo/db/multi_key_path_tracker.h" @@ -82,6 +72,16 @@ #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry_impl.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/kv/kv_engine.h" #include "mongo/db/storage/mdb_catalog.h" #include "mongo/db/storage/recovery_unit.h" diff --git a/src/mongo/db/local_catalog/index_catalog_impl.h b/src/mongo/db/shard_role/shard_catalog/index_catalog_impl.h similarity index 99% rename from src/mongo/db/local_catalog/index_catalog_impl.h rename to src/mongo/db/shard_role/shard_catalog/index_catalog_impl.h index c5d7c01bec2..e6f40e72ee4 100644 --- a/src/mongo/db/local_catalog/index_catalog_impl.h +++ b/src/mongo/db/shard_role/shard_catalog/index_catalog_impl.h @@ -37,14 +37,14 @@ #include "mongo/db/index/multikey_paths.h" #include "mongo/db/index_builds/index_build_interceptor.h" #include "mongo/db/index_builds/resumable_index_builds_gen.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/update/document_diff_calculator.h" diff --git a/src/mongo/db/local_catalog/index_catalog_impl_test.cpp b/src/mongo/db/shard_role/shard_catalog/index_catalog_impl_test.cpp similarity index 94% rename from src/mongo/db/local_catalog/index_catalog_impl_test.cpp rename to src/mongo/db/shard_role/shard_catalog/index_catalog_impl_test.cpp index 23fdb345f6e..2fca7e9c467 100644 --- a/src/mongo/db/local_catalog/index_catalog_impl_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/index_catalog_impl_test.cpp @@ -27,12 +27,12 @@ * it in the license file. */ -#include "mongo/db/local_catalog/index_catalog_impl.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_impl.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/ddl/list_indexes_allowed_fields.h" -#include "mongo/db/local_catalog/index_key_validate.h" +#include "mongo/db/index_key_validate.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/list_indexes_allowed_fields.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" #include "mongo/db/storage/sorted_data_interface.h" #include "mongo/stdx/thread.h" #include "mongo/unittest/barrier.h" diff --git a/src/mongo/db/local_catalog/index_catalog_mock.h b/src/mongo/db/shard_role/shard_catalog/index_catalog_mock.h similarity index 97% rename from src/mongo/db/local_catalog/index_catalog_mock.h rename to src/mongo/db/shard_role/shard_catalog/index_catalog_mock.h index de8740fabf8..a273a563513 100644 --- a/src/mongo/db/local_catalog/index_catalog_mock.h +++ b/src/mongo/db/shard_role/shard_catalog/index_catalog_mock.h @@ -30,10 +30,10 @@ #pragma once #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry_mock.h" -#include "mongo/db/local_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry_mock.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" namespace mongo { diff --git a/src/mongo/db/local_catalog/index_descriptor.cpp b/src/mongo/db/shard_role/shard_catalog/index_descriptor.cpp similarity index 99% rename from src/mongo/db/local_catalog/index_descriptor.cpp rename to src/mongo/db/shard_role/shard_catalog/index_descriptor.cpp index 086c49366be..687f94f7cdc 100644 --- a/src/mongo/db/local_catalog/index_descriptor.cpp +++ b/src/mongo/db/shard_role/shard_catalog/index_descriptor.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/base/error_codes.h" #include "mongo/base/status_with.h" @@ -43,7 +43,6 @@ #include "mongo/db/feature_flag.h" #include "mongo/db/index/wildcard_access_method.h" #include "mongo/db/index/wildcard_key_generator.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/expression_context_builder.h" @@ -51,6 +50,7 @@ #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/query/compiler/parsers/matcher/expression_parser.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/db/storage/storage_parameters_gen.h" #include "mongo/util/assert_util.h" #include "mongo/util/string_map.h" diff --git a/src/mongo/db/local_catalog/index_descriptor.h b/src/mongo/db/shard_role/shard_catalog/index_descriptor.h similarity index 99% rename from src/mongo/db/local_catalog/index_descriptor.h rename to src/mongo/db/shard_role/shard_catalog/index_descriptor.h index ab95b22e2bf..6d5023a14a9 100644 --- a/src/mongo/db/local_catalog/index_descriptor.h +++ b/src/mongo/db/shard_role/shard_catalog/index_descriptor.h @@ -35,10 +35,10 @@ #include "mongo/bson/ordering.h" #include "mongo/db/index/multikey_paths.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/db/storage/sorted_data_interface.h" #include "mongo/util/intrusive_counter.h" #include "mongo/util/modules_incompletely_marked_header.h" diff --git a/src/mongo/db/local_catalog/index_signature_test.cpp b/src/mongo/db/shard_role/shard_catalog/index_signature_test.cpp similarity index 98% rename from src/mongo/db/local_catalog/index_signature_test.cpp rename to src/mongo/db/shard_role/shard_catalog/index_signature_test.cpp index f29038ba967..a5da1aaec82 100644 --- a/src/mongo/db/local_catalog/index_signature_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/index_signature_test.cpp @@ -39,17 +39,17 @@ #include "mongo/crypto/encryption_fields_gen.h" #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/storage_interface.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/idl/server_parameter_test_controller.h" diff --git a/src/mongo/db/local_catalog/indexcatalogtests.cpp b/src/mongo/db/shard_role/shard_catalog/indexcatalogtests.cpp similarity index 96% rename from src/mongo/db/local_catalog/indexcatalogtests.cpp rename to src/mongo/db/shard_role/shard_catalog/indexcatalogtests.cpp index 10c5598ba51..e67ca586b74 100644 --- a/src/mongo/db/local_catalog/indexcatalogtests.cpp +++ b/src/mongo/db/shard_role/shard_catalog/indexcatalogtests.cpp @@ -34,17 +34,17 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/client.h" #include "mongo/db/index_builds/index_build_test_helpers.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/dbtests/dbtests.h" // IWYU pragma: keep #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/local_catalog/list_indexes.cpp b/src/mongo/db/shard_role/shard_catalog/list_indexes.cpp similarity index 95% rename from src/mongo/db/local_catalog/list_indexes.cpp rename to src/mongo/db/shard_role/shard_catalog/list_indexes.cpp index a3c1e6b41f1..32c14db40f2 100644 --- a/src/mongo/db/local_catalog/list_indexes.cpp +++ b/src/mongo/db/shard_role/shard_catalog/list_indexes.cpp @@ -28,7 +28,7 @@ */ -#include "mongo/db/local_catalog/list_indexes.h" +#include "mongo/db/shard_role/shard_catalog/list_indexes.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" @@ -38,13 +38,13 @@ #include "mongo/db/basic_types_gen.h" #include "mongo/db/curop_failpoint_helpers.h" #include "mongo/db/index_builds/index_builds_coordinator.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/db_raii.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/collation/collator_interface.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" #include "mongo/util/assert_util.h" #include "mongo/util/fail_point.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/local_catalog/list_indexes.h b/src/mongo/db/shard_role/shard_catalog/list_indexes.h similarity index 97% rename from src/mongo/db/local_catalog/list_indexes.h rename to src/mongo/db/shard_role/shard_catalog/list_indexes.h index b1081e33163..364683d3bf7 100644 --- a/src/mongo/db/local_catalog/list_indexes.h +++ b/src/mongo/db/shard_role/shard_catalog/list_indexes.h @@ -30,9 +30,9 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_role.h" #include diff --git a/src/mongo/db/local_catalog/shard_role_catalog/metadata_manager.cpp b/src/mongo/db/shard_role/shard_catalog/metadata_manager.cpp similarity index 99% rename from src/mongo/db/local_catalog/shard_role_catalog/metadata_manager.cpp rename to src/mongo/db/shard_role/shard_catalog/metadata_manager.cpp index fd36ceabbce..2d18f1cc6b8 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/metadata_manager.cpp +++ b/src/mongo/db/shard_role/shard_catalog/metadata_manager.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_catalog/metadata_manager.h" +#include "mongo/db/shard_role/shard_catalog/metadata_manager.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/shard_key_util.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/metadata_manager.h b/src/mongo/db/shard_role/shard_catalog/metadata_manager.h similarity index 98% rename from src/mongo/db/local_catalog/shard_role_catalog/metadata_manager.h rename to src/mongo/db/shard_role/shard_catalog/metadata_manager.h index 71ec7ca7e3a..6af9d329a6f 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/metadata_manager.h +++ b/src/mongo/db/shard_role/shard_catalog/metadata_manager.h @@ -36,11 +36,11 @@ #include // IWYU pragma: no_include "ext/alloc_traits.h" #include "mongo/db/global_catalog/type_chunk.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/stdx/mutex.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/metadata_manager_test.cpp b/src/mongo/db/shard_role/shard_catalog/metadata_manager_test.cpp similarity index 99% rename from src/mongo/db/local_catalog/shard_role_catalog/metadata_manager_test.cpp rename to src/mongo/db/shard_role/shard_catalog/metadata_manager_test.cpp index 8ab2eb0a0c8..52390d2d864 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/metadata_manager_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/metadata_manager_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_catalog/metadata_manager.h" +#include "mongo/db/shard_role/shard_catalog/metadata_manager.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonmisc.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/op_observer_sharding_test.cpp b/src/mongo/db/shard_role/shard_catalog/op_observer_sharding_test.cpp similarity index 95% rename from src/mongo/db/local_catalog/shard_role_catalog/op_observer_sharding_test.cpp rename to src/mongo/db/shard_role/shard_catalog/op_observer_sharding_test.cpp index 080fcd50757..2863f459480 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/op_observer_sharding_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/op_observer_sharding_test.cpp @@ -40,16 +40,6 @@ #include "mongo/db/global_catalog/type_collection_common_types_gen.h" #include "mongo/db/global_catalog/type_database_gen.h" #include "mongo/db/keypattern.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state_mock.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_impl.h" @@ -62,6 +52,16 @@ #include "mongo/db/s/migration_chunk_cloner_source_op_observer.h" #include "mongo/db/s/migration_source_manager.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state_mock.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.cpp b/src/mongo/db/shard_role/shard_catalog/operation_sharding_state.cpp similarity index 99% rename from src/mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.cpp rename to src/mongo/db/shard_role/shard_catalog/operation_sharding_state.cpp index cc839ea553a..3a2c722139b 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.cpp +++ b/src/mongo/db/shard_role/shard_catalog/operation_sharding_state.cpp @@ -27,11 +27,11 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/base/error_codes.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.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" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/platform/atomic_word.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h b/src/mongo/db/shard_role/shard_catalog/operation_sharding_state.h similarity index 99% rename from src/mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h rename to src/mongo/db/shard_role/shard_catalog/operation_sharding_state.h index 90e1e43db21..922a413b87b 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h +++ b/src/mongo/db/shard_role/shard_catalog/operation_sharding_state.h @@ -31,9 +31,9 @@ #include "mongo/base/status.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/ddl/replica_set_ddl_tracker.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/ddl/replica_set_ddl_tracker.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/db/versioning_protocol/shard_version.h" #include "mongo/util/future.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/operation_sharding_state_test.cpp b/src/mongo/db/shard_role/shard_catalog/operation_sharding_state_test.cpp similarity index 98% rename from src/mongo/db/local_catalog/shard_role_catalog/operation_sharding_state_test.cpp rename to src/mongo/db/shard_role/shard_catalog/operation_sharding_state_test.cpp index 12ef602e42f..85f7654b4e2 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/operation_sharding_state_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/operation_sharding_state_test.cpp @@ -27,12 +27,12 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/base/string_data.h" #include "mongo/bson/oid.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/db/versioning_protocol/shard_version_factory.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/participant_block.idl b/src/mongo/db/shard_role/shard_catalog/participant_block.idl similarity index 100% rename from src/mongo/db/local_catalog/shard_role_catalog/participant_block.idl rename to src/mongo/db/shard_role/shard_catalog/participant_block.idl diff --git a/src/mongo/db/raw_data_operation.cpp b/src/mongo/db/shard_role/shard_catalog/raw_data_operation.cpp similarity index 96% rename from src/mongo/db/raw_data_operation.cpp rename to src/mongo/db/shard_role/shard_catalog/raw_data_operation.cpp index 54ccfa7cd8c..2a7223e4980 100644 --- a/src/mongo/db/raw_data_operation.cpp +++ b/src/mongo/db/shard_role/shard_catalog/raw_data_operation.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" namespace mongo { namespace { diff --git a/src/mongo/db/raw_data_operation.h b/src/mongo/db/shard_role/shard_catalog/raw_data_operation.h similarity index 100% rename from src/mongo/db/raw_data_operation.h rename to src/mongo/db/shard_role/shard_catalog/raw_data_operation.h diff --git a/src/mongo/db/local_catalog/rename_collection.cpp b/src/mongo/db/shard_role/shard_catalog/rename_collection.cpp similarity index 97% rename from src/mongo/db/local_catalog/rename_collection.cpp rename to src/mongo/db/shard_role/shard_catalog/rename_collection.cpp index 81baa94bf26..21d2d473fe8 100644 --- a/src/mongo/db/local_catalog/rename_collection.cpp +++ b/src/mongo/db/shard_role/shard_catalog/rename_collection.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/rename_collection.h" +#include "mongo/db/shard_role/shard_catalog/rename_collection.h" #include "mongo/base/error_codes.h" #include "mongo/base/status_with.h" @@ -43,28 +43,6 @@ #include "mongo/db/curop.h" #include "mongo/db/database_name.h" #include "mongo/db/index_builds/index_builds_coordinator.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/drop_collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/list_indexes.h" -#include "mongo/db/local_catalog/local_oplog_info.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" -#include "mongo/db/local_catalog/unique_collection_name.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/batched_write_policy.h" #include "mongo/db/op_observer/op_observer.h" @@ -72,10 +50,32 @@ #include "mongo/db/profile_settings.h" #include "mongo/db/query/write_ops/insert.h" #include "mongo/db/record_id.h" +#include "mongo/db/repl/local_oplog_info.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_catalog/drop_collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/list_indexes.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/unique_collection_name.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/stats/top.h" #include "mongo/db/storage/exceptions.h" #include "mongo/db/storage/record_data.h" diff --git a/src/mongo/db/local_catalog/rename_collection.h b/src/mongo/db/shard_role/shard_catalog/rename_collection.h similarity index 98% rename from src/mongo/db/local_catalog/rename_collection.h rename to src/mongo/db/shard_role/shard_catalog/rename_collection.h index 479dc4e9de0..5605cd25f1f 100644 --- a/src/mongo/db/local_catalog/rename_collection.h +++ b/src/mongo/db/shard_role/shard_catalog/rename_collection.h @@ -32,10 +32,10 @@ #include "mongo/base/status.h" #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/optime.h" #include "mongo/db/server_parameter.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/db/tenant_id.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/local_catalog/rename_collection_test.cpp b/src/mongo/db/shard_role/shard_catalog/rename_collection_test.cpp similarity index 98% rename from src/mongo/db/local_catalog/rename_collection_test.cpp rename to src/mongo/db/shard_role/shard_catalog/rename_collection_test.cpp index 2a18eade4aa..0762487a31b 100644 --- a/src/mongo/db/local_catalog/rename_collection_test.cpp +++ b/src/mongo/db/shard_role/shard_catalog/rename_collection_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/rename_collection.h" +#include "mongo/db/shard_role/shard_catalog/rename_collection.h" #include "mongo/base/error_codes.h" #include "mongo/base/status_with.h" @@ -40,18 +40,6 @@ #include "mongo/db/client.h" #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_noop.h" @@ -66,6 +54,18 @@ #include "mongo/db/repl/storage_interface_mock.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/idl/server_parameter_test_controller.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.cpp b/src/mongo/db/shard_role/shard_catalog/scoped_collection_metadata.cpp similarity index 96% rename from src/mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.cpp rename to src/mongo/db/shard_role/shard_catalog/scoped_collection_metadata.cpp index bbd88d2a81b..5d5c5dae0ca 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.cpp +++ b/src/mongo/db/shard_role/shard_catalog/scoped_collection_metadata.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" namespace mongo { diff --git a/src/mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h b/src/mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h similarity index 98% rename from src/mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h rename to src/mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h index 4926aba9b77..250927e2d8e 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h +++ b/src/mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h @@ -30,7 +30,7 @@ #pragma once #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" namespace mongo { diff --git a/src/mongo/db/local_catalog/shard_role_catalog/shard_authoritative_catalog.idl b/src/mongo/db/shard_role/shard_catalog/shard_authoritative_catalog.idl similarity index 100% rename from src/mongo/db/local_catalog/shard_role_catalog/shard_authoritative_catalog.idl rename to src/mongo/db/shard_role/shard_catalog/shard_authoritative_catalog.idl diff --git a/src/mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.cpp b/src/mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.cpp similarity index 98% rename from src/mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.cpp rename to src/mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.cpp index 505d035c197..b35d74e5319 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.cpp +++ b/src/mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/base/error_codes.h" #include "mongo/base/status_with.h" @@ -37,36 +37,36 @@ #include "mongo/db/curop.h" #include "mongo/db/database_name.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/read_only_catalog_cache_loader.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/ensure_chunk_version_is_greater_than_gen.h" #include "mongo/db/global_catalog/ddl/shard_key_util.h" #include "mongo/db/global_catalog/ddl/sharding_migration_critical_section.h" #include "mongo/db/global_catalog/type_database_gen.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_util.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/change_stream_oplog_notification.h" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/read_only_catalog_cache_loader.h" #include "mongo/db/s/forwardable_operation_metadata.h" #include "mongo/db/s/migration_source_manager.h" #include "mongo/db/s/migration_util.h" #include "mongo/db/s/range_deletion_util.h" #include "mongo/db/s/resharding/resharding_donor_recipient_common.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_util.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/tenant_id.h" #include "mongo/db/topology/sharding_state.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/executor/task_executor_pool.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h b/src/mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h similarity index 97% rename from src/mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h rename to src/mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h index cc7dba0f8b0..5f7d44bc502 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h +++ b/src/mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h @@ -31,11 +31,11 @@ #include "mongo/base/status.h" #include "mongo/base/string_data.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/db/versioning_protocol/shard_version.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/shard_filtering_util.cpp b/src/mongo/db/shard_role/shard_catalog/shard_filtering_util.cpp similarity index 97% rename from src/mongo/db/local_catalog/shard_role_catalog/shard_filtering_util.cpp rename to src/mongo/db/shard_role/shard_catalog/shard_filtering_util.cpp index a25598fdc61..7dd8a71cb41 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/shard_filtering_util.cpp +++ b/src/mongo/db/shard_role/shard_catalog/shard_filtering_util.cpp @@ -27,8 +27,8 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/sharding_api_d_params_gen.h" namespace mongo { diff --git a/src/mongo/db/local_catalog/shard_role_catalog/shard_filtering_util.h b/src/mongo/db/shard_role/shard_catalog/shard_filtering_util.h similarity index 100% rename from src/mongo/db/local_catalog/shard_role_catalog/shard_filtering_util.h rename to src/mongo/db/shard_role/shard_catalog/shard_filtering_util.h diff --git a/src/mongo/db/local_catalog/shardsvr_cleanup_structured_encryption_data_command.cpp b/src/mongo/db/shard_role/shard_catalog/shardsvr_cleanup_structured_encryption_data_command.cpp similarity index 95% rename from src/mongo/db/local_catalog/shardsvr_cleanup_structured_encryption_data_command.cpp rename to src/mongo/db/shard_role/shard_catalog/shardsvr_cleanup_structured_encryption_data_command.cpp index 43d93138135..e0ee82f7415 100644 --- a/src/mongo/db/local_catalog/shardsvr_cleanup_structured_encryption_data_command.cpp +++ b/src/mongo/db/shard_role/shard_catalog/shardsvr_cleanup_structured_encryption_data_command.cpp @@ -35,23 +35,23 @@ #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/resource_pattern.h" +#include "mongo/db/cleanup_structured_encryption_data_coordinator.h" +#include "mongo/db/cleanup_structured_encryption_data_coordinator_gen.h" #include "mongo/db/commands.h" #include "mongo/db/commands/feature_compatibility_version.h" #include "mongo/db/commands/fle2_cleanup_gen.h" #include "mongo/db/commands/fle2_compact.h" #include "mongo/db/curop.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/ddl/cleanup_structured_encryption_data_coordinator.h" -#include "mongo/db/global_catalog/ddl/cleanup_structured_encryption_data_coordinator_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_service.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/shardsvr_clone_authoritative_metadata_command.cpp b/src/mongo/db/shard_role/shard_catalog/shardsvr_clone_authoritative_metadata_command.cpp similarity index 98% rename from src/mongo/db/local_catalog/shard_role_catalog/shardsvr_clone_authoritative_metadata_command.cpp rename to src/mongo/db/shard_role/shard_catalog/shardsvr_clone_authoritative_metadata_command.cpp index 65384c7c16b..9e25c68c444 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/shardsvr_clone_authoritative_metadata_command.cpp +++ b/src/mongo/db/shard_role/shard_catalog/shardsvr_clone_authoritative_metadata_command.cpp @@ -32,7 +32,7 @@ #include "mongo/db/global_catalog/ddl/clone_authoritative_metadata_coordinator.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/topology/sharding_state.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kSharding diff --git a/src/mongo/db/local_catalog/shardsvr_compact_structured_encryption_data_command.cpp b/src/mongo/db/shard_role/shard_catalog/shardsvr_compact_structured_encryption_data_command.cpp similarity index 95% rename from src/mongo/db/local_catalog/shardsvr_compact_structured_encryption_data_command.cpp rename to src/mongo/db/shard_role/shard_catalog/shardsvr_compact_structured_encryption_data_command.cpp index be683933da5..632a2adf55b 100644 --- a/src/mongo/db/local_catalog/shardsvr_compact_structured_encryption_data_command.cpp +++ b/src/mongo/db/shard_role/shard_catalog/shardsvr_compact_structured_encryption_data_command.cpp @@ -39,20 +39,20 @@ #include "mongo/db/commands/feature_compatibility_version.h" #include "mongo/db/commands/fle2_compact.h" #include "mongo/db/commands/fle2_compact_gen.h" +#include "mongo/db/compact_structured_encryption_data_coordinator.h" +#include "mongo/db/compact_structured_encryption_data_coordinator_gen.h" #include "mongo/db/curop.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/ddl/compact_structured_encryption_data_coordinator.h" -#include "mongo/db/global_catalog/ddl/compact_structured_encryption_data_coordinator_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_gen.h" #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator_service.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/local_catalog/shard_role_catalog/shardsvr_fetch_coll_metadata_command.cpp b/src/mongo/db/shard_role/shard_catalog/shardsvr_fetch_coll_metadata_command.cpp similarity index 99% rename from src/mongo/db/local_catalog/shard_role_catalog/shardsvr_fetch_coll_metadata_command.cpp rename to src/mongo/db/shard_role/shard_catalog/shardsvr_fetch_coll_metadata_command.cpp index 0b771cab994..04454b69ccf 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/shardsvr_fetch_coll_metadata_command.cpp +++ b/src/mongo/db/shard_role/shard_catalog/shardsvr_fetch_coll_metadata_command.cpp @@ -36,8 +36,8 @@ #include "mongo/db/global_catalog/ddl/sharding_ddl_util.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/sharding_state.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/transaction/transaction_participant.h" -#include "mongo/db/vector_clock/vector_clock.h" #include "mongo/logv2/log.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kSharding diff --git a/src/mongo/db/local_catalog/snapshot_helper.cpp b/src/mongo/db/shard_role/shard_catalog/snapshot_helper.cpp similarity index 98% rename from src/mongo/db/local_catalog/snapshot_helper.cpp rename to src/mongo/db/shard_role/shard_catalog/snapshot_helper.cpp index 15b6530770a..eb91844f7d9 100644 --- a/src/mongo/db/local_catalog/snapshot_helper.cpp +++ b/src/mongo/db/shard_role/shard_catalog/snapshot_helper.cpp @@ -28,15 +28,15 @@ */ -#include "mongo/db/local_catalog/snapshot_helper.h" +#include "mongo/db/shard_role/shard_catalog/snapshot_helper.h" #include "mongo/base/error_codes.h" #include "mongo/db/client.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/local_catalog/snapshot_helper.h b/src/mongo/db/shard_role/shard_catalog/snapshot_helper.h similarity index 100% rename from src/mongo/db/local_catalog/snapshot_helper.h rename to src/mongo/db/shard_role/shard_catalog/snapshot_helper.h diff --git a/src/mongo/db/local_catalog/shard_role_catalog/stale_shard_exception_handler.cpp b/src/mongo/db/shard_role/shard_catalog/stale_shard_exception_handler.cpp similarity index 90% rename from src/mongo/db/local_catalog/shard_role_catalog/stale_shard_exception_handler.cpp rename to src/mongo/db/shard_role/shard_catalog/stale_shard_exception_handler.cpp index ec7b662cf6b..f458170daca 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/stale_shard_exception_handler.cpp +++ b/src/mongo/db/shard_role/shard_catalog/stale_shard_exception_handler.cpp @@ -27,12 +27,12 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_catalog/stale_shard_exception_handler.h" +#include "mongo/db/shard_role/shard_catalog/stale_shard_exception_handler.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/s/resharding/resharding_metrics_helpers.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/versioning_protocol/stale_exception.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kSharding diff --git a/src/mongo/db/local_catalog/shard_role_catalog/stale_shard_exception_handler.h b/src/mongo/db/shard_role/shard_catalog/stale_shard_exception_handler.h similarity index 93% rename from src/mongo/db/local_catalog/shard_role_catalog/stale_shard_exception_handler.h rename to src/mongo/db/shard_role/shard_catalog/stale_shard_exception_handler.h index 5b3a2d7ec44..46390b95e63 100644 --- a/src/mongo/db/local_catalog/shard_role_catalog/stale_shard_exception_handler.h +++ b/src/mongo/db/shard_role/shard_catalog/stale_shard_exception_handler.h @@ -29,9 +29,9 @@ #pragma once -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state.h" #include "mongo/db/versioning_protocol/stale_exception.h" namespace mongo { diff --git a/src/mongo/db/local_catalog/shard_role_catalog/type_oplog_catalog_metadata.idl b/src/mongo/db/shard_role/shard_catalog/type_oplog_catalog_metadata.idl similarity index 100% rename from src/mongo/db/local_catalog/shard_role_catalog/type_oplog_catalog_metadata.idl rename to src/mongo/db/shard_role/shard_catalog/type_oplog_catalog_metadata.idl diff --git a/src/mongo/db/local_catalog/uncommitted_catalog_updates.cpp b/src/mongo/db/shard_role/shard_catalog/uncommitted_catalog_updates.cpp similarity index 98% rename from src/mongo/db/local_catalog/uncommitted_catalog_updates.cpp rename to src/mongo/db/shard_role/shard_catalog/uncommitted_catalog_updates.cpp index 7a8c637b918..9df971ae8b6 100644 --- a/src/mongo/db/local_catalog/uncommitted_catalog_updates.cpp +++ b/src/mongo/db/shard_role/shard_catalog/uncommitted_catalog_updates.cpp @@ -27,10 +27,10 @@ * it in the license file. */ -#include "mongo/db/local_catalog/uncommitted_catalog_updates.h" +#include "mongo/db/shard_role/shard_catalog/uncommitted_catalog_updates.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/util/decorable.h" diff --git a/src/mongo/db/local_catalog/uncommitted_catalog_updates.h b/src/mongo/db/shard_role/shard_catalog/uncommitted_catalog_updates.h similarity index 98% rename from src/mongo/db/local_catalog/uncommitted_catalog_updates.h rename to src/mongo/db/shard_role/shard_catalog/uncommitted_catalog_updates.h index 66797754d51..2f450ff9ad2 100644 --- a/src/mongo/db/local_catalog/uncommitted_catalog_updates.h +++ b/src/mongo/db/shard_role/shard_catalog/uncommitted_catalog_updates.h @@ -30,12 +30,12 @@ #pragma once #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/views_for_database.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/views_for_database.h" #include "mongo/db/views/view.h" #include "mongo/stdx/unordered_set.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/local_catalog/uncommitted_multikey.cpp b/src/mongo/db/shard_role/shard_catalog/uncommitted_multikey.cpp similarity index 93% rename from src/mongo/db/local_catalog/uncommitted_multikey.cpp rename to src/mongo/db/shard_role/shard_catalog/uncommitted_multikey.cpp index a18870e0c19..f9ca01abcb7 100644 --- a/src/mongo/db/local_catalog/uncommitted_multikey.cpp +++ b/src/mongo/db/shard_role/shard_catalog/uncommitted_multikey.cpp @@ -27,10 +27,10 @@ * it in the license file. */ -#include "mongo/db/local_catalog/uncommitted_multikey.h" +#include "mongo/db/shard_role/shard_catalog/uncommitted_multikey.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/util/decorable.h" diff --git a/src/mongo/db/local_catalog/uncommitted_multikey.h b/src/mongo/db/shard_role/shard_catalog/uncommitted_multikey.h similarity index 96% rename from src/mongo/db/local_catalog/uncommitted_multikey.h rename to src/mongo/db/shard_role/shard_catalog/uncommitted_multikey.h index d1a7370e8b7..157a9d5a4fa 100644 --- a/src/mongo/db/local_catalog/uncommitted_multikey.h +++ b/src/mongo/db/shard_role/shard_catalog/uncommitted_multikey.h @@ -30,8 +30,8 @@ #pragma once #include "mongo/db/auth/validated_tenancy_scope.h" -#include "mongo/db/local_catalog/durable_catalog_entry_metadata.h" #include "mongo/db/server_parameter.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.h" #include #include diff --git a/src/mongo/db/local_catalog/unique_collection_name.cpp b/src/mongo/db/shard_role/shard_catalog/unique_collection_name.cpp similarity index 94% rename from src/mongo/db/local_catalog/unique_collection_name.cpp rename to src/mongo/db/shard_role/shard_catalog/unique_collection_name.cpp index 601670bf8e5..dee16c17c89 100644 --- a/src/mongo/db/local_catalog/unique_collection_name.cpp +++ b/src/mongo/db/shard_role/shard_catalog/unique_collection_name.cpp @@ -27,14 +27,14 @@ * it in the license file. */ -#include "mongo/db/local_catalog/unique_collection_name.h" +#include "mongo/db/shard_role/shard_catalog/unique_collection_name.h" #include "mongo/base/error_codes.h" #include "mongo/base/status.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.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" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/platform/random.h" #include "mongo/stdx/mutex.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/local_catalog/unique_collection_name.h b/src/mongo/db/shard_role/shard_catalog/unique_collection_name.h similarity index 100% rename from src/mongo/db/local_catalog/unique_collection_name.h rename to src/mongo/db/shard_role/shard_catalog/unique_collection_name.h diff --git a/src/mongo/db/local_catalog/validate_db_metadata.idl b/src/mongo/db/shard_role/shard_catalog/validate_db_metadata.idl similarity index 100% rename from src/mongo/db/local_catalog/validate_db_metadata.idl rename to src/mongo/db/shard_role/shard_catalog/validate_db_metadata.idl diff --git a/src/mongo/db/local_catalog/validate_db_metadata_cmd.cpp b/src/mongo/db/shard_role/shard_catalog/validate_db_metadata_cmd.cpp similarity index 94% rename from src/mongo/db/local_catalog/validate_db_metadata_cmd.cpp rename to src/mongo/db/shard_role/shard_catalog/validate_db_metadata_cmd.cpp index 64ce6f02ce9..9dc9e4362c3 100644 --- a/src/mongo/db/local_catalog/validate_db_metadata_cmd.cpp +++ b/src/mongo/db/shard_role/shard_catalog/validate_db_metadata_cmd.cpp @@ -35,19 +35,19 @@ #include "mongo/db/basic_types.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/index_key_validate.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/validate_db_metadata_common.h" -#include "mongo/db/local_catalog/validate_db_metadata_gen.h" +#include "mongo/db/index_key_validate.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/validate_db_metadata_common.h" +#include "mongo/db/shard_role/shard_catalog/validate_db_metadata_gen.h" #include "mongo/db/views/view.h" #include "mongo/db/views/view_catalog_helpers.h" #include "mongo/rpc/op_msg.h" diff --git a/src/mongo/db/local_catalog/validate_db_metadata_common.h b/src/mongo/db/shard_role/shard_catalog/validate_db_metadata_common.h similarity index 97% rename from src/mongo/db/local_catalog/validate_db_metadata_common.h rename to src/mongo/db/shard_role/shard_catalog/validate_db_metadata_common.h index 108c711d959..c29e020063e 100644 --- a/src/mongo/db/local_catalog/validate_db_metadata_common.h +++ b/src/mongo/db/shard_role/shard_catalog/validate_db_metadata_common.h @@ -31,7 +31,7 @@ #include "mongo/bson/util/builder.h" #include "mongo/db/auth/authorization_session.h" -#include "mongo/db/local_catalog/validate_db_metadata_gen.h" +#include "mongo/db/shard_role/shard_catalog/validate_db_metadata_gen.h" namespace mongo { diff --git a/src/mongo/db/local_catalog/views_for_database.cpp b/src/mongo/db/shard_role/shard_catalog/views_for_database.cpp similarity index 97% rename from src/mongo/db/local_catalog/views_for_database.cpp rename to src/mongo/db/shard_role/shard_catalog/views_for_database.cpp index ad3fef08482..9831c6c6556 100644 --- a/src/mongo/db/local_catalog/views_for_database.cpp +++ b/src/mongo/db/shard_role/shard_catalog/views_for_database.cpp @@ -28,7 +28,7 @@ */ -#include "mongo/db/local_catalog/views_for_database.h" +#include "mongo/db/shard_role/shard_catalog/views_for_database.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" @@ -42,15 +42,15 @@ #include "mongo/db/curop.h" #include "mongo/db/database_name.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/query/collation/collator_factory_interface.h" #include "mongo/db/record_id.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/views/util.h" diff --git a/src/mongo/db/local_catalog/views_for_database.h b/src/mongo/db/shard_role/shard_catalog/views_for_database.h similarity index 99% rename from src/mongo/db/local_catalog/views_for_database.h rename to src/mongo/db/shard_role/shard_catalog/views_for_database.h index ff8c2ecf41a..62699f1c850 100644 --- a/src/mongo/db/local_catalog/views_for_database.h +++ b/src/mongo/db/shard_role/shard_catalog/views_for_database.h @@ -32,11 +32,11 @@ #include "mongo/base/status.h" #include "mongo/base/status_with.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/collation/collator_factory_interface.h" #include "mongo/db/query/collation/collator_interface.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/views/view.h" #include "mongo/db/views/view_graph.h" diff --git a/src/mongo/db/local_catalog/virtual_collection_impl.cpp b/src/mongo/db/shard_role/shard_catalog/virtual_collection_impl.cpp similarity index 91% rename from src/mongo/db/local_catalog/virtual_collection_impl.cpp rename to src/mongo/db/shard_role/shard_catalog/virtual_collection_impl.cpp index f3fd81d28a4..f2d6f669c61 100644 --- a/src/mongo/db/local_catalog/virtual_collection_impl.cpp +++ b/src/mongo/db/shard_role/shard_catalog/virtual_collection_impl.cpp @@ -27,13 +27,13 @@ * it in the license file. */ -#include "mongo/db/local_catalog/virtual_collection_impl.h" +#include "mongo/db/shard_role/shard_catalog/virtual_collection_impl.h" -#include "mongo/db/local_catalog/collection_impl.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/index_catalog_impl.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/local_catalog/virtual_collection_impl.h b/src/mongo/db/shard_role/shard_catalog/virtual_collection_impl.h similarity index 96% rename from src/mongo/db/local_catalog/virtual_collection_impl.h rename to src/mongo/db/shard_role/shard_catalog/virtual_collection_impl.h index 87324aa7998..157c3aed9f9 100644 --- a/src/mongo/db/local_catalog/virtual_collection_impl.h +++ b/src/mongo/db/shard_role/shard_catalog/virtual_collection_impl.h @@ -38,17 +38,6 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/timestamp.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/collection_options_gen.h" -#include "mongo/db/local_catalog/durable_catalog_entry.h" -#include "mongo/db/local_catalog/durable_catalog_entry_metadata.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/virtual_collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/change_stream_pre_and_post_images_options_gen.h" @@ -56,6 +45,17 @@ #include "mongo/db/query/compiler/parsers/matcher/expression_parser.h" #include "mongo/db/query/virtual_collection/external_record_store.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/virtual_collection_options.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/ident.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/snapshot.h" diff --git a/src/mongo/db/local_catalog/virtual_collection_options.h b/src/mongo/db/shard_role/shard_catalog/virtual_collection_options.h similarity index 100% rename from src/mongo/db/local_catalog/virtual_collection_options.h rename to src/mongo/db/shard_role/shard_catalog/virtual_collection_options.h diff --git a/src/mongo/db/local_catalog/shard_role_api/shard_role.cpp b/src/mongo/db/shard_role/shard_role.cpp similarity index 99% rename from src/mongo/db/local_catalog/shard_role_api/shard_role.cpp rename to src/mongo/db/shard_role/shard_role.cpp index 36b5a3a8d8f..e5c408cbd97 100644 --- a/src/mongo/db/local_catalog/shard_role_api/shard_role.cpp +++ b/src/mongo/db/shard_role/shard_role.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/base/error_codes.h" #include "mongo/base/status.h" @@ -37,26 +37,26 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/commands/server_status/server_status_metric.h" #include "mongo/db/curop.h" -#include "mongo/db/global_catalog/catalog_cache/shard_cannot_refresh_due_to_locks_held_exception.h" -#include "mongo/db/local_catalog/catalog_helper.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch_info.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/shard_role_api/direct_connection_util.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_util.h" -#include "mongo/db/local_catalog/snapshot_helper.h" #include "mongo/db/repl/intent_registry.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/direct_connection_util.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_util.h" +#include "mongo/db/shard_role/shard_catalog/snapshot_helper.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/sharding_environment/sharding_runtime_d_params_gen.h" diff --git a/src/mongo/db/local_catalog/shard_role_api/shard_role.h b/src/mongo/db/shard_role/shard_role.h similarity index 97% rename from src/mongo/db/local_catalog/shard_role_api/shard_role.h rename to src/mongo/db/shard_role/shard_role.h index 638d031fbc4..fbcdfd4ce05 100644 --- a/src/mongo/db/local_catalog/shard_role_api/shard_role.h +++ b/src/mongo/db/shard_role/shard_role.h @@ -30,19 +30,19 @@ #pragma once #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_type.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/post_resharding_placement.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/read_concern_args.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/post_resharding_placement.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/collection_type.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/views/view.h" #include "mongo/util/assert_util.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/local_catalog/shard_role_api/shard_role_loop.cpp b/src/mongo/db/shard_role/shard_role_loop.cpp similarity index 96% rename from src/mongo/db/local_catalog/shard_role_api/shard_role_loop.cpp rename to src/mongo/db/shard_role/shard_role_loop.cpp index 162925a1226..8fb69872d06 100644 --- a/src/mongo/db/local_catalog/shard_role_api/shard_role_loop.cpp +++ b/src/mongo/db/shard_role/shard_role_loop.cpp @@ -27,13 +27,13 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_api/shard_role_loop.h" +#include "mongo/db/shard_role/shard_role_loop.h" -#include "mongo/db/global_catalog/catalog_cache/shard_cannot_refresh_due_to_locks_held_exception.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h" #include "mongo/db/operation_context.h" +#include "mongo/db/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_api_d_params_gen.h" #include "mongo/db/sharding_environment/sharding_statistics.h" diff --git a/src/mongo/db/local_catalog/shard_role_api/shard_role_loop.h b/src/mongo/db/shard_role/shard_role_loop.h similarity index 100% rename from src/mongo/db/local_catalog/shard_role_api/shard_role_loop.h rename to src/mongo/db/shard_role/shard_role_loop.h diff --git a/src/mongo/db/local_catalog/shard_role_api/shard_role_loop_test.cpp b/src/mongo/db/shard_role/shard_role_loop_test.cpp similarity index 98% rename from src/mongo/db/local_catalog/shard_role_api/shard_role_loop_test.cpp rename to src/mongo/db/shard_role/shard_role_loop_test.cpp index 48f9e42a09a..25f139df5b3 100644 --- a/src/mongo/db/local_catalog/shard_role_api/shard_role_loop_test.cpp +++ b/src/mongo/db/shard_role/shard_role_loop_test.cpp @@ -27,15 +27,15 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_api/shard_role_loop.h" +#include "mongo/db/shard_role/shard_role_loop.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_mock.h" -#include "mongo/db/global_catalog/catalog_cache/shard_cannot_refresh_due_to_locks_held_exception.h" -#include "mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_mock.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_mock.h" +#include "mongo/db/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.h" +#include "mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_mock.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_api_d_params_gen.h" #include "mongo/db/versioning_protocol/shard_version_factory.h" diff --git a/src/mongo/db/local_catalog/shard_role_api/shard_role_mock.cpp b/src/mongo/db/shard_role/shard_role_mock.cpp similarity index 98% rename from src/mongo/db/local_catalog/shard_role_api/shard_role_mock.cpp rename to src/mongo/db/shard_role/shard_role_mock.cpp index b3a692d63c6..a8b5af03346 100644 --- a/src/mongo/db/local_catalog/shard_role_api/shard_role_mock.cpp +++ b/src/mongo/db/shard_role/shard_role_mock.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_api/shard_role_mock.h" +#include "mongo/db/shard_role/shard_role_mock.h" namespace mongo { diff --git a/src/mongo/db/local_catalog/shard_role_api/shard_role_mock.h b/src/mongo/db/shard_role/shard_role_mock.h similarity index 96% rename from src/mongo/db/local_catalog/shard_role_api/shard_role_mock.h rename to src/mongo/db/shard_role/shard_role_mock.h index 2b2f6bebbc0..bb2dee09836 100644 --- a/src/mongo/db/local_catalog/shard_role_api/shard_role_mock.h +++ b/src/mongo/db/shard_role/shard_role_mock.h @@ -29,10 +29,10 @@ #pragma once -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_role.h" #include diff --git a/src/mongo/db/local_catalog/shard_role_api/shard_role_test.cpp b/src/mongo/db/shard_role/shard_role_test.cpp similarity index 99% rename from src/mongo/db/local_catalog/shard_role_api/shard_role_test.cpp rename to src/mongo/db/shard_role/shard_role_test.cpp index a56ee1e012d..b401c8a6c8c 100644 --- a/src/mongo/db/local_catalog/shard_role_api/shard_role_test.cpp +++ b/src/mongo/db/shard_role/shard_role_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" @@ -39,30 +39,30 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/client.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/global_catalog/catalog_cache/shard_cannot_refresh_due_to_locks_held_exception.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/global_catalog/type_chunk.h" -#include "mongo/db/local_catalog/catalog_control.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch_info.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state_mock.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/pipeline/shard_role_transaction_resources_stasher_for_pipeline.h" #include "mongo/db/query/client_cursor/cursor_manager.h" #include "mongo/db/query/internal_plans.h" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/catalog_control.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state_mock.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/sharding_environment/sharding_runtime_d_params_gen.h" diff --git a/src/mongo/db/local_catalog/shard_role_api/transaction_resources.cpp b/src/mongo/db/shard_role/transaction_resources.cpp similarity index 99% rename from src/mongo/db/local_catalog/shard_role_api/transaction_resources.cpp rename to src/mongo/db/shard_role/transaction_resources.cpp index 990cc09c6a8..fe947fa13bc 100644 --- a/src/mongo/db/local_catalog/shard_role_api/transaction_resources.cpp +++ b/src/mongo/db/shard_role/transaction_resources.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/base/error_codes.h" #include "mongo/base/status.h" diff --git a/src/mongo/db/local_catalog/shard_role_api/transaction_resources.h b/src/mongo/db/shard_role/transaction_resources.h similarity index 98% rename from src/mongo/db/local_catalog/shard_role_api/transaction_resources.h rename to src/mongo/db/shard_role/transaction_resources.h index 18cfc0c6984..1117a59b877 100644 --- a/src/mongo/db/local_catalog/shard_role_api/transaction_resources.h +++ b/src/mongo/db/shard_role/transaction_resources.h @@ -29,13 +29,13 @@ #pragma once -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/shard_role_api/post_resharding_placement.h" -#include "mongo/db/local_catalog/shard_role_catalog/scoped_collection_metadata.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/read_concern_args.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/post_resharding_placement.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/scoped_collection_metadata.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/versioning_protocol/database_version.h" diff --git a/src/mongo/db/local_catalog/shard_role_api/transaction_resources_init_mongod.cpp b/src/mongo/db/shard_role/transaction_resources_init_mongod.cpp similarity index 98% rename from src/mongo/db/local_catalog/shard_role_api/transaction_resources_init_mongod.cpp rename to src/mongo/db/shard_role/transaction_resources_init_mongod.cpp index ca0b9d0753a..1fae5d0b7c6 100644 --- a/src/mongo/db/local_catalog/shard_role_api/transaction_resources_init_mongod.cpp +++ b/src/mongo/db/shard_role/transaction_resources_init_mongod.cpp @@ -28,9 +28,9 @@ */ #include "mongo/db/client.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/local_catalog/shard_role_api/transaction_resources_init_non_mongod.cpp b/src/mongo/db/shard_role/transaction_resources_init_non_mongod.cpp similarity index 97% rename from src/mongo/db/local_catalog/shard_role_api/transaction_resources_init_non_mongod.cpp rename to src/mongo/db/shard_role/transaction_resources_init_non_mongod.cpp index 223e8a8b726..be67016e068 100644 --- a/src/mongo/db/local_catalog/shard_role_api/transaction_resources_init_non_mongod.cpp +++ b/src/mongo/db/shard_role/transaction_resources_init_non_mongod.cpp @@ -28,9 +28,9 @@ */ #include "mongo/db/client.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include #include diff --git a/src/mongo/db/sharding_environment/README.md b/src/mongo/db/sharding_environment/README.md index e4269731b75..61335aa1b5a 100644 --- a/src/mongo/db/sharding_environment/README.md +++ b/src/mongo/db/sharding_environment/README.md @@ -6,30 +6,30 @@ It is not intended to be a tutorial on how to operate sharding as a user and it ## Sharding terminology and acronyms -- Config Data: All the [catalog containers](../local_catalog/README_sharding_catalog.md#catalog-containers) residing on the CSRS. +- Config Data: All the [catalog containers](../shard_role/shard_catalog/README_sharding_catalog.md#catalog-containers) residing on the CSRS. - Config Shard: Same as CSRS. - CRUD operation: Comes from [Create, Read, Update, Delete](https://en.wikipedia.org/wiki/Create,_read,_update_and_delete), and indicates operations which modify a collection's data as opposed to the catalog. - CSRS: **C**onfig **S**erver as a **R**eplica **S**et. This is a fancy name for the [config server](https://www.mongodb.com/docs/manual/core/sharded-cluster-config-servers/). Comes from the times of version 3.2 and earlier, when there was a legacy type of Config server called [SCCC](https://www.mongodb.com/docs/manual/release-notes/3.4-compatibility/#removal-of-support-for-sccc-config-servers) which didn't operate as a replica set. -- CSS: [Collection Sharding State](/src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h#L59) +- CSS: [Collection Sharding State](../shard_role/shard_catalog/collection_sharding_state.h#L59) - DDL operation: Comes from [Data Definition Language](https://en.wikipedia.org/wiki/Data_definition_language), and indicates operations which modify the catalog (e.g., create collection, create index, drop database) as opposed to CRUD, which modifies the data. -- DSS: [Database Sharding State](/src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h#L42) -- Routing Info: The subset of data stored in the [catalog containers](../local_catalog/README_sharding_catalog.md#catalog-containers) which is used for making routing decisions. As of the time of this writing, the contents of _config.databases_, _config.collections_ and _config.chunks_. +- DSS: [Database Sharding State](../shard_role/shard_catalog/database_sharding_state.h#L42) +- Routing Info: The subset of data stored in the [catalog containers](../shard_role/shard_catalog/README_sharding_catalog.md#catalog-containers) which is used for making routing decisions. As of the time of this writing, the contents of _config.databases_, _config.collections_ and _config.chunks_. - SS: [Sharding State](/src/mongo/db/topology/sharding_state.h#L51) ## Sharding code architecture The graph further down visualises the architecture of the MongoDB Sharding system and the relationships between its various components and the links below point to the relevant sections describing these components. -- [Sharding catalog](../local_catalog/README_sharding_catalog.md#sharding-catalog) -- [Router role](../local_catalog/README_sharding_catalog.md#router-role) -- [Shard role](../local_catalog/README_sharding_catalog.md#router-role) -- [Routing Info Consistency Model](../global_catalog/catalog_cache/README_routing_info_cache_consistency_model.md) +- [Sharding catalog](../shard_role/shard_catalog/README_sharding_catalog.md#sharding-catalog) +- [Router role](../shard_role/shard_catalog/README_sharding_catalog.md#router-role) +- [Shard role](../shard_role/shard_catalog/README_sharding_catalog.md#router-role) +- [Routing Info Consistency Model](../router_role/routing_cache/README_routing_info_cache_consistency_model.md) - [Shard versioning protocol](../versioning_protocol/README_versioning_protocols.md) - [Balancer](../s/balancer/README.md) - [Range deleter](../s/README_range_deleter.md) - [DDL Operations](../global_catalog/ddl/README_ddl_operations.md) - [Migrations](../s/README_migrations.md) - - [UserWriteBlocking](../user_write_block/README_user_write_blocking.md) + - [UserWriteBlocking](../topology/user_write_block/README_user_write_blocking.md) - [Sessions and Transactions](../s/README_sessions_and_transactions.md) - [Startup and Shutdown](README_startup_and_shutdown.md) - [Query Sampling for Shard Key Analyzer](../s/README_analyze_shard_key.md) diff --git a/src/mongo/db/sharding_environment/client/config_shard_wrapper.cpp b/src/mongo/db/sharding_environment/client/config_shard_wrapper.cpp index f3d861846cc..35ecdb271d0 100644 --- a/src/mongo/db/sharding_environment/client/config_shard_wrapper.cpp +++ b/src/mongo/db/sharding_environment/client/config_shard_wrapper.cpp @@ -30,7 +30,7 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/logical_time.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/util/assert_util.h" #include diff --git a/src/mongo/db/sharding_environment/client/config_shard_wrapper_test.cpp b/src/mongo/db/sharding_environment/client/config_shard_wrapper_test.cpp index 855292d9557..361cd00d5f7 100644 --- a/src/mongo/db/sharding_environment/client/config_shard_wrapper_test.cpp +++ b/src/mongo/db/sharding_environment/client/config_shard_wrapper_test.cpp @@ -44,7 +44,7 @@ #include "mongo/db/sharding_environment/sharding_mongos_test_fixture.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/topology/shard_registry.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/unittest/unittest.h" #include diff --git a/src/mongo/db/sharding_environment/client/shard_remote.cpp b/src/mongo/db/sharding_environment/client/shard_remote.cpp index b25d433922c..0301684f28a 100644 --- a/src/mongo/db/sharding_environment/client/shard_remote.cpp +++ b/src/mongo/db/sharding_environment/client/shard_remote.cpp @@ -50,7 +50,7 @@ #include "mongo/db/server_options.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/cluster_role.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/executor/remote_command_request.h" #include "mongo/executor/remote_command_response.h" #include "mongo/executor/task_executor_pool.h" diff --git a/src/mongo/db/sharding_environment/cluster_command_test_fixture.cpp b/src/mongo/db/sharding_environment/cluster_command_test_fixture.cpp index bbb783b987c..59eef8311cf 100644 --- a/src/mongo/db/sharding_environment/cluster_command_test_fixture.cpp +++ b/src/mongo/db/sharding_environment/cluster_command_test_fixture.cpp @@ -37,7 +37,6 @@ #include "mongo/db/client.h" #include "mongo/db/commands.h" #include "mongo/db/commands/txn_cmds_gen.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/keys_collection_client_sharded.h" #include "mongo/db/keys_collection_manager.h" #include "mongo/db/keys_collection_manager_gen.h" @@ -45,6 +44,7 @@ #include "mongo/db/read_write_concern_defaults.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/request_execution_context.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_cache.h" #include "mongo/db/session/logical_session_cache_noop.h" @@ -53,7 +53,7 @@ #include "mongo/db/sharding_environment/cluster_command_test_fixture.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/mongod_and_mongos_server_parameters_gen.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/executor/network_test_env.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/rpc/op_msg.h" diff --git a/src/mongo/db/sharding_environment/cluster_command_test_fixture.h b/src/mongo/db/sharding_environment/cluster_command_test_fixture.h index bf7e9fe1d57..39d3a3f09c5 100644 --- a/src/mongo/db/sharding_environment/cluster_command_test_fixture.h +++ b/src/mongo/db/sharding_environment/cluster_command_test_fixture.h @@ -34,10 +34,10 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/timestamp.h" #include "mongo/db/dbmessage.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_test_fixture.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" #include "mongo/db/read_write_concern_defaults_cache_lookup_mock.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_test_fixture.h" #include "mongo/db/stats/counters.h" #include "mongo/executor/remote_command_request.h" #include "mongo/util/fail_point.h" diff --git a/src/mongo/db/sharding_environment/config_server_op_observer.cpp b/src/mongo/db/sharding_environment/config_server_op_observer.cpp index c791794ae67..c9de0331ec8 100644 --- a/src/mongo/db/sharding_environment/config_server_op_observer.cpp +++ b/src/mongo/db/sharding_environment/config_server_op_observer.cpp @@ -37,19 +37,19 @@ #include "mongo/bson/bsontypes.h" #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" #include "mongo/db/global_catalog/type_shard.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/logical_time.h" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_feature_flags_gen.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/cluster_identity_loader.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/sharding_ready.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_options.h" +#include "mongo/db/topology/vector_clock/topology_time_ticker.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/db/update/update_oplog_entry_serialization.h" -#include "mongo/db/vector_clock/topology_time_ticker.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" #include "mongo/util/assert_util.h" #include "mongo/util/version/releases.h" diff --git a/src/mongo/db/sharding_environment/config_server_op_observer.h b/src/mongo/db/sharding_environment/config_server_op_observer.h index c6321d23c6a..a3010d10d46 100644 --- a/src/mongo/db/sharding_environment/config_server_op_observer.h +++ b/src/mongo/db/sharding_environment/config_server_op_observer.h @@ -30,7 +30,6 @@ #pragma once #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_noop.h" @@ -39,6 +38,7 @@ #include "mongo/db/repl/optime.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/uuid.h" #include diff --git a/src/mongo/db/sharding_environment/config_server_op_observer_test.cpp b/src/mongo/db/sharding_environment/config_server_op_observer_test.cpp index 290088cdfe2..9debc0a608c 100644 --- a/src/mongo/db/sharding_environment/config_server_op_observer_test.cpp +++ b/src/mongo/db/sharding_environment/config_server_op_observer_test.cpp @@ -37,7 +37,7 @@ #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/sharding_environment/cluster_identity_loader.h" #include "mongo/db/sharding_environment/config_server_test_fixture.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/unittest/death_test.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/sharding_environment/config_server_test_fixture.cpp b/src/mongo/db/sharding_environment/config_server_test_fixture.cpp index c776beba5a6..dc40d36a624 100644 --- a/src/mongo/db/sharding_environment/config_server_test_fixture.cpp +++ b/src/mongo/db/sharding_environment/config_server_test_fixture.cpp @@ -38,9 +38,6 @@ #include "mongo/client/connection_string.h" #include "mongo/client/read_preference.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_impl.h" -#include "mongo/db/global_catalog/catalog_cache/routing_information_cache.h" -#include "mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_impl.h" #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" #include "mongo/db/global_catalog/sharding_catalog_client_impl.h" #include "mongo/db/global_catalog/type_chunk.h" @@ -58,6 +55,9 @@ #include "mongo/db/query/write_ops/write_ops_parsers.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/repl/replication_coordinator_mock.h" +#include "mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_impl.h" +#include "mongo/db/router_role/routing_cache/routing_information_cache.h" +#include "mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_impl.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" diff --git a/src/mongo/db/sharding_environment/config_server_test_fixture.h b/src/mongo/db/sharding_environment/config_server_test_fixture.h index 18037aa8556..56f45ce10a9 100644 --- a/src/mongo/db/sharding_environment/config_server_test_fixture.h +++ b/src/mongo/db/sharding_environment/config_server_test_fixture.h @@ -42,9 +42,9 @@ #include "mongo/db/global_catalog/type_shard.h" #include "mongo/db/keypattern.h" #include "mongo/db/keys_collection_document_gen.h" -#include "mongo/db/local_catalog/catalog_raii.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" diff --git a/src/mongo/db/sharding_environment/grid.h b/src/mongo/db/sharding_environment/grid.h index 936017863de..8b4ed72e8c8 100644 --- a/src/mongo/db/sharding_environment/grid.h +++ b/src/mongo/db/sharding_environment/grid.h @@ -29,9 +29,9 @@ #pragma once -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/operation_context.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/service_context.h" #include "mongo/db/topology/shard_registry.h" #include "mongo/executor/connection_pool_stats.h" diff --git a/src/mongo/db/sharding_environment/s_sharding_server_status.cpp b/src/mongo/db/sharding_environment/s_sharding_server_status.cpp index 1dfe7c6ac75..d5aa90826e5 100644 --- a/src/mongo/db/sharding_environment/s_sharding_server_status.cpp +++ b/src/mongo/db/sharding_environment/s_sharding_server_status.cpp @@ -31,16 +31,16 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/client/connection_string.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_server_status.h" #include "mongo/db/commands/server_status/server_status.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/logical_time.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/optime.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/sharding_environment/client/num_hosts_targeted_metrics.h" #include "mongo/db/sharding_environment/grid.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_server_status.h" #include "mongo/db/topology/shard_registry.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/s/balancer_configuration.h" #include 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 45a5e9fa970..1d813d56ff5 100644 --- a/src/mongo/db/sharding_environment/shard_server_op_observer.cpp +++ b/src/mongo/db/sharding_environment/shard_server_op_observer.cpp @@ -39,22 +39,22 @@ #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/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_critical_section_document_gen.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" -#include "mongo/db/local_catalog/shard_role_catalog/type_oplog_catalog_metadata_gen.h" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/replica_set_endpoint_sharding_state.h" #include "mongo/db/s/balancer_stats_registry.h" #include "mongo/db/s/migration_source_manager.h" #include "mongo/db/s/range_deletion_task_gen.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_critical_section_document_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_runtime.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" +#include "mongo/db/shard_role/shard_catalog/type_oplog_catalog_metadata_gen.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/sharding_initialization_mongod.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/tenant_id.h" diff --git a/src/mongo/db/sharding_environment/shard_server_op_observer.h b/src/mongo/db/sharding_environment/shard_server_op_observer.h index 14776d37fce..91e71f41783 100644 --- a/src/mongo/db/sharding_environment/shard_server_op_observer.h +++ b/src/mongo/db/sharding_environment/shard_server_op_observer.h @@ -30,8 +30,6 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_noop.h" @@ -39,6 +37,8 @@ #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/optime.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/util/uuid.h" #include diff --git a/src/mongo/db/sharding_environment/shard_server_op_observer_test.cpp b/src/mongo/db/sharding_environment/shard_server_op_observer_test.cpp index 3457b494b52..e8f09fdb9cf 100644 --- a/src/mongo/db/sharding_environment/shard_server_op_observer_test.cpp +++ b/src/mongo/db/sharding_environment/shard_server_op_observer_test.cpp @@ -31,8 +31,6 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/global_catalog/type_shard.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer_util.h" #include "mongo/db/operation_context.h" @@ -40,6 +38,8 @@ #include "mongo/db/repl/storage_interface_impl.h" #include "mongo/db/replica_set_endpoint_sharding_state.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/sharding_environment/shard_server_test_fixture.cpp b/src/mongo/db/sharding_environment/shard_server_test_fixture.cpp index d857cbb64a5..8426e2a1d0c 100644 --- a/src/mongo/db/sharding_environment/shard_server_test_fixture.cpp +++ b/src/mongo/db/sharding_environment/shard_server_test_fixture.cpp @@ -31,13 +31,13 @@ #include "mongo/client/connection_string.h" #include "mongo/client/remote_command_targeter_mock.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader.h" -#include "mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_impl.h" -#include "mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader.h" -#include "mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_impl.h" #include "mongo/db/global_catalog/sharding_catalog_client_impl.h" #include "mongo/db/repl/replication_coordinator_mock.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/config_server_catalog_cache_loader.h" +#include "mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_impl.h" +#include "mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader.h" +#include "mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_impl.h" #include "mongo/db/service_context_d_test_fixture.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/topology/cluster_role.h" diff --git a/src/mongo/db/sharding_environment/shard_server_test_fixture.h b/src/mongo/db/sharding_environment/shard_server_test_fixture.h index 8feda981d3f..21e95276c65 100644 --- a/src/mongo/db/sharding_environment/shard_server_test_fixture.h +++ b/src/mongo/db/sharding_environment/shard_server_test_fixture.h @@ -30,12 +30,12 @@ #pragma once #include "mongo/client/remote_command_targeter_mock.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_mock.h" -#include "mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_mock.h" -#include "mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader.h" -#include "mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_mock.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_mock.h" +#include "mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_mock.h" +#include "mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader.h" +#include "mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_mock.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/sharding_mongod_test_fixture.h" #include "mongo/util/net/hostandport.h" diff --git a/src/mongo/db/sharding_environment/sharding_initialization.cpp b/src/mongo/db/sharding_environment/sharding_initialization.cpp index a4292c62d7b..6b04b926790 100644 --- a/src/mongo/db/sharding_environment/sharding_initialization.cpp +++ b/src/mongo/db/sharding_environment/sharding_initialization.cpp @@ -36,8 +36,6 @@ #include "mongo/bson/bsonmisc.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/client/connection_string.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/router_role_api/routing_table_cache_gossip_metadata_hook.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/sharding_catalog_client_impl.h" #include "mongo/db/global_catalog/type_database_gen.h" @@ -49,6 +47,8 @@ #include "mongo/db/repl/optime_with.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_table_cache_gossip_metadata_hook.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/num_hosts_targeted_metrics.h" @@ -57,7 +57,7 @@ #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/mongod_and_mongos_server_parameters_gen.h" #include "mongo/db/topology/cluster_role.h" -#include "mongo/db/vector_clock/vector_clock_metadata_hook.h" +#include "mongo/db/topology/vector_clock/vector_clock_metadata_hook.h" #include "mongo/executor/async_multicaster.h" #include "mongo/executor/connection_pool.h" #include "mongo/executor/network_connection_hook.h" diff --git a/src/mongo/db/sharding_environment/sharding_initialization_mongod.cpp b/src/mongo/db/sharding_environment/sharding_initialization_mongod.cpp index 0b4ade4efb4..564e15045c2 100644 --- a/src/mongo/db/sharding_environment/sharding_initialization_mongod.cpp +++ b/src/mongo/db/sharding_environment/sharding_initialization_mongod.cpp @@ -50,13 +50,6 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/feature_flag.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader.h" -#include "mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_impl.h" -#include "mongo/db/global_catalog/catalog_cache/read_only_catalog_cache_loader.h" -#include "mongo/db/global_catalog/catalog_cache/routing_information_cache.h" -#include "mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader.h" -#include "mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_impl.h" #include "mongo/db/global_catalog/ddl/drop_agg_temp_collections.h" #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" #include "mongo/db/global_catalog/index_on_config.h" @@ -66,12 +59,6 @@ #include "mongo/db/keys_collection_client.h" #include "mongo/db/keys_collection_client_direct.h" #include "mongo/db/keys_collection_client_sharded.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/logical_time_validator.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -85,12 +72,25 @@ #include "mongo/db/replica_set_endpoint_sharding_state.h" #include "mongo/db/replica_set_endpoint_util.h" #include "mongo/db/replication_state_transition_lock_guard.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/config_server_catalog_cache_loader.h" +#include "mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_impl.h" +#include "mongo/db/router_role/routing_cache/read_only_catalog_cache_loader.h" +#include "mongo/db/router_role/routing_cache/routing_information_cache.h" +#include "mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader.h" +#include "mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_impl.h" #include "mongo/db/s/migration_util.h" #include "mongo/db/s/range_deletion_task_gen.h" #include "mongo/db/s/resharding/resharding_donor_recipient_common.h" #include "mongo/db/s/transaction_coordinator_service.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/client/shard_factory.h" #include "mongo/db/sharding_environment/client/shard_remote.h" #include "mongo/db/sharding_environment/client/sharding_connection_hook.h" @@ -107,7 +107,7 @@ #include "mongo/db/topology/cluster_role.h" #include "mongo/db/topology/shard_registry.h" #include "mongo/db/topology/sharding_state.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/db/versioning_protocol/shard_version.h" #include "mongo/executor/network_interface_factory.h" diff --git a/src/mongo/db/sharding_environment/sharding_initialization_mongod_test.cpp b/src/mongo/db/sharding_environment/sharding_initialization_mongod_test.cpp index 424e3690605..1a04e9bdb78 100644 --- a/src/mongo/db/sharding_environment/sharding_initialization_mongod_test.cpp +++ b/src/mongo/db/sharding_environment/sharding_initialization_mongod_test.cpp @@ -38,19 +38,19 @@ #include "mongo/bson/oid.h" #include "mongo/client/remote_command_targeter_mock.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_impl.h" -#include "mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_impl.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/sharding_catalog_client_impl.h" #include "mongo/db/global_catalog/type_shard_identity.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_impl.h" #include "mongo/db/op_observer/op_observer_registry.h" #include "mongo/db/op_observer/operation_logger_mock.h" +#include "mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_impl.h" +#include "mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_impl.h" #include "mongo/db/s/migration_chunk_cloner_source_op_observer.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/shard_server_op_observer.h" diff --git a/src/mongo/db/sharding_environment/sharding_initialization_op_observer_test.cpp b/src/mongo/db/sharding_environment/sharding_initialization_op_observer_test.cpp index b357388576f..f8295730d4d 100644 --- a/src/mongo/db/sharding_environment/sharding_initialization_op_observer_test.cpp +++ b/src/mongo/db/sharding_environment/sharding_initialization_op_observer_test.cpp @@ -38,12 +38,12 @@ #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_catalog/type_shard_identity.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" #include "mongo/db/sharding_environment/sharding_initialization_mongod.h" #include "mongo/db/sharding_environment/sharding_mongod_test_fixture.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/sharding_environment/sharding_initialization_waiter.cpp b/src/mongo/db/sharding_environment/sharding_initialization_waiter.cpp index 115e501c0e4..a408dafebc8 100644 --- a/src/mongo/db/sharding_environment/sharding_initialization_waiter.cpp +++ b/src/mongo/db/sharding_environment/sharding_initialization_waiter.cpp @@ -31,7 +31,7 @@ #include "mongo/db/repl/wait_for_majority_service.h" #include "mongo/db/topology/sharding_state.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" namespace mongo { diff --git a/src/mongo/db/sharding_environment/sharding_mongod_test_fixture.cpp b/src/mongo/db/sharding_environment/sharding_mongod_test_fixture.cpp index 4929cf2f25e..39da444031b 100644 --- a/src/mongo/db/sharding_environment/sharding_mongod_test_fixture.cpp +++ b/src/mongo/db/sharding_environment/sharding_mongod_test_fixture.cpp @@ -34,12 +34,7 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/client/remote_command_targeter_factory_mock.h" #include "mongo/client/replica_set_monitor.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_impl.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_impl.h" #include "mongo/db/op_observer/op_observer_registry.h" @@ -54,9 +49,14 @@ #include "mongo/db/repl/replication_recovery_mock.h" #include "mongo/db/repl/storage_interface.h" #include "mongo/db/repl/storage_interface_impl.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_impl.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/sharding_environment/client/shard_factory.h" #include "mongo/db/sharding_environment/client/shard_remote.h" #include "mongo/db/sharding_environment/grid.h" diff --git a/src/mongo/db/sharding_environment/sharding_mongod_test_fixture.h b/src/mongo/db/sharding_environment/sharding_mongod_test_fixture.h index c6bf5ff32af..deecb08c662 100644 --- a/src/mongo/db/sharding_environment/sharding_mongod_test_fixture.h +++ b/src/mongo/db/sharding_environment/sharding_mongod_test_fixture.h @@ -32,11 +32,11 @@ #include "mongo/base/status.h" #include "mongo/base/string_data.h" #include "mongo/client/connection_string.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_mock.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/repl/repl_settings.h" #include "mongo/db/repl/replication_coordinator_mock.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/shard_server_catalog_cache_loader_mock.h" #include "mongo/db/service_context_d_test_fixture.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_test_fixture_common.h" diff --git a/src/mongo/db/sharding_environment/sharding_mongos_test_fixture.cpp b/src/mongo/db/sharding_environment/sharding_mongos_test_fixture.cpp index 4273c0f06f9..aaf07cd513d 100644 --- a/src/mongo/db/sharding_environment/sharding_mongos_test_fixture.cpp +++ b/src/mongo/db/sharding_environment/sharding_mongos_test_fixture.cpp @@ -41,10 +41,6 @@ #include "mongo/client/remote_command_targeter_mock.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader.h" -#include "mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_impl.h" -#include "mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_mock.h" #include "mongo/db/global_catalog/sharding_catalog_client_impl.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/global_catalog/type_collection_gen.h" @@ -60,6 +56,10 @@ #include "mongo/db/query/write_ops/write_ops_parsers.h" #include "mongo/db/repl/optime.h" #include "mongo/db/repl/read_concern_args.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/config_server_catalog_cache_loader.h" +#include "mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_impl.h" +#include "mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_mock.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/num_hosts_targeted_metrics.h" #include "mongo/db/sharding_environment/client/shard.h" @@ -69,7 +69,7 @@ #include "mongo/db/sharding_environment/sharding_initialization.h" #include "mongo/db/topology/shard_registry.h" #include "mongo/db/topology/sharding_state.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/executor/network_connection_hook.h" #include "mongo/executor/network_interface_mock.h" #include "mongo/executor/remote_command_request.h" diff --git a/src/mongo/db/sharding_environment/sharding_mongos_test_fixture.h b/src/mongo/db/sharding_environment/sharding_mongos_test_fixture.h index 61400a39094..8ed46269c25 100644 --- a/src/mongo/db/sharding_environment/sharding_mongos_test_fixture.h +++ b/src/mongo/db/sharding_environment/sharding_mongos_test_fixture.h @@ -36,11 +36,11 @@ #include "mongo/bson/timestamp.h" #include "mongo/client/remote_command_targeter_mock.h" #include "mongo/db/error_labels.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_mock.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_collection.h" #include "mongo/db/global_catalog/type_shard.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_mock.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/sharding_test_fixture_common.h" #include "mongo/db/topology/shard_registry.h" diff --git a/src/mongo/db/sharding_environment/sharding_server_status.cpp b/src/mongo/db/sharding_environment/sharding_server_status.cpp index 1ca3c6cc3a4..1b837d0b5b2 100644 --- a/src/mongo/db/sharding_environment/sharding_server_status.cpp +++ b/src/mongo/db/sharding_environment/sharding_server_status.cpp @@ -32,30 +32,30 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/client/connection_string.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_server_status.h" #include "mongo/db/commands/server_status/server_status.h" #include "mongo/db/feature_flag.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/routing_information_cache.h" #include "mongo/db/global_catalog/type_collection.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/shard_role_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/optime.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/routing_information_cache.h" #include "mongo/db/s/active_migrations_registry.h" #include "mongo/db/s/range_deleter_service.h" #include "mongo/db/s/resharding/resharding_cumulative_metrics.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/shard_filtering_metadata_refresh.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_statistics.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_server_status.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/topology/shard_registry.h" #include "mongo/db/topology/sharding_state.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/s/balancer_configuration.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/sharding_environment/sharding_state_command.cpp b/src/mongo/db/sharding_environment/sharding_state_command.cpp index 19065103d63..5fc13c75694 100644 --- a/src/mongo/db/sharding_environment/sharding_state_command.cpp +++ b/src/mongo/db/sharding_environment/sharding_state_command.cpp @@ -39,9 +39,9 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/topology/shard_registry.h" diff --git a/src/mongo/db/sharding_environment/sharding_test_fixture_common.cpp b/src/mongo/db/sharding_environment/sharding_test_fixture_common.cpp index 678b70cc1de..cc67201f10f 100644 --- a/src/mongo/db/sharding_environment/sharding_test_fixture_common.cpp +++ b/src/mongo/db/sharding_environment/sharding_test_fixture_common.cpp @@ -36,15 +36,15 @@ #include "mongo/bson/oid.h" #include "mongo/db/client.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielders.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/query_request_helper.h" #include "mongo/db/query/write_ops/write_ops_gen.h" +#include "mongo/db/shard_role/resource_yielders.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_shared_state_cache.h" #include "mongo/db/storage/storage_options.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/executor/network_interface.h" #include "mongo/executor/remote_command_request.h" #include "mongo/rpc/op_msg.h" diff --git a/src/mongo/db/sorter/BUILD.bazel b/src/mongo/db/sorter/BUILD.bazel index 0bfe9be5dea..cfc8b1ad87b 100644 --- a/src/mongo/db/sorter/BUILD.bazel +++ b/src/mongo/db/sorter/BUILD.bazel @@ -73,9 +73,9 @@ mongo_cc_unit_test( ":sorter_test_utils", "//src/mongo/db:service_context", "//src/mongo/db/exec/document_value", - "//src/mongo/db/local_catalog/lock_manager", "//src/mongo/db/query:query_knobs", "//src/mongo/db/query:spill_util", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/db/storage:encryption_hooks", "//src/mongo/db/storage:storage_options", "//src/third_party/snappy", diff --git a/src/mongo/db/startup_recovery.cpp b/src/mongo/db/startup_recovery.cpp index c238b6e3da2..5f9d5f096dd 100644 --- a/src/mongo/db/startup_recovery.cpp +++ b/src/mongo/db/startup_recovery.cpp @@ -48,21 +48,6 @@ #include "mongo/db/index_builds/multi_index_block.h" #include "mongo/db/index_builds/rebuild_indexes.h" #include "mongo/db/index_builds/resumable_index_builds_gen.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/catalog_repair.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/drop_collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/mongod_options_storage_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -73,6 +58,21 @@ #include "mongo/db/repl/storage_interface.h" #include "mongo/db/rss/replicated_storage_service.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_repair.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/drop_collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/control/journal_flusher.h" #include "mongo/db/storage/kv/kv_engine.h" #include "mongo/db/storage/storage_options.h" diff --git a/src/mongo/db/stats/BUILD.bazel b/src/mongo/db/stats/BUILD.bazel index a3f6ea30a88..67e94f72ad1 100644 --- a/src/mongo/db/stats/BUILD.bazel +++ b/src/mongo/db/stats/BUILD.bazel @@ -145,10 +145,10 @@ mongo_cc_library( "//src/mongo/db:shard_role", "//src/mongo/db/commands/server_status:server_status_core", "//src/mongo/db/index:index_access_method", - "//src/mongo/db/local_catalog:collection_options", - "//src/mongo/db/local_catalog:index_catalog", "//src/mongo/db/pipeline:document_sources_idl", "//src/mongo/db/s:balancer_stats_registry", + "//src/mongo/db/shard_role/shard_catalog:collection_options", + "//src/mongo/db/shard_role/shard_catalog:index_catalog", "//src/mongo/db/timeseries/bucket_catalog", "//src/mongo/util/concurrency:spin_lock", ], @@ -165,8 +165,8 @@ mongo_cc_library( "//src/mongo/db:shard_role", "//src/mongo/db/commands/server_status:server_status_core", "//src/mongo/db/index:index_access_method", - "//src/mongo/db/local_catalog:index_catalog", "//src/mongo/db/pipeline:document_sources_idl", + "//src/mongo/db/shard_role/shard_catalog:index_catalog", "//src/mongo/db/timeseries/bucket_catalog", ], ) diff --git a/src/mongo/db/stats/change_stream_preimages_server_status.cpp b/src/mongo/db/stats/change_stream_preimages_server_status.cpp index 9a9b80f360d..2bada718f00 100644 --- a/src/mongo/db/stats/change_stream_preimages_server_status.cpp +++ b/src/mongo/db/stats/change_stream_preimages_server_status.cpp @@ -35,9 +35,9 @@ #include "mongo/db/change_stream_pre_image_util.h" #include "mongo/db/change_stream_pre_images_collection_manager.h" #include "mongo/db/commands/server_status/server_status.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/version_context.h" #include diff --git a/src/mongo/db/stats/lock_server_status_section.cpp b/src/mongo/db/stats/lock_server_status_section.cpp index d776fc3b263..f5a7d9886dd 100644 --- a/src/mongo/db/stats/lock_server_status_section.cpp +++ b/src/mongo/db/stats/lock_server_status_section.cpp @@ -32,10 +32,10 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/client.h" #include "mongo/db/commands/server_status/server_status.h" -#include "mongo/db/local_catalog/lock_manager/lock_stats.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_stats.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/util/assert_util.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/stats/storage_stats.cpp b/src/mongo/db/stats/storage_stats.cpp index c9b9a82fde8..64f01d327b6 100644 --- a/src/mongo/db/stats/storage_stats.cpp +++ b/src/mongo/db/stats/storage_stats.cpp @@ -35,20 +35,20 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/basic_types_gen.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/profile_settings.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/s/balancer_stats_registry.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/timeseries/bucket_catalog/bucket_catalog.h" #include "mongo/db/timeseries/bucket_catalog/global_bucket_catalog.h" diff --git a/src/mongo/db/storage/BUILD.bazel b/src/mongo/db/storage/BUILD.bazel index 97d381a1a4c..cd397ecab7e 100644 --- a/src/mongo/db/storage/BUILD.bazel +++ b/src/mongo/db/storage/BUILD.bazel @@ -300,9 +300,9 @@ mongo_cc_library( "//src/mongo/db:service_context", "//src/mongo/db:shard_role", "//src/mongo/db/commands/server_status:server_status_core", - "//src/mongo/db/local_catalog:collection_catalog", - "//src/mongo/db/local_catalog:local_oplog_info", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", + "//src/mongo/db/shard_role/shard_catalog:collection_catalog", + "//src/mongo/db/shard_role/shard_catalog:local_oplog_info", "//src/mongo/util:background_job", ], ) @@ -359,7 +359,7 @@ mongo_cc_library( deps = [ ":disk_space_monitor", ":record_store_base", - "//src/mongo/db/local_catalog/lock_manager:exception_util", + "//src/mongo/db/shard_role/lock_manager:exception_util", ], ) @@ -510,7 +510,7 @@ mongo_cc_library( ":storage_options", "//src/mongo/db:record_id_helpers", "//src/mongo/db:shard_role_api", - "//src/mongo/db/local_catalog:collection_options", + "//src/mongo/db/shard_role/shard_catalog:collection_options", "//src/mongo/db/update:update_document_diff", ], ) @@ -609,13 +609,13 @@ mongo_cc_unit_test( "//src/mongo/db:shard_role", "//src/mongo/db:startup_recovery", "//src/mongo/db/index_builds:resumable_index_builds_idl", - "//src/mongo/db/local_catalog:catalog_impl", - "//src/mongo/db/local_catalog:catalog_repair", - "//src/mongo/db/local_catalog:catalog_test_fixture", - "//src/mongo/db/local_catalog:collection_options", - "//src/mongo/db/local_catalog:durable_catalog", "//src/mongo/db/rss:persistence_provider_impl", "//src/mongo/db/rss:service_lifecycle_impl", + "//src/mongo/db/shard_role/shard_catalog:catalog_impl", + "//src/mongo/db/shard_role/shard_catalog:catalog_repair", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", + "//src/mongo/db/shard_role/shard_catalog:collection_options", + "//src/mongo/db/shard_role/shard_catalog:durable_catalog", "//src/mongo/db/storage:storage_control", "//src/mongo/db/storage:storage_engine_direct_crud", "//src/mongo/db/storage:storage_engine_impl", @@ -694,7 +694,7 @@ mongo_cc_benchmark( deps = [ "//src/mongo/db:record_id_helpers", "//src/mongo/db:server_base", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", ], ) diff --git a/src/mongo/db/storage/README.md b/src/mongo/db/storage/README.md index 32c3b08f254..1f923a7aa69 100644 --- a/src/mongo/db/storage/README.md +++ b/src/mongo/db/storage/README.md @@ -7,7 +7,7 @@ places with more detailed documentation. Third-party storage engines are integrated through self-contained modules that can be dropped into an existing MongoDB source tree, and will be automatically configured and included. -For more context and information on how this API is used, see the [Catalog](../local_catalog/README.md). +For more context and information on how this API is used, see the [Catalog](../shard_role/shard_catalog/README.md). ## Record Stores @@ -16,7 +16,7 @@ them. All MongoDB collections are implemented with a [RecordStore](record_store. implemented with a [SortedDataInterface](sorted_data_interface.h). By using the [KVEngine](kv/kv_engine.h) class, you only have to deal with the abstraction, as the [StorageEngineImpl](storage_engine_impl.h) implements the [StorageEngine](storage_engine.h) -interface, using record stores for catalogs. See the [Catalog](../local_catalog/README.md) for more information. +interface, using record stores for catalogs. See the [Catalog](../shard_role/shard_catalog/README.md) for more information. ### Record Identities @@ -41,7 +41,7 @@ MongoDB uses multi-granular intent locking; see the [Concurrency FAQ][]. In all ensure that operations to meta-data, such as creation and deletion of record stores, are serialized with respect to other accesses. -See the [Catalog](../local_catalog/README.md) and [Concurrency Control](../local_catalog/lock_manager/README.md) for more information. +See the [Catalog](../shard_role/shard_catalog/README.md) and [Concurrency Control](../shard_role/lock_manager/README.md) for more information. ## Transactions @@ -283,7 +283,7 @@ There are three components to startup recovery. The first step, of course, is st engine. More detail about WiredTiger's startup recovery procedure can be found [here](wiredtiger/README.md#startup-recovery). -The other two parts of storage startup recovery bring the [catalog](../local_catalog/README.md) back into +The other two parts of storage startup recovery bring the [catalog](../shard_role/shard_catalog/README.md) back into a consistent state. The catalog typically refers to MongoDB's notion of collections and indexes, but it's important to note that storage engines such as WiredTiger have their own notion of a catalog. @@ -456,7 +456,7 @@ A new truncate marker is created when either: CollectionTruncateMarkers support collections that meet the following requirements: - Insert and truncate only. No updates or individual document deletes. -- [Clustered](../local_catalog/README.md#clustered-collections) with no secondary indexes. +- [Clustered](../shard_role/shard_catalog/README.md#clustered-collections) with no secondary indexes. - RecordId's in Timestamp order. - Deletion of content follows RecordId ordering. - This is a general property of clustered capped collections. diff --git a/src/mongo/db/storage/collection_truncate_markers.cpp b/src/mongo/db/storage/collection_truncate_markers.cpp index bfa4f8044dc..61d20f48f25 100644 --- a/src/mongo/db/storage/collection_truncate_markers.cpp +++ b/src/mongo/db/storage/collection_truncate_markers.cpp @@ -29,8 +29,8 @@ #include "mongo/db/storage/collection_truncate_markers.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/collection_truncate_markers_parameters_gen.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/recovery_unit.h" diff --git a/src/mongo/db/storage/collection_truncate_markers_test.cpp b/src/mongo/db/storage/collection_truncate_markers_test.cpp index 611af26c1eb..f644180131f 100644 --- a/src/mongo/db/storage/collection_truncate_markers_test.cpp +++ b/src/mongo/db/storage/collection_truncate_markers_test.cpp @@ -33,9 +33,9 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/client.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" #include "mongo/db/storage/storage_engine_test_fixture.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/idl/server_parameter_test_controller.h" diff --git a/src/mongo/db/storage/control/journal_flusher.cpp b/src/mongo/db/storage/control/journal_flusher.cpp index 22f553dc501..09de6375e4e 100644 --- a/src/mongo/db/storage/control/journal_flusher.cpp +++ b/src/mongo/db/storage/control/journal_flusher.cpp @@ -35,8 +35,8 @@ #include "mongo/base/string_data.h" #include "mongo/db/admission/execution_admission_context.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/control/journal_flusher.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_options.h" diff --git a/src/mongo/db/storage/durable_history_pin.cpp b/src/mongo/db/storage/durable_history_pin.cpp index 4fb046d7c93..69a80b881d6 100644 --- a/src/mongo/db/storage/durable_history_pin.cpp +++ b/src/mongo/db/storage/durable_history_pin.cpp @@ -35,8 +35,8 @@ #include "mongo/base/status_with.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/logv2/log.h" #include "mongo/util/decorable.h" diff --git a/src/mongo/db/storage/kv/BUILD.bazel b/src/mongo/db/storage/kv/BUILD.bazel index 5cc86ecc5d2..93d76172e65 100644 --- a/src/mongo/db/storage/kv/BUILD.bazel +++ b/src/mongo/db/storage/kv/BUILD.bazel @@ -16,8 +16,8 @@ mongo_cc_library( ], deps = [ "//src/mongo/db:shard_role_api", - "//src/mongo/db/local_catalog/lock_manager", - "//src/mongo/db/local_catalog/lock_manager:exception_util", + "//src/mongo/db/shard_role/lock_manager", + "//src/mongo/db/shard_role/lock_manager:exception_util", ], ) @@ -32,9 +32,9 @@ mongo_cc_library( "//src/mongo/db:service_context_d", "//src/mongo/db:service_context_test_fixture", "//src/mongo/db:shard_role_api", - "//src/mongo/db/local_catalog:catalog_impl", - "//src/mongo/db/local_catalog:durable_catalog", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", + "//src/mongo/db/shard_role/shard_catalog:catalog_impl", + "//src/mongo/db/shard_role/shard_catalog:durable_catalog", "//src/mongo/db/storage:mdb_catalog", "//src/mongo/db/storage:record_store_base", "//src/mongo/db/storage:sorted_data_interface_test_assert", diff --git a/src/mongo/db/storage/kv/durable_catalog_test.cpp b/src/mongo/db/storage/kv/durable_catalog_test.cpp index c6952185f58..575252e309d 100644 --- a/src/mongo/db/storage/kv/durable_catalog_test.cpp +++ b/src/mongo/db/storage/kv/durable_catalog_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/durable_catalog.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog.h" #include "mongo/base/error_codes.h" #include "mongo/base/status_with.h" @@ -40,26 +40,26 @@ #include "mongo/db/index/index_constants.h" #include "mongo/db/index/multikey_paths.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_impl.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/durable_catalog_entry_metadata.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/multitenancy_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.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/durable_catalog_entry_metadata.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/ident.h" #include "mongo/db/storage/kv/kv_engine.h" #include "mongo/db/storage/mdb_catalog.h" diff --git a/src/mongo/db/storage/kv/kv_drop_pending_ident_reaper.cpp b/src/mongo/db/storage/kv/kv_drop_pending_ident_reaper.cpp index 581329b342e..573e62184d9 100644 --- a/src/mongo/db/storage/kv/kv_drop_pending_ident_reaper.cpp +++ b/src/mongo/db/storage/kv/kv_drop_pending_ident_reaper.cpp @@ -31,9 +31,9 @@ #include "mongo/db/storage/kv/kv_drop_pending_ident_reaper.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/ident.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/logv2/attribute_storage.h" diff --git a/src/mongo/db/storage/kv/kv_drop_pending_ident_reaper_test.cpp b/src/mongo/db/storage/kv/kv_drop_pending_ident_reaper_test.cpp index d8001b85cf6..30bcf030ef5 100644 --- a/src/mongo/db/storage/kv/kv_drop_pending_ident_reaper_test.cpp +++ b/src/mongo/db/storage/kv/kv_drop_pending_ident_reaper_test.cpp @@ -32,10 +32,10 @@ #include "mongo/base/error_codes.h" #include "mongo/base/status.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/namespace_string.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/ident.h" #include "mongo/db/storage/key_format.h" #include "mongo/db/storage/record_store.h" diff --git a/src/mongo/db/storage/kv/kv_engine_test_harness.cpp b/src/mongo/db/storage/kv/kv_engine_test_harness.cpp index fdac8c84764..62fd5337412 100644 --- a/src/mongo/db/storage/kv/kv_engine_test_harness.cpp +++ b/src/mongo/db/storage/kv/kv_engine_test_harness.cpp @@ -37,18 +37,18 @@ #include "mongo/bson/oid.h" #include "mongo/bson/timestamp.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/durable_catalog.h" -#include "mongo/db/local_catalog/durable_catalog_entry_metadata.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/multitenancy_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" #include "mongo/db/rss/replicated_storage_service.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/key_format.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/kv/kv_engine.h" diff --git a/src/mongo/db/storage/kv/kv_engine_timestamps_test.cpp b/src/mongo/db/storage/kv/kv_engine_timestamps_test.cpp index 83cd0820971..edf80d488f0 100644 --- a/src/mongo/db/storage/kv/kv_engine_timestamps_test.cpp +++ b/src/mongo/db/storage/kv/kv_engine_timestamps_test.cpp @@ -32,16 +32,16 @@ #include "mongo/base/string_data.h" #include "mongo/bson/timestamp.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" #include "mongo/db/rss/replicated_storage_service.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/kv/kv_engine.h" #include "mongo/db/storage/kv/kv_engine_test_harness.h" #include "mongo/db/storage/record_data.h" diff --git a/src/mongo/db/storage/kv/storage_engine_test.cpp b/src/mongo/db/storage/kv/storage_engine_test.cpp index 0ae41002b09..bef748553ae 100644 --- a/src/mongo/db/storage/kv/storage_engine_test.cpp +++ b/src/mongo/db/storage/kv/storage_engine_test.cpp @@ -37,16 +37,16 @@ #include "mongo/db/client.h" #include "mongo/db/index_builds/index_builds.h" #include "mongo/db/index_builds/index_builds_coordinator.h" -#include "mongo/db/local_catalog/catalog_control.h" -#include "mongo/db/local_catalog/catalog_helper.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/durable_catalog.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_control.h" +#include "mongo/db/shard_role/shard_catalog/catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog.h" #include "mongo/db/startup_recovery.h" #include "mongo/db/storage/control/storage_control.h" #include "mongo/db/storage/key_format.h" diff --git a/src/mongo/db/storage/mdb_catalog.cpp b/src/mongo/db/storage/mdb_catalog.cpp index 576d254442c..ed7da1b1ad5 100644 --- a/src/mongo/db/storage/mdb_catalog.cpp +++ b/src/mongo/db/storage/mdb_catalog.cpp @@ -30,10 +30,10 @@ #include "mongo/db/storage/mdb_catalog.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/feature_document_util.h" #include "mongo/db/storage/kv/kv_engine.h" #include "mongo/db/storage/record_store.h" diff --git a/src/mongo/db/storage/mdb_catalog_test.cpp b/src/mongo/db/storage/mdb_catalog_test.cpp index 16d19120b62..2e2abfd6139 100644 --- a/src/mongo/db/storage/mdb_catalog_test.cpp +++ b/src/mongo/db/storage/mdb_catalog_test.cpp @@ -30,11 +30,11 @@ #include "mongo/db/storage/mdb_catalog.h" #include "mongo/bson/json.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/collection_record_store_options.h" -#include "mongo/db/local_catalog/durable_catalog.h" -#include "mongo/db/local_catalog/durable_catalog_entry_metadata.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_record_store_options.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog_entry_metadata.h" #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/storage/oplog_async_sampling_test.cpp b/src/mongo/db/storage/oplog_async_sampling_test.cpp index 709e789590c..6a84bf4a3ef 100644 --- a/src/mongo/db/storage/oplog_async_sampling_test.cpp +++ b/src/mongo/db/storage/oplog_async_sampling_test.cpp @@ -30,10 +30,6 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/client.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" @@ -42,6 +38,10 @@ #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/repl/storage_interface_impl.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/oplog_truncation.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/wiredtiger/wiredtiger_record_store.h" diff --git a/src/mongo/db/storage/oplog_cap_maintainer_thread.cpp b/src/mongo/db/storage/oplog_cap_maintainer_thread.cpp index 7e6f6c6ad99..312953cf09e 100644 --- a/src/mongo/db/storage/oplog_cap_maintainer_thread.cpp +++ b/src/mongo/db/storage/oplog_cap_maintainer_thread.cpp @@ -35,12 +35,12 @@ #include "mongo/db/admission/execution_admission_context.h" #include "mongo/db/client.h" #include "mongo/db/commands/server_status/server_status.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/local_oplog_info.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/intent_registry.h" +#include "mongo/db/repl/local_oplog_info.h" #include "mongo/db/rss/replicated_storage_service.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" #include "mongo/db/storage/collection_truncate_markers.h" #include "mongo/db/storage/oplog_truncate_marker_parameters_gen.h" #include "mongo/db/storage/oplog_truncation.h" diff --git a/src/mongo/db/storage/oplog_truncate_markers.cpp b/src/mongo/db/storage/oplog_truncate_markers.cpp index c9f5a3e5b3a..226cc61c2c8 100644 --- a/src/mongo/db/storage/oplog_truncate_markers.cpp +++ b/src/mongo/db/storage/oplog_truncate_markers.cpp @@ -29,8 +29,8 @@ #include "mongo/db/storage/oplog_truncate_markers.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/repl/oplog_entry.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/kv/kv_engine.h" #include "mongo/db/storage/oplog_truncate_marker_parameters_gen.h" #include "mongo/db/storage/storage_options.h" diff --git a/src/mongo/db/storage/oplog_truncation.cpp b/src/mongo/db/storage/oplog_truncation.cpp index 5105dea6c55..49348b6163d 100644 --- a/src/mongo/db/storage/oplog_truncation.cpp +++ b/src/mongo/db/storage/oplog_truncation.cpp @@ -29,8 +29,8 @@ #include "mongo/db/storage/oplog_truncation.h" -#include "mongo/db/local_catalog/local_oplog_info.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" +#include "mongo/db/repl/local_oplog_info.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" #include "mongo/db/storage/collection_truncate_markers.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kStorage diff --git a/src/mongo/db/storage/oplog_truncation_test.cpp b/src/mongo/db/storage/oplog_truncation_test.cpp index fdcd1717ec2..3fb45a086b1 100644 --- a/src/mongo/db/storage/oplog_truncation_test.cpp +++ b/src/mongo/db/storage/oplog_truncation_test.cpp @@ -32,10 +32,6 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/client.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" @@ -46,6 +42,10 @@ #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/repl/storage_interface_impl.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/wiredtiger/wiredtiger_record_store.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/storage/record_store.cpp b/src/mongo/db/storage/record_store.cpp index 631db4cbbaf..d6ae0f636a5 100644 --- a/src/mongo/db/storage/record_store.cpp +++ b/src/mongo/db/storage/record_store.cpp @@ -29,8 +29,8 @@ #include "mongo/db/storage/record_store.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/damage_vector.h" #include diff --git a/src/mongo/db/storage/record_store_base.cpp b/src/mongo/db/storage/record_store_base.cpp index b8f1418690f..6d3bf3f6645 100644 --- a/src/mongo/db/storage/record_store_base.cpp +++ b/src/mongo/db/storage/record_store_base.cpp @@ -29,8 +29,8 @@ #include "mongo/db/storage/record_store_base.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/transaction_resources.h" namespace mongo { namespace { diff --git a/src/mongo/db/storage/record_store_test_oplog.cpp b/src/mongo/db/storage/record_store_test_oplog.cpp index 84eccf5e8cd..f305a0d0e62 100644 --- a/src/mongo/db/storage/record_store_test_oplog.cpp +++ b/src/mongo/db/storage/record_store_test_oplog.cpp @@ -34,11 +34,11 @@ #include "mongo/bson/bsonmisc.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" #include "mongo/db/record_id_helpers.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/key_format.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" diff --git a/src/mongo/db/storage/record_store_test_storagesize.cpp b/src/mongo/db/storage/record_store_test_storagesize.cpp index 628771a0098..3ce633b1781 100644 --- a/src/mongo/db/storage/record_store_test_storagesize.cpp +++ b/src/mongo/db/storage/record_store_test_storagesize.cpp @@ -29,10 +29,10 @@ #include "mongo/base/status_with.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/record_id.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/record_store_test_harness.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/storage/recovery_unit_test_harness.cpp b/src/mongo/db/storage/recovery_unit_test_harness.cpp index 1085f928f68..dea52c70e7f 100644 --- a/src/mongo/db/storage/recovery_unit_test_harness.cpp +++ b/src/mongo/db/storage/recovery_unit_test_harness.cpp @@ -32,9 +32,9 @@ #include "mongo/base/error_codes.h" #include "mongo/base/status_with.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/record_id.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/recovery_unit.h" diff --git a/src/mongo/db/storage/spill_table.cpp b/src/mongo/db/storage/spill_table.cpp index 5b5e84a6502..251ca2d214d 100644 --- a/src/mongo/db/storage/spill_table.cpp +++ b/src/mongo/db/storage/spill_table.cpp @@ -29,8 +29,8 @@ #include "mongo/db/storage/spill_table.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" #include "mongo/db/storage/disk_space_monitor.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_engine.h" diff --git a/src/mongo/db/storage/storage_engine_change_context.cpp b/src/mongo/db/storage/storage_engine_change_context.cpp index 82e8561f279..5d151cb676c 100644 --- a/src/mongo/db/storage/storage_engine_change_context.cpp +++ b/src/mongo/db/storage/storage_engine_change_context.cpp @@ -33,9 +33,9 @@ #include "mongo/base/error_codes.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/operation_id.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/storage/storage_engine_impl.cpp b/src/mongo/db/storage/storage_engine_impl.cpp index 657592855fa..a4d09057c02 100644 --- a/src/mongo/db/storage/storage_engine_impl.cpp +++ b/src/mongo/db/storage/storage_engine_impl.cpp @@ -36,10 +36,10 @@ #include "mongo/db/admission/execution_admission_context.h" #include "mongo/db/client.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/rss/replicated_storage_service.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/backup_cursor_hooks.h" #include "mongo/db/storage/deferred_drop_record_store.h" #include "mongo/db/storage/disk_space_monitor.h" diff --git a/src/mongo/db/storage/storage_engine_impl_test.cpp b/src/mongo/db/storage/storage_engine_impl_test.cpp index acdbb7946fc..30be3e6831d 100644 --- a/src/mongo/db/storage/storage_engine_impl_test.cpp +++ b/src/mongo/db/storage/storage_engine_impl_test.cpp @@ -29,8 +29,8 @@ #include "mongo/db/storage/storage_engine_impl.h" -#include "mongo/db/local_catalog/catalog_helper.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/catalog_helper.h" #include "mongo/db/storage/devnull/devnull_kv_engine.h" #include "mongo/util/periodic_runner_factory.h" diff --git a/src/mongo/db/storage/storage_engine_init.cpp b/src/mongo/db/storage/storage_engine_init.cpp index 9900240728b..cf2e6db5c5d 100644 --- a/src/mongo/db/storage/storage_engine_init.cpp +++ b/src/mongo/db/storage/storage_engine_init.cpp @@ -35,8 +35,8 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/bsontypes.h" #include "mongo/db/exec/scoped_timer.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/control/storage_control.h" #include "mongo/db/storage/oplog_cap_maintainer_thread.h" #include "mongo/db/storage/recovery_unit.h" diff --git a/src/mongo/db/storage/storage_engine_test_fixture.h b/src/mongo/db/storage/storage_engine_test_fixture.h index 4cbe87a6c96..89aa1266657 100644 --- a/src/mongo/db/storage/storage_engine_test_fixture.h +++ b/src/mongo/db/storage/storage_engine_test_fixture.h @@ -29,15 +29,15 @@ #pragma once -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/catalog_repair.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_impl.h" -#include "mongo/db/local_catalog/durable_catalog.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/repl/storage_interface_impl.h" #include "mongo/db/rss/replicated_storage_service.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_repair.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_impl.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/kv/kv_engine.h" #include "mongo/db/storage/mdb_catalog.h" #include "mongo/db/storage/spill_table.h" diff --git a/src/mongo/db/storage/storage_util.h b/src/mongo/db/storage/storage_util.h index dcabc666760..e166f8a550e 100644 --- a/src/mongo/db/storage/storage_util.h +++ b/src/mongo/db/storage/storage_util.h @@ -30,9 +30,9 @@ #pragma once #include "mongo/base/status.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/storage/test_harness_helper.h b/src/mongo/db/storage/test_harness_helper.h index e55ed04318e..cfa5056026e 100644 --- a/src/mongo/db/storage/test_harness_helper.h +++ b/src/mongo/db/storage/test_harness_helper.h @@ -29,8 +29,8 @@ #pragma once -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/util/modules.h" namespace mongo { diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_cursor.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_cursor.cpp index 33828c98563..f25f23b0f94 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_cursor.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_cursor.cpp @@ -31,7 +31,7 @@ #include "mongo/db/storage/wiredtiger/wiredtiger_cursor.h" #include "mongo/base/error_codes.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/wiredtiger/wiredtiger_connection.h" #include "mongo/db/storage/wiredtiger/wiredtiger_util.h" diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp index 941fac5b193..b6e359ca5b5 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp @@ -38,13 +38,13 @@ #include "mongo/db/client.h" #include "mongo/db/commands/server_status/server_status_metric.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/rss/replicated_storage_service.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" #include "mongo/db/server_parameter.h" #include "mongo/db/server_recovery.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/ident.h" #include "mongo/db/storage/journal_listener.h" #include "mongo/db/storage/key_format.h" diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp index 1e7eb1e8037..f711a80463b 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp @@ -43,13 +43,13 @@ #include "mongo/base/initializer.h" #include "mongo/bson/bsonelement.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" #include "mongo/db/rss/replicated_storage_service.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/checkpointer.h" #include "mongo/db/storage/kv/kv_engine_test_harness.h" #include "mongo/db/storage/record_data.h" diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.cpp index a9a81440554..21f0465868c 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.cpp @@ -31,8 +31,8 @@ // IWYU pragma: no_include "cxxabi.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/kv/kv_engine.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/recovery_unit.h" diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp index 8fd2bf83cd8..2ee8afb1f16 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp @@ -43,11 +43,11 @@ #include "mongo/bson/bsonelement.h" #include "mongo/bson/util/builder.h" #include "mongo/bson/util/builder_fwd.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id_helpers.h" #include "mongo/db/server_recovery.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/collection_truncate_markers.h" #include "mongo/db/storage/damage_vector.h" #include "mongo/db/storage/duplicate_key_error_info.h" diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store_test.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store_test.cpp index 4c95d375295..b717f291df2 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store_test.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store_test.cpp @@ -39,9 +39,9 @@ #include "mongo/bson/bsontypes.h" #include "mongo/bson/json.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/rss/replicated_storage_service.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/kv/kv_engine.h" #include "mongo/db/storage/record_store_test_harness.h" #include "mongo/db/storage/recovery_unit.h" diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store_test_harness.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store_test_harness.cpp index 0a1d5265d5b..b27c3f8b1e0 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store_test_harness.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store_test_harness.cpp @@ -30,11 +30,11 @@ #include "mongo/db/storage/wiredtiger/wiredtiger_record_store_test_harness.h" #include "mongo/base/initializer.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/rss/replicated_storage_service.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/wiredtiger/wiredtiger_record_store.h" #include "mongo/db/storage/wiredtiger/wiredtiger_recovery_unit.h" #include "mongo/db/storage/wiredtiger/wiredtiger_util.h" diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_recovery_unit_test.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_recovery_unit_test.cpp index 33c28d6eff0..13ec4232b0e 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_recovery_unit_test.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_recovery_unit_test.cpp @@ -35,11 +35,11 @@ #include "mongo/base/status_with.h" #include "mongo/base/string_data.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/record_id.h" #include "mongo/db/rss/replicated_storage_service.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/recovery_unit_test_harness.h" #include "mongo/db/storage/wiredtiger/wiredtiger_cursor_helpers.h" diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_standard_record_store_test.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_standard_record_store_test.cpp index c6fe85465bf..9ff8aeff69b 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_standard_record_store_test.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_standard_record_store_test.cpp @@ -32,11 +32,11 @@ #include "mongo/base/status_with.h" #include "mongo/base/string_data.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/damage_vector.h" #include "mongo/db/storage/ident.h" #include "mongo/db/storage/key_format.h" diff --git a/src/mongo/db/storage/wiredtiger/write_conflict_retry_bm.cpp b/src/mongo/db/storage/wiredtiger/write_conflict_retry_bm.cpp index 90dabbe51de..55364e069b5 100644 --- a/src/mongo/db/storage/wiredtiger/write_conflict_retry_bm.cpp +++ b/src/mongo/db/storage/wiredtiger/write_conflict_retry_bm.cpp @@ -27,9 +27,9 @@ * it in the license file. */ -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/record_store_test_harness.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/db/storage/write_unit_of_work.cpp b/src/mongo/db/storage/write_unit_of_work.cpp index f98512ea3d0..e23b3cc5501 100644 --- a/src/mongo/db/storage/write_unit_of_work.cpp +++ b/src/mongo/db/storage/write_unit_of_work.cpp @@ -30,10 +30,10 @@ #include "mongo/db/storage/write_unit_of_work.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/system_index.cpp b/src/mongo/db/system_index.cpp index 163785a6c61..b399a185e97 100644 --- a/src/mongo/db/system_index.cpp +++ b/src/mongo/db/system_index.cpp @@ -43,17 +43,17 @@ #include "mongo/db/exec/scoped_timer.h" #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/index_builds/index_builds_manager.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/index_key_validate.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" +#include "mongo/db/index_key_validate.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/intent_registry.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/local_catalog/throttle_cursor.cpp b/src/mongo/db/throttle_cursor.cpp similarity index 99% rename from src/mongo/db/local_catalog/throttle_cursor.cpp rename to src/mongo/db/throttle_cursor.cpp index 6f08f02f8bd..0844cadccb6 100644 --- a/src/mongo/db/local_catalog/throttle_cursor.cpp +++ b/src/mongo/db/throttle_cursor.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/local_catalog/throttle_cursor.h" +#include "mongo/db/throttle_cursor.h" #include "mongo/bson/bsonobj.h" #include "mongo/db/client.h" diff --git a/src/mongo/db/local_catalog/throttle_cursor.h b/src/mongo/db/throttle_cursor.h similarity index 98% rename from src/mongo/db/local_catalog/throttle_cursor.h rename to src/mongo/db/throttle_cursor.h index 29f6c9d2c73..dae349b6d1b 100644 --- a/src/mongo/db/local_catalog/throttle_cursor.h +++ b/src/mongo/db/throttle_cursor.h @@ -29,11 +29,11 @@ #pragma once -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/index_entry_comparison.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/sorted_data_interface.h" diff --git a/src/mongo/db/local_catalog/throttle_cursor_test.cpp b/src/mongo/db/throttle_cursor_test.cpp similarity index 96% rename from src/mongo/db/local_catalog/throttle_cursor_test.cpp rename to src/mongo/db/throttle_cursor_test.cpp index 2a81168dad7..1facb151689 100644 --- a/src/mongo/db/local_catalog/throttle_cursor_test.cpp +++ b/src/mongo/db/throttle_cursor_test.cpp @@ -28,7 +28,7 @@ */ -#include "mongo/db/local_catalog/throttle_cursor.h" +#include "mongo/db/throttle_cursor.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonmisc.h" @@ -36,17 +36,17 @@ #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/curop.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/storage_interface.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/validate/validate_gen.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/timeseries/BUILD.bazel b/src/mongo/db/timeseries/BUILD.bazel index 8111ba7f68b..29abf73bb91 100644 --- a/src/mongo/db/timeseries/BUILD.bazel +++ b/src/mongo/db/timeseries/BUILD.bazel @@ -42,7 +42,7 @@ mongo_cc_library( deps = [ ":timeseries_options", # TODO(SERVER-93876): Remove. "//src/mongo:base", - "//src/mongo/db/local_catalog:index_catalog", + "//src/mongo/db/shard_role/shard_catalog:index_catalog", ], ) @@ -68,8 +68,8 @@ mongo_cc_library( "//src/mongo:base", "//src/mongo/db:shard_role", "//src/mongo/db/index:index_access_method", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:catalog_test_fixture", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", "//src/mongo/db/timeseries/bucket_catalog", ], ) @@ -113,9 +113,9 @@ mongo_cc_library( "//src/mongo/db:index_commands_idl", # TODO(SERVER-93876): Remove. "//src/mongo/db:server_base", "//src/mongo/db/exec:bucket_unpacker", - "//src/mongo/db/local_catalog:index_catalog", "//src/mongo/db/query:bucket_predicate_generator", # TODO(SERVER-93876): Remove. "//src/mongo/db/query/write_ops:write_ops_parsers", # TODO(SERVER-93876): Remove. + "//src/mongo/db/shard_role/shard_catalog:index_catalog", "//src/mongo/db/storage:storage_options", # TODO(SERVER-93876): Remove. ], ) @@ -129,7 +129,7 @@ mongo_cc_library( ":timeseries_options", "//src/mongo/db:server_base", "//src/mongo/db:shard_role", - "//src/mongo/db/local_catalog:collection_catalog", + "//src/mongo/db/shard_role/shard_catalog:collection_catalog", ], ) @@ -145,11 +145,11 @@ mongo_cc_library( "//src/mongo/db:record_id_helpers", "//src/mongo/db:shard_role", "//src/mongo/db/collection_crud", - "//src/mongo/db/local_catalog:collection_query_info", - "//src/mongo/db/local_catalog:document_validation", "//src/mongo/db/query/query_stats", "//src/mongo/db/query/write_ops:delete_request_idl", "//src/mongo/db/query/write_ops:write_ops_exec_util", + "//src/mongo/db/shard_role/shard_catalog:collection_query_info", + "//src/mongo/db/shard_role/shard_catalog:document_validation", "//src/mongo/db/storage:storage_options", "//src/mongo/db/timeseries/bucket_catalog", "//src/mongo/db/timeseries/write_ops:timeseries_write_ops_utils_internal", @@ -164,9 +164,9 @@ mongo_cc_library( ], deps = [ ":timeseries_extended_range", - "//src/mongo/db/local_catalog:collection_catalog", - "//src/mongo/db/local_catalog/lock_manager", "//src/mongo/db/op_observer", + "//src/mongo/db/shard_role/lock_manager", + "//src/mongo/db/shard_role/shard_catalog:collection_catalog", "//src/mongo/db/timeseries/bucket_catalog", ], ) @@ -185,7 +185,7 @@ mongo_cc_library( "//src/mongo/db:server_base", "//src/mongo/db:shard_role", "//src/mongo/db/exec:bucket_unpacker", - "//src/mongo/db/local_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", ], ) diff --git a/src/mongo/db/timeseries/README.md b/src/mongo/db/timeseries/README.md index 0ad0a2777aa..b24ef76c785 100644 --- a/src/mongo/db/timeseries/README.md +++ b/src/mongo/db/timeseries/README.md @@ -1,6 +1,6 @@ # Time-Series Collections -MongoDB supports a new collection type for storing time-series data with the [timeseries](../local_catalog/ddl/create.idl) +MongoDB supports a new collection type for storing time-series data with the [timeseries](../shard_role/ddl/create.idl) collection option. A time-series collection presents a simple interface for inserting and querying measurements while organizing the actual data in buckets. @@ -9,7 +9,7 @@ at creation. Optionally, a [metaField](https://github.com/mongodb/mongo/blob/r8. measurements in the buckets. MongoDB also supports an expiration mechanism on measurements through the `expireAfterSeconds` option. -A (viewful) time-series collection `mytscoll` in the `mydb` database is represented in the [catalog](../local_catalog/README.md) by a +A (viewful) time-series collection `mytscoll` in the `mydb` database is represented in the [catalog](../shard_role/shard_catalog/README.md) by a combination of a view and a system collection: - The non-materialized view `mydb.mytscoll` is defined with the bucket collection as the source collection with diff --git a/src/mongo/db/timeseries/bucket_catalog/BUILD.bazel b/src/mongo/db/timeseries/bucket_catalog/BUILD.bazel index bfe686bd578..b0a32a201d1 100644 --- a/src/mongo/db/timeseries/bucket_catalog/BUILD.bazel +++ b/src/mongo/db/timeseries/bucket_catalog/BUILD.bazel @@ -34,7 +34,7 @@ mongo_cc_library( "//src/mongo/db:record_id_helpers", "//src/mongo/db:server_base", "//src/mongo/db/commands/server_status:server_status_core", - "//src/mongo/db/local_catalog:collection_catalog", + "//src/mongo/db/shard_role/shard_catalog:collection_catalog", "//src/mongo/db/storage:storage_options", "//src/mongo/db/timeseries:bucket_compression", "//src/mongo/db/timeseries:bucket_compression_failure", @@ -63,7 +63,7 @@ mongo_cc_unit_test( "//src/mongo/db:dbdirectclient", "//src/mongo/db:shard_role", "//src/mongo/db/collection_crud", - "//src/mongo/db/local_catalog:catalog_test_fixture", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", "//src/mongo/db/timeseries:bucket_compression", "//src/mongo/db/timeseries:timeseries_metadata", "//src/mongo/db/timeseries:timeseries_options", diff --git a/src/mongo/db/timeseries/bucket_catalog/bucket_catalog.h b/src/mongo/db/timeseries/bucket_catalog/bucket_catalog.h index 3a6744ea64b..14f10a89cb8 100644 --- a/src/mongo/db/timeseries/bucket_catalog/bucket_catalog.h +++ b/src/mongo/db/timeseries/bucket_catalog/bucket_catalog.h @@ -34,7 +34,7 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/local_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/timeseries/bucket_catalog/bucket.h" #include "mongo/db/timeseries/bucket_catalog/bucket_identifiers.h" #include "mongo/db/timeseries/bucket_catalog/bucket_state_registry.h" diff --git a/src/mongo/db/timeseries/bucket_catalog/bucket_catalog_helpers_test.cpp b/src/mongo/db/timeseries/bucket_catalog/bucket_catalog_helpers_test.cpp index d4f5c95baa6..09b797a8c0b 100644 --- a/src/mongo/db/timeseries/bucket_catalog/bucket_catalog_helpers_test.cpp +++ b/src/mongo/db/timeseries/bucket_catalog/bucket_catalog_helpers_test.cpp @@ -36,13 +36,13 @@ #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/curop.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/repl/oplog.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/timeseries/metadata.h" #include "mongo/db/timeseries/timeseries_constants.h" diff --git a/src/mongo/db/timeseries/bucket_catalog/bucket_catalog_internal.cpp b/src/mongo/db/timeseries/bucket_catalog/bucket_catalog_internal.cpp index 2d258646001..17cdbf82750 100644 --- a/src/mongo/db/timeseries/bucket_catalog/bucket_catalog_internal.cpp +++ b/src/mongo/db/timeseries/bucket_catalog/bucket_catalog_internal.cpp @@ -34,9 +34,9 @@ #include "mongo/bson/bsontypes.h" #include "mongo/bson/column/bsoncolumn.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/operation_id.h" #include "mongo/db/pipeline/aggregate_command_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/timeseries/bucket_catalog/bucket_catalog.h" #include "mongo/db/timeseries/bucket_catalog/bucket_catalog_helpers.h" #include "mongo/db/timeseries/bucket_catalog/bucket_metadata.h" diff --git a/src/mongo/db/timeseries/bucket_catalog/bucket_catalog_internal.h b/src/mongo/db/timeseries/bucket_catalog/bucket_catalog_internal.h index efda562cf67..5446c9ba30a 100644 --- a/src/mongo/db/timeseries/bucket_catalog/bucket_catalog_internal.h +++ b/src/mongo/db/timeseries/bucket_catalog/bucket_catalog_internal.h @@ -34,7 +34,7 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/oid.h" -#include "mongo/db/local_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/timeseries/bucket_catalog/bucket.h" #include "mongo/db/timeseries/bucket_catalog/bucket_catalog.h" #include "mongo/db/timeseries/bucket_catalog/bucket_identifiers.h" diff --git a/src/mongo/db/timeseries/bucket_catalog/bucket_catalog_test.cpp b/src/mongo/db/timeseries/bucket_catalog/bucket_catalog_test.cpp index 63f0afa7978..b0380b0b58a 100644 --- a/src/mongo/db/timeseries/bucket_catalog/bucket_catalog_test.cpp +++ b/src/mongo/db/timeseries/bucket_catalog/bucket_catalog_test.cpp @@ -34,10 +34,10 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/json.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" #include "mongo/db/tenant_id.h" #include "mongo/db/timeseries/bucket_catalog/bucket_catalog_internal.h" #include "mongo/db/timeseries/bucket_catalog/bucket_metadata.h" diff --git a/src/mongo/db/timeseries/catalog_helper.cpp b/src/mongo/db/timeseries/catalog_helper.cpp index ce048251164..1a1c606ed79 100644 --- a/src/mongo/db/timeseries/catalog_helper.cpp +++ b/src/mongo/db/timeseries/catalog_helper.cpp @@ -29,10 +29,10 @@ #include "mongo/db/timeseries/catalog_helper.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/timeseries/timeseries_options.h" #include diff --git a/src/mongo/db/timeseries/catalog_helper.h b/src/mongo/db/timeseries/catalog_helper.h index 194c73c2234..c7fdbdea7d9 100644 --- a/src/mongo/db/timeseries/catalog_helper.h +++ b/src/mongo/db/timeseries/catalog_helper.h @@ -29,10 +29,10 @@ #pragma once -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/server_parameter.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/timeseries/collection_pre_conditions_util.cpp b/src/mongo/db/timeseries/collection_pre_conditions_util.cpp index 2d3927a0829..e808fab1a88 100644 --- a/src/mongo/db/timeseries/collection_pre_conditions_util.cpp +++ b/src/mongo/db/timeseries/collection_pre_conditions_util.cpp @@ -29,9 +29,9 @@ #include "mongo/db/timeseries/collection_pre_conditions_util.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/timeseries/catalog_helper.h" diff --git a/src/mongo/db/timeseries/collection_pre_conditions_util.h b/src/mongo/db/timeseries/collection_pre_conditions_util.h index 3607bd65634..e2a3729654a 100644 --- a/src/mongo/db/timeseries/collection_pre_conditions_util.h +++ b/src/mongo/db/timeseries/collection_pre_conditions_util.h @@ -29,9 +29,9 @@ #pragma once -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/util/modules.h" MONGO_MOD_PUBLIC; diff --git a/src/mongo/db/timeseries/collection_pre_conditions_util_test.cpp b/src/mongo/db/timeseries/collection_pre_conditions_util_test.cpp index b0e701333bc..30202783aa1 100644 --- a/src/mongo/db/timeseries/collection_pre_conditions_util_test.cpp +++ b/src/mongo/db/timeseries/collection_pre_conditions_util_test.cpp @@ -29,7 +29,7 @@ #include "mongo/db/timeseries/collection_pre_conditions_util.h" -#include "mongo/db/local_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" #include "mongo/db/timeseries/timeseries_test_fixture.h" diff --git a/src/mongo/db/timeseries/timeseries_collmod.cpp b/src/mongo/db/timeseries/timeseries_collmod.cpp index 381d76379a2..54bd21336c8 100644 --- a/src/mongo/db/timeseries/timeseries_collmod.cpp +++ b/src/mongo/db/timeseries/timeseries_collmod.cpp @@ -32,8 +32,8 @@ #include "mongo/base/error_codes.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/coll_mod.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch.h" +#include "mongo/db/shard_role/shard_catalog/coll_mod.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch.h" #include "mongo/db/timeseries/catalog_helper.h" #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/db/timeseries/timeseries_index_schema_conversion_functions.h" diff --git a/src/mongo/db/timeseries/timeseries_collmod.h b/src/mongo/db/timeseries/timeseries_collmod.h index e8a4dbf12b6..6eca10d399a 100644 --- a/src/mongo/db/timeseries/timeseries_collmod.h +++ b/src/mongo/db/timeseries/timeseries_collmod.h @@ -31,9 +31,9 @@ #include "mongo/base/status.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/local_catalog/ddl/coll_mod_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/ddl/coll_mod_gen.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/db/timeseries/timeseries_collmod_test.cpp b/src/mongo/db/timeseries/timeseries_collmod_test.cpp index 50eefd747a4..84cbf1951cc 100644 --- a/src/mongo/db/timeseries/timeseries_collmod_test.cpp +++ b/src/mongo/db/timeseries/timeseries_collmod_test.cpp @@ -29,14 +29,14 @@ #include "mongo/db/timeseries/timeseries_collmod.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/ddl/coll_mod_gen.h" -#include "mongo/db/local_catalog/ddl/create_gen.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/repl/replication_coordinator_mock.h" +#include "mongo/db/shard_role/ddl/coll_mod_gen.h" +#include "mongo/db/shard_role/ddl/create_gen.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/timeseries/timeseries_test_fixture.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/timeseries/timeseries_commands_conversion_helper.cpp b/src/mongo/db/timeseries/timeseries_commands_conversion_helper.cpp index e5b215657c4..2a992faddc8 100644 --- a/src/mongo/db/timeseries/timeseries_commands_conversion_helper.cpp +++ b/src/mongo/db/timeseries/timeseries_commands_conversion_helper.cpp @@ -37,11 +37,11 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/index_builds/commit_quorum_options.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/ddl/create_indexes_gen.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/query/timeseries/bucket_spec.h" +#include "mongo/db/shard_role/ddl/create_indexes_gen.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/timeseries/timeseries_constants.h" #include "mongo/db/timeseries/timeseries_index_schema_conversion_functions.h" #include "mongo/logv2/redaction.h" diff --git a/src/mongo/db/timeseries/timeseries_constants.h b/src/mongo/db/timeseries/timeseries_constants.h index c8461a191fa..526bad58c7c 100644 --- a/src/mongo/db/timeseries/timeseries_constants.h +++ b/src/mongo/db/timeseries/timeseries_constants.h @@ -30,7 +30,7 @@ #pragma once #include "mongo/base/string_data.h" -#include "mongo/db/local_catalog/ddl/create_gen.h" +#include "mongo/db/shard_role/ddl/create_gen.h" #include "mongo/util/modules.h" #include "mongo/util/string_map.h" diff --git a/src/mongo/db/timeseries/timeseries_extended_range.cpp b/src/mongo/db/timeseries/timeseries_extended_range.cpp index 2aad568ea39..8a93863a554 100644 --- a/src/mongo/db/timeseries/timeseries_extended_range.cpp +++ b/src/mongo/db/timeseries/timeseries_extended_range.cpp @@ -35,10 +35,10 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsontypes.h" #include "mongo/bson/oid.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/timeseries/timeseries_constants.h" diff --git a/src/mongo/db/timeseries/timeseries_extended_range.h b/src/mongo/db/timeseries/timeseries_extended_range.h index 9ea12d739ab..fbb45f013d1 100644 --- a/src/mongo/db/timeseries/timeseries_extended_range.h +++ b/src/mongo/db/timeseries/timeseries_extended_range.h @@ -29,9 +29,9 @@ #pragma once -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/util/modules.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/timeseries/timeseries_index_schema_conversion_functions.cpp b/src/mongo/db/timeseries/timeseries_index_schema_conversion_functions.cpp index e69a1c84980..938508c873e 100644 --- a/src/mongo/db/timeseries/timeseries_index_schema_conversion_functions.cpp +++ b/src/mongo/db/timeseries/timeseries_index_schema_conversion_functions.cpp @@ -37,13 +37,13 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/bsontypes.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/matcher/expression_algo.h" #include "mongo/db/matcher/extensions_callback_noop.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/query/compiler/parsers/matcher/expression_parser.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/timeseries/timeseries_constants.h" #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/logv2/redaction.h" diff --git a/src/mongo/db/timeseries/timeseries_index_schema_conversion_functions.h b/src/mongo/db/timeseries/timeseries_index_schema_conversion_functions.h index ab644fad745..be4691856a6 100644 --- a/src/mongo/db/timeseries/timeseries_index_schema_conversion_functions.h +++ b/src/mongo/db/timeseries/timeseries_index_schema_conversion_functions.h @@ -31,9 +31,9 @@ #include "mongo/base/status_with.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/index_catalog.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/timeseries/timeseries_index_schema_conversion_functions_test.cpp b/src/mongo/db/timeseries/timeseries_index_schema_conversion_functions_test.cpp index 7037f9f6b87..8332769f010 100644 --- a/src/mongo/db/timeseries/timeseries_index_schema_conversion_functions_test.cpp +++ b/src/mongo/db/timeseries/timeseries_index_schema_conversion_functions_test.cpp @@ -33,7 +33,7 @@ #include "mongo/bson/bsonmisc.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/local_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/timeseries/timeseries_constants.h" #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/timeseries/timeseries_op_observer.cpp b/src/mongo/db/timeseries/timeseries_op_observer.cpp index bbb7020845e..595012cb060 100644 --- a/src/mongo/db/timeseries/timeseries_op_observer.cpp +++ b/src/mongo/db/timeseries/timeseries_op_observer.cpp @@ -30,13 +30,13 @@ #include "mongo/db/timeseries/timeseries_op_observer.h" #include "mongo/bson/bsonelement.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_operation_source.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/oplog.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_operation_source.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/stats/counters.h" #include "mongo/db/timeseries/bucket_catalog/bucket_catalog.h" #include "mongo/db/timeseries/bucket_catalog/bucket_catalog_helpers.h" diff --git a/src/mongo/db/timeseries/timeseries_op_observer.h b/src/mongo/db/timeseries/timeseries_op_observer.h index 3e4325cac28..6e74082ba66 100644 --- a/src/mongo/db/timeseries/timeseries_op_observer.h +++ b/src/mongo/db/timeseries/timeseries_op_observer.h @@ -30,13 +30,13 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_noop.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/optime.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/modules.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/timeseries/timeseries_request_util.h b/src/mongo/db/timeseries/timeseries_request_util.h index 8d879c9ed49..6e40bd789a5 100644 --- a/src/mongo/db/timeseries/timeseries_request_util.h +++ b/src/mongo/db/timeseries/timeseries_request_util.h @@ -31,7 +31,7 @@ #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/timeseries/catalog_helper.h" #include "mongo/db/timeseries/collection_pre_conditions_util.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/timeseries/timeseries_test_fixture.cpp b/src/mongo/db/timeseries/timeseries_test_fixture.cpp index c070ee56290..e66b8bd5dcb 100644 --- a/src/mongo/db/timeseries/timeseries_test_fixture.cpp +++ b/src/mongo/db/timeseries/timeseries_test_fixture.cpp @@ -35,14 +35,14 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/bsontypes.h" #include "mongo/bson/bsontypes_util.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/create_collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" #include "mongo/db/storage/kv/kv_engine.h" #include "mongo/db/timeseries/bucket_catalog/bucket_catalog.h" #include "mongo/db/timeseries/bucket_catalog/bucket_catalog_internal.h" diff --git a/src/mongo/db/timeseries/timeseries_test_fixture.h b/src/mongo/db/timeseries/timeseries_test_fixture.h index 3e9d4b9cb4c..92dfcce1c97 100644 --- a/src/mongo/db/timeseries/timeseries_test_fixture.h +++ b/src/mongo/db/timeseries/timeseries_test_fixture.h @@ -33,11 +33,11 @@ #include "mongo/base/string_data_comparator.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsontypes.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" #include "mongo/db/timeseries/bucket_catalog/bucket_catalog.h" #include "mongo/platform/decimal128.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/timeseries/timeseries_write_commands_test.cpp b/src/mongo/db/timeseries/timeseries_write_commands_test.cpp index bae7b985c08..76aa25cb66e 100644 --- a/src/mongo/db/timeseries/timeseries_write_commands_test.cpp +++ b/src/mongo/db/timeseries/timeseries_write_commands_test.cpp @@ -31,11 +31,11 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/json.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/durable_catalog.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog.h" #include "mongo/db/storage/mdb_catalog.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/timeseries/timeseries_gen.h" diff --git a/src/mongo/db/timeseries/timeseries_write_util.cpp b/src/mongo/db/timeseries/timeseries_write_util.cpp index 9c5a62857fc..55f04daf37e 100644 --- a/src/mongo/db/timeseries/timeseries_write_util.cpp +++ b/src/mongo/db/timeseries/timeseries_write_util.cpp @@ -38,8 +38,6 @@ #include "mongo/db/curop.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/feature_flag.h" -#include "mongo/db/local_catalog/collection_operation_source.h" -#include "mongo/db/local_catalog/document_validation.h" #include "mongo/db/profile_settings.h" #include "mongo/db/query/write_ops/delete_request_gen.h" #include "mongo/db/query/write_ops/update_request.h" @@ -49,6 +47,8 @@ #include "mongo/db/repl/repl_client_info.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_operation_source.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" #include "mongo/db/stats/counters.h" #include "mongo/db/storage/kv/kv_engine.h" #include "mongo/db/storage/storage_parameters_gen.h" diff --git a/src/mongo/db/timeseries/timeseries_write_util.h b/src/mongo/db/timeseries/timeseries_write_util.h index 3b2c6b6f660..e4efe2675d8 100644 --- a/src/mongo/db/timeseries/timeseries_write_util.h +++ b/src/mongo/db/timeseries/timeseries_write_util.h @@ -32,12 +32,12 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/oid.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/record_id.h" #include "mongo/db/repl/optime.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/timeseries/bucket_catalog/bucket_catalog.h" #include "mongo/db/timeseries/bucket_catalog/write_batch.h" #include "mongo/db/timeseries/timeseries_gen.h" diff --git a/src/mongo/db/timeseries/timeseries_write_util_test.cpp b/src/mongo/db/timeseries/timeseries_write_util_test.cpp index 13e76289f3f..1c519e5b0d2 100644 --- a/src/mongo/db/timeseries/timeseries_write_util_test.cpp +++ b/src/mongo/db/timeseries/timeseries_write_util_test.cpp @@ -33,10 +33,10 @@ #include "mongo/bson/json.h" #include "mongo/bson/unordered_fields_bsonobj_comparator.h" #include "mongo/db/collection_crud/collection_write_path.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/record_id_helpers.h" #include "mongo/db/repl/oplog.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/timeseries/bucket_catalog/bucket_identifiers.h" diff --git a/src/mongo/db/timeseries/viewless_timeseries_collection_creation_helpers.h b/src/mongo/db/timeseries/viewless_timeseries_collection_creation_helpers.h index ad67c4bc17c..70bf86ce938 100644 --- a/src/mongo/db/timeseries/viewless_timeseries_collection_creation_helpers.h +++ b/src/mongo/db/timeseries/viewless_timeseries_collection_creation_helpers.h @@ -31,7 +31,7 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" #include "mongo/util/modules.h" MONGO_MOD_PUBLIC; diff --git a/src/mongo/db/timeseries/write_ops/BUILD.bazel b/src/mongo/db/timeseries/write_ops/BUILD.bazel index e33cabbf37c..a416ca9da6f 100644 --- a/src/mongo/db/timeseries/write_ops/BUILD.bazel +++ b/src/mongo/db/timeseries/write_ops/BUILD.bazel @@ -27,10 +27,10 @@ mongo_cc_library( "//src/mongo/db:shard_role", "//src/mongo/db/collection_crud", "//src/mongo/db/commands:mongod_fcv", - "//src/mongo/db/local_catalog:collection_uuid_mismatch_info", - "//src/mongo/db/local_catalog:document_validation", "//src/mongo/db/query/write_ops:write_ops_exec_util", "//src/mongo/db/query/write_ops:write_ops_parsers", + "//src/mongo/db/shard_role/shard_catalog:collection_uuid_mismatch_info", + "//src/mongo/db/shard_role/shard_catalog:document_validation", "//src/mongo/db/stats:counters", "//src/mongo/db/stats:server_read_concern_write_concern_metrics", "//src/mongo/db/timeseries:bucket_compression_failure", @@ -51,9 +51,9 @@ mongo_cc_library( "//src/mongo/db:server_base", "//src/mongo/db/collection_crud", "//src/mongo/db/commands:mongod_fcv", - "//src/mongo/db/local_catalog:document_validation", "//src/mongo/db/query/write_ops:write_ops_exec_util", "//src/mongo/db/query/write_ops:write_ops_parsers", + "//src/mongo/db/shard_role/shard_catalog:document_validation", "//src/mongo/db/stats:counters", "//src/mongo/db/storage:storage_options", "//src/mongo/db/timeseries:bucket_compression", diff --git a/src/mongo/db/timeseries/write_ops/internal/BUILD.bazel b/src/mongo/db/timeseries/write_ops/internal/BUILD.bazel index 3e1c92eaf12..01785126f08 100644 --- a/src/mongo/db/timeseries/write_ops/internal/BUILD.bazel +++ b/src/mongo/db/timeseries/write_ops/internal/BUILD.bazel @@ -40,8 +40,8 @@ mongo_cc_unit_test( ], deps = [ "//src/mongo/db/collection_crud", - "//src/mongo/db/local_catalog:catalog_test_fixture", "//src/mongo/db/query/write_ops:write_ops_exec", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", "//src/mongo/db/timeseries:timeseries_metadata", "//src/mongo/db/timeseries:timeseries_options", "//src/mongo/db/timeseries:timeseries_test_fixture", diff --git a/src/mongo/db/timeseries/write_ops/internal/timeseries_write_ops_internal.cpp b/src/mongo/db/timeseries/write_ops/internal/timeseries_write_ops_internal.cpp index 691d9e8cda0..2964ddd6425 100644 --- a/src/mongo/db/timeseries/write_ops/internal/timeseries_write_ops_internal.cpp +++ b/src/mongo/db/timeseries/write_ops/internal/timeseries_write_ops_internal.cpp @@ -30,10 +30,10 @@ #include "mongo/db/timeseries/write_ops/internal/timeseries_write_ops_internal.h" #include "mongo/db/collection_crud/collection_write_path.h" -#include "mongo/db/local_catalog/document_validation.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/profile_settings.h" #include "mongo/db/query/write_ops/write_ops_exec_util.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/storage/kv/kv_engine.h" #include "mongo/db/storage/storage_parameters_gen.h" #include "mongo/db/timeseries/bucket_catalog/global_bucket_catalog.h" diff --git a/src/mongo/db/timeseries/write_ops/internal/timeseries_write_ops_internal_test.cpp b/src/mongo/db/timeseries/write_ops/internal/timeseries_write_ops_internal_test.cpp index e66af2f72b7..c06741af91b 100644 --- a/src/mongo/db/timeseries/write_ops/internal/timeseries_write_ops_internal_test.cpp +++ b/src/mongo/db/timeseries/write_ops/internal/timeseries_write_ops_internal_test.cpp @@ -32,10 +32,10 @@ #include "mongo/bson/bsontypes.h" #include "mongo/bson/bsontypes_util.h" #include "mongo/bson/json.h" -#include "mongo/db/local_catalog/create_collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/session/session_catalog.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" #include "mongo/db/timeseries/bucket_catalog/execution_stats.h" #include "mongo/db/timeseries/timeseries_request_util.h" #include "mongo/db/timeseries/timeseries_test_fixture.h" diff --git a/src/mongo/db/timeseries/write_ops/timeseries_write_ops.cpp b/src/mongo/db/timeseries/write_ops/timeseries_write_ops.cpp index bed1c6ca504..90c326f8d37 100644 --- a/src/mongo/db/timeseries/write_ops/timeseries_write_ops.cpp +++ b/src/mongo/db/timeseries/write_ops/timeseries_write_ops.cpp @@ -30,7 +30,7 @@ #include "mongo/db/timeseries/write_ops/timeseries_write_ops.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch.h" #include "mongo/db/stats/counters.h" #include "mongo/db/stats/server_write_concern_metrics.h" #include "mongo/db/stats/top.h" diff --git a/src/mongo/db/timeseries/write_ops/timeseries_write_ops_test.cpp b/src/mongo/db/timeseries/write_ops/timeseries_write_ops_test.cpp index 5fbdf15a4e8..fce9df5b93e 100644 --- a/src/mongo/db/timeseries/write_ops/timeseries_write_ops_test.cpp +++ b/src/mongo/db/timeseries/write_ops/timeseries_write_ops_test.cpp @@ -32,9 +32,9 @@ #include "mongo/bson/json.h" #include "mongo/bson/unordered_fields_bsonobj_comparator.h" #include "mongo/db/collection_crud/collection_write_path.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/create_collection.h" #include "mongo/db/namespace_string.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" #include "mongo/db/timeseries/bucket_compression.h" #include "mongo/db/timeseries/collection_pre_conditions_util.h" #include "mongo/db/timeseries/timeseries_test_fixture.h" diff --git a/src/mongo/db/topology/add_shard_coordinator.cpp b/src/mongo/db/topology/add_shard_coordinator.cpp index cc2e3bf632a..61205083017 100644 --- a/src/mongo/db/topology/add_shard_coordinator.cpp +++ b/src/mongo/db/topology/add_shard_coordinator.cpp @@ -33,8 +33,8 @@ #include "mongo/db/global_catalog/ddl/configsvr_coordinator_service.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" -#include "mongo/db/local_catalog/ddl/list_collections_gen.h" -#include "mongo/db/local_catalog/shard_role_catalog/participant_block_gen.h" +#include "mongo/db/shard_role/ddl/list_collections_gen.h" +#include "mongo/db/shard_role/shard_catalog/participant_block_gen.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_api_d_params_gen.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" @@ -43,8 +43,8 @@ #include "mongo/db/topology/add_shard_gen.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/db/topology/topology_change_helpers.h" -#include "mongo/db/user_write_block/user_writes_critical_section_document_gen.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/user_write_block/user_writes_critical_section_document_gen.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/executor/network_interface_factory.h" #include "mongo/executor/network_interface_thread_pool.h" #include "mongo/executor/scoped_task_executor.h" diff --git a/src/mongo/db/cluster_parameters/BUILD.bazel b/src/mongo/db/topology/cluster_parameters/BUILD.bazel similarity index 100% rename from src/mongo/db/cluster_parameters/BUILD.bazel rename to src/mongo/db/topology/cluster_parameters/BUILD.bazel diff --git a/src/mongo/db/global_catalog/router_role_api/OWNERS.yml b/src/mongo/db/topology/cluster_parameters/OWNERS.yml similarity index 100% rename from src/mongo/db/global_catalog/router_role_api/OWNERS.yml rename to src/mongo/db/topology/cluster_parameters/OWNERS.yml diff --git a/src/mongo/db/cluster_parameters/cluster_get_cluster_parameter_cmd.cpp b/src/mongo/db/topology/cluster_parameters/cluster_get_cluster_parameter_cmd.cpp similarity index 94% rename from src/mongo/db/cluster_parameters/cluster_get_cluster_parameter_cmd.cpp rename to src/mongo/db/topology/cluster_parameters/cluster_get_cluster_parameter_cmd.cpp index c6b33e0fe83..f73d51ea76d 100644 --- a/src/mongo/db/cluster_parameters/cluster_get_cluster_parameter_cmd.cpp +++ b/src/mongo/db/topology/cluster_parameters/cluster_get_cluster_parameter_cmd.cpp @@ -33,15 +33,15 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/privilege.h" #include "mongo/db/auth/resource_pattern.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_cmds_gen.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_refresher.h" -#include "mongo/db/cluster_parameters/get_cluster_parameter_invocation.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/server_parameter.h" #include "mongo/db/service_context.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_cmds_gen.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_refresher.h" +#include "mongo/db/topology/cluster_parameters/get_cluster_parameter_invocation.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/cluster_parameters/cluster_parameter_synchronization_helpers.cpp b/src/mongo/db/topology/cluster_parameters/cluster_parameter_synchronization_helpers.cpp similarity index 98% rename from src/mongo/db/cluster_parameters/cluster_parameter_synchronization_helpers.cpp rename to src/mongo/db/topology/cluster_parameters/cluster_parameter_synchronization_helpers.cpp index 5a696281441..9e0e4610df1 100644 --- a/src/mongo/db/cluster_parameters/cluster_parameter_synchronization_helpers.cpp +++ b/src/mongo/db/topology/cluster_parameters/cluster_parameter_synchronization_helpers.cpp @@ -27,16 +27,16 @@ * it in the license file. */ -#include "mongo/db/cluster_parameters/cluster_parameter_synchronization_helpers.h" +#include "mongo/db/topology/cluster_parameters/cluster_parameter_synchronization_helpers.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/bsontypes.h" #include "mongo/db/audit.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/logical_time.h" #include "mongo/db/server_parameter.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/logv2/log.h" #include "mongo/util/functional.h" diff --git a/src/mongo/db/cluster_parameters/cluster_parameter_synchronization_helpers.h b/src/mongo/db/topology/cluster_parameters/cluster_parameter_synchronization_helpers.h similarity index 97% rename from src/mongo/db/cluster_parameters/cluster_parameter_synchronization_helpers.h rename to src/mongo/db/topology/cluster_parameters/cluster_parameter_synchronization_helpers.h index 3348146cae7..545b6884633 100644 --- a/src/mongo/db/cluster_parameters/cluster_parameter_synchronization_helpers.h +++ b/src/mongo/db/topology/cluster_parameters/cluster_parameter_synchronization_helpers.h @@ -31,8 +31,8 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/db/tenant_id.h" #include diff --git a/src/mongo/db/cluster_parameters/cluster_parameter_synchronization_helpers_test.cpp b/src/mongo/db/topology/cluster_parameters/cluster_parameter_synchronization_helpers_test.cpp similarity index 96% rename from src/mongo/db/cluster_parameters/cluster_parameter_synchronization_helpers_test.cpp rename to src/mongo/db/topology/cluster_parameters/cluster_parameter_synchronization_helpers_test.cpp index e47ed410444..f649ea97baf 100644 --- a/src/mongo/db/cluster_parameters/cluster_parameter_synchronization_helpers_test.cpp +++ b/src/mongo/db/topology/cluster_parameters/cluster_parameter_synchronization_helpers_test.cpp @@ -27,11 +27,11 @@ * it in the license file. */ -#include "mongo/db/cluster_parameters/cluster_parameter_synchronization_helpers.h" +#include "mongo/db/topology/cluster_parameters/cluster_parameter_synchronization_helpers.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_test_util.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_test_util.h" #include "mongo/unittest/log_test.h" #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/cluster_parameters/cluster_server_parameter.idl b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter.idl similarity index 100% rename from src/mongo/db/cluster_parameters/cluster_server_parameter.idl rename to src/mongo/db/topology/cluster_parameters/cluster_server_parameter.idl diff --git a/src/mongo/db/cluster_parameters/cluster_server_parameter_cmds.idl b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_cmds.idl similarity index 100% rename from src/mongo/db/cluster_parameters/cluster_server_parameter_cmds.idl rename to src/mongo/db/topology/cluster_parameters/cluster_server_parameter_cmds.idl diff --git a/src/mongo/db/cluster_parameters/cluster_server_parameter_common.cpp b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_common.cpp similarity index 97% rename from src/mongo/db/cluster_parameters/cluster_server_parameter_common.cpp rename to src/mongo/db/topology/cluster_parameters/cluster_server_parameter_common.cpp index 7e46f9d83a7..acf3d89e1d4 100644 --- a/src/mongo/db/cluster_parameters/cluster_server_parameter_common.cpp +++ b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_common.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/cluster_parameters/cluster_server_parameter_common.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_common.h" #include "mongo/base/error_codes.h" #include "mongo/base/status.h" @@ -39,8 +39,8 @@ #include "mongo/client/read_preference.h" #include "mongo/client/remote_command_targeter.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/ddl/list_databases_for_all_tenants_gen.h" #include "mongo/db/multitenancy_gen.h" +#include "mongo/db/shard_role/ddl/list_databases_for_all_tenants_gen.h" #include "mongo/executor/remote_command_request.h" #include "mongo/executor/remote_command_response.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/cluster_parameters/cluster_server_parameter_common.h b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_common.h similarity index 100% rename from src/mongo/db/cluster_parameters/cluster_server_parameter_common.h rename to src/mongo/db/topology/cluster_parameters/cluster_server_parameter_common.h diff --git a/src/mongo/db/cluster_parameters/cluster_server_parameter_common_test.cpp b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_common_test.cpp similarity index 93% rename from src/mongo/db/cluster_parameters/cluster_server_parameter_common_test.cpp rename to src/mongo/db/topology/cluster_parameters/cluster_server_parameter_common_test.cpp index 94d9bafc6d0..9b653c87f65 100644 --- a/src/mongo/db/cluster_parameters/cluster_server_parameter_common_test.cpp +++ b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_common_test.cpp @@ -27,19 +27,19 @@ * it in the license file. */ -#include "mongo/db/cluster_parameters/cluster_server_parameter_common.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_common.h" #include "mongo/base/string_data.h" #include "mongo/db/client.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_test_util.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/ddl/create_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/ddl/create_gen.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/shard_local.h" #include "mongo/db/sharding_environment/shard_retry_server_parameters_gen.h" #include "mongo/db/sharding_environment/shard_shared_state_cache.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_test_util.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/cluster_parameters/cluster_server_parameter_initializer.cpp b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_initializer.cpp similarity index 91% rename from src/mongo/db/cluster_parameters/cluster_server_parameter_initializer.cpp rename to src/mongo/db/topology/cluster_parameters/cluster_server_parameter_initializer.cpp index 61c9fb97c02..e83068bb47d 100644 --- a/src/mongo/db/cluster_parameters/cluster_server_parameter_initializer.cpp +++ b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_initializer.cpp @@ -27,18 +27,18 @@ * it in the license file. */ -#include "mongo/db/cluster_parameters/cluster_server_parameter_initializer.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_initializer.h" #include "mongo/base/string_data.h" -#include "mongo/db/cluster_parameters/cluster_parameter_synchronization_helpers.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/multitenancy_gen.h" #include "mongo/db/repl/replica_set_aware_service.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/tenant_id.h" +#include "mongo/db/topology/cluster_parameters/cluster_parameter_synchronization_helpers.h" #include "mongo/logv2/log.h" #include "mongo/util/decorable.h" diff --git a/src/mongo/db/cluster_parameters/cluster_server_parameter_initializer.h b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_initializer.h similarity index 98% rename from src/mongo/db/cluster_parameters/cluster_server_parameter_initializer.h rename to src/mongo/db/topology/cluster_parameters/cluster_server_parameter_initializer.h index 395cbf7b737..46b8e0b4e06 100644 --- a/src/mongo/db/cluster_parameters/cluster_server_parameter_initializer.h +++ b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_initializer.h @@ -29,10 +29,10 @@ #pragma once -#include "mongo/db/local_catalog/db_raii.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/replica_set_aware_service.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" #include diff --git a/src/mongo/db/cluster_parameters/cluster_server_parameter_initializer_test.cpp b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_initializer_test.cpp similarity index 93% rename from src/mongo/db/cluster_parameters/cluster_server_parameter_initializer_test.cpp rename to src/mongo/db/topology/cluster_parameters/cluster_server_parameter_initializer_test.cpp index 6879a5f919f..6162be194d7 100644 --- a/src/mongo/db/cluster_parameters/cluster_server_parameter_initializer_test.cpp +++ b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_initializer_test.cpp @@ -27,23 +27,23 @@ * it in the license file. */ -#include "mongo/db/cluster_parameters/cluster_server_parameter_initializer.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_initializer.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/timestamp.h" #include "mongo/db/client.h" -#include "mongo/db/cluster_parameters/cluster_parameter_synchronization_helpers.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_test_gen.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_test_util.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/ddl/create_gen.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" #include "mongo/db/server_parameter.h" #include "mongo/db/server_parameter_with_storage.h" +#include "mongo/db/shard_role/ddl/create_gen.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/tenant_id.h" +#include "mongo/db/topology/cluster_parameters/cluster_parameter_synchronization_helpers.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_test_gen.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_test_util.h" #include "mongo/unittest/unittest.h" #include diff --git a/src/mongo/db/cluster_parameters/cluster_server_parameter_op_observer.cpp b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_op_observer.cpp similarity index 96% rename from src/mongo/db/cluster_parameters/cluster_server_parameter_op_observer.cpp rename to src/mongo/db/topology/cluster_parameters/cluster_server_parameter_op_observer.cpp index 3a1f3acbe43..eca1c413622 100644 --- a/src/mongo/db/cluster_parameters/cluster_server_parameter_op_observer.cpp +++ b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_op_observer.cpp @@ -27,17 +27,17 @@ * it in the license file. */ -#include "mongo/db/cluster_parameters/cluster_server_parameter_op_observer.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_op_observer.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonelement.h" #include "mongo/bson/bsontypes.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/cluster_parameters/cluster_parameter_synchronization_helpers.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/tenant_id.h" +#include "mongo/db/topology/cluster_parameters/cluster_parameter_synchronization_helpers.h" #include "mongo/logv2/log.h" #include diff --git a/src/mongo/db/cluster_parameters/cluster_server_parameter_op_observer.h b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_op_observer.h similarity index 98% rename from src/mongo/db/cluster_parameters/cluster_server_parameter_op_observer.h rename to src/mongo/db/topology/cluster_parameters/cluster_server_parameter_op_observer.h index 5538aa11201..6ff3a97c710 100644 --- a/src/mongo/db/cluster_parameters/cluster_server_parameter_op_observer.h +++ b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_op_observer.h @@ -31,7 +31,6 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_noop.h" @@ -39,6 +38,7 @@ #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/optime.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" #include "mongo/util/uuid.h" #include diff --git a/src/mongo/db/cluster_parameters/cluster_server_parameter_op_observer_test.cpp b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_op_observer_test.cpp similarity index 98% rename from src/mongo/db/cluster_parameters/cluster_server_parameter_op_observer_test.cpp rename to src/mongo/db/topology/cluster_parameters/cluster_server_parameter_op_observer_test.cpp index c719d642de4..4960c5cae54 100644 --- a/src/mongo/db/cluster_parameters/cluster_server_parameter_op_observer_test.cpp +++ b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_op_observer_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/cluster_parameters/cluster_server_parameter_op_observer.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_op_observer.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonelement.h" @@ -35,19 +35,19 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/timestamp.h" #include "mongo/db/client.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_gen.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_test_gen.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_test_util.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/ddl/create_gen.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/logical_time.h" #include "mongo/db/op_observer/op_observer_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" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/tenant_id.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_gen.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_test_gen.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_test_util.h" #include "mongo/logv2/log.h" #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/cluster_parameters/cluster_server_parameter_refresher.cpp b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_refresher.cpp similarity index 98% rename from src/mongo/db/cluster_parameters/cluster_server_parameter_refresher.cpp rename to src/mongo/db/topology/cluster_parameters/cluster_server_parameter_refresher.cpp index 1947630e4b0..fe0bb8c5cb8 100644 --- a/src/mongo/db/cluster_parameters/cluster_server_parameter_refresher.cpp +++ b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_refresher.cpp @@ -28,7 +28,7 @@ */ // IWYU pragma: no_include "ext/alloc_traits.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_refresher.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_refresher.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" @@ -39,10 +39,7 @@ #include "mongo/db/audit.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/client.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_common.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_refresher_gen.h" #include "mongo/db/feature_compatibility_version_parser.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielder.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/client_cursor/cursor_response.h" #include "mongo/db/query/find_command.h" @@ -50,8 +47,11 @@ #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/server_options.h" #include "mongo/db/server_parameter.h" +#include "mongo/db/shard_role/resource_yielder.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/tenant_id.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_common.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_refresher_gen.h" #include "mongo/db/topology/shard_registry.h" #include "mongo/db/transaction/transaction_api.h" #include "mongo/db/write_concern_options.h" diff --git a/src/mongo/db/cluster_parameters/cluster_server_parameter_refresher.h b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_refresher.h similarity index 100% rename from src/mongo/db/cluster_parameters/cluster_server_parameter_refresher.h rename to src/mongo/db/topology/cluster_parameters/cluster_server_parameter_refresher.h diff --git a/src/mongo/db/cluster_parameters/cluster_server_parameter_refresher.idl b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_refresher.idl similarity index 96% rename from src/mongo/db/cluster_parameters/cluster_server_parameter_refresher.idl rename to src/mongo/db/topology/cluster_parameters/cluster_server_parameter_refresher.idl index b86ba8583d4..7689546d6dd 100644 --- a/src/mongo/db/cluster_parameters/cluster_server_parameter_refresher.idl +++ b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_refresher.idl @@ -28,7 +28,7 @@ global: cpp_namespace: "mongo" cpp_includes: - - "mongo/db/cluster_parameters/cluster_server_parameter_refresher.h" + - "mongo/db/topology/cluster_parameters/cluster_server_parameter_refresher.h" imports: - "mongo/db/basic_types.idl" diff --git a/src/mongo/db/cluster_parameters/cluster_server_parameter_refresher_test.cpp b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_refresher_test.cpp similarity index 99% rename from src/mongo/db/cluster_parameters/cluster_server_parameter_refresher_test.cpp rename to src/mongo/db/topology/cluster_parameters/cluster_server_parameter_refresher_test.cpp index 357e0a6eaef..c350d2b9c02 100644 --- a/src/mongo/db/cluster_parameters/cluster_server_parameter_refresher_test.cpp +++ b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_refresher_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/cluster_parameters/cluster_server_parameter_refresher.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_refresher.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" diff --git a/src/mongo/db/cluster_parameters/cluster_server_parameter_server_status.cpp b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_server_status.cpp similarity index 97% rename from src/mongo/db/cluster_parameters/cluster_server_parameter_server_status.cpp rename to src/mongo/db/topology/cluster_parameters/cluster_server_parameter_server_status.cpp index 39de031b196..d1fb6878f9b 100644 --- a/src/mongo/db/cluster_parameters/cluster_server_parameter_server_status.cpp +++ b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_server_status.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/cluster_parameters/cluster_server_parameter_server_status.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_server_status.h" #include "mongo/db/server_parameter_with_storage.h" diff --git a/src/mongo/db/cluster_parameters/cluster_server_parameter_server_status.h b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_server_status.h similarity index 100% rename from src/mongo/db/cluster_parameters/cluster_server_parameter_server_status.h rename to src/mongo/db/topology/cluster_parameters/cluster_server_parameter_server_status.h diff --git a/src/mongo/db/cluster_parameters/cluster_server_parameter_server_status_test.cpp b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_server_status_test.cpp similarity index 97% rename from src/mongo/db/cluster_parameters/cluster_server_parameter_server_status_test.cpp rename to src/mongo/db/topology/cluster_parameters/cluster_server_parameter_server_status_test.cpp index 869c0fae0d7..3fb2c218c14 100644 --- a/src/mongo/db/cluster_parameters/cluster_server_parameter_server_status_test.cpp +++ b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_server_status_test.cpp @@ -27,10 +27,10 @@ * it in the license file. */ -#include "mongo/db/cluster_parameters/cluster_server_parameter_server_status.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_server_status.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_test_gen.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_test_gen.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kTest diff --git a/src/mongo/db/cluster_parameters/cluster_server_parameter_test.idl b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_test.idl similarity index 97% rename from src/mongo/db/cluster_parameters/cluster_server_parameter_test.idl rename to src/mongo/db/topology/cluster_parameters/cluster_server_parameter_test.idl index 8469b29ca49..561ca654dca 100644 --- a/src/mongo/db/cluster_parameters/cluster_server_parameter_test.idl +++ b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_test.idl @@ -31,7 +31,7 @@ global: imports: - "mongo/db/basic_types.idl" - - "mongo/db/cluster_parameters/cluster_server_parameter.idl" + - "mongo/db/topology/cluster_parameters/cluster_server_parameter.idl" structs: ClusterServerParameterTest: diff --git a/src/mongo/db/cluster_parameters/cluster_server_parameter_test_util.cpp b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_test_util.cpp similarity index 96% rename from src/mongo/db/cluster_parameters/cluster_server_parameter_test_util.cpp rename to src/mongo/db/topology/cluster_parameters/cluster_server_parameter_test_util.cpp index 060f5969516..bd129de2a2d 100644 --- a/src/mongo/db/cluster_parameters/cluster_server_parameter_test_util.cpp +++ b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_test_util.cpp @@ -27,20 +27,20 @@ * it in the license file. */ -#include "mongo/db/cluster_parameters/cluster_server_parameter_test_util.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_test_util.h" #include "mongo/base/error_codes.h" #include "mongo/bson/bsonmisc.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/oid.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_gen.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_test_gen.h" #include "mongo/db/database_name.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_gen.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_test_gen.h" #include "mongo/rpc/op_msg.h" #include "mongo/rpc/reply_interface.h" #include "mongo/rpc/unique_message.h" diff --git a/src/mongo/db/cluster_parameters/cluster_server_parameter_test_util.h b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_test_util.h similarity index 96% rename from src/mongo/db/cluster_parameters/cluster_server_parameter_test_util.h rename to src/mongo/db/topology/cluster_parameters/cluster_server_parameter_test_util.h index 791791f069b..12832724e42 100644 --- a/src/mongo/db/cluster_parameters/cluster_server_parameter_test_util.h +++ b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_test_util.h @@ -33,8 +33,6 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/change_stream_options_manager.h" #include "mongo/db/client.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_gen.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_test_gen.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/logical_time.h" #include "mongo/db/multitenancy_gen.h" @@ -48,6 +46,8 @@ #include "mongo/db/repl/storage_interface_mock.h" #include "mongo/db/service_context_d_test_fixture.h" #include "mongo/db/tenant_id.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_gen.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_test_gen.h" #include "mongo/s/write_ops/batched_command_response.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/cluster_parameters/cluster_set_cluster_parameter_cmd.cpp b/src/mongo/db/topology/cluster_parameters/cluster_set_cluster_parameter_cmd.cpp similarity index 96% rename from src/mongo/db/cluster_parameters/cluster_set_cluster_parameter_cmd.cpp rename to src/mongo/db/topology/cluster_parameters/cluster_set_cluster_parameter_cmd.cpp index ca9a10cebcc..6aab1ca5850 100644 --- a/src/mongo/db/cluster_parameters/cluster_set_cluster_parameter_cmd.cpp +++ b/src/mongo/db/topology/cluster_parameters/cluster_set_cluster_parameter_cmd.cpp @@ -35,8 +35,6 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/privilege.h" #include "mongo/db/auth/resource_pattern.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_cmds_gen.h" -#include "mongo/db/cluster_parameters/set_cluster_server_parameter_router_impl.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" @@ -46,6 +44,8 @@ #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_cmds_gen.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_server_parameter_router_impl.h" #include "mongo/db/topology/shard_registry.h" #include "mongo/db/update/storage_validation.h" #include "mongo/rpc/op_msg.h" diff --git a/src/mongo/db/cluster_parameters/configsvr_set_cluster_parameter_command.cpp b/src/mongo/db/topology/cluster_parameters/configsvr_set_cluster_parameter_command.cpp similarity index 97% rename from src/mongo/db/cluster_parameters/configsvr_set_cluster_parameter_command.cpp rename to src/mongo/db/topology/cluster_parameters/configsvr_set_cluster_parameter_command.cpp index a64551a58b7..1760ac546f9 100644 --- a/src/mongo/db/cluster_parameters/configsvr_set_cluster_parameter_command.cpp +++ b/src/mongo/db/topology/cluster_parameters/configsvr_set_cluster_parameter_command.cpp @@ -32,7 +32,6 @@ #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/resource_pattern.h" -#include "mongo/db/cluster_parameters/set_cluster_parameter_configsvr_impl.h" #include "mongo/db/commands.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" @@ -42,6 +41,7 @@ #include "mongo/db/server_parameter.h" #include "mongo/db/service_context.h" #include "mongo/db/tenant_id.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_parameter_configsvr_impl.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/s/migration_blocking_operation/migration_blocking_operation_feature_flags_gen.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/cluster_parameters/get_cluster_parameter_command.cpp b/src/mongo/db/topology/cluster_parameters/get_cluster_parameter_command.cpp similarity index 96% rename from src/mongo/db/cluster_parameters/get_cluster_parameter_command.cpp rename to src/mongo/db/topology/cluster_parameters/get_cluster_parameter_command.cpp index 432805d0b1a..cc9165a02cb 100644 --- a/src/mongo/db/cluster_parameters/get_cluster_parameter_command.cpp +++ b/src/mongo/db/topology/cluster_parameters/get_cluster_parameter_command.cpp @@ -34,8 +34,6 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/privilege.h" #include "mongo/db/auth/resource_pattern.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_cmds_gen.h" -#include "mongo/db/cluster_parameters/get_cluster_parameter_invocation.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/feature_flag.h" @@ -46,6 +44,8 @@ #include "mongo/db/server_options.h" #include "mongo/db/server_parameter.h" #include "mongo/db/service_context.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_cmds_gen.h" +#include "mongo/db/topology/cluster_parameters/get_cluster_parameter_invocation.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/cluster_parameters/get_cluster_parameter_invocation.cpp b/src/mongo/db/topology/cluster_parameters/get_cluster_parameter_invocation.cpp similarity index 98% rename from src/mongo/db/cluster_parameters/get_cluster_parameter_invocation.cpp rename to src/mongo/db/topology/cluster_parameters/get_cluster_parameter_invocation.cpp index 793a70eb94a..70b5b106d09 100644 --- a/src/mongo/db/cluster_parameters/get_cluster_parameter_invocation.cpp +++ b/src/mongo/db/topology/cluster_parameters/get_cluster_parameter_invocation.cpp @@ -28,7 +28,7 @@ */ -#include "mongo/db/cluster_parameters/get_cluster_parameter_invocation.h" +#include "mongo/db/topology/cluster_parameters/get_cluster_parameter_invocation.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" diff --git a/src/mongo/db/cluster_parameters/get_cluster_parameter_invocation.h b/src/mongo/db/topology/cluster_parameters/get_cluster_parameter_invocation.h similarity index 96% rename from src/mongo/db/cluster_parameters/get_cluster_parameter_invocation.h rename to src/mongo/db/topology/cluster_parameters/get_cluster_parameter_invocation.h index 1cd2623ac51..8eada410ce5 100644 --- a/src/mongo/db/cluster_parameters/get_cluster_parameter_invocation.h +++ b/src/mongo/db/topology/cluster_parameters/get_cluster_parameter_invocation.h @@ -30,9 +30,9 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_cmds_gen.h" #include "mongo/db/server_parameter.h" #include "mongo/db/tenant_id.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_cmds_gen.h" #include #include diff --git a/src/mongo/db/cluster_parameters/migration_blocking_operation_cluster_parameters.idl b/src/mongo/db/topology/cluster_parameters/migration_blocking_operation_cluster_parameters.idl similarity index 97% rename from src/mongo/db/cluster_parameters/migration_blocking_operation_cluster_parameters.idl rename to src/mongo/db/topology/cluster_parameters/migration_blocking_operation_cluster_parameters.idl index 6a05cdcccc4..7a94e943850 100644 --- a/src/mongo/db/cluster_parameters/migration_blocking_operation_cluster_parameters.idl +++ b/src/mongo/db/topology/cluster_parameters/migration_blocking_operation_cluster_parameters.idl @@ -26,7 +26,7 @@ # it in the license file. imports: - - "mongo/db/cluster_parameters/cluster_server_parameter.idl" + - "mongo/db/topology/cluster_parameters/cluster_server_parameter.idl" global: cpp_namespace: mongo::migration_blocking_operation diff --git a/src/mongo/db/cluster_parameters/set_cluster_parameter_command.cpp b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_command.cpp similarity index 95% rename from src/mongo/db/cluster_parameters/set_cluster_parameter_command.cpp rename to src/mongo/db/topology/cluster_parameters/set_cluster_parameter_command.cpp index 841e592605d..516de0418c7 100644 --- a/src/mongo/db/cluster_parameters/set_cluster_parameter_command.cpp +++ b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_command.cpp @@ -36,9 +36,6 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/privilege.h" #include "mongo/db/auth/resource_pattern.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_cmds_gen.h" -#include "mongo/db/cluster_parameters/set_cluster_parameter_invocation.h" -#include "mongo/db/cluster_parameters/set_cluster_parameter_replset_impl.h" #include "mongo/db/commands.h" #include "mongo/db/commands/feature_compatibility_version.h" #include "mongo/db/database_name.h" @@ -51,6 +48,9 @@ #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_cmds_gen.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_parameter_invocation.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_parameter_replset_impl.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/write_concern_options.h" #include "mongo/rpc/op_msg.h" diff --git a/src/mongo/db/cluster_parameters/set_cluster_parameter_configsvr_impl.cpp b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_configsvr_impl.cpp similarity index 95% rename from src/mongo/db/cluster_parameters/set_cluster_parameter_configsvr_impl.cpp rename to src/mongo/db/topology/cluster_parameters/set_cluster_parameter_configsvr_impl.cpp index fe7372e4810..2e070c16378 100644 --- a/src/mongo/db/cluster_parameters/set_cluster_parameter_configsvr_impl.cpp +++ b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_configsvr_impl.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/cluster_parameters/set_cluster_parameter_configsvr_impl.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_parameter_configsvr_impl.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" @@ -37,9 +37,6 @@ #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/resource_pattern.h" -#include "mongo/db/cluster_parameters/set_cluster_parameter_coordinator.h" -#include "mongo/db/cluster_parameters/set_cluster_parameter_coordinator_document_gen.h" -#include "mongo/db/cluster_parameters/set_cluster_parameter_invocation.h" #include "mongo/db/commands.h" #include "mongo/db/commands/feature_compatibility_version.h" #include "mongo/db/database_name.h" @@ -56,6 +53,9 @@ #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/tenant_id.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator_document_gen.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_parameter_invocation.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/rpc/op_msg.h" #include "mongo/s/migration_blocking_operation/migration_blocking_operation_feature_flags_gen.h" diff --git a/src/mongo/db/cluster_parameters/set_cluster_parameter_configsvr_impl.h b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_configsvr_impl.h similarity index 96% rename from src/mongo/db/cluster_parameters/set_cluster_parameter_configsvr_impl.h rename to src/mongo/db/topology/cluster_parameters/set_cluster_parameter_configsvr_impl.h index 2ba4ca5224c..7f92ce81cf6 100644 --- a/src/mongo/db/cluster_parameters/set_cluster_parameter_configsvr_impl.h +++ b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_configsvr_impl.h @@ -30,10 +30,10 @@ #pragma once #include "mongo/bson/timestamp.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_cmds_gen.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/logical_time.h" #include "mongo/db/operation_context.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_cmds_gen.h" namespace mongo { diff --git a/src/mongo/db/cluster_parameters/set_cluster_parameter_coordinator.cpp b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator.cpp similarity index 97% rename from src/mongo/db/cluster_parameters/set_cluster_parameter_coordinator.cpp rename to src/mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator.cpp index 9ee25e72441..a6f6b6814cb 100644 --- a/src/mongo/db/cluster_parameters/set_cluster_parameter_coordinator.cpp +++ b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator.cpp @@ -28,7 +28,7 @@ */ -#include "mongo/db/cluster_parameters/set_cluster_parameter_coordinator.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator.h" #include "mongo/base/error_codes.h" #include "mongo/base/status.h" @@ -40,8 +40,6 @@ #include "mongo/bson/timestamp.h" #include "mongo/client/read_preference.h" #include "mongo/db/client.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_cmds_gen.h" -#include "mongo/db/cluster_parameters/set_cluster_parameter_invocation.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/dbdirectclient.h" @@ -49,18 +47,20 @@ #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" #include "mongo/db/global_catalog/ddl/sharding_util.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_logging.h" #include "mongo/db/tenant_id.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_cmds_gen.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_parameter_invocation.h" #include "mongo/db/topology/shard_registry.h" -#include "mongo/db/vector_clock/vector_clock.h" +#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" diff --git a/src/mongo/db/cluster_parameters/set_cluster_parameter_coordinator.h b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator.h similarity index 98% rename from src/mongo/db/cluster_parameters/set_cluster_parameter_coordinator.h rename to src/mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator.h index bf19b68e8f1..bba2ba5eaa7 100644 --- a/src/mongo/db/cluster_parameters/set_cluster_parameter_coordinator.h +++ b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator.h @@ -30,13 +30,13 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/cluster_parameters/set_cluster_parameter_coordinator_document_gen.h" #include "mongo/db/global_catalog/ddl/configsvr_coordinator.h" #include "mongo/db/global_catalog/ddl/configsvr_coordinator_gen.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/process_interface/mongo_process_interface.h" #include "mongo/db/session/internal_session_pool.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator_document_gen.h" #include "mongo/executor/scoped_task_executor.h" #include "mongo/idl/idl_parser.h" #include "mongo/util/cancellation.h" diff --git a/src/mongo/db/cluster_parameters/set_cluster_parameter_coordinator_document.idl b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator_document.idl similarity index 100% rename from src/mongo/db/cluster_parameters/set_cluster_parameter_coordinator_document.idl rename to src/mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator_document.idl diff --git a/src/mongo/db/cluster_parameters/set_cluster_parameter_coordinator_test.cpp b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator_test.cpp similarity index 97% rename from src/mongo/db/cluster_parameters/set_cluster_parameter_coordinator_test.cpp rename to src/mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator_test.cpp index 8f574c896d0..243b4fc1b08 100644 --- a/src/mongo/db/cluster_parameters/set_cluster_parameter_coordinator_test.cpp +++ b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator_test.cpp @@ -26,10 +26,10 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -#include "mongo/db/cluster_parameters/set_cluster_parameter_coordinator.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator.h" #include "mongo/bson/bsonmisc.h" -#include "mongo/db/cluster_parameters/set_cluster_parameter_coordinator_document_gen.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator_document_gen.h" #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/cluster_parameters/set_cluster_parameter_invocation.cpp b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_invocation.cpp similarity index 98% rename from src/mongo/db/cluster_parameters/set_cluster_parameter_invocation.cpp rename to src/mongo/db/topology/cluster_parameters/set_cluster_parameter_invocation.cpp index 20b889d137f..5efb55d8162 100644 --- a/src/mongo/db/cluster_parameters/set_cluster_parameter_invocation.cpp +++ b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_invocation.cpp @@ -28,7 +28,7 @@ */ -#include "mongo/db/cluster_parameters/set_cluster_parameter_invocation.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_parameter_invocation.h" #include "mongo/base/error_codes.h" #include "mongo/base/status.h" @@ -44,8 +44,8 @@ #include "mongo/db/query/write_ops/write_ops_parsers.h" #include "mongo/db/server_options.h" #include "mongo/db/topology/cluster_role.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/update/storage_validation.h" -#include "mongo/db/vector_clock/vector_clock.h" #include "mongo/logv2/log.h" #include "mongo/rpc/op_msg.h" #include "mongo/rpc/reply_interface.h" diff --git a/src/mongo/db/cluster_parameters/set_cluster_parameter_invocation.h b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_invocation.h similarity index 98% rename from src/mongo/db/cluster_parameters/set_cluster_parameter_invocation.h rename to src/mongo/db/topology/cluster_parameters/set_cluster_parameter_invocation.h index e420b907ee9..f5d30faa17c 100644 --- a/src/mongo/db/cluster_parameters/set_cluster_parameter_invocation.h +++ b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_invocation.h @@ -33,12 +33,12 @@ #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_cmds_gen.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/operation_context.h" #include "mongo/db/server_parameter.h" #include "mongo/db/tenant_id.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_cmds_gen.h" #include "mongo/db/write_concern_options.h" #include "mongo/s/write_ops/batched_command_response.h" diff --git a/src/mongo/db/cluster_parameters/set_cluster_parameter_invocation_test.cpp b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_invocation_test.cpp similarity index 99% rename from src/mongo/db/cluster_parameters/set_cluster_parameter_invocation_test.cpp rename to src/mongo/db/topology/cluster_parameters/set_cluster_parameter_invocation_test.cpp index c69614f0f29..0757183e2a8 100644 --- a/src/mongo/db/cluster_parameters/set_cluster_parameter_invocation_test.cpp +++ b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_invocation_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/cluster_parameters/set_cluster_parameter_invocation.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_parameter_invocation.h" #include "mongo/base/error_codes.h" #include "mongo/base/status.h" diff --git a/src/mongo/db/cluster_parameters/set_cluster_parameter_replset_impl.cpp b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_replset_impl.cpp similarity index 96% rename from src/mongo/db/cluster_parameters/set_cluster_parameter_replset_impl.cpp rename to src/mongo/db/topology/cluster_parameters/set_cluster_parameter_replset_impl.cpp index adf25ad0485..8a67345d53d 100644 --- a/src/mongo/db/cluster_parameters/set_cluster_parameter_replset_impl.cpp +++ b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_replset_impl.cpp @@ -27,11 +27,10 @@ * it in the license file. */ -#include "mongo/db/cluster_parameters/set_cluster_parameter_replset_impl.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_parameter_replset_impl.h" #include "mongo/base/error_codes.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/cluster_parameters/set_cluster_parameter_invocation.h" #include "mongo/db/commands.h" #include "mongo/db/commands/feature_compatibility_version.h" #include "mongo/db/dbdirectclient.h" @@ -40,6 +39,7 @@ #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_parameter_invocation.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/write_concern_options.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/cluster_parameters/set_cluster_parameter_replset_impl.h b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_replset_impl.h similarity index 96% rename from src/mongo/db/cluster_parameters/set_cluster_parameter_replset_impl.h rename to src/mongo/db/topology/cluster_parameters/set_cluster_parameter_replset_impl.h index a07ddad1e7d..a8de49a1e3c 100644 --- a/src/mongo/db/cluster_parameters/set_cluster_parameter_replset_impl.h +++ b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_replset_impl.h @@ -31,10 +31,10 @@ #include "mongo/bson/timestamp.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_cmds_gen.h" #include "mongo/db/logical_time.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_cmds_gen.h" #include #include diff --git a/src/mongo/db/cluster_parameters/set_cluster_server_parameter_router_impl.cpp b/src/mongo/db/topology/cluster_parameters/set_cluster_server_parameter_router_impl.cpp similarity index 97% rename from src/mongo/db/cluster_parameters/set_cluster_server_parameter_router_impl.cpp rename to src/mongo/db/topology/cluster_parameters/set_cluster_server_parameter_router_impl.cpp index a46ca6e839d..4c8863020f4 100644 --- a/src/mongo/db/cluster_parameters/set_cluster_server_parameter_router_impl.cpp +++ b/src/mongo/db/topology/cluster_parameters/set_cluster_server_parameter_router_impl.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/cluster_parameters/set_cluster_server_parameter_router_impl.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_server_parameter_router_impl.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/query/query_settings/query_settings_service_dependencies.h" diff --git a/src/mongo/db/cluster_parameters/set_cluster_server_parameter_router_impl.h b/src/mongo/db/topology/cluster_parameters/set_cluster_server_parameter_router_impl.h similarity index 95% rename from src/mongo/db/cluster_parameters/set_cluster_server_parameter_router_impl.h rename to src/mongo/db/topology/cluster_parameters/set_cluster_server_parameter_router_impl.h index f411d87e917..c9d667ae140 100644 --- a/src/mongo/db/cluster_parameters/set_cluster_server_parameter_router_impl.h +++ b/src/mongo/db/topology/cluster_parameters/set_cluster_server_parameter_router_impl.h @@ -30,9 +30,9 @@ #pragma once #include "mongo/bson/timestamp.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_cmds_gen.h" #include "mongo/db/logical_time.h" #include "mongo/db/operation_context.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_cmds_gen.h" namespace mongo { diff --git a/src/mongo/db/cluster_parameters/sharding_cluster_parameters.idl b/src/mongo/db/topology/cluster_parameters/sharding_cluster_parameters.idl similarity index 99% rename from src/mongo/db/cluster_parameters/sharding_cluster_parameters.idl rename to src/mongo/db/topology/cluster_parameters/sharding_cluster_parameters.idl index 4d2e372802d..311285782fe 100644 --- a/src/mongo/db/cluster_parameters/sharding_cluster_parameters.idl +++ b/src/mongo/db/topology/cluster_parameters/sharding_cluster_parameters.idl @@ -26,7 +26,7 @@ # it in the license file. imports: - - "mongo/db/cluster_parameters/cluster_server_parameter.idl" + - "mongo/db/topology/cluster_parameters/cluster_server_parameter.idl" global: cpp_namespace: mongo diff --git a/src/mongo/db/cluster_parameters/shardsvr_set_cluster_parameter_command.cpp b/src/mongo/db/topology/cluster_parameters/shardsvr_set_cluster_parameter_command.cpp similarity index 97% rename from src/mongo/db/cluster_parameters/shardsvr_set_cluster_parameter_command.cpp rename to src/mongo/db/topology/cluster_parameters/shardsvr_set_cluster_parameter_command.cpp index c3d0da819b9..98add2e992f 100644 --- a/src/mongo/db/cluster_parameters/shardsvr_set_cluster_parameter_command.cpp +++ b/src/mongo/db/topology/cluster_parameters/shardsvr_set_cluster_parameter_command.cpp @@ -36,8 +36,6 @@ #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/resource_pattern.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_cmds_gen.h" -#include "mongo/db/cluster_parameters/set_cluster_parameter_invocation.h" #include "mongo/db/commands.h" #include "mongo/db/commands/feature_compatibility_version.h" #include "mongo/db/database_name.h" @@ -47,6 +45,8 @@ #include "mongo/db/operation_context.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_cmds_gen.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_parameter_invocation.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/write_concern_options.h" #include "mongo/rpc/op_msg.h" diff --git a/src/mongo/db/topology/cluster_remove_shard_cmd.cpp b/src/mongo/db/topology/cluster_remove_shard_cmd.cpp index c7ca37db4a6..6525253a29d 100644 --- a/src/mongo/db/topology/cluster_remove_shard_cmd.cpp +++ b/src/mongo/db/topology/cluster_remove_shard_cmd.cpp @@ -43,8 +43,8 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.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/db/sharding_environment/grid.h" diff --git a/src/mongo/db/topology/shard_registry.cpp b/src/mongo/db/topology/shard_registry.cpp index 22327843ad8..29db3c07611 100644 --- a/src/mongo/db/topology/shard_registry.cpp +++ b/src/mongo/db/topology/shard_registry.cpp @@ -38,16 +38,16 @@ #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/type_shard.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/logical_time.h" #include "mongo/db/repl/optime_with.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/client/config_shard_wrapper.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/cluster_role.h" -#include "mongo/db/vector_clock/vector_clock.h" -#include "mongo/db/vector_clock/vector_clock_metadata_hook.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock_metadata_hook.h" #include "mongo/executor/network_connection_hook.h" #include "mongo/executor/network_interface_factory.h" #include "mongo/executor/network_interface_thread_pool.h" diff --git a/src/mongo/db/topology/shard_registry_test.cpp b/src/mongo/db/topology/shard_registry_test.cpp index 9e76dd658be..42262a06387 100644 --- a/src/mongo/db/topology/shard_registry_test.cpp +++ b/src/mongo/db/topology/shard_registry_test.cpp @@ -28,7 +28,7 @@ */ #include "mongo/db/sharding_environment/sharding_mongos_test_fixture.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/unittest/death_test.h" #include "mongo/unittest/log_test.h" diff --git a/src/mongo/db/topology/sharding_catalog_manager_add_shard_test.cpp b/src/mongo/db/topology/sharding_catalog_manager_add_shard_test.cpp index bd0cac8f7b0..fce3733acf7 100644 --- a/src/mongo/db/topology/sharding_catalog_manager_add_shard_test.cpp +++ b/src/mongo/db/topology/sharding_catalog_manager_add_shard_test.cpp @@ -50,8 +50,6 @@ #include "mongo/client/remote_command_targeter_factory_mock.h" #include "mongo/client/remote_command_targeter_mock.h" #include "mongo/db/client.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_cmds_gen.h" -#include "mongo/db/cluster_parameters/set_cluster_parameter_invocation.h" #include "mongo/db/commands/set_feature_compatibility_version_gen.h" #include "mongo/db/database_name.h" #include "mongo/db/dbdirectclient.h" @@ -83,6 +81,8 @@ #include "mongo/db/tenant_id.h" #include "mongo/db/time_proof_service.h" #include "mongo/db/topology/add_shard_gen.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_cmds_gen.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_parameter_invocation.h" #include "mongo/db/topology/topology_change_helpers.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/db/wire_version.h" 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 3f4e2eae857..84400d3fa7e 100644 --- a/src/mongo/db/topology/sharding_catalog_manager_shard_operations.cpp +++ b/src/mongo/db/topology/sharding_catalog_manager_shard_operations.cpp @@ -54,10 +54,6 @@ #include "mongo/client/remote_command_targeter.h" #include "mongo/client/replica_set_monitor.h" #include "mongo/db/audit.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_cmds_gen.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_common.h" -#include "mongo/db/cluster_parameters/set_cluster_parameter_invocation.h" -#include "mongo/db/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/commands.h" #include "mongo/db/commands/feature_compatibility_version.h" #include "mongo/db/commands/set_feature_compatibility_version_gen.h" @@ -80,11 +76,6 @@ #include "mongo/db/global_catalog/type_shard.h" #include "mongo/db/keys_collection_document_gen.h" #include "mongo/db/keys_collection_util.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/ddl/list_collections_gen.h" -#include "mongo/db/local_catalog/drop_database.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielder.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -106,6 +97,11 @@ #include "mongo/db/server_parameter.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/ddl/list_collections_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/resource_yielder.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/drop_database.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" @@ -114,15 +110,19 @@ #include "mongo/db/sharding_environment/sharding_logging.h" #include "mongo/db/tenant_id.h" #include "mongo/db/topology/add_shard_gen.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_cmds_gen.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_common.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_parameter_invocation.h" +#include "mongo/db/topology/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/topology/remove_shard_draining_progress_gen.h" #include "mongo/db/topology/shard_registry.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/db/topology/topology_change_helpers.h" +#include "mongo/db/topology/user_write_block/set_user_write_block_mode_gen.h" +#include "mongo/db/topology/user_write_block/user_writes_critical_section_document_gen.h" +#include "mongo/db/topology/user_write_block/user_writes_recoverable_critical_section_service.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/db/transaction/transaction_api.h" -#include "mongo/db/user_write_block/set_user_write_block_mode_gen.h" -#include "mongo/db/user_write_block/user_writes_critical_section_document_gen.h" -#include "mongo/db/user_write_block/user_writes_recoverable_critical_section_service.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/db/write_concern_options.h" #include "mongo/executor/connection_pool_stats.h" diff --git a/src/mongo/db/topology/topology_change_helpers.cpp b/src/mongo/db/topology/topology_change_helpers.cpp index abe6750c644..61d302781c6 100644 --- a/src/mongo/db/topology/topology_change_helpers.cpp +++ b/src/mongo/db/topology/topology_change_helpers.cpp @@ -47,9 +47,6 @@ #include "mongo/client/remote_command_targeter.h" #include "mongo/client/replica_set_monitor.h" #include "mongo/db/audit.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_common.h" -#include "mongo/db/cluster_parameters/set_cluster_parameter_invocation.h" -#include "mongo/db/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/dbdirectclient.h" @@ -66,10 +63,6 @@ #include "mongo/db/global_catalog/type_remove_shard_event_gen.h" #include "mongo/db/global_catalog/type_shard.h" #include "mongo/db/keys_collection_util.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/ddl/list_collections_gen.h" -#include "mongo/db/local_catalog/ddl/list_databases_for_all_tenants_gen.h" -#include "mongo/db/local_catalog/drop_database.h" #include "mongo/db/logical_time.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -89,6 +82,10 @@ #include "mongo/db/server_parameter.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/ddl/list_collections_gen.h" +#include "mongo/db/shard_role/ddl/list_databases_for_all_tenants_gen.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/drop_database.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/cluster_identity_loader.h" #include "mongo/db/sharding_environment/grid.h" @@ -96,13 +93,16 @@ #include "mongo/db/sharding_environment/sharding_config_server_parameters_gen.h" #include "mongo/db/tenant_id.h" #include "mongo/db/topology/add_shard_gen.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_common.h" +#include "mongo/db/topology/cluster_parameters/set_cluster_parameter_invocation.h" +#include "mongo/db/topology/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/topology/remove_shard_draining_progress_gen.h" #include "mongo/db/topology/topology_change_helpers.h" +#include "mongo/db/topology/user_write_block/set_user_write_block_mode_gen.h" +#include "mongo/db/topology/user_write_block/user_writes_critical_section_document_gen.h" +#include "mongo/db/topology/user_write_block/user_writes_recoverable_critical_section_service.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/db/transaction/transaction_api.h" -#include "mongo/db/user_write_block/set_user_write_block_mode_gen.h" -#include "mongo/db/user_write_block/user_writes_critical_section_document_gen.h" -#include "mongo/db/user_write_block/user_writes_recoverable_critical_section_service.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" #include "mongo/db/write_concern_options.h" #include "mongo/executor/remote_command_request.h" #include "mongo/executor/remote_command_response.h" diff --git a/src/mongo/db/user_write_block/BUILD.bazel b/src/mongo/db/topology/user_write_block/BUILD.bazel similarity index 90% rename from src/mongo/db/user_write_block/BUILD.bazel rename to src/mongo/db/topology/user_write_block/BUILD.bazel index a759fad1e21..3ddd3fd9500 100644 --- a/src/mongo/db/user_write_block/BUILD.bazel +++ b/src/mongo/db/topology/user_write_block/BUILD.bazel @@ -14,7 +14,7 @@ idl_generator( src = "set_user_write_block_mode.idl", deps = [ "//src/mongo/db:basic_types_gen", - "//src/mongo/db/user_write_block:user_writes_block_reason_gen", + "//src/mongo/db/topology/user_write_block:user_writes_block_reason_gen", "//src/mongo/idl:generic_argument_gen", ], ) @@ -42,7 +42,7 @@ idl_generator( src = "user_writes_critical_section_document.idl", deps = [ "//src/mongo/db:basic_types_gen", - "//src/mongo/db/user_write_block:user_writes_block_reason_gen", + "//src/mongo/db/topology/user_write_block:user_writes_block_reason_gen", ], ) diff --git a/src/mongo/db/user_write_block/OWNERS.yml b/src/mongo/db/topology/user_write_block/OWNERS.yml similarity index 100% rename from src/mongo/db/user_write_block/OWNERS.yml rename to src/mongo/db/topology/user_write_block/OWNERS.yml diff --git a/src/mongo/db/user_write_block/README_user_write_blocking.md b/src/mongo/db/topology/user_write_block/README_user_write_blocking.md similarity index 100% rename from src/mongo/db/user_write_block/README_user_write_blocking.md rename to src/mongo/db/topology/user_write_block/README_user_write_blocking.md diff --git a/src/mongo/db/user_write_block/cluster_set_user_write_block_mode_command.cpp b/src/mongo/db/topology/user_write_block/cluster_set_user_write_block_mode_command.cpp similarity index 98% rename from src/mongo/db/user_write_block/cluster_set_user_write_block_mode_command.cpp rename to src/mongo/db/topology/user_write_block/cluster_set_user_write_block_mode_command.cpp index 7f8dabccf86..eb237f536ca 100644 --- a/src/mongo/db/user_write_block/cluster_set_user_write_block_mode_command.cpp +++ b/src/mongo/db/topology/user_write_block/cluster_set_user_write_block_mode_command.cpp @@ -44,7 +44,7 @@ #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/shard_registry.h" -#include "mongo/db/user_write_block/set_user_write_block_mode_gen.h" +#include "mongo/db/topology/user_write_block/set_user_write_block_mode_gen.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/user_write_block/configsvr_set_user_write_block_mode_command.cpp b/src/mongo/db/topology/user_write_block/configsvr_set_user_write_block_mode_command.cpp similarity index 98% rename from src/mongo/db/user_write_block/configsvr_set_user_write_block_mode_command.cpp rename to src/mongo/db/topology/user_write_block/configsvr_set_user_write_block_mode_command.cpp index 2d52f31d495..10c5d202346 100644 --- a/src/mongo/db/user_write_block/configsvr_set_user_write_block_mode_command.cpp +++ b/src/mongo/db/topology/user_write_block/configsvr_set_user_write_block_mode_command.cpp @@ -44,7 +44,7 @@ #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/topology/cluster_role.h" -#include "mongo/db/user_write_block/set_user_write_block_mode_coordinator_document_gen.h" +#include "mongo/db/topology/user_write_block/set_user_write_block_mode_coordinator_document_gen.h" #include "mongo/rpc/op_msg.h" #include "mongo/util/assert_util.h" #include "mongo/util/future.h" diff --git a/src/mongo/db/user_write_block/global_user_write_block_state.cpp b/src/mongo/db/topology/user_write_block/global_user_write_block_state.cpp similarity index 96% rename from src/mongo/db/user_write_block/global_user_write_block_state.cpp rename to src/mongo/db/topology/user_write_block/global_user_write_block_state.cpp index b80e72605c2..d840fa0bf71 100644 --- a/src/mongo/db/user_write_block/global_user_write_block_state.cpp +++ b/src/mongo/db/topology/user_write_block/global_user_write_block_state.cpp @@ -28,13 +28,13 @@ */ -#include "mongo/db/user_write_block/global_user_write_block_state.h" +#include "mongo/db/topology/user_write_block/global_user_write_block_state.h" #include "mongo/base/error_codes.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/topology/cluster_role.h" -#include "mongo/db/user_write_block/write_block_bypass.h" +#include "mongo/db/topology/user_write_block/write_block_bypass.h" #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" diff --git a/src/mongo/db/user_write_block/global_user_write_block_state.h b/src/mongo/db/topology/user_write_block/global_user_write_block_state.h similarity index 98% rename from src/mongo/db/user_write_block/global_user_write_block_state.h rename to src/mongo/db/topology/user_write_block/global_user_write_block_state.h index 6c0753cc4ce..33a7d28fd93 100644 --- a/src/mongo/db/user_write_block/global_user_write_block_state.h +++ b/src/mongo/db/topology/user_write_block/global_user_write_block_state.h @@ -33,7 +33,7 @@ #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" -#include "mongo/db/user_write_block/user_writes_block_reason_gen.h" +#include "mongo/db/topology/user_write_block/user_writes_block_reason_gen.h" #include "mongo/platform/atomic_word.h" #include diff --git a/src/mongo/db/user_write_block/set_user_write_block_mode.idl b/src/mongo/db/topology/user_write_block/set_user_write_block_mode.idl similarity index 97% rename from src/mongo/db/user_write_block/set_user_write_block_mode.idl rename to src/mongo/db/topology/user_write_block/set_user_write_block_mode.idl index ebd36622852..49c2f1a9330 100644 --- a/src/mongo/db/user_write_block/set_user_write_block_mode.idl +++ b/src/mongo/db/topology/user_write_block/set_user_write_block_mode.idl @@ -31,7 +31,7 @@ global: imports: - "mongo/db/basic_types.idl" - - "mongo/db/user_write_block/user_writes_block_reason.idl" + - "mongo/db/topology/user_write_block/user_writes_block_reason.idl" structs: SetUserWriteBlockModeRequest: diff --git a/src/mongo/db/user_write_block/set_user_write_block_mode_command.cpp b/src/mongo/db/topology/user_write_block/set_user_write_block_mode_command.cpp similarity index 96% rename from src/mongo/db/user_write_block/set_user_write_block_mode_command.cpp rename to src/mongo/db/topology/user_write_block/set_user_write_block_mode_command.cpp index a607e9b031f..7c2a9136831 100644 --- a/src/mongo/db/user_write_block/set_user_write_block_mode_command.cpp +++ b/src/mongo/db/topology/user_write_block/set_user_write_block_mode_command.cpp @@ -44,9 +44,9 @@ #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/topology/cluster_role.h" -#include "mongo/db/user_write_block/global_user_write_block_state.h" -#include "mongo/db/user_write_block/set_user_write_block_mode_gen.h" -#include "mongo/db/user_write_block/user_writes_recoverable_critical_section_service.h" +#include "mongo/db/topology/user_write_block/global_user_write_block_state.h" +#include "mongo/db/topology/user_write_block/set_user_write_block_mode_gen.h" +#include "mongo/db/topology/user_write_block/user_writes_recoverable_critical_section_service.h" #include "mongo/db/write_concern.h" #include "mongo/db/write_concern_options.h" #include "mongo/stdx/mutex.h" diff --git a/src/mongo/db/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 similarity index 97% rename from src/mongo/db/user_write_block/set_user_write_block_mode_coordinator.cpp rename to src/mongo/db/topology/user_write_block/set_user_write_block_mode_coordinator.cpp index f486d6e35c5..da490aa4c80 100644 --- a/src/mongo/db/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 @@ -28,7 +28,7 @@ */ -#include "mongo/db/user_write_block/set_user_write_block_mode_coordinator.h" +#include "mongo/db/topology/user_write_block/set_user_write_block_mode_coordinator.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" @@ -40,16 +40,16 @@ #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h" #include "mongo/db/global_catalog/ddl/sharding_util.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" #include "mongo/db/namespace_string.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/repl/repl_client_info.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/shard_registry.h" -#include "mongo/db/user_write_block/set_user_write_block_mode_gen.h" -#include "mongo/db/user_write_block/user_writes_recoverable_critical_section_service.h" +#include "mongo/db/topology/user_write_block/set_user_write_block_mode_gen.h" +#include "mongo/db/topology/user_write_block/user_writes_recoverable_critical_section_service.h" #include "mongo/db/write_concern.h" #include "mongo/executor/task_executor.h" #include "mongo/executor/task_executor_pool.h" diff --git a/src/mongo/db/user_write_block/set_user_write_block_mode_coordinator.h b/src/mongo/db/topology/user_write_block/set_user_write_block_mode_coordinator.h similarity index 97% rename from src/mongo/db/user_write_block/set_user_write_block_mode_coordinator.h rename to src/mongo/db/topology/user_write_block/set_user_write_block_mode_coordinator.h index 1a1eb7d6f96..fbd975c6fb0 100644 --- a/src/mongo/db/user_write_block/set_user_write_block_mode_coordinator.h +++ b/src/mongo/db/topology/user_write_block/set_user_write_block_mode_coordinator.h @@ -36,7 +36,7 @@ #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/process_interface/mongo_process_interface.h" #include "mongo/db/session/internal_session_pool.h" -#include "mongo/db/user_write_block/set_user_write_block_mode_coordinator_document_gen.h" +#include "mongo/db/topology/user_write_block/set_user_write_block_mode_coordinator_document_gen.h" #include "mongo/executor/scoped_task_executor.h" #include "mongo/idl/idl_parser.h" #include "mongo/util/cancellation.h" diff --git a/src/mongo/db/user_write_block/set_user_write_block_mode_coordinator_document.idl b/src/mongo/db/topology/user_write_block/set_user_write_block_mode_coordinator_document.idl similarity index 100% rename from src/mongo/db/user_write_block/set_user_write_block_mode_coordinator_document.idl rename to src/mongo/db/topology/user_write_block/set_user_write_block_mode_coordinator_document.idl diff --git a/src/mongo/db/user_write_block/shardsvr_set_user_write_block_mode_command.cpp b/src/mongo/db/topology/user_write_block/shardsvr_set_user_write_block_mode_command.cpp similarity index 98% rename from src/mongo/db/user_write_block/shardsvr_set_user_write_block_mode_command.cpp rename to src/mongo/db/topology/user_write_block/shardsvr_set_user_write_block_mode_command.cpp index be1a9587a3e..e769ed511ea 100644 --- a/src/mongo/db/user_write_block/shardsvr_set_user_write_block_mode_command.cpp +++ b/src/mongo/db/topology/user_write_block/shardsvr_set_user_write_block_mode_command.cpp @@ -49,8 +49,8 @@ #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/topology/cluster_role.h" -#include "mongo/db/user_write_block/global_user_write_block_state.h" -#include "mongo/db/user_write_block/user_writes_recoverable_critical_section_service.h" +#include "mongo/db/topology/user_write_block/global_user_write_block_state.h" +#include "mongo/db/topology/user_write_block/user_writes_recoverable_critical_section_service.h" #include "mongo/rpc/op_msg.h" #include "mongo/stdx/mutex.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/user_write_block/user_write_block_mode_op_observer.cpp b/src/mongo/db/topology/user_write_block/user_write_block_mode_op_observer.cpp similarity index 96% rename from src/mongo/db/user_write_block/user_write_block_mode_op_observer.cpp rename to src/mongo/db/topology/user_write_block/user_write_block_mode_op_observer.cpp index 751700aa97c..8a34d5fc840 100644 --- a/src/mongo/db/user_write_block/user_write_block_mode_op_observer.cpp +++ b/src/mongo/db/topology/user_write_block/user_write_block_mode_op_observer.cpp @@ -27,16 +27,16 @@ * it in the license file. */ -#include "mongo/db/user_write_block/user_write_block_mode_op_observer.h" +#include "mongo/db/topology/user_write_block/user_write_block_mode_op_observer.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/collection_operation_source.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/shard_role/shard_catalog/collection_operation_source.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" -#include "mongo/db/user_write_block/global_user_write_block_state.h" -#include "mongo/db/user_write_block/user_writes_critical_section_document_gen.h" -#include "mongo/db/user_write_block/user_writes_recoverable_critical_section_service.h" +#include "mongo/db/topology/user_write_block/global_user_write_block_state.h" +#include "mongo/db/topology/user_write_block/user_writes_critical_section_document_gen.h" +#include "mongo/db/topology/user_write_block/user_writes_recoverable_critical_section_service.h" #include "mongo/idl/idl_parser.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/user_write_block/user_write_block_mode_op_observer.h b/src/mongo/db/topology/user_write_block/user_write_block_mode_op_observer.h similarity index 98% rename from src/mongo/db/user_write_block/user_write_block_mode_op_observer.h rename to src/mongo/db/topology/user_write_block/user_write_block_mode_op_observer.h index c0f1a86cf08..b99019c2959 100644 --- a/src/mongo/db/user_write_block/user_write_block_mode_op_observer.h +++ b/src/mongo/db/topology/user_write_block/user_write_block_mode_op_observer.h @@ -31,8 +31,6 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_noop.h" @@ -40,6 +38,8 @@ #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/optime.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/util/uuid.h" #include diff --git a/src/mongo/db/user_write_block/user_write_block_mode_op_observer_test.cpp b/src/mongo/db/topology/user_write_block/user_write_block_mode_op_observer_test.cpp similarity index 96% rename from src/mongo/db/user_write_block/user_write_block_mode_op_observer_test.cpp rename to src/mongo/db/topology/user_write_block/user_write_block_mode_op_observer_test.cpp index 3504d8b59a9..efcbfdf260d 100644 --- a/src/mongo/db/user_write_block/user_write_block_mode_op_observer_test.cpp +++ b/src/mongo/db/topology/user_write_block/user_write_block_mode_op_observer_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/user_write_block/user_write_block_mode_op_observer.h" +#include "mongo/db/topology/user_write_block/user_write_block_mode_op_observer.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonelement.h" @@ -36,13 +36,6 @@ #include "mongo/crypto/encryption_fields_gen.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/collection_operation_source.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/ddl/create_gen.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/op_observer/op_observer_util.h" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/repl_settings.h" @@ -51,9 +44,16 @@ #include "mongo/db/repl/storage_interface.h" #include "mongo/db/repl/storage_interface_mock.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/ddl/create_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_operation_source.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" #include "mongo/db/timeseries/timeseries_gen.h" -#include "mongo/db/user_write_block/global_user_write_block_state.h" -#include "mongo/db/user_write_block/write_block_bypass.h" +#include "mongo/db/topology/user_write_block/global_user_write_block_state.h" +#include "mongo/db/topology/user_write_block/write_block_bypass.h" #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/user_write_block/user_writes_block_reason.idl b/src/mongo/db/topology/user_write_block/user_writes_block_reason.idl similarity index 100% rename from src/mongo/db/user_write_block/user_writes_block_reason.idl rename to src/mongo/db/topology/user_write_block/user_writes_block_reason.idl diff --git a/src/mongo/db/user_write_block/user_writes_critical_section_document.idl b/src/mongo/db/topology/user_write_block/user_writes_critical_section_document.idl similarity index 97% rename from src/mongo/db/user_write_block/user_writes_critical_section_document.idl rename to src/mongo/db/topology/user_write_block/user_writes_critical_section_document.idl index fc1fadb2bc6..fe6dff1e935 100644 --- a/src/mongo/db/user_write_block/user_writes_critical_section_document.idl +++ b/src/mongo/db/topology/user_write_block/user_writes_critical_section_document.idl @@ -35,7 +35,7 @@ global: imports: - "mongo/db/basic_types.idl" - - "mongo/db/user_write_block/user_writes_block_reason.idl" + - "mongo/db/topology/user_write_block/user_writes_block_reason.idl" structs: userWriteBlockingCriticalSectionDocument: diff --git a/src/mongo/db/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 similarity index 97% rename from src/mongo/db/user_write_block/user_writes_recoverable_critical_section_service.cpp rename to src/mongo/db/topology/user_write_block/user_writes_recoverable_critical_section_service.cpp index 4bf49e3bc74..f97b27568e5 100644 --- a/src/mongo/db/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 @@ -28,7 +28,7 @@ */ -#include "mongo/db/user_write_block/user_writes_recoverable_critical_section_service.h" +#include "mongo/db/topology/user_write_block/user_writes_recoverable_critical_section_service.h" #include "mongo/base/error_codes.h" #include "mongo/base/status.h" @@ -38,18 +38,18 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.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" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/topology/cluster_role.h" -#include "mongo/db/user_write_block/global_user_write_block_state.h" -#include "mongo/db/user_write_block/user_writes_critical_section_document_gen.h" +#include "mongo/db/topology/user_write_block/global_user_write_block_state.h" +#include "mongo/db/topology/user_write_block/user_writes_critical_section_document_gen.h" #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" #include "mongo/platform/compiler.h" diff --git a/src/mongo/db/user_write_block/user_writes_recoverable_critical_section_service.h b/src/mongo/db/topology/user_write_block/user_writes_recoverable_critical_section_service.h similarity index 99% rename from src/mongo/db/user_write_block/user_writes_recoverable_critical_section_service.h rename to src/mongo/db/topology/user_write_block/user_writes_recoverable_critical_section_service.h index 7d235f7561c..c7144181745 100644 --- a/src/mongo/db/user_write_block/user_writes_recoverable_critical_section_service.h +++ b/src/mongo/db/topology/user_write_block/user_writes_recoverable_critical_section_service.h @@ -33,7 +33,7 @@ #include "mongo/db/operation_context.h" #include "mongo/db/repl/replica_set_aware_service.h" #include "mongo/db/service_context.h" -#include "mongo/db/user_write_block/user_writes_block_reason_gen.h" +#include "mongo/db/topology/user_write_block/user_writes_block_reason_gen.h" #include diff --git a/src/mongo/db/user_write_block/write_block_bypass.cpp b/src/mongo/db/topology/user_write_block/write_block_bypass.cpp similarity index 97% rename from src/mongo/db/user_write_block/write_block_bypass.cpp rename to src/mongo/db/topology/user_write_block/write_block_bypass.cpp index 74758e9c0cd..3213e879a1f 100644 --- a/src/mongo/db/user_write_block/write_block_bypass.cpp +++ b/src/mongo/db/topology/user_write_block/write_block_bypass.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/user_write_block/write_block_bypass.h" +#include "mongo/db/topology/user_write_block/write_block_bypass.h" #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/authorization_session.h" diff --git a/src/mongo/db/user_write_block/write_block_bypass.h b/src/mongo/db/topology/user_write_block/write_block_bypass.h similarity index 100% rename from src/mongo/db/user_write_block/write_block_bypass.h rename to src/mongo/db/topology/user_write_block/write_block_bypass.h diff --git a/src/mongo/db/vector_clock/BUILD.bazel b/src/mongo/db/topology/vector_clock/BUILD.bazel similarity index 100% rename from src/mongo/db/vector_clock/BUILD.bazel rename to src/mongo/db/topology/vector_clock/BUILD.bazel diff --git a/src/mongo/db/vector_clock/OWNERS.yml b/src/mongo/db/topology/vector_clock/OWNERS.yml similarity index 100% rename from src/mongo/db/vector_clock/OWNERS.yml rename to src/mongo/db/topology/vector_clock/OWNERS.yml diff --git a/src/mongo/db/vector_clock/topology_time_ticker.cpp b/src/mongo/db/topology/vector_clock/topology_time_ticker.cpp similarity index 96% rename from src/mongo/db/vector_clock/topology_time_ticker.cpp rename to src/mongo/db/topology/vector_clock/topology_time_ticker.cpp index 151294e1b3e..394e297cc1e 100644 --- a/src/mongo/db/vector_clock/topology_time_ticker.cpp +++ b/src/mongo/db/topology/vector_clock/topology_time_ticker.cpp @@ -28,14 +28,14 @@ */ -#include "mongo/db/vector_clock/topology_time_ticker.h" +#include "mongo/db/topology/vector_clock/topology_time_ticker.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/logical_time.h" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/replication_coordinator.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/shard_role/transaction_resources.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" diff --git a/src/mongo/db/vector_clock/topology_time_ticker.h b/src/mongo/db/topology/vector_clock/topology_time_ticker.h similarity index 100% rename from src/mongo/db/vector_clock/topology_time_ticker.h rename to src/mongo/db/topology/vector_clock/topology_time_ticker.h diff --git a/src/mongo/db/vector_clock/topology_time_ticker_test.cpp b/src/mongo/db/topology/vector_clock/topology_time_ticker_test.cpp similarity index 97% rename from src/mongo/db/vector_clock/topology_time_ticker_test.cpp rename to src/mongo/db/topology/vector_clock/topology_time_ticker_test.cpp index bd4e09adda7..dd836aa34c3 100644 --- a/src/mongo/db/vector_clock/topology_time_ticker_test.cpp +++ b/src/mongo/db/topology/vector_clock/topology_time_ticker_test.cpp @@ -27,15 +27,15 @@ * it in the license file. */ -#include "mongo/db/vector_clock/topology_time_ticker.h" +#include "mongo/db/topology/vector_clock/topology_time_ticker.h" #include "mongo/base/string_data.h" #include "mongo/db/logical_time.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" #include "mongo/db/sharding_environment/config_server_test_fixture.h" -#include "mongo/db/vector_clock/vector_clock.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/unittest/death_test.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/vector_clock/vector_clock.cpp b/src/mongo/db/topology/vector_clock/vector_clock.cpp similarity index 99% rename from src/mongo/db/vector_clock/vector_clock.cpp rename to src/mongo/db/topology/vector_clock/vector_clock.cpp index 897d199b5aa..6d18b48aae3 100644 --- a/src/mongo/db/vector_clock/vector_clock.cpp +++ b/src/mongo/db/topology/vector_clock/vector_clock.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/base/error_codes.h" #include "mongo/bson/bsonelement.h" @@ -46,8 +46,8 @@ #include "mongo/db/server_options.h" #include "mongo/db/signed_logical_time.h" #include "mongo/db/time_proof_service.h" -#include "mongo/db/vector_clock/vector_clock_document_gen.h" -#include "mongo/db/vector_clock/vector_clock_gen.h" +#include "mongo/db/topology/vector_clock/vector_clock_document_gen.h" +#include "mongo/db/topology/vector_clock/vector_clock_gen.h" #include "mongo/util/assert_util.h" #include "mongo/util/clock_source.h" #include "mongo/util/decorable.h" diff --git a/src/mongo/db/vector_clock/vector_clock.h b/src/mongo/db/topology/vector_clock/vector_clock.h similarity index 99% rename from src/mongo/db/vector_clock/vector_clock.h rename to src/mongo/db/topology/vector_clock/vector_clock.h index 6202acb9329..0a6a7609ab2 100644 --- a/src/mongo/db/vector_clock/vector_clock.h +++ b/src/mongo/db/topology/vector_clock/vector_clock.h @@ -34,7 +34,7 @@ #include "mongo/db/logical_time.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" -#include "mongo/db/vector_clock/vector_clock_gen.h" +#include "mongo/db/topology/vector_clock/vector_clock_gen.h" #include "mongo/stdx/mutex.h" #include "mongo/util/assert_util.h" #include "mongo/util/observable_mutex.h" diff --git a/src/mongo/db/vector_clock/vector_clock.idl b/src/mongo/db/topology/vector_clock/vector_clock.idl similarity index 100% rename from src/mongo/db/vector_clock/vector_clock.idl rename to src/mongo/db/topology/vector_clock/vector_clock.idl diff --git a/src/mongo/db/vector_clock/vector_clock_config_server_test.cpp b/src/mongo/db/topology/vector_clock/vector_clock_config_server_test.cpp similarity index 99% rename from src/mongo/db/vector_clock/vector_clock_config_server_test.cpp rename to src/mongo/db/topology/vector_clock/vector_clock_config_server_test.cpp index c50a595de64..5a9090062dd 100644 --- a/src/mongo/db/vector_clock/vector_clock_config_server_test.cpp +++ b/src/mongo/db/topology/vector_clock/vector_clock_config_server_test.cpp @@ -45,8 +45,8 @@ #include "mongo/db/service_context_d_test_fixture.h" #include "mongo/db/sharding_environment/config_server_test_fixture.h" #include "mongo/db/sharding_environment/grid.h" -#include "mongo/db/vector_clock/vector_clock.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/transport/session.h" #include "mongo/unittest/death_test.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/vector_clock/vector_clock_document.idl b/src/mongo/db/topology/vector_clock/vector_clock_document.idl similarity index 100% rename from src/mongo/db/vector_clock/vector_clock_document.idl rename to src/mongo/db/topology/vector_clock/vector_clock_document.idl diff --git a/src/mongo/db/vector_clock/vector_clock_metadata_hook.cpp b/src/mongo/db/topology/vector_clock/vector_clock_metadata_hook.cpp similarity index 95% rename from src/mongo/db/vector_clock/vector_clock_metadata_hook.cpp rename to src/mongo/db/topology/vector_clock/vector_clock_metadata_hook.cpp index 3ce4feb57eb..388d8bf1276 100644 --- a/src/mongo/db/vector_clock/vector_clock_metadata_hook.cpp +++ b/src/mongo/db/topology/vector_clock/vector_clock_metadata_hook.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/vector_clock/vector_clock_metadata_hook.h" +#include "mongo/db/topology/vector_clock/vector_clock_metadata_hook.h" #include "mongo/base/status.h" #include "mongo/base/string_data.h" @@ -39,8 +39,8 @@ #include "mongo/db/operation_context.h" #include "mongo/db/operation_time_tracker.h" #include "mongo/db/service_context.h" -#include "mongo/db/vector_clock/vector_clock.h" -#include "mongo/db/vector_clock/vector_clock_gen.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock_gen.h" #include "mongo/transport/session.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/vector_clock/vector_clock_metadata_hook.h b/src/mongo/db/topology/vector_clock/vector_clock_metadata_hook.h similarity index 100% rename from src/mongo/db/vector_clock/vector_clock_metadata_hook.h rename to src/mongo/db/topology/vector_clock/vector_clock_metadata_hook.h diff --git a/src/mongo/db/vector_clock/vector_clock_mongod.cpp b/src/mongo/db/topology/vector_clock/vector_clock_mongod.cpp similarity index 98% rename from src/mongo/db/vector_clock/vector_clock_mongod.cpp rename to src/mongo/db/topology/vector_clock/vector_clock_mongod.cpp index 0d194517c14..179cd14c738 100644 --- a/src/mongo/db/vector_clock/vector_clock_mongod.cpp +++ b/src/mongo/db/topology/vector_clock/vector_clock_mongod.cpp @@ -28,7 +28,7 @@ */ -#include "mongo/db/vector_clock/vector_clock_mongod.h" +#include "mongo/db/topology/vector_clock/vector_clock_mongod.h" #include "mongo/base/status.h" #include "mongo/base/string_data.h" @@ -53,9 +53,9 @@ #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/cluster_role.h" -#include "mongo/db/vector_clock/topology_time_ticker.h" -#include "mongo/db/vector_clock/vector_clock.h" -#include "mongo/db/vector_clock/vector_clock_document_gen.h" +#include "mongo/db/topology/vector_clock/topology_time_ticker.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock_document_gen.h" #include "mongo/executor/task_executor_pool.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/vector_clock/vector_clock_mongod.h b/src/mongo/db/topology/vector_clock/vector_clock_mongod.h similarity index 97% rename from src/mongo/db/vector_clock/vector_clock_mongod.h rename to src/mongo/db/topology/vector_clock/vector_clock_mongod.h index 2701e248c1a..4f9e1d1a90a 100644 --- a/src/mongo/db/vector_clock/vector_clock_mongod.h +++ b/src/mongo/db/topology/vector_clock/vector_clock_mongod.h @@ -34,8 +34,8 @@ #include "mongo/db/repl/replica_set_aware_service.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/service_context.h" -#include "mongo/db/vector_clock/vector_clock.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/stdx/mutex.h" namespace mongo { diff --git a/src/mongo/db/vector_clock/vector_clock_mongod_test.cpp b/src/mongo/db/topology/vector_clock/vector_clock_mongod_test.cpp similarity index 99% rename from src/mongo/db/vector_clock/vector_clock_mongod_test.cpp rename to src/mongo/db/topology/vector_clock/vector_clock_mongod_test.cpp index 7b6a0693a98..6c086d490fd 100644 --- a/src/mongo/db/vector_clock/vector_clock_mongod_test.cpp +++ b/src/mongo/db/topology/vector_clock/vector_clock_mongod_test.cpp @@ -52,8 +52,8 @@ #include "mongo/db/sharding_environment/sharding_mongod_test_fixture.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/db/topology/cluster_role.h" -#include "mongo/db/vector_clock/vector_clock.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/transport/session.h" #include "mongo/unittest/death_test.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/db/vector_clock/vector_clock_mutable.cpp b/src/mongo/db/topology/vector_clock/vector_clock_mutable.cpp similarity index 98% rename from src/mongo/db/vector_clock/vector_clock_mutable.cpp rename to src/mongo/db/topology/vector_clock/vector_clock_mutable.cpp index 2de1e47b9cb..60272936984 100644 --- a/src/mongo/db/vector_clock/vector_clock_mutable.cpp +++ b/src/mongo/db/topology/vector_clock/vector_clock_mutable.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/bson/timestamp.h" #include "mongo/db/client.h" diff --git a/src/mongo/db/vector_clock/vector_clock_mutable.h b/src/mongo/db/topology/vector_clock/vector_clock_mutable.h similarity index 98% rename from src/mongo/db/vector_clock/vector_clock_mutable.h rename to src/mongo/db/topology/vector_clock/vector_clock_mutable.h index 09aa9a4ca55..c952de28905 100644 --- a/src/mongo/db/vector_clock/vector_clock_mutable.h +++ b/src/mongo/db/topology/vector_clock/vector_clock_mutable.h @@ -32,7 +32,7 @@ #include "mongo/db/logical_time.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/util/future.h" #include diff --git a/src/mongo/db/vector_clock/vector_clock_shard_server_test.cpp b/src/mongo/db/topology/vector_clock/vector_clock_shard_server_test.cpp similarity index 98% rename from src/mongo/db/vector_clock/vector_clock_shard_server_test.cpp rename to src/mongo/db/topology/vector_clock/vector_clock_shard_server_test.cpp index cc7ab3d7ef9..3127cdd563f 100644 --- a/src/mongo/db/vector_clock/vector_clock_shard_server_test.cpp +++ b/src/mongo/db/topology/vector_clock/vector_clock_shard_server_test.cpp @@ -48,9 +48,9 @@ #include "mongo/db/service_context_d_test_fixture.h" #include "mongo/db/sharding_environment/shard_server_test_fixture.h" #include "mongo/db/storage/storage_engine.h" -#include "mongo/db/vector_clock/vector_clock.h" -#include "mongo/db/vector_clock/vector_clock_document_gen.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock_document_gen.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/unittest/death_test.h" #include "mongo/unittest/unittest.h" #include "mongo/util/duration.h" diff --git a/src/mongo/db/vector_clock/vector_clock_test.cpp b/src/mongo/db/topology/vector_clock/vector_clock_test.cpp similarity index 98% rename from src/mongo/db/vector_clock/vector_clock_test.cpp rename to src/mongo/db/topology/vector_clock/vector_clock_test.cpp index 31298ca2b4c..c7ae7c24f5b 100644 --- a/src/mongo/db/vector_clock/vector_clock_test.cpp +++ b/src/mongo/db/topology/vector_clock/vector_clock_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" @@ -39,9 +39,9 @@ #include "mongo/db/namespace_string.h" #include "mongo/db/repl/optime.h" #include "mongo/db/repl/replication_coordinator_mock.h" -#include "mongo/db/vector_clock/vector_clock_document_gen.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" -#include "mongo/db/vector_clock/vector_clock_test_fixture.h" +#include "mongo/db/topology/vector_clock/vector_clock_document_gen.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock_test_fixture.h" #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" #include "mongo/util/duration.h" diff --git a/src/mongo/db/vector_clock/vector_clock_test_fixture.cpp b/src/mongo/db/topology/vector_clock/vector_clock_test_fixture.cpp similarity index 95% rename from src/mongo/db/vector_clock/vector_clock_test_fixture.cpp rename to src/mongo/db/topology/vector_clock/vector_clock_test_fixture.cpp index 025b275605d..a05f81d170e 100644 --- a/src/mongo/db/vector_clock/vector_clock_test_fixture.cpp +++ b/src/mongo/db/topology/vector_clock/vector_clock_test_fixture.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/vector_clock/vector_clock_test_fixture.h" +#include "mongo/db/topology/vector_clock/vector_clock_test_fixture.h" #include "mongo/base/checked_cast.h" #include "mongo/db/dbdirectclient.h" @@ -40,8 +40,8 @@ #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" -#include "mongo/db/vector_clock/vector_clock.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/unittest/unittest.h" #include "mongo/util/clock_source_mock.h" diff --git a/src/mongo/db/vector_clock/vector_clock_test_fixture.h b/src/mongo/db/topology/vector_clock/vector_clock_test_fixture.h similarity index 100% rename from src/mongo/db/vector_clock/vector_clock_test_fixture.h rename to src/mongo/db/topology/vector_clock/vector_clock_test_fixture.h diff --git a/src/mongo/db/vector_clock/vector_clock_trivial.cpp b/src/mongo/db/topology/vector_clock/vector_clock_trivial.cpp similarity index 97% rename from src/mongo/db/vector_clock/vector_clock_trivial.cpp rename to src/mongo/db/topology/vector_clock/vector_clock_trivial.cpp index d181657b6aa..1e41e7024c2 100644 --- a/src/mongo/db/vector_clock/vector_clock_trivial.cpp +++ b/src/mongo/db/topology/vector_clock/vector_clock_trivial.cpp @@ -30,8 +30,8 @@ #include "mongo/db/logical_time.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" -#include "mongo/db/vector_clock/vector_clock.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/util/assert_util.h" #include "mongo/util/decorable.h" #include "mongo/util/future.h" diff --git a/src/mongo/db/transaction/BUILD.bazel b/src/mongo/db/transaction/BUILD.bazel index a67d494c9d2..191d1bf92cf 100644 --- a/src/mongo/db/transaction/BUILD.bazel +++ b/src/mongo/db/transaction/BUILD.bazel @@ -94,13 +94,13 @@ mongo_cc_library( "//src/mongo/db/commands/server_status:server_status_core", "//src/mongo/db/index:index_access_method", "//src/mongo/db/index_builds:index_builds_coordinator", - "//src/mongo/db/local_catalog:local_oplog_info", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/repl:apply_ops_command_info", "//src/mongo/db/repl:repl_server_parameters", "//src/mongo/db/repl:replica_set_aware_service", "//src/mongo/db/rss:replicated_storage_service", "//src/mongo/db/session:session_catalog_mongod", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:local_oplog_info", "//src/mongo/db/stats:top", "//src/mongo/db/stats:transaction_stats", "//src/mongo/db/update:update_driver", @@ -153,8 +153,8 @@ mongo_cc_benchmark( ":transaction_operations", "//src/mongo/db:server_base", "//src/mongo/db:service_context_test_fixture", - "//src/mongo/db/local_catalog/lock_manager", "//src/mongo/db/op_observer:batched_write_context", "//src/mongo/db/repl:oplog_entry", + "//src/mongo/db/shard_role/lock_manager", ], ) diff --git a/src/mongo/db/transaction/transaction_api.cpp b/src/mongo/db/transaction/transaction_api.cpp index d0e4a24a534..21416d666a3 100644 --- a/src/mongo/db/transaction/transaction_api.cpp +++ b/src/mongo/db/transaction/transaction_api.cpp @@ -41,7 +41,6 @@ #include "mongo/db/commands/txn_cmds_gen.h" #include "mongo/db/error_labels.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/read_write_concern_provenance_base_gen.h" @@ -49,6 +48,7 @@ #include "mongo/db/session/internal_session_pool.h" #include "mongo/db/session/logical_session_id_helpers.h" #include "mongo/db/session/session_catalog.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/tenant_id.h" #include "mongo/db/transaction_validation.h" #include "mongo/db/write_concern_options.h" diff --git a/src/mongo/db/transaction/transaction_api.h b/src/mongo/db/transaction/transaction_api.h index 8d9e17436d2..48ce21d03bf 100644 --- a/src/mongo/db/transaction/transaction_api.h +++ b/src/mongo/db/transaction/transaction_api.h @@ -39,13 +39,13 @@ #include "mongo/db/commands/query_cmd/bulk_write_gen.h" #include "mongo/db/database_name.h" #include "mongo/db/dbmessage.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielder.h" #include "mongo/db/logical_time.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/find_command.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/resource_yielder.h" #include "mongo/executor/inline_executor.h" #include "mongo/executor/task_executor.h" #include "mongo/rpc/message.h" diff --git a/src/mongo/db/transaction/transaction_api_test.cpp b/src/mongo/db/transaction/transaction_api_test.cpp index 57c9f0177b9..21209f6a701 100644 --- a/src/mongo/db/transaction/transaction_api_test.cpp +++ b/src/mongo/db/transaction/transaction_api_test.cpp @@ -40,7 +40,6 @@ #include "mongo/db/commands/txn_cmds_gen.h" #include "mongo/db/error_labels.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/read_concern_args.h" @@ -48,6 +47,7 @@ #include "mongo/db/service_context.h" #include "mongo/db/service_context_test_fixture.h" #include "mongo/db/session/logical_session_id_helpers.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/tenant_id.h" #include "mongo/db/transaction/internal_transaction_metrics.h" #include "mongo/db/versioning_protocol/database_version.h" diff --git a/src/mongo/db/transaction/transaction_history_iterator.cpp b/src/mongo/db/transaction/transaction_history_iterator.cpp index bf26d140f0b..9c197113a6f 100644 --- a/src/mongo/db/transaction/transaction_history_iterator.cpp +++ b/src/mongo/db/transaction/transaction_history_iterator.cpp @@ -35,9 +35,6 @@ #include "mongo/bson/bsonmisc.h" #include "mongo/bson/bsonobj.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" @@ -49,6 +46,9 @@ #include "mongo/db/query/get_executor.h" #include "mongo/db/query/plan_executor.h" #include "mongo/db/repl/oplog_entry.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/stats/top.h" #include "mongo/logv2/redaction.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/transaction/transaction_metrics_observer.cpp b/src/mongo/db/transaction/transaction_metrics_observer.cpp index 75bf29302bb..7b74a3747eb 100644 --- a/src/mongo/db/transaction/transaction_metrics_observer.cpp +++ b/src/mongo/db/transaction/transaction_metrics_observer.cpp @@ -31,7 +31,7 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/stats/top.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_stats.h" diff --git a/src/mongo/db/transaction/transaction_participant.cpp b/src/mongo/db/transaction/transaction_participant.cpp index 7cfd96d268e..d194597a5f5 100644 --- a/src/mongo/db/transaction/transaction_participant.cpp +++ b/src/mongo/db/transaction/transaction_participant.cpp @@ -41,24 +41,8 @@ #include "mongo/db/curop_failpoint_helpers.h" #include "mongo/db/database_name.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/global_catalog/router_role_api/sharding_write_router.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/internal_transactions_feature_flag_gen.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/local_oplog_info.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/fill_locker_info.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/lock_manager/locker.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/uncommitted_catalog_updates.h" #include "mongo/db/logical_time.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/query/compiler/parsers/matcher/expression_parser.h" @@ -68,11 +52,13 @@ #include "mongo/db/record_id.h" #include "mongo/db/record_id_helpers.h" #include "mongo/db/repl/apply_ops_command_info.h" +#include "mongo/db/repl/local_oplog_info.h" #include "mongo/db/repl/oplog_entry_gen.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/repl/storage_interface.h" #include "mongo/db/replication_state_transition_lock_guard.h" +#include "mongo/db/router_role/sharding_write_router.h" #include "mongo/db/rss/replicated_storage_service.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" @@ -81,18 +67,32 @@ #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_helpers.h" #include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/fill_locker_info.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/locker.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/uncommitted_catalog_updates.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/exceptions.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/storage/storage_stats.h" #include "mongo/db/topology/cluster_role.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/db/transaction/retryable_writes_stats.h" #include "mongo/db/transaction/server_transactions_metrics.h" #include "mongo/db/transaction/transaction_history_iterator.h" #include "mongo/db/transaction/transaction_participant_gen.h" #include "mongo/db/txn_retry_counter_too_old_info.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" #include "mongo/db/versioning_protocol/shard_version.h" #include "mongo/db/write_concern_options.h" #include "mongo/idl/idl_parser.h" diff --git a/src/mongo/db/transaction/transaction_participant.h b/src/mongo/db/transaction/transaction_participant.h index 3ae043fa146..695750332c0 100644 --- a/src/mongo/db/transaction/transaction_participant.h +++ b/src/mongo/db/transaction/transaction_participant.h @@ -37,9 +37,6 @@ #include "mongo/db/api_parameters.h" #include "mongo/db/client.h" #include "mongo/db/commands/txn_cmds_gen.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_stats.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/update_request.h" @@ -53,6 +50,9 @@ #include "mongo/db/session/session.h" #include "mongo/db/session/session_catalog.h" #include "mongo/db/session/session_txn_record_gen.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_stats.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/stats/single_transaction_stats.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_engine.h" diff --git a/src/mongo/db/transaction/transaction_participant_resource_yielder.h b/src/mongo/db/transaction/transaction_participant_resource_yielder.h index e53d9a37350..c655ab5c675 100644 --- a/src/mongo/db/transaction/transaction_participant_resource_yielder.h +++ b/src/mongo/db/transaction/transaction_participant_resource_yielder.h @@ -30,8 +30,8 @@ #pragma once #include "mongo/base/string_data.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielder.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/resource_yielder.h" #include "mongo/util/assert_util.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/transaction/transaction_participant_retryable_writes_test.cpp b/src/mongo/db/transaction/transaction_participant_retryable_writes_test.cpp index 67bfeb9f5fd..8d716226b55 100644 --- a/src/mongo/db/transaction/transaction_participant_retryable_writes_test.cpp +++ b/src/mongo/db/transaction/transaction_participant_retryable_writes_test.cpp @@ -38,9 +38,6 @@ #include "mongo/client/dbclient_cursor.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/exec/document_value/value.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_noop.h" @@ -64,6 +61,9 @@ #include "mongo/db/session/session_catalog.h" #include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/session/session_txn_record_gen.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/topology/cluster_role.h" diff --git a/src/mongo/db/transaction/transaction_participant_test.cpp b/src/mongo/db/transaction/transaction_participant_test.cpp index 9da53181f25..42052093ff2 100644 --- a/src/mongo/db/transaction/transaction_participant_test.cpp +++ b/src/mongo/db/transaction/transaction_participant_test.cpp @@ -52,23 +52,13 @@ #include "mongo/db/dbhelpers.h" #include "mongo/db/exec/document_value/value.h" #include "mongo/db/global_settings.h" -#include "mongo/db/local_catalog/catalog_control.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/local_oplog_info.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_impl.h" #include "mongo/db/op_observer/op_observer_noop.h" #include "mongo/db/op_observer/op_observer_registry.h" #include "mongo/db/op_observer/operation_logger_impl.h" #include "mongo/db/operation_context.h" +#include "mongo/db/repl/local_oplog_info.h" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/mock_repl_coord_server_fixture.h" #include "mongo/db/repl/oplog.h" @@ -88,6 +78,16 @@ #include "mongo/db/session/session_catalog.h" #include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/session/session_txn_record_gen.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_control.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/durable_history_pin.h" #include "mongo/db/storage/execution_context.h" #include "mongo/db/storage/record_data.h" diff --git a/src/mongo/db/ttl/BUILD.bazel b/src/mongo/db/ttl/BUILD.bazel index 880036f8b6c..6ac95f06f2c 100644 --- a/src/mongo/db/ttl/BUILD.bazel +++ b/src/mongo/db/ttl/BUILD.bazel @@ -42,11 +42,11 @@ mongo_cc_library( "//src/mongo/db:shard_role", "//src/mongo/db/commands:mongod_fsync", "//src/mongo/db/commands/server_status:server_status_core", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:index_key_validate", "//src/mongo/db/query/write_ops", "//src/mongo/db/repl:replica_set_aware_service", "//src/mongo/db/s:sharding_runtime_d", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:index_key_validate", ], ) diff --git a/src/mongo/db/ttl/ttl_monitor.cpp b/src/mongo/db/ttl/ttl_monitor.cpp index 5e5580e8efa..4ad4ead013d 100644 --- a/src/mongo/db/ttl/ttl_monitor.cpp +++ b/src/mongo/db/ttl/ttl_monitor.cpp @@ -43,19 +43,8 @@ #include "mongo/db/exec/classic/batched_delete_stage.h" #include "mongo/db/exec/classic/delete_stage.h" #include "mongo/db/exec/collection_scan_common.h" +#include "mongo/db/index_key_validate.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/index_key_validate.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role_loop.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_debug.h" #include "mongo/db/pipeline/expression_context_builder.h" @@ -70,6 +59,17 @@ #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/shard_role_loop.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/timeseries/timeseries_constants.h" #include "mongo/db/timeseries/timeseries_gen.h" diff --git a/src/mongo/db/ttl/ttl_monitor.h b/src/mongo/db/ttl/ttl_monitor.h index 207e8d989ec..b3d094baad7 100644 --- a/src/mongo/db/ttl/ttl_monitor.h +++ b/src/mongo/db/ttl/ttl_monitor.h @@ -30,10 +30,10 @@ #pragma once #include "mongo/base/status.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/record_id_bound.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/ttl/ttl_collection_cache.h" #include "mongo/stdx/condition_variable.h" #include "mongo/stdx/mutex.h" diff --git a/src/mongo/db/ttl/ttl_test.cpp b/src/mongo/db/ttl/ttl_test.cpp index 7663252be20..42c0be16973 100644 --- a/src/mongo/db/ttl/ttl_test.cpp +++ b/src/mongo/db/ttl/ttl_test.cpp @@ -39,14 +39,7 @@ #include "mongo/db/index_builds/index_build_entry_helpers.h" #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/index_builds/index_builds_manager.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/durable_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/index_key_validate.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" +#include "mongo/db/index_key_validate.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/expression.h" #include "mongo/db/repl/oplog.h" @@ -54,6 +47,13 @@ #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/repl/storage_interface_mock.h" #include "mongo/db/service_context_d_test_fixture.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/mdb_catalog.h" #include "mongo/db/ttl/ttl_monitor.h" #include "mongo/idl/server_parameter_test_controller.h" diff --git a/src/mongo/db/update/current_date_node.cpp b/src/mongo/db/update/current_date_node.cpp index 5a8752be5b3..c7c93234213 100644 --- a/src/mongo/db/update/current_date_node.cpp +++ b/src/mongo/db/update/current_date_node.cpp @@ -37,7 +37,7 @@ #include "mongo/db/logical_time.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/update/object_replace_executor.cpp b/src/mongo/db/update/object_replace_executor.cpp index 61486a162ff..38bf03c1f97 100644 --- a/src/mongo/db/update/object_replace_executor.cpp +++ b/src/mongo/db/update/object_replace_executor.cpp @@ -43,9 +43,9 @@ #include "mongo/db/field_ref_set.h" #include "mongo/db/logical_time.h" #include "mongo/db/service_context.h" +#include "mongo/db/topology/vector_clock/vector_clock_mutable.h" #include "mongo/db/update/storage_validation.h" #include "mongo/db/update/update_oplog_entry_serialization.h" -#include "mongo/db/vector_clock/vector_clock_mutable.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/validate/BUILD.bazel b/src/mongo/db/validate/BUILD.bazel index 54fae8ac778..a9f46ea4f81 100644 --- a/src/mongo/db/validate/BUILD.bazel +++ b/src/mongo/db/validate/BUILD.bazel @@ -50,11 +50,11 @@ mongo_cc_library( "//src/mongo/db:multitenancy", "//src/mongo/db:server_base", "//src/mongo/db:shard_role", - "//src/mongo/db/local_catalog:collection_catalog", - "//src/mongo/db/local_catalog:database_holder", - "//src/mongo/db/local_catalog:index_catalog", - "//src/mongo/db/local_catalog:throttle_cursor", "//src/mongo/db/repl:repl_coordinator_interface", + "//src/mongo/db/shard_role/shard_catalog:collection_catalog", + "//src/mongo/db/shard_role/shard_catalog:database_holder", + "//src/mongo/db/shard_role/shard_catalog:index_catalog", + "//src/mongo/db/shard_role/shard_catalog:throttle_cursor", "//src/mongo/db/storage:storage_options", "//src/mongo/db/timeseries:catalog_helper", "//src/mongo/db/views", @@ -85,13 +85,13 @@ mongo_cc_library( "//src/mongo/db/index:index_access_method", "//src/mongo/db/index:multikey_paths", "//src/mongo/db/index:preallocated_container_pool", - "//src/mongo/db/local_catalog:catalog_impl", - "//src/mongo/db/local_catalog:collection_options", - "//src/mongo/db/local_catalog:index_catalog", - "//src/mongo/db/local_catalog:index_key_validate", - "//src/mongo/db/local_catalog:throttle_cursor", - "//src/mongo/db/local_catalog/lock_manager:exception_util", "//src/mongo/db/query/query_stats", + "//src/mongo/db/shard_role/lock_manager:exception_util", + "//src/mongo/db/shard_role/shard_catalog:catalog_impl", + "//src/mongo/db/shard_role/shard_catalog:collection_options", + "//src/mongo/db/shard_role/shard_catalog:index_catalog", + "//src/mongo/db/shard_role/shard_catalog:index_key_validate", + "//src/mongo/db/shard_role/shard_catalog:throttle_cursor", "//src/mongo/db/storage:record_store_base", "//src/mongo/db/storage/key_string", "//src/mongo/db/timeseries:timeseries_options", @@ -113,7 +113,7 @@ mongo_cc_unit_test( ], deps = [ ":collection_validation", - "//src/mongo/db/local_catalog:catalog_test_fixture", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", "//src/mongo/db/storage:sorted_data_interface_test_assert", ], ) diff --git a/src/mongo/db/validate/README.md b/src/mongo/db/validate/README.md index b6e63cde530..b55e99a20fc 100644 --- a/src/mongo/db/validate/README.md +++ b/src/mongo/db/validate/README.md @@ -32,9 +32,9 @@ Additionally, users can specify that they'd like to perform a `full` validation. ## Types of Validation - Verifies the collection's durable catalog entry and in-memory state match. -- Indexes are marked as [multikey](../local_catalog/README.md#multikey-indexes) correctly. -- Index [multikey](../local_catalog/README.md#multikey-indexes) paths cover all of the records in the `RecordStore`. -- Indexes are not missing [multikey](../local_catalog/README.md#multikey-indexes) metadata information. +- Indexes are marked as [multikey](../shard_role/shard_catalog/README.md#multikey-indexes) correctly. +- Index [multikey](../shard_role/shard_catalog/README.md#multikey-indexes) paths cover all of the records in the `RecordStore`. +- Indexes are not missing [multikey](../shard_role/shard_catalog/README.md#multikey-indexes) metadata information. - Index entries are in increasing order if the sort order is ascending. - Index entries are in decreasing order if the sort order is descending. - Unique indexes do not have duplicate keys. diff --git a/src/mongo/db/validate/collection_validation.cpp b/src/mongo/db/validate/collection_validation.cpp index 879f0db240f..9fd0e6faa08 100644 --- a/src/mongo/db/validate/collection_validation.cpp +++ b/src/mongo/db/validate/collection_validation.cpp @@ -40,21 +40,21 @@ #include "mongo/db/basic_types_gen.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/collection_options_gen.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/index_key_validate.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" +#include "mongo/db/index_key_validate.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/record_id.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/server_feature_flags_gen.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_options.h" diff --git a/src/mongo/db/validate/collection_validation_test.cpp b/src/mongo/db/validate/collection_validation_test.cpp index afdf5ff5ea5..40d8a1e386b 100644 --- a/src/mongo/db/validate/collection_validation_test.cpp +++ b/src/mongo/db/validate/collection_validation_test.cpp @@ -44,20 +44,20 @@ #include "mongo/db/client.h" #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/create_collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/optime.h" #include "mongo/db/repl/storage_interface.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/create_collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/recovery_unit.h" diff --git a/src/mongo/db/validate/index_consistency.cpp b/src/mongo/db/validate/index_consistency.cpp index cd540f2f0d0..5ab8ac427c5 100644 --- a/src/mongo/db/validate/index_consistency.cpp +++ b/src/mongo/db/validate/index_consistency.cpp @@ -51,13 +51,13 @@ #include "mongo/db/index/index_access_method.h" #include "mongo/db/index/preallocated_container_pool.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/index_repair.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" +#include "mongo/db/index_repair.h" #include "mongo/db/multi_key_path_tracker.h" #include "mongo/db/namespace_string.h" #include "mongo/db/record_id_helpers.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/index_entry_comparison.h" #include "mongo/db/storage/key_format.h" #include "mongo/db/storage/key_string/key_string.h" diff --git a/src/mongo/db/validate/index_consistency.h b/src/mongo/db/validate/index_consistency.h index 971b4950194..e26965eb13c 100644 --- a/src/mongo/db/validate/index_consistency.h +++ b/src/mongo/db/validate/index_consistency.h @@ -33,13 +33,13 @@ #include "mongo/bson/ordering.h" #include "mongo/bson/simple_bsonobj_comparator.h" #include "mongo/db/index/multikey_paths.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/throttle_cursor.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/key_string/key_string.h" +#include "mongo/db/throttle_cursor.h" #include "mongo/db/validate/validate_results.h" #include "mongo/db/validate/validate_state.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/validate/index_consistency_test.cpp b/src/mongo/db/validate/index_consistency_test.cpp index 94d2e39c696..4a9696d3bf9 100644 --- a/src/mongo/db/validate/index_consistency_test.cpp +++ b/src/mongo/db/validate/index_consistency_test.cpp @@ -32,7 +32,7 @@ #include "mongo/bson/bsonmisc.h" #include "mongo/bson/bsonobj.h" #include "mongo/db/collection_crud/collection_write_path.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" #include "mongo/db/validate/collection_validation.h" #include "mongo/db/validate/validate_gen.h" #include "mongo/db/validate/validate_options.h" diff --git a/src/mongo/db/validate/validate_adaptor.cpp b/src/mongo/db/validate/validate_adaptor.cpp index 30999bbb628..593fbe66628 100644 --- a/src/mongo/db/validate/validate_adaptor.cpp +++ b/src/mongo/db/validate/validate_adaptor.cpp @@ -46,23 +46,23 @@ #include "mongo/db/curop.h" #include "mongo/db/exec/matcher/matcher.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_impl.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/throttle_cursor.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/record_id_helpers.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_impl.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/mdb_catalog.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/write_unit_of_work.h" +#include "mongo/db/throttle_cursor.h" #include "mongo/db/timeseries/bucket_catalog/flat_bson.h" #include "mongo/db/timeseries/timeseries_constants.h" #include "mongo/db/timeseries/timeseries_extended_range.h" diff --git a/src/mongo/db/validate/validate_adaptor.h b/src/mongo/db/validate/validate_adaptor.h index 41e59abad5f..4fe4d9c8059 100644 --- a/src/mongo/db/validate/validate_adaptor.h +++ b/src/mongo/db/validate/validate_adaptor.h @@ -32,10 +32,10 @@ #include "mongo/base/status.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/validate/index_consistency.h" #include "mongo/db/validate/validate_results.h" diff --git a/src/mongo/db/validate/validate_state.cpp b/src/mongo/db/validate/validate_state.cpp index 26246b22b20..122f0028241 100644 --- a/src/mongo/db/validate/validate_state.cpp +++ b/src/mongo/db/validate/validate_state.cpp @@ -33,14 +33,14 @@ #include "mongo/base/error_codes.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/index_names.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/intent_registry.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_engine.h" diff --git a/src/mongo/db/validate/validate_state.h b/src/mongo/db/validate/validate_state.h index c9cbcc83002..36bc84b6828 100644 --- a/src/mongo/db/validate/validate_state.h +++ b/src/mongo/db/validate/validate_state.h @@ -32,21 +32,21 @@ #include "mongo/bson/bson_validate.h" #include "mongo/bson/bson_validate_gen.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" -#include "mongo/db/local_catalog/throttle_cursor.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/storage_parameters_gen.h" +#include "mongo/db/throttle_cursor.h" #include "mongo/db/validate/validate_options.h" #include "mongo/util/assert_util.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/versioning_protocol/README_versioning_protocols.md b/src/mongo/db/versioning_protocol/README_versioning_protocols.md index e3288458278..0eeb8dd945d 100644 --- a/src/mongo/db/versioning_protocol/README_versioning_protocols.md +++ b/src/mongo/db/versioning_protocol/README_versioning_protocols.md @@ -98,7 +98,7 @@ A placement version change indicates that something has changed about what data ## Routing (a.k.a. Placement) Information Refreshes -For sharded collections, routing is driven by the chunk placement information, for which the config server represents the [authoritative source](../local_catalog/README_sharding_catalog.md#authoritative-containers). +For sharded collections, routing is driven by the chunk placement information, for which the config server represents the [authoritative source](../shard_role/shard_catalog/README_sharding_catalog.md#authoritative-containers). MongoS and shard primaries refresh their placement information from the config server. Shard secondaries, however, refresh from the shard primaries through a component called the Shard Server Catalog Cache Loader. When a shard primary refreshes from a config server, it persists the refreshed information to disk. This information is then replicated to secondaries who will refresh their cache from this on-disk information. 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 19d1438ac72..a438d5dbab6 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 @@ -42,11 +42,11 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #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/operation_context.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" diff --git a/src/mongo/db/versioning_protocol/comparable_database_version_test.cpp b/src/mongo/db/versioning_protocol/comparable_database_version_test.cpp index 353f50f9e47..c49f9784a9c 100644 --- a/src/mongo/db/versioning_protocol/comparable_database_version_test.cpp +++ b/src/mongo/db/versioning_protocol/comparable_database_version_test.cpp @@ -29,7 +29,7 @@ #include "mongo/base/string_data.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/unittest/unittest.h" #include "mongo/util/uuid.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 c7423761a7a..f707405d883 100644 --- a/src/mongo/db/versioning_protocol/get_database_version_command.cpp +++ b/src/mongo/db/versioning_protocol/get_database_version_command.cpp @@ -36,13 +36,13 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_runtime.h" #include "mongo/db/topology/cluster_role.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/db/versioning_protocol/database_version.h" 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 23ecd57e851..b9ae78df279 100644 --- a/src/mongo/db/versioning_protocol/get_shard_version_command.cpp +++ b/src/mongo/db/versioning_protocol/get_shard_version_command.cpp @@ -43,13 +43,13 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/shard_key_pattern.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/shard_registry.h" #include "mongo/db/topology/sharding_state.h" diff --git a/src/mongo/db/versioning_protocol/shard_version_factory.h b/src/mongo/db/versioning_protocol/shard_version_factory.h index 27a74f49062..e918da44e80 100644 --- a/src/mongo/db/versioning_protocol/shard_version_factory.h +++ b/src/mongo/db/versioning_protocol/shard_version_factory.h @@ -29,7 +29,7 @@ #pragma once #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_metadata.h" +#include "mongo/db/shard_role/shard_catalog/collection_metadata.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/db/versioning_protocol/shard_version.h" diff --git a/src/mongo/db/views/BUILD.bazel b/src/mongo/db/views/BUILD.bazel index 406f1a70dd8..c04305df465 100644 --- a/src/mongo/db/views/BUILD.bazel +++ b/src/mongo/db/views/BUILD.bazel @@ -43,8 +43,8 @@ mongo_cc_library( deps = [ ":resolved_view", ":views", - "//src/mongo/db/local_catalog:collection_catalog", "//src/mongo/db/pipeline:aggregation", + "//src/mongo/db/shard_role/shard_catalog:collection_catalog", "//src/mongo/db/storage:storage_options", ], ) @@ -64,10 +64,10 @@ mongo_cc_unit_test( "//src/mongo/db:multitenancy", "//src/mongo/db:shard_role", "//src/mongo/db/auth:authmocks", - "//src/mongo/db/local_catalog:catalog_test_fixture", "//src/mongo/db/query:query_test_service_context", "//src/mongo/db/query/collation:collator_interface_mock", "//src/mongo/db/repl:replmocks", + "//src/mongo/db/shard_role/shard_catalog:catalog_test_fixture", "//src/mongo/unittest", ], ) diff --git a/src/mongo/db/views/view_catalog_helpers.cpp b/src/mongo/db/views/view_catalog_helpers.cpp index 1cd64450848..50f183829f1 100644 --- a/src/mongo/db/views/view_catalog_helpers.cpp +++ b/src/mongo/db/views/view_catalog_helpers.cpp @@ -40,8 +40,6 @@ #include "mongo/bson/bsonelement.h" #include "mongo/db/basic_types_gen.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/document_source.h" #include "mongo/db/pipeline/expression_context.h" @@ -53,6 +51,8 @@ #include "mongo/db/query/collation/collation_spec.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" #include "mongo/db/storage/storage_options.h" #include "mongo/db/timeseries/timeseries_gen.h" #include "mongo/db/views/view_graph.h" diff --git a/src/mongo/db/views/view_catalog_helpers.h b/src/mongo/db/views/view_catalog_helpers.h index 45c1b3ae730..2b13c7f5095 100644 --- a/src/mongo/db/views/view_catalog_helpers.h +++ b/src/mongo/db/views/view_catalog_helpers.h @@ -31,9 +31,9 @@ #include "mongo/base/status_with.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/collection_catalog.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" #include "mongo/db/views/resolved_view.h" #include "mongo/db/views/view.h" #include "mongo/stdx/unordered_set.h" diff --git a/src/mongo/db/views/view_catalog_test.cpp b/src/mongo/db/views/view_catalog_test.cpp index 27da9068638..f91a0a39e30 100644 --- a/src/mongo/db/views/view_catalog_test.cpp +++ b/src/mongo/db/views/view_catalog_test.cpp @@ -39,13 +39,6 @@ #include "mongo/bson/simple_bsonobj_comparator.h" #include "mongo/db/basic_types_gen.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/catalog_test_fixture.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/lock_manager/resource_catalog.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/collation/collator_factory_interface.h" @@ -57,6 +50,13 @@ #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/repl/storage_interface.h" #include "mongo/db/repl/storage_interface_mock.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/lock_manager/resource_catalog.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/catalog_test_fixture.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/database.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/tenant_id.h" #include "mongo/db/views/resolved_view.h" diff --git a/src/mongo/dbtests/BUILD.bazel b/src/mongo/dbtests/BUILD.bazel index 10bce35247d..a2dd3f93878 100644 --- a/src/mongo/dbtests/BUILD.bazel +++ b/src/mongo/dbtests/BUILD.bazel @@ -28,10 +28,10 @@ mongo_cc_library( "//src/mongo/db:service_context_d", "//src/mongo/db/admission:flow_control_parameters", "//src/mongo/db/index_builds:index_builds_coordinator_mongod", - "//src/mongo/db/local_catalog:catalog_impl", "//src/mongo/db/op_observer", "//src/mongo/db/rss/attached_storage:attached_persistence_provider", "//src/mongo/db/s:sharding_runtime_d", + "//src/mongo/db/shard_role/shard_catalog:catalog_impl", "//src/mongo/db/storage:storage_control", "//src/mongo/db/storage:storage_options", "//src/mongo/scripting:scripting_common", @@ -132,8 +132,8 @@ mongo_cc_binary( "validate_tests.cpp", "wildcard_access_method_test.cpp", "wildcard_multikey_persistence_test.cpp", - "//src/mongo/db/local_catalog:catalogtests.cpp", - "//src/mongo/db/local_catalog:indexcatalogtests.cpp", + "//src/mongo/db/shard_role/shard_catalog:catalogtests.cpp", + "//src/mongo/db/shard_role/shard_catalog:indexcatalogtests.cpp", ], srcs_select = [{ "//bazel/config:js_engine_mozjs": [ @@ -169,10 +169,6 @@ mongo_cc_binary( "//src/mongo/db/index:index_access_method", "//src/mongo/db/index_builds:index_build_test_helpers", "//src/mongo/db/index_builds:multi_index_block", - "//src/mongo/db/local_catalog:catalog_helpers", - "//src/mongo/db/local_catalog:collection_options", - "//src/mongo/db/local_catalog:durable_catalog", - "//src/mongo/db/local_catalog:index_key_validate", "//src/mongo/db/op_observer", "//src/mongo/db/op_observer:op_observer_impl", "//src/mongo/db/op_observer:operation_logger_impl", @@ -193,6 +189,10 @@ mongo_cc_binary( "//src/mongo/db/repl:storage_interface_impl", "//src/mongo/db/repl/dbcheck:deferred_writer", "//src/mongo/db/session:service_liaison_mongod", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", + "//src/mongo/db/shard_role/shard_catalog:collection_options", + "//src/mongo/db/shard_role/shard_catalog:durable_catalog", + "//src/mongo/db/shard_role/shard_catalog:index_key_validate", "//src/mongo/db/storage:mdb_catalog", "//src/mongo/db/storage:sorted_data_interface_test_assert", "//src/mongo/db/storage:storage_engine_impl", diff --git a/src/mongo/dbtests/clienttests.cpp b/src/mongo/dbtests/clienttests.cpp index 989f28e6f9e..4858057737b 100644 --- a/src/mongo/dbtests/clienttests.cpp +++ b/src/mongo/dbtests/clienttests.cpp @@ -38,13 +38,13 @@ #include "mongo/db/database_name.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/index_builds/index_build_test_helpers.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/find_command.h" #include "mongo/db/query/query_settings/query_settings_service.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" #include "mongo/db/tenant_id.h" #include "mongo/dbtests/dbtests.h" // IWYU pragma: keep #include "mongo/unittest/unittest.h" diff --git a/src/mongo/dbtests/counttests.cpp b/src/mongo/dbtests/counttests.cpp index 104cfcf3be0..5be998994ad 100644 --- a/src/mongo/dbtests/counttests.cpp +++ b/src/mongo/dbtests/counttests.cpp @@ -39,11 +39,11 @@ #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/curop.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/database.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/database.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/dbtests/dbtests.h" // IWYU pragma: keep #include "mongo/unittest/unittest.h" diff --git a/src/mongo/dbtests/dbhelper_tests.cpp b/src/mongo/dbtests/dbhelper_tests.cpp index fbe6bcc474b..e879e4b3886 100644 --- a/src/mongo/dbtests/dbhelper_tests.cpp +++ b/src/mongo/dbtests/dbhelper_tests.cpp @@ -39,15 +39,6 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/global_settings.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_impl.h" @@ -61,6 +52,15 @@ #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/dbtests/dbtests.h" // IWYU pragma: keep diff --git a/src/mongo/dbtests/dbtests.cpp b/src/mongo/dbtests/dbtests.cpp index aa976078a57..8ef4284d269 100644 --- a/src/mongo/dbtests/dbtests.cpp +++ b/src/mongo/dbtests/dbtests.cpp @@ -45,9 +45,6 @@ #include "mongo/db/commands/test_commands_enabled.h" #include "mongo/db/index_builds/index_builds_common.h" #include "mongo/db/index_builds/multi_index_block.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/profile_settings.h" #include "mongo/db/query/client_cursor/cursor_manager.h" #include "mongo/db/query/query_settings/query_settings_service.h" @@ -60,6 +57,9 @@ #include "mongo/db/service_context.h" #include "mongo/db/service_entry_point_shard_role.h" #include "mongo/db/session_manager_mongod.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/ident.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/dbtests/dbtests.h b/src/mongo/dbtests/dbtests.h index d0ca066052d..4f4b420ef07 100644 --- a/src/mongo/dbtests/dbtests.h +++ b/src/mongo/dbtests/dbtests.h @@ -30,12 +30,12 @@ #pragma once #include "mongo/base/string_data.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/dbtests/deferred_writer.cpp b/src/mongo/dbtests/deferred_writer.cpp index 5c944e4de68..9d884884fa8 100644 --- a/src/mongo/dbtests/deferred_writer.cpp +++ b/src/mongo/dbtests/deferred_writer.cpp @@ -36,16 +36,16 @@ #include "mongo/bson/simple_bsonobj_comparator.h" #include "mongo/db/client.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/internal_plans.h" #include "mongo/db/query/plan_executor.h" #include "mongo/db/query/plan_yield_policy.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" #include "mongo/dbtests/dbtests.h" // IWYU pragma: keep #include "mongo/platform/atomic_word.h" #include "mongo/stdx/thread.h" diff --git a/src/mongo/dbtests/extended_validate_tests.cpp b/src/mongo/dbtests/extended_validate_tests.cpp index c74903053aa..9024995e294 100644 --- a/src/mongo/dbtests/extended_validate_tests.cpp +++ b/src/mongo/dbtests/extended_validate_tests.cpp @@ -36,15 +36,15 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/client.h" #include "mongo/db/collection_crud/collection_write_path.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/storage/storage_options.h" diff --git a/src/mongo/dbtests/extensions_callback_real_test.cpp b/src/mongo/dbtests/extensions_callback_real_test.cpp index 5ee11e0eb93..1118f34731f 100644 --- a/src/mongo/dbtests/extensions_callback_real_test.cpp +++ b/src/mongo/dbtests/extensions_callback_real_test.cpp @@ -37,9 +37,6 @@ #include "mongo/db/client.h" #include "mongo/db/fts/fts_query.h" #include "mongo/db/index_builds/index_build_test_helpers.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/matcher/expression_text.h" #include "mongo/db/matcher/expression_text_base.h" @@ -49,6 +46,9 @@ #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/query/query_knobs_gen.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/database.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/dbtests/dbtests.h" // IWYU pragma: keep #include "mongo/platform/atomic_word.h" diff --git a/src/mongo/dbtests/framework.cpp b/src/mongo/dbtests/framework.cpp index ef1bbe2a238..73df8df6872 100644 --- a/src/mongo/dbtests/framework.cpp +++ b/src/mongo/dbtests/framework.cpp @@ -34,18 +34,18 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/index_builds/index_builds_coordinator.h" #include "mongo/db/index_builds/index_builds_coordinator_mongod.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog_helper.h" -#include "mongo/db/local_catalog/collection_impl.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/database_holder_impl.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h" -#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state_factory_shard.h" -#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state_factory_shard.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_registry.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog_helper.h" +#include "mongo/db/shard_role/shard_catalog/collection_impl.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state.h" +#include "mongo/db/shard_role/shard_catalog/collection_sharding_state_factory_shard.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/database_holder_impl.h" +#include "mongo/db/shard_role/shard_catalog/database_sharding_state_factory_shard.h" #include "mongo/db/storage/control/storage_control.h" #include "mongo/db/topology/sharding_state.h" #include "mongo/dbtests/dbtests.h" // IWYU pragma: keep diff --git a/src/mongo/dbtests/indexupdatetests.cpp b/src/mongo/dbtests/indexupdatetests.cpp index caeb72d6fe1..ce7ee6c89bd 100644 --- a/src/mongo/dbtests/indexupdatetests.cpp +++ b/src/mongo/dbtests/indexupdatetests.cpp @@ -43,17 +43,17 @@ #include "mongo/db/index/index_constants.h" #include "mongo/db/index_builds/index_build_test_helpers.h" #include "mongo/db/index_builds/multi_index_block.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/db/storage/storage_engine_init.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/dbtests/insert_test.cpp b/src/mongo/dbtests/insert_test.cpp index d68cd76a1eb..8f5579b52e6 100644 --- a/src/mongo/dbtests/insert_test.cpp +++ b/src/mongo/dbtests/insert_test.cpp @@ -33,12 +33,12 @@ #include "mongo/bson/bsonmisc.h" #include "mongo/bson/bsonobj.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" #include "mongo/unittest/unittest.h" #include diff --git a/src/mongo/dbtests/pdfiletests.cpp b/src/mongo/dbtests/pdfiletests.cpp index 872054113b4..0851c75a56c 100644 --- a/src/mongo/dbtests/pdfiletests.cpp +++ b/src/mongo/dbtests/pdfiletests.cpp @@ -38,17 +38,17 @@ #include "mongo/db/client.h" #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/curop.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/insert.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/dbtests/dbtests.h" // IWYU pragma: keep #include "mongo/unittest/unittest.h" diff --git a/src/mongo/dbtests/plan_executor_invalidation_test.cpp b/src/mongo/dbtests/plan_executor_invalidation_test.cpp index d5ea61b1eb7..7a324d8f753 100644 --- a/src/mongo/dbtests/plan_executor_invalidation_test.cpp +++ b/src/mongo/dbtests/plan_executor_invalidation_test.cpp @@ -41,7 +41,6 @@ #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/collection_scan_common.h" #include "mongo/db/index_builds/index_build_test_helpers.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" @@ -54,6 +53,7 @@ #include "mongo/db/query/plan_yield_policy.h" #include "mongo/db/query/query_planner_params.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/db/tenant_id.h" #include "mongo/dbtests/dbtests.h" // IWYU pragma: keep diff --git a/src/mongo/dbtests/query_plan_executor.cpp b/src/mongo/dbtests/query_plan_executor.cpp index 1d49ca68379..47bef8991da 100644 --- a/src/mongo/dbtests/query_plan_executor.cpp +++ b/src/mongo/dbtests/query_plan_executor.cpp @@ -44,11 +44,6 @@ #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/collection_scan_common.h" #include "mongo/db/index_builds/index_build_test_helpers.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/document_source_cursor.h" @@ -65,6 +60,11 @@ #include "mongo/db/query/query_request_helper.h" #include "mongo/db/query/tailable_mode_gen.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/dbtests/dbtests.h" // IWYU pragma: keep #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/dbtests/query_stage_and.cpp b/src/mongo/dbtests/query_stage_and.cpp index 9821f5600fa..af379b34210 100644 --- a/src/mongo/dbtests/query_stage_and.cpp +++ b/src/mongo/dbtests/query_stage_and.cpp @@ -50,15 +50,15 @@ #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/index_builds/index_build_test_helpers.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/record_id.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/dbtests/query_stage_batched_delete.cpp b/src/mongo/dbtests/query_stage_batched_delete.cpp index b56acfa97bc..50969f57f1f 100644 --- a/src/mongo/dbtests/query_stage_batched_delete.cpp +++ b/src/mongo/dbtests/query_stage_batched_delete.cpp @@ -44,11 +44,6 @@ #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/collection_scan_common.h" #include "mongo/db/exec/plan_stats.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_noop.h" @@ -61,6 +56,11 @@ #include "mongo/db/query/plan_executor.h" #include "mongo/db/record_id.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/checkpointer.h" #include "mongo/db/storage/snapshot.h" #include "mongo/dbtests/dbtests.h" // IWYU pragma: keep diff --git a/src/mongo/dbtests/query_stage_cached_plan.cpp b/src/mongo/dbtests/query_stage_cached_plan.cpp index a37570f73c6..f84b506c847 100644 --- a/src/mongo/dbtests/query_stage_cached_plan.cpp +++ b/src/mongo/dbtests/query_stage_cached_plan.cpp @@ -43,8 +43,6 @@ #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/matcher/matcher.h" #include "mongo/db/index_builds/index_build_test_helpers.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" @@ -60,6 +58,8 @@ #include "mongo/db/query/query_planner_params.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/dbtests/dbtests.h" // IWYU pragma: keep diff --git a/src/mongo/dbtests/query_stage_collscan.cpp b/src/mongo/dbtests/query_stage_collscan.cpp index 66c702d7e8b..66d1e5f3e53 100644 --- a/src/mongo/dbtests/query_stage_collscan.cpp +++ b/src/mongo/dbtests/query_stage_collscan.cpp @@ -50,16 +50,6 @@ #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/document_value/value.h" #include "mongo/db/exec/plan_stats.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_options_gen.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/matcher/expression_leaf.h" #include "mongo/db/namespace_string.h" @@ -75,6 +65,16 @@ #include "mongo/db/record_id.h" #include "mongo/db/record_id_helpers.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_options_gen.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/dbtests/query_stage_count.cpp b/src/mongo/dbtests/query_stage_count.cpp index bb953c258ee..a3f0cecf799 100644 --- a/src/mongo/dbtests/query_stage_count.cpp +++ b/src/mongo/dbtests/query_stage_count.cpp @@ -45,14 +45,6 @@ #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/collection_scan_common.h" #include "mongo/db/exec/plan_stats.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -65,6 +57,14 @@ #include "mongo/db/repl/oplog.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/recovery_unit.h" diff --git a/src/mongo/dbtests/query_stage_count_scan.cpp b/src/mongo/dbtests/query_stage_count_scan.cpp index 2f546680119..47560406d6c 100644 --- a/src/mongo/dbtests/query_stage_count_scan.cpp +++ b/src/mongo/dbtests/query_stage_count_scan.cpp @@ -36,16 +36,16 @@ #include "mongo/db/exec/classic/plan_stage.h" #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/index_builds/index_build_test_helpers.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/dbtests/dbtests.h" // IWYU pragma: keep #include "mongo/unittest/unittest.h" diff --git a/src/mongo/dbtests/query_stage_delete.cpp b/src/mongo/dbtests/query_stage_delete.cpp index ae143ad1889..da1fe814a77 100644 --- a/src/mongo/dbtests/query_stage_delete.cpp +++ b/src/mongo/dbtests/query_stage_delete.cpp @@ -42,10 +42,6 @@ #include "mongo/db/exec/collection_scan_common.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/plan_stats.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" @@ -55,6 +51,10 @@ #include "mongo/db/query/plan_executor.h" #include "mongo/db/record_id.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/snapshot.h" #include "mongo/dbtests/dbtests.h" // IWYU pragma: keep #include "mongo/unittest/unittest.h" diff --git a/src/mongo/dbtests/query_stage_distinct.cpp b/src/mongo/dbtests/query_stage_distinct.cpp index 9f7c6a9ca0e..71b8561d68c 100644 --- a/src/mongo/dbtests/query_stage_distinct.cpp +++ b/src/mongo/dbtests/query_stage_distinct.cpp @@ -37,7 +37,6 @@ #include "mongo/db/exec/classic/plan_stage.h" #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/index_builds/index_build_test_helpers.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" @@ -45,6 +44,7 @@ #include "mongo/db/query/compiler/optimizer/index_bounds_builder/index_bounds_builder.h" #include "mongo/db/query/compiler/physical_model/index_bounds/index_bounds.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/dbtests/dbtests.h" // IWYU pragma: keep #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/dbtests/query_stage_fetch.cpp b/src/mongo/dbtests/query_stage_fetch.cpp index d68f3afdc17..f4fd489fcf3 100644 --- a/src/mongo/dbtests/query_stage_fetch.cpp +++ b/src/mongo/dbtests/query_stage_fetch.cpp @@ -43,12 +43,6 @@ #include "mongo/db/exec/classic/queued_data_stage.h" #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/document_value/document.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -57,6 +51,12 @@ #include "mongo/db/query/compiler/parsers/matcher/expression_parser.h" #include "mongo/db/record_id.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/dbtests/query_stage_ixscan.cpp b/src/mongo/dbtests/query_stage_ixscan.cpp index f0ebb8ea6aa..9140461be15 100644 --- a/src/mongo/dbtests/query_stage_ixscan.cpp +++ b/src/mongo/dbtests/query_stage_ixscan.cpp @@ -41,13 +41,6 @@ #include "mongo/db/exec/classic/plan_stage.h" #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/plan_stats.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -58,6 +51,13 @@ #include "mongo/db/query/plan_executor.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/dbtests/dbtests.h" // IWYU pragma: keep #include "mongo/unittest/unittest.h" diff --git a/src/mongo/dbtests/query_stage_merge_sort.cpp b/src/mongo/dbtests/query_stage_merge_sort.cpp index 41330333dda..5784a53ff3c 100644 --- a/src/mongo/dbtests/query_stage_merge_sort.cpp +++ b/src/mongo/dbtests/query_stage_merge_sort.cpp @@ -43,9 +43,6 @@ #include "mongo/db/exec/classic/working_set_common.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/index_builds/index_build_test_helpers.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" @@ -57,6 +54,9 @@ #include "mongo/db/query/query_planner_params.h" #include "mongo/db/record_id.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/dbtests/query_stage_multiplan.cpp b/src/mongo/dbtests/query_stage_multiplan.cpp index 26be559b136..97ee4a3a5c7 100644 --- a/src/mongo/dbtests/query_stage_multiplan.cpp +++ b/src/mongo/dbtests/query_stage_multiplan.cpp @@ -48,9 +48,6 @@ #include "mongo/db/exec/plan_cache_util.h" #include "mongo/db/exec/plan_stats.h" #include "mongo/db/index_builds/index_build_test_helpers.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -82,6 +79,9 @@ #include "mongo/db/query/query_planner_test_lib.h" #include "mongo/db/query/stage_builder/stage_builder_util.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/snapshot.h" #include "mongo/dbtests/dbtests.h" // IWYU pragma: keep #include "mongo/idl/server_parameter_test_controller.h" diff --git a/src/mongo/dbtests/query_stage_near.cpp b/src/mongo/dbtests/query_stage_near.cpp index 1b9b42f0ddb..ac2874e8619 100644 --- a/src/mongo/dbtests/query_stage_near.cpp +++ b/src/mongo/dbtests/query_stage_near.cpp @@ -45,13 +45,13 @@ #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/document_value/value.h" #include "mongo/db/index_builds/index_build_test_helpers.h" -#include "mongo/db/local_catalog/index_descriptor.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/storage/storage_options.h" #include "mongo/dbtests/dbtests.h" // IWYU pragma: keep diff --git a/src/mongo/dbtests/query_stage_sort.cpp b/src/mongo/dbtests/query_stage_sort.cpp index 726b28b6331..de5c117652a 100644 --- a/src/mongo/dbtests/query_stage_sort.cpp +++ b/src/mongo/dbtests/query_stage_sort.cpp @@ -49,10 +49,6 @@ #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/document_value/value.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_yield_restore.h" -#include "mongo/db/local_catalog/database.h" #include "mongo/db/memory_tracking/memory_usage_tracker.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -70,6 +66,10 @@ #include "mongo/db/record_id.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_yield_restore.h" +#include "mongo/db/shard_role/shard_catalog/database.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/storage/write_unit_of_work.h" diff --git a/src/mongo/dbtests/query_stage_tests.cpp b/src/mongo/dbtests/query_stage_tests.cpp index 26283301ff8..ba42172b52e 100644 --- a/src/mongo/dbtests/query_stage_tests.cpp +++ b/src/mongo/dbtests/query_stage_tests.cpp @@ -37,8 +37,6 @@ #include "mongo/db/exec/classic/plan_stage.h" #include "mongo/db/exec/classic/working_set.h" #include "mongo/db/index_builds/index_build_test_helpers.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -51,6 +49,8 @@ #include "mongo/db/query/query_planner_params.h" #include "mongo/db/record_id.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/dbtests/dbtests.h" // IWYU pragma: keep #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/dbtests/query_stage_update.cpp b/src/mongo/dbtests/query_stage_update.cpp index f1be075eb05..a35461641ec 100644 --- a/src/mongo/dbtests/query_stage_update.cpp +++ b/src/mongo/dbtests/query_stage_update.cpp @@ -50,7 +50,6 @@ #include "mongo/db/exec/collection_scan_common.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/plan_stats.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/matcher/expression_with_placeholder.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -64,6 +63,7 @@ #include "mongo/db/query/write_ops/write_ops_parsers.h" #include "mongo/db/record_id.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/update/update_driver.h" #include "mongo/dbtests/dbtests.h" // IWYU pragma: keep diff --git a/src/mongo/dbtests/querytests.cpp b/src/mongo/dbtests/querytests.cpp index f1ea4e899dc..67db82b1a9c 100644 --- a/src/mongo/dbtests/querytests.cpp +++ b/src/mongo/dbtests/querytests.cpp @@ -50,15 +50,6 @@ #include "mongo/db/index_builds/index_build_interceptor.h" #include "mongo/db/index_builds/index_build_test_helpers.h" #include "mongo/db/index_builds/multi_index_block.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/client_cursor/clientcursor.h" @@ -69,6 +60,15 @@ #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/snapshot.h" #include "mongo/db/storage/storage_engine.h" diff --git a/src/mongo/dbtests/replica_set_tests.cpp b/src/mongo/dbtests/replica_set_tests.cpp index cedb60a4c85..2a95c6958d6 100644 --- a/src/mongo/dbtests/replica_set_tests.cpp +++ b/src/mongo/dbtests/replica_set_tests.cpp @@ -33,7 +33,6 @@ #include "mongo/db/admission/execution_admission_context.h" #include "mongo/db/client.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/last_vote.h" @@ -44,6 +43,7 @@ #include "mongo/db/repl/storage_interface.h" #include "mongo/db/repl/storage_interface_impl.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/unittest/unittest.h" #include "mongo/util/concurrency/admission_context.h" diff --git a/src/mongo/dbtests/repltests.cpp b/src/mongo/dbtests/repltests.cpp index 174638175cf..6529e5cc886 100644 --- a/src/mongo/dbtests/repltests.cpp +++ b/src/mongo/dbtests/repltests.cpp @@ -44,16 +44,6 @@ #include "mongo/db/exec/document_value/value.h" #include "mongo/db/exec/mutable_bson/mutable_bson_test_utils.h" #include "mongo/db/index_builds/index_build_test_helpers.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/exception_util.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/op_observer/op_observer_impl.h" @@ -76,6 +66,16 @@ #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/exception_util.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_role.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/storage/storage_engine.h" diff --git a/src/mongo/dbtests/rollbacktests.cpp b/src/mongo/dbtests/rollbacktests.cpp index 3c701984369..675412384d2 100644 --- a/src/mongo/dbtests/rollbacktests.cpp +++ b/src/mongo/dbtests/rollbacktests.cpp @@ -36,24 +36,24 @@ #include "mongo/db/collection_crud/collection_write_path.h" #include "mongo/db/curop.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/database_holder.h" -#include "mongo/db/local_catalog/db_raii.h" -#include "mongo/db/local_catalog/drop_collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/rename_collection.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/database_holder.h" +#include "mongo/db/shard_role/shard_catalog/db_raii.h" +#include "mongo/db/shard_role/shard_catalog/drop_collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_catalog/rename_collection.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" diff --git a/src/mongo/dbtests/storage_debug_util.cpp b/src/mongo/dbtests/storage_debug_util.cpp index 2a36cd421bc..05f6c9a0798 100644 --- a/src/mongo/dbtests/storage_debug_util.cpp +++ b/src/mongo/dbtests/storage_debug_util.cpp @@ -33,15 +33,15 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/ordering.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" diff --git a/src/mongo/dbtests/validate_tests.cpp b/src/mongo/dbtests/validate_tests.cpp index 6328a079997..f0e458d1c12 100644 --- a/src/mongo/dbtests/validate_tests.cpp +++ b/src/mongo/dbtests/validate_tests.cpp @@ -45,24 +45,24 @@ #include "mongo/db/index_builds/index_build_test_helpers.h" #include "mongo/db/index_builds/index_builds_common.h" #include "mongo/db/index_builds/multi_index_block.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/clustered_collection_util.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_catalog.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/database.h" -#include "mongo/db/local_catalog/durable_catalog.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/record_id.h" #include "mongo/db/record_id_helpers.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/clustered_collection_util.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_catalog.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/database.h" +#include "mongo/db/shard_role/shard_catalog/durable_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/key_format.h" #include "mongo/db/storage/key_string/key_string.h" #include "mongo/db/storage/mdb_catalog.h" diff --git a/src/mongo/dbtests/wildcard_multikey_persistence_test.cpp b/src/mongo/dbtests/wildcard_multikey_persistence_test.cpp index 8d09ee2b2b6..89a121af2b3 100644 --- a/src/mongo/dbtests/wildcard_multikey_persistence_test.cpp +++ b/src/mongo/dbtests/wildcard_multikey_persistence_test.cpp @@ -39,15 +39,6 @@ #include "mongo/db/index/multikey_metadata_access_stats.h" #include "mongo/db/index_builds/index_build_test_helpers.h" #include "mongo/db/index_builds/multi_index_block.h" -#include "mongo/db/local_catalog/catalog_raii.h" -#include "mongo/db/local_catalog/collection.h" -#include "mongo/db/local_catalog/collection_options.h" -#include "mongo/db/local_catalog/index_catalog.h" -#include "mongo/db/local_catalog/index_catalog_entry.h" -#include "mongo/db/local_catalog/index_descriptor.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager_defs.h" -#include "mongo/db/local_catalog/shard_role_api/shard_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/compiler/dependency_analysis/dependencies.h" @@ -57,6 +48,15 @@ #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/storage_interface_impl.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager_defs.h" +#include "mongo/db/shard_role/shard_catalog/catalog_raii.h" +#include "mongo/db/shard_role/shard_catalog/collection.h" +#include "mongo/db/shard_role/shard_catalog/collection_options.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog.h" +#include "mongo/db/shard_role/shard_catalog/index_catalog_entry.h" +#include "mongo/db/shard_role/shard_catalog/index_descriptor.h" +#include "mongo/db/shard_role/shard_role.h" #include "mongo/db/storage/index_entry_comparison.h" #include "mongo/db/storage/key_format.h" #include "mongo/db/storage/key_string/key_string.h" diff --git a/src/mongo/idl/BUILD.bazel b/src/mongo/idl/BUILD.bazel index 4166c0af12e..2885e6b421b 100644 --- a/src/mongo/idl/BUILD.bazel +++ b/src/mongo/idl/BUILD.bazel @@ -12,7 +12,7 @@ exports_files( mongo_cc_library( name = "cluster_server_parameter", srcs = [ - "//src/mongo/db/cluster_parameters:cluster_server_parameter_gen", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_gen", ], deps = [ "//src/mongo/db:server_base", @@ -29,12 +29,12 @@ idl_generator( "//src/mongo/db:basic_types_gen", "//src/mongo/db:version_context_gen", "//src/mongo/db:write_concern_options_gen", - "//src/mongo/db/global_catalog/router_role_api:gossiped_routing_cache_gen", "//src/mongo/db/repl:read_concern_args_gen", "//src/mongo/db/repl:read_concern_gen", + "//src/mongo/db/router_role:gossiped_routing_cache_gen", "//src/mongo/db/session:logical_session_id_gen", "//src/mongo/db/sharding_environment:sharding_types_gen", - "//src/mongo/db/vector_clock:vector_clock_gen", + "//src/mongo/db/topology/vector_clock:vector_clock_gen", "//src/mongo/rpc/metadata:audit_metadata_gen", ], ) @@ -46,7 +46,7 @@ idl_generator( mongo_cc_library( name = "cluster_server_parameter_server_status", - srcs = ["//src/mongo/db/cluster_parameters:cluster_server_parameter_server_status.cpp"], + srcs = ["//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_server_status.cpp"], deps = [ "//src/mongo/bson:bson_validate", "//src/mongo/db:server_base", @@ -69,7 +69,7 @@ idl_generator( src = "server_parameter_with_storage_test_structs.idl", deps = [ "//src/mongo/db:basic_types_gen", - "//src/mongo/db/cluster_parameters:cluster_server_parameter_gen", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_gen", ], ) @@ -124,34 +124,34 @@ mongo_cc_library( mongo_cc_library( name = "cluster_parameter_synchronization_helpers", srcs = [ - "//src/mongo/db/cluster_parameters:cluster_parameter_synchronization_helpers.cpp", + "//src/mongo/db/topology/cluster_parameters:cluster_parameter_synchronization_helpers.cpp", ], deps = [ "//src/mongo/db:audit", "//src/mongo/db:server_base", "//src/mongo/db:shard_role", - "//src/mongo/db/local_catalog:collection_catalog", + "//src/mongo/db/shard_role/shard_catalog:collection_catalog", ], ) mongo_cc_library( name = "cluster_server_parameter_initializer", srcs = [ - "//src/mongo/db/cluster_parameters:cluster_server_parameter_initializer.cpp", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_initializer.cpp", ], deps = [ ":cluster_parameter_synchronization_helpers", "//src/mongo/db:server_base", "//src/mongo/db:shard_role", - "//src/mongo/db/local_catalog:collection_catalog", "//src/mongo/db/repl:replica_set_aware_service", + "//src/mongo/db/shard_role/shard_catalog:collection_catalog", ], ) mongo_cc_library( name = "cluster_server_parameter_op_observer", srcs = [ - "//src/mongo/db/cluster_parameters:cluster_server_parameter_op_observer.cpp", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_op_observer.cpp", ], deps = [ ":cluster_parameter_synchronization_helpers", @@ -166,7 +166,7 @@ mongo_cc_library( mongo_cc_library( name = "cluster_server_parameter_common", srcs = [ - "//src/mongo/db/cluster_parameters:cluster_server_parameter_common.cpp", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_common.cpp", ], deps = [ "//src/mongo:base", @@ -178,8 +178,8 @@ mongo_cc_library( mongo_cc_library( name = "cluster_server_parameter_refresher", srcs = [ - "//src/mongo/db/cluster_parameters:cluster_server_parameter_refresher.cpp", - "//src/mongo/db/cluster_parameters:cluster_server_parameter_refresher_gen", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_refresher.cpp", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_refresher_gen", ], deps = [ ":cluster_server_parameter", @@ -203,14 +203,14 @@ mongo_cc_library( mongo_cc_unit_test( name = "cluster_server_parameter_test", srcs = [ - "//src/mongo/db/cluster_parameters:cluster_parameter_synchronization_helpers_test.cpp", - "//src/mongo/db/cluster_parameters:cluster_server_parameter_common_test.cpp", - "//src/mongo/db/cluster_parameters:cluster_server_parameter_initializer_test.cpp", - "//src/mongo/db/cluster_parameters:cluster_server_parameter_op_observer_test.cpp", - "//src/mongo/db/cluster_parameters:cluster_server_parameter_refresher_test.cpp", - "//src/mongo/db/cluster_parameters:cluster_server_parameter_server_status_test.cpp", - "//src/mongo/db/cluster_parameters:cluster_server_parameter_test_gen", - "//src/mongo/db/cluster_parameters:cluster_server_parameter_test_util.cpp", + "//src/mongo/db/topology/cluster_parameters:cluster_parameter_synchronization_helpers_test.cpp", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_common_test.cpp", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_initializer_test.cpp", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_op_observer_test.cpp", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_refresher_test.cpp", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_server_status_test.cpp", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_test_gen", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_test_util.cpp", ], tags = ["mongo_unittest_fourth_group"], deps = [ @@ -225,7 +225,6 @@ mongo_cc_unit_test( "//src/mongo/db:service_context_d_test_fixture", "//src/mongo/db/auth:authmocks", "//src/mongo/db/commands:create_command", - "//src/mongo/db/local_catalog:catalog_helpers", "//src/mongo/db/op_observer", "//src/mongo/db/op_observer:op_observer_util", "//src/mongo/db/query/client_cursor:cursor_response_idl", @@ -235,6 +234,7 @@ mongo_cc_unit_test( "//src/mongo/db/repl:replmocks", "//src/mongo/db/repl:storage_interface_impl", "//src/mongo/db/s:sharding_runtime_d", + "//src/mongo/db/shard_role/shard_catalog:catalog_helpers", "//src/mongo/s:sharding_mongos_test_fixture", "//src/mongo/util:signal_handlers", ], @@ -271,7 +271,7 @@ mongo_cc_unit_test( "//src/mongo/db:service_context", "//src/mongo/db/auth:authprivilege", "//src/mongo/db/auth:security_token_auth", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/rpc:message", "//src/mongo/util/cmdline_utils", "//src/mongo/util/options_parser", @@ -288,9 +288,9 @@ mongo_cc_benchmark( ":idl_parser", "//src/mongo/db:api_parameters", # TODO(SERVER-93876): Remove. "//src/mongo/db/auth:authprivilege", - "//src/mongo/db/local_catalog/lock_manager", "//src/mongo/db/query:query_request", "//src/mongo/db/query/write_ops:write_ops_parsers", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/rpc:message", ], ) diff --git a/src/mongo/idl/generic_argument.idl b/src/mongo/idl/generic_argument.idl index 85a7915eacf..8f1e94cf4de 100644 --- a/src/mongo/idl/generic_argument.idl +++ b/src/mongo/idl/generic_argument.idl @@ -39,12 +39,12 @@ imports: - "mongo/db/repl/read_concern_args.idl" - "mongo/db/repl/replication_types.idl" - "mongo/db/session/logical_session_id.idl" - - "mongo/db/vector_clock/vector_clock.idl" + - "mongo/db/topology/vector_clock/vector_clock.idl" - "mongo/db/version_context.idl" - "mongo/db/write_concern_options.idl" - "mongo/rpc/metadata/audit_metadata.idl" - "mongo/db/sharding_environment/sharding_types.idl" - - "mongo/db/global_catalog/router_role_api/gossiped_routing_cache.idl" + - "mongo/db/router_role/gossiped_routing_cache.idl" structs: GenericArguments: diff --git a/src/mongo/idl/server_parameter_with_storage_test.cpp b/src/mongo/idl/server_parameter_with_storage_test.cpp index 9495ef4e8ad..9e90be9bc1e 100644 --- a/src/mongo/idl/server_parameter_with_storage_test.cpp +++ b/src/mongo/idl/server_parameter_with_storage_test.cpp @@ -32,7 +32,7 @@ #include "mongo/bson/bsonmisc.h" #include "mongo/bson/oid.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_gen.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_gen.h" #include "mongo/idl/server_parameter_test_util.h" #include "mongo/idl/server_parameter_with_storage_test.h" #include "mongo/idl/server_parameter_with_storage_test_gen.h" diff --git a/src/mongo/idl/server_parameter_with_storage_test_structs.idl b/src/mongo/idl/server_parameter_with_storage_test_structs.idl index 5fc1ab1f97d..52f3d07110a 100644 --- a/src/mongo/idl/server_parameter_with_storage_test_structs.idl +++ b/src/mongo/idl/server_parameter_with_storage_test_structs.idl @@ -31,7 +31,7 @@ global: imports: - "mongo/db/basic_types.idl" - - "mongo/db/cluster_parameters/cluster_server_parameter.idl" + - "mongo/db/topology/cluster_parameters/cluster_server_parameter.idl" structs: preAndPostImagesStruct: diff --git a/src/mongo/logv2/BUILD.bazel b/src/mongo/logv2/BUILD.bazel index 38055e76b15..ded8fe7f7e2 100644 --- a/src/mongo/logv2/BUILD.bazel +++ b/src/mongo/logv2/BUILD.bazel @@ -39,7 +39,7 @@ mongo_cc_unit_test( deps = [ "//src/mongo/db/auth:security_token", "//src/mongo/db/commands:core", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/transport:transport_layer_common", "//src/mongo/util:clock_source_mock", ], diff --git a/src/mongo/platform/BUILD.bazel b/src/mongo/platform/BUILD.bazel index 07604831b10..43bda0a2495 100644 --- a/src/mongo/platform/BUILD.bazel +++ b/src/mongo/platform/BUILD.bazel @@ -148,7 +148,7 @@ mongo_cc_benchmark( deps = [ "//src/mongo:base", "//src/mongo/db:service_context_non_d", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/util:processinfo", ], ) diff --git a/src/mongo/platform/rwmutex_bm.cpp b/src/mongo/platform/rwmutex_bm.cpp index 5fb1c0dac77..99b7f1b2f13 100644 --- a/src/mongo/platform/rwmutex_bm.cpp +++ b/src/mongo/platform/rwmutex_bm.cpp @@ -29,9 +29,9 @@ #include "mongo/platform/rwmutex.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" -#include "mongo/db/local_catalog/lock_manager/lock_manager.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/lock_manager.h" #include "mongo/platform/waitable_atomic.h" #include "mongo/stdx/mutex.h" #include "mongo/stdx/thread.h" diff --git a/src/mongo/replay/BUILD.bazel b/src/mongo/replay/BUILD.bazel index 43f81319c3a..c14b8e3791f 100644 --- a/src/mongo/replay/BUILD.bazel +++ b/src/mongo/replay/BUILD.bazel @@ -28,8 +28,8 @@ mongo_cc_library( "//src/mongo:base", "//src/mongo/client:clientdriver_network", "//src/mongo/db:traffic_reader", - "//src/mongo/db/local_catalog/lock_manager", "//src/mongo/db/query/util:stop_token", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/rpc:message", "//src/mongo/util:periodic_runner", "//src/mongo/util:periodic_runner_factory", diff --git a/src/mongo/rpc/BUILD.bazel b/src/mongo/rpc/BUILD.bazel index dd84504404d..c87c29dd31f 100644 --- a/src/mongo/rpc/BUILD.bazel +++ b/src/mongo/rpc/BUILD.bazel @@ -275,8 +275,8 @@ mongo_cc_fuzzer_test( deps = [ "message", "rpc", - "//src/mongo/db/local_catalog/lock_manager", "//src/mongo/db/query/write_ops:write_ops_parsers", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/transport:message_compressor", ], ) diff --git a/src/mongo/rpc/metadata.cpp b/src/mongo/rpc/metadata.cpp index c4b57440704..2f7da90b4a0 100644 --- a/src/mongo/rpc/metadata.cpp +++ b/src/mongo/rpc/metadata.cpp @@ -42,10 +42,10 @@ #include "mongo/db/dbmessage.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/util/deferred.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/tenant_id.h" -#include "mongo/db/user_write_block/write_block_bypass.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/user_write_block/write_block_bypass.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/rpc/metadata/audit_metadata.h" #include "mongo/rpc/metadata/audit_user_attrs.h" #include "mongo/rpc/metadata/client_metadata.h" diff --git a/src/mongo/s/BUILD.bazel b/src/mongo/s/BUILD.bazel index ef5f03f3f80..7798db49c1c 100644 --- a/src/mongo/s/BUILD.bazel +++ b/src/mongo/s/BUILD.bazel @@ -73,14 +73,14 @@ mongo_cc_library( "transaction_router.cpp", "transaction_router_resource_yielder.cpp", ":router_transactions_stats_gen", - "//src/mongo/db/cluster_parameters:set_cluster_server_parameter_router_impl.cpp", "//src/mongo/db/global_catalog:shard_key_pattern_query_util.cpp", "//src/mongo/db/global_catalog/ddl:cluster_ddl.cpp", - "//src/mongo/db/global_catalog/router_role_api:cluster_commands_helpers.cpp", - "//src/mongo/db/global_catalog/router_role_api:collection_routing_info_targeter.cpp", - "//src/mongo/db/global_catalog/router_role_api:collection_uuid_mismatch.cpp", - "//src/mongo/db/global_catalog/router_role_api:router_role.cpp", - "//src/mongo/db/global_catalog/router_role_api:routing_context.cpp", + "//src/mongo/db/router_role:cluster_commands_helpers.cpp", + "//src/mongo/db/router_role:collection_routing_info_targeter.cpp", + "//src/mongo/db/router_role:collection_uuid_mismatch.cpp", + "//src/mongo/db/router_role:router_role.cpp", + "//src/mongo/db/router_role:routing_context.cpp", + "//src/mongo/db/topology/cluster_parameters:set_cluster_server_parameter_router_impl.cpp", ], deps = [ ":async_requests_sender", @@ -91,9 +91,6 @@ mongo_cc_library( "//src/mongo/db:mongohasher", "//src/mongo/db:shared_request_handling", "//src/mongo/db/commands:txn_cmd_request", - "//src/mongo/db/local_catalog:collection_uuid_mismatch_info", - "//src/mongo/db/local_catalog/lock_manager", - "//src/mongo/db/local_catalog/shard_role_api:resource_yielders", "//src/mongo/db/pipeline/process_interface:mongo_process_interface", "//src/mongo/db/query:query_planner", "//src/mongo/db/query/query_settings:query_settings_service_dependencies", @@ -102,6 +99,9 @@ mongo_cc_library( "//src/mongo/db/session:logical_session_id_helpers", "//src/mongo/db/session:session_catalog", "//src/mongo/db/session:sessions_collection", + "//src/mongo/db/shard_role:resource_yielders", + "//src/mongo/db/shard_role/lock_manager", + "//src/mongo/db/shard_role/shard_catalog:collection_uuid_mismatch_info", "//src/mongo/db/stats:transaction_stats", "//src/mongo/db/timeseries:timeseries_metadata", "//src/mongo/rpc:command_status", @@ -137,7 +137,7 @@ mongo_cc_library( ":analyze_shard_key_common", ":grid", "//src/mongo/db:dbdirectclient", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", ], ) @@ -163,11 +163,11 @@ mongo_cc_library( name = "grid", srcs = [ "balancer_configuration.cpp", - "//src/mongo/db/global_catalog/catalog_cache:catalog_cache.cpp", - "//src/mongo/db/global_catalog/catalog_cache:catalog_cache_loader.cpp", - "//src/mongo/db/global_catalog/catalog_cache:config_server_catalog_cache_loader_impl.cpp", - "//src/mongo/db/global_catalog/catalog_cache:routing_information_cache.cpp", "//src/mongo/db/global_catalog/ddl:shard_util.cpp", + "//src/mongo/db/router_role/routing_cache:catalog_cache.cpp", + "//src/mongo/db/router_role/routing_cache:catalog_cache_loader.cpp", + "//src/mongo/db/router_role/routing_cache:config_server_catalog_cache_loader_impl.cpp", + "//src/mongo/db/router_role/routing_cache:routing_information_cache.cpp", "//src/mongo/db/sharding_environment:cluster_identity_loader.cpp", "//src/mongo/db/sharding_environment:grid.cpp", "//src/mongo/db/sharding_environment:router_uptime_reporter.cpp", @@ -182,8 +182,8 @@ mongo_cc_library( "//src/mongo/db:read_write_concern_defaults", "//src/mongo/db:server_base", "//src/mongo/db/exec:scoped_timer", - "//src/mongo/db/local_catalog/lock_manager", # TODO(SERVER-93876): Remove. "//src/mongo/db/repl:replica_set_messages", # TODO(SERVER-93876): Remove. + "//src/mongo/db/shard_role/lock_manager", # TODO(SERVER-93876): Remove. "//src/mongo/db/update:update_common", # TODO(SERVER-93876): Remove. "//src/mongo/executor:task_executor_pool", "//src/mongo/s/client:shard_interface", @@ -286,7 +286,6 @@ mongo_cc_library( "would_change_owning_shard_exception.cpp", ":balancer_configuration_gen", ":balancer_feature_flag_gen", - "//src/mongo/db/cluster_parameters:sharding_cluster_parameters_gen", "//src/mongo/db/global_catalog:chunk.cpp", "//src/mongo/db/global_catalog:chunk_manager.cpp", "//src/mongo/db/global_catalog:shard_key_pattern.cpp", @@ -305,7 +304,6 @@ mongo_cc_library( "//src/mongo/db/global_catalog:type_remove_shard_event_gen", "//src/mongo/db/global_catalog:type_shard.cpp", "//src/mongo/db/global_catalog:type_tags.cpp", - "//src/mongo/db/global_catalog/catalog_cache:shard_cannot_refresh_due_to_locks_held_exception.cpp", "//src/mongo/db/global_catalog/ddl:add_shard_to_zone_gen", "//src/mongo/db/global_catalog/ddl:cannot_implicitly_create_collection_info.cpp", "//src/mongo/db/global_catalog/ddl:drop_collection_if_uuid_not_matching_gen", @@ -322,13 +320,15 @@ mongo_cc_library( "//src/mongo/db/global_catalog/ddl:shardsvr_join_migrations_request_gen", "//src/mongo/db/global_catalog/ddl:untrack_unsplittable_collection_gen", "//src/mongo/db/global_catalog/metadata_consistency_validation:check_metadata_consistency_gen", - "//src/mongo/db/local_catalog/ddl:clone_catalog_data_gen", - "//src/mongo/db/local_catalog/shard_role_catalog:flush_database_cache_updates_gen", - "//src/mongo/db/local_catalog/shard_role_catalog:flush_routing_table_cache_updates_gen", + "//src/mongo/db/router_role/routing_cache:shard_cannot_refresh_due_to_locks_held_exception.cpp", + "//src/mongo/db/shard_role/ddl:clone_catalog_data_gen", + "//src/mongo/db/shard_role/shard_catalog:flush_database_cache_updates_gen", + "//src/mongo/db/shard_role/shard_catalog:flush_routing_table_cache_updates_gen", "//src/mongo/db/sharding_environment:mongod_and_mongos_server_parameters_gen", "//src/mongo/db/sharding_environment:sharding_feature_flags.cpp", "//src/mongo/db/sharding_environment:sharding_feature_flags_gen", "//src/mongo/db/topology:remove_shard_gen", + "//src/mongo/db/topology/cluster_parameters:sharding_cluster_parameters_gen", "//src/mongo/db/versioning_protocol:get_database_version_gen", "//src/mongo/db/versioning_protocol:shard_version_factory.cpp", "//src/mongo/db/versioning_protocol:stale_exception.cpp", @@ -362,7 +362,7 @@ mongo_cc_library( deps = [ "//src/mongo/client:connection_string", "//src/mongo/db/commands:create_command", - "//src/mongo/db/user_write_block:set_user_write_block_mode_idl", + "//src/mongo/db/topology/user_write_block:set_user_write_block_mode_idl", "//src/mongo/db/matcher:path", "//src/mongo/db:coll_mod_command_idl", "//src/mongo/db:index_commands_idl", @@ -379,8 +379,8 @@ mongo_cc_library( # TODO(SERVER-93876): Remove. "//src/mongo/client:read_preference", "//src/mongo/db/auth:authprivilege", - "//src/mongo/db/local_catalog:collection_options", - "//src/mongo/db/cluster_parameters:cluster_server_parameter_cmds_idl", + "//src/mongo/db/shard_role/shard_catalog:collection_options", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_cmds_idl", "//src/mongo/db/query/query_shape", "//src/mongo/db/storage/key_string", "//src/mongo/db/timeseries:timeseries_options", @@ -445,7 +445,7 @@ mongo_cc_library( "initialize_tenant_to_shard_cache.cpp", "sharding_task_executor_pool_controller.cpp", ":sharding_task_executor_pool_gen", - "//src/mongo/db/global_catalog/router_role_api:routing_table_cache_gossip_metadata_hook.cpp", + "//src/mongo/db/router_role:routing_table_cache_gossip_metadata_hook.cpp", "//src/mongo/db/sharding_environment:sharding_initialization.cpp", "//src/mongo/db/sharding_environment/client:sharding_connection_hook.cpp", "//src/mongo/db/sharding_environment/client:sharding_network_connection_hook.cpp", @@ -500,10 +500,10 @@ mongo_cc_library( "//src/mongo/db:internal_transactions_feature_flag", "//src/mongo/db:not_primary_error_tracker", "//src/mongo/db/commands/query_cmd:bulk_write_common", - "//src/mongo/db/local_catalog:collection_uuid_mismatch_info", "//src/mongo/db/pipeline", "//src/mongo/db/pipeline/process_interface:mongos_process_interface", "//src/mongo/db/query/write_ops:parsed_update", + "//src/mongo/db/shard_role/shard_catalog:collection_uuid_mismatch_info", "//src/mongo/db/storage:storage_options", "//src/mongo/db/timeseries:timeseries_conversion_util", "//src/mongo/db/timeseries:timeseries_metadata", @@ -713,7 +713,7 @@ mongo_cc_library( "mongos_initializers", "mongos_topology_coordinator", "//src/mongo/s/query/exec:cluster_cursor_cleanup_job", - "//src/mongo/db/local_catalog/shard_role_api:resource_yielders", + "//src/mongo/db/shard_role:resource_yielders", "sessions_collection_sharded", "sharding_initialization", "sharding_router_api", @@ -768,10 +768,10 @@ mongo_cc_binary( mongo_cc_library( name = "sharding_test_fixture_common", srcs = [ - "//src/mongo/db/global_catalog/catalog_cache:catalog_cache_loader_mock.cpp", - "//src/mongo/db/global_catalog/catalog_cache:catalog_cache_mock.cpp", - "//src/mongo/db/global_catalog/catalog_cache:config_server_catalog_cache_loader_mock.cpp", - "//src/mongo/db/global_catalog/catalog_cache:shard_server_catalog_cache_loader_mock.cpp", + "//src/mongo/db/router_role/routing_cache:catalog_cache_loader_mock.cpp", + "//src/mongo/db/router_role/routing_cache:catalog_cache_mock.cpp", + "//src/mongo/db/router_role/routing_cache:config_server_catalog_cache_loader_mock.cpp", + "//src/mongo/db/router_role/routing_cache:shard_server_catalog_cache_loader_mock.cpp", "//src/mongo/db/sharding_environment:sharding_test_fixture_common.cpp", ], deps = [ @@ -779,8 +779,8 @@ mongo_cc_library( ":sharding_router_api", "//src/mongo/client:remote_command_targeter_mock", "//src/mongo/db:service_context_test_fixture", - "//src/mongo/db/local_catalog/lock_manager", - "//src/mongo/db/local_catalog/shard_role_api:resource_yielders", + "//src/mongo/db/shard_role:resource_yielders", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/db/transaction", "//src/mongo/executor:network_interface_mock", "//src/mongo/executor:network_test_env", @@ -792,7 +792,7 @@ mongo_cc_library( mongo_cc_library( name = "sharding_mongos_test_fixture", srcs = [ - "//src/mongo/db/global_catalog/catalog_cache:catalog_cache_test_fixture.cpp", + "//src/mongo/db/router_role/routing_cache:catalog_cache_test_fixture.cpp", "//src/mongo/db/sharding_environment:sharding_mongos_test_fixture.cpp", ], deps = [ @@ -841,17 +841,17 @@ mongo_cc_unit_test( "//src/mongo/db/global_catalog:type_mongos_test.cpp", "//src/mongo/db/global_catalog:type_shard_test.cpp", "//src/mongo/db/global_catalog:type_tags_test.cpp", - "//src/mongo/db/global_catalog/catalog_cache:catalog_cache_refresh_test.cpp", - "//src/mongo/db/global_catalog/catalog_cache:catalog_cache_test.cpp", "//src/mongo/db/global_catalog/ddl:add_shard_to_zone_request_test.cpp", "//src/mongo/db/global_catalog/ddl:merge_chunks_request_test.cpp", "//src/mongo/db/global_catalog/ddl:remove_shard_from_zone_request_test.cpp", "//src/mongo/db/global_catalog/ddl:sessions_collection_sharded_test.cpp", - "//src/mongo/db/global_catalog/router_role_api:collection_routing_info_targeter_test.cpp", - "//src/mongo/db/global_catalog/router_role_api:mock_ns_targeter.cpp", - "//src/mongo/db/global_catalog/router_role_api:router_role_test.cpp", - "//src/mongo/db/global_catalog/router_role_api:routing_table_cache_gossip_metadata_hook_test.cpp", - "//src/mongo/db/global_catalog/router_role_api:routing_table_history_test.cpp", + "//src/mongo/db/router_role:collection_routing_info_targeter_test.cpp", + "//src/mongo/db/router_role:mock_ns_targeter.cpp", + "//src/mongo/db/router_role:router_role_test.cpp", + "//src/mongo/db/router_role:routing_table_cache_gossip_metadata_hook_test.cpp", + "//src/mongo/db/router_role:routing_table_history_test.cpp", + "//src/mongo/db/router_role/routing_cache:catalog_cache_refresh_test.cpp", + "//src/mongo/db/router_role/routing_cache:catalog_cache_test.cpp", "//src/mongo/db/sharding_environment:cluster_identity_loader_test.cpp", "//src/mongo/db/sharding_environment/client:config_shard_wrapper_test.cpp", "//src/mongo/db/sharding_environment/client:shard_remote_test.cpp", diff --git a/src/mongo/s/append_raw_responses_test.cpp b/src/mongo/s/append_raw_responses_test.cpp index d270f7d15ff..c0a81c97403 100644 --- a/src/mongo/s/append_raw_responses_test.cpp +++ b/src/mongo/s/append_raw_responses_test.cpp @@ -40,7 +40,6 @@ #include "mongo/client/connection_string.h" #include "mongo/client/remote_command_targeter_mock.h" #include "mongo/db/commands.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/global_catalog/sharding_catalog_client_mock.h" #include "mongo/db/global_catalog/type_shard.h" @@ -48,6 +47,7 @@ #include "mongo/db/operation_context.h" #include "mongo/db/repl/optime_with.h" #include "mongo/db/repl/read_concern_level.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/sharding_environment/sharding_mongos_test_fixture.h" #include "mongo/db/versioning_protocol/chunk_version.h" diff --git a/src/mongo/s/async_requests_sender.h b/src/mongo/s/async_requests_sender.h index 0a5f433dde9..8808a13e392 100644 --- a/src/mongo/s/async_requests_sender.h +++ b/src/mongo/s/async_requests_sender.h @@ -35,8 +35,8 @@ #include "mongo/bson/bsonobj.h" #include "mongo/client/read_preference.h" #include "mongo/db/baton.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielder.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/resource_yielder.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/executor/remote_command_response.h" diff --git a/src/mongo/s/async_rpc_shard_targeter.h b/src/mongo/s/async_rpc_shard_targeter.h index c1fa629b0b5..24aee398ac8 100644 --- a/src/mongo/s/async_rpc_shard_targeter.h +++ b/src/mongo/s/async_rpc_shard_targeter.h @@ -34,9 +34,9 @@ #include "mongo/base/status_with.h" #include "mongo/client/read_preference.h" #include "mongo/client/remote_command_targeter.h" -#include "mongo/db/local_catalog/shard_role_catalog/operation_sharding_state.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" diff --git a/src/mongo/s/balancer_configuration.h b/src/mongo/s/balancer_configuration.h index eb288a2e8c2..c431e457246 100644 --- a/src/mongo/s/balancer_configuration.h +++ b/src/mongo/s/balancer_configuration.h @@ -32,7 +32,7 @@ #include "mongo/base/status.h" #include "mongo/base/status_with.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/lock_manager/d_concurrency.h" +#include "mongo/db/shard_role/lock_manager/d_concurrency.h" #include "mongo/platform/atomic_word.h" #include "mongo/s/balancer_configuration_gen.h" #include "mongo/s/request_types/migration_secondary_throttle_options.h" diff --git a/src/mongo/s/balancer_configuration_test.cpp b/src/mongo/s/balancer_configuration_test.cpp index 4f839d9d076..e93ccaa06cd 100644 --- a/src/mongo/s/balancer_configuration_test.cpp +++ b/src/mongo/s/balancer_configuration_test.cpp @@ -40,7 +40,7 @@ #include "mongo/db/query/query_request_helper.h" #include "mongo/db/repl/optime.h" #include "mongo/db/sharding_environment/sharding_mongos_test_fixture.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/executor/network_test_env.h" #include "mongo/executor/remote_command_request.h" #include "mongo/idl/server_parameter_test_controller.h" diff --git a/src/mongo/s/client_metadata_propagation_egress_hook.cpp b/src/mongo/s/client_metadata_propagation_egress_hook.cpp index 731513c63bd..15b0130b35b 100644 --- a/src/mongo/s/client_metadata_propagation_egress_hook.cpp +++ b/src/mongo/s/client_metadata_propagation_egress_hook.cpp @@ -30,8 +30,8 @@ #include "mongo/s/client_metadata_propagation_egress_hook.h" #include "mongo/db/operation_context.h" -#include "mongo/db/raw_data_operation.h" -#include "mongo/db/user_write_block/write_block_bypass.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" +#include "mongo/db/topology/user_write_block/write_block_bypass.h" #include "mongo/idl/generic_argument_gen.h" #include "mongo/rpc/metadata/audit_metadata.h" #include "mongo/rpc/metadata/client_metadata.h" diff --git a/src/mongo/s/cluster_write.cpp b/src/mongo/s/cluster_write.cpp index d414648054e..5a75bae7840 100644 --- a/src/mongo/s/cluster_write.cpp +++ b/src/mongo/s/cluster_write.cpp @@ -31,10 +31,10 @@ #include "mongo/s/cluster_write.h" #include "mongo/db/fle_crud.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" -#include "mongo/db/global_catalog/router_role_api/ns_targeter.h" #include "mongo/db/not_primary_error_tracker.h" #include "mongo/db/query/shard_key_diagnostic_printer.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" +#include "mongo/db/router_role/ns_targeter.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/logv2/log.h" #include "mongo/s/write_ops/bulk_write_exec.h" diff --git a/src/mongo/s/commands/BUILD.bazel b/src/mongo/s/commands/BUILD.bazel index 477bd8c811f..bf3cf4eac05 100644 --- a/src/mongo/s/commands/BUILD.bazel +++ b/src/mongo/s/commands/BUILD.bazel @@ -23,7 +23,7 @@ idl_generator( mongo_cc_library( name = "sharded_cluster_sharding_commands", srcs = [ - "//src/mongo/db/global_catalog/catalog_cache:flush_router_config_cmd.cpp", + "//src/mongo/db/router_role/routing_cache:flush_router_config_cmd.cpp", "//src/mongo/db/topology:get_shard_map_cmd.cpp", ], deps = [ @@ -33,7 +33,7 @@ mongo_cc_library( "//src/mongo/db/fts:base_fts", "//src/mongo/db/index:expression_params", "//src/mongo/db/index:index_access_method", - "//src/mongo/db/local_catalog:index_key_validate", + "//src/mongo/db/shard_role/shard_catalog:index_key_validate", "//src/mongo/s:grid", ], ) @@ -111,8 +111,6 @@ mongo_cc_library( "internal_transactions_test_command_s.cpp", "s_read_write_concern_defaults_server_status.cpp", ":cluster_fsync_unlock_cmd_gen", - "//src/mongo/db/cluster_parameters:cluster_get_cluster_parameter_cmd.cpp", - "//src/mongo/db/cluster_parameters:cluster_set_cluster_parameter_cmd.cpp", "//src/mongo/db/global_catalog/ddl:cluster_collection_mod_cmd.cpp", "//src/mongo/db/global_catalog/ddl:cluster_convert_to_capped_cmd.cpp", "//src/mongo/db/global_catalog/ddl:cluster_create_cmd.cpp", @@ -133,14 +131,16 @@ mongo_cc_library( "//src/mongo/db/global_catalog/ddl:cluster_untrack_unsplittable_collection.cpp", "//src/mongo/db/global_catalog/ddl:refine_collection_shard_key_gen", "//src/mongo/db/global_catalog/ddl:shard_collection_gen", - "//src/mongo/db/local_catalog:cluster_coll_stats_cmd.cpp", - "//src/mongo/db/local_catalog:cluster_db_stats_cmd.cpp", - "//src/mongo/db/local_catalog:cluster_validate_db_metadata_cmd.cpp", - "//src/mongo/db/local_catalog/lock_manager:cluster_lock_info_cmd.cpp", + "//src/mongo/db/shard_role/lock_manager:cluster_lock_info_cmd.cpp", + "//src/mongo/db/shard_role/shard_catalog:cluster_coll_stats_cmd.cpp", + "//src/mongo/db/shard_role/shard_catalog:cluster_db_stats_cmd.cpp", + "//src/mongo/db/shard_role/shard_catalog:cluster_validate_db_metadata_cmd.cpp", "//src/mongo/db/sharding_environment:cluster_commands_gen", "//src/mongo/db/sharding_environment:cluster_is_db_grid_cmd.cpp", "//src/mongo/db/sharding_environment:cluster_multicast_cmd.cpp", - "//src/mongo/db/user_write_block:cluster_set_user_write_block_mode_command.cpp", + "//src/mongo/db/topology/cluster_parameters:cluster_get_cluster_parameter_cmd.cpp", + "//src/mongo/db/topology/cluster_parameters:cluster_set_cluster_parameter_cmd.cpp", + "//src/mongo/db/topology/user_write_block:cluster_set_user_write_block_mode_command.cpp", "//src/mongo/db/versioning_protocol:cluster_get_database_version_cmd.cpp", "//src/mongo/db/versioning_protocol:cluster_get_shard_version_cmd.cpp", "//src/mongo/s/commands/commit_quorum:cluster_set_index_commit_quorum_cmd.cpp", @@ -189,7 +189,6 @@ mongo_cc_library( "//src/mongo/db:shared_request_handling", "//src/mongo/db:validate_api_parameters", "//src/mongo/db/auth:auth_checks", - "//src/mongo/db/cluster_parameters:cluster_server_parameter_cmds_idl", "//src/mongo/db/commands:buildinfo_common", "//src/mongo/db/commands:cluster_server_parameter_commands_invocation", "//src/mongo/db/commands:core", @@ -209,10 +208,6 @@ mongo_cc_library( "//src/mongo/db/commands/query_cmd:map_reduce_parser", "//src/mongo/db/commands/query_cmd:search_index_commands", "//src/mongo/db/ftdc:ftdc_server", - "//src/mongo/db/local_catalog:collection_uuid_mismatch_info", - "//src/mongo/db/local_catalog:validate_db_metadata_command", - "//src/mongo/db/local_catalog/ddl:rename_collection_idl", - "//src/mongo/db/local_catalog/lock_manager:lock_info_command", "//src/mongo/db/matcher:expressions_mongod_only", "//src/mongo/db/query:command_request_response", "//src/mongo/db/query:map_reduce_output_format", @@ -225,12 +220,17 @@ mongo_cc_library( "//src/mongo/db/repl:repl_server_parameters", "//src/mongo/db/repl/hello:hello_auth", "//src/mongo/db/repl/hello:hello_command", + "//src/mongo/db/shard_role/ddl:rename_collection_idl", + "//src/mongo/db/shard_role/lock_manager:lock_info_command", + "//src/mongo/db/shard_role/shard_catalog:collection_uuid_mismatch_info", + "//src/mongo/db/shard_role/shard_catalog:validate_db_metadata_command", "//src/mongo/db/stats:api_version_metrics", "//src/mongo/db/stats:counters", "//src/mongo/db/timeseries:timeseries_conversion_util", "//src/mongo/db/timeseries:timeseries_options", + "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter_cmds_idl", + "//src/mongo/db/topology/user_write_block:set_user_write_block_mode_idl", "//src/mongo/db/transaction:transaction_api", - "//src/mongo/db/user_write_block:set_user_write_block_mode_idl", "//src/mongo/db/views", "//src/mongo/executor:async_multicaster", "//src/mongo/executor:async_request_executor", @@ -320,7 +320,7 @@ mongo_cc_unit_test( name = "s_commands_test", srcs = [ "document_shard_key_update_test.cpp", - "//src/mongo/db/local_catalog:cluster_validate_db_metadata_cmd_test.cpp", + "//src/mongo/db/shard_role/shard_catalog:cluster_validate_db_metadata_cmd_test.cpp", "//src/mongo/db/sharding_environment:cluster_command_test_fixture.cpp", "//src/mongo/s/commands/query_cmd:cluster_aggregate_test.cpp", "//src/mongo/s/commands/query_cmd:cluster_bulk_write_test.cpp", diff --git a/src/mongo/s/commands/cluster_analyze_shard_key_cmd.cpp b/src/mongo/s/commands/cluster_analyze_shard_key_cmd.cpp index 33dbbd04e7b..97680742bd7 100644 --- a/src/mongo/s/commands/cluster_analyze_shard_key_cmd.cpp +++ b/src/mongo/s/commands/cluster_analyze_shard_key_cmd.cpp @@ -38,12 +38,12 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/read_concern_args.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" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" diff --git a/src/mongo/s/commands/cluster_auto_split_vector_cmd.cpp b/src/mongo/s/commands/cluster_auto_split_vector_cmd.cpp index e94c3c0ec78..1c2ad5ded84 100644 --- a/src/mongo/s/commands/cluster_auto_split_vector_cmd.cpp +++ b/src/mongo/s/commands/cluster_auto_split_vector_cmd.cpp @@ -30,10 +30,10 @@ #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/commands.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/service_context.h" #include "mongo/s/request_types/auto_split_vector_gen.h" diff --git a/src/mongo/s/commands/cluster_clear_jumbo_flag_cmd.cpp b/src/mongo/s/commands/cluster_clear_jumbo_flag_cmd.cpp index 1ec85adb739..90e800e0f7a 100644 --- a/src/mongo/s/commands/cluster_clear_jumbo_flag_cmd.cpp +++ b/src/mongo/s/commands/cluster_clear_jumbo_flag_cmd.cpp @@ -35,16 +35,16 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/global_catalog/shard_key_pattern_query_util.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/namespace_string.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" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/cluster_commands_gen.h" diff --git a/src/mongo/s/commands/cluster_configure_query_analyzer_cmd.cpp b/src/mongo/s/commands/cluster_configure_query_analyzer_cmd.cpp index 3b57b5126e4..dd2e6a99564 100644 --- a/src/mongo/s/commands/cluster_configure_query_analyzer_cmd.cpp +++ b/src/mongo/s/commands/cluster_configure_query_analyzer_cmd.cpp @@ -36,11 +36,11 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/namespace_string.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" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" diff --git a/src/mongo/s/commands/cluster_filemd5_cmd.cpp b/src/mongo/s/commands/cluster_filemd5_cmd.cpp index 5213898656a..e9e3ca78d2b 100644 --- a/src/mongo/s/commands/cluster_filemd5_cmd.cpp +++ b/src/mongo/s/commands/cluster_filemd5_cmd.cpp @@ -43,13 +43,13 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/legacy_runtime_constants_gen.h" #include "mongo/db/query/collation/collation_spec.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/executor/remote_command_response.h" diff --git a/src/mongo/s/commands/cluster_fle2_cleanup_cmd.cpp b/src/mongo/s/commands/cluster_fle2_cleanup_cmd.cpp index c0e49846ec7..5264ea76293 100644 --- a/src/mongo/s/commands/cluster_fle2_cleanup_cmd.cpp +++ b/src/mongo/s/commands/cluster_fle2_cleanup_cmd.cpp @@ -41,10 +41,10 @@ #include "mongo/db/commands/fle2_cleanup_gen.h" #include "mongo/db/curop.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/namespace_string.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" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" diff --git a/src/mongo/s/commands/cluster_fle2_compact_cmd.cpp b/src/mongo/s/commands/cluster_fle2_compact_cmd.cpp index 5ba6b326a62..920dfeef219 100644 --- a/src/mongo/s/commands/cluster_fle2_compact_cmd.cpp +++ b/src/mongo/s/commands/cluster_fle2_compact_cmd.cpp @@ -41,10 +41,10 @@ #include "mongo/db/commands/fle2_compact_gen.h" #include "mongo/db/curop.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/namespace_string.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" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" diff --git a/src/mongo/s/commands/cluster_fle2_get_count_info_cmd.cpp b/src/mongo/s/commands/cluster_fle2_get_count_info_cmd.cpp index 4969a2e5764..19a886b055b 100644 --- a/src/mongo/s/commands/cluster_fle2_get_count_info_cmd.cpp +++ b/src/mongo/s/commands/cluster_fle2_get_count_info_cmd.cpp @@ -40,12 +40,12 @@ #include "mongo/db/commands/fle2_get_count_info_command_gen.h" #include "mongo/db/curop.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/read_concern_support_result.h" #include "mongo/db/repl/read_concern_level.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/executor/remote_command_response.h" diff --git a/src/mongo/s/commands/cluster_fsync_unlock_cmd.cpp b/src/mongo/s/commands/cluster_fsync_unlock_cmd.cpp index 7dd3fb0ba6f..cf30a7606be 100644 --- a/src/mongo/s/commands/cluster_fsync_unlock_cmd.cpp +++ b/src/mongo/s/commands/cluster_fsync_unlock_cmd.cpp @@ -32,7 +32,7 @@ #include "mongo/client/remote_command_targeter.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/commands.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" diff --git a/src/mongo/s/commands/cluster_hello_cmd.cpp b/src/mongo/s/commands/cluster_hello_cmd.cpp index 2560ffa547f..a82ffdffaf2 100644 --- a/src/mongo/s/commands/cluster_hello_cmd.cpp +++ b/src/mongo/s/commands/cluster_hello_cmd.cpp @@ -44,7 +44,6 @@ #include "mongo/db/commands/test_commands_enabled.h" #include "mongo/db/curop.h" #include "mongo/db/database_name.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/write_ops.h" #include "mongo/db/read_concern_support_result.h" @@ -54,6 +53,7 @@ #include "mongo/db/server_parameter.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/sharding_environment/mongos_hello_response.h" #include "mongo/db/tenant_id.h" #include "mongo/db/topology/mongos_topology_coordinator.h" diff --git a/src/mongo/s/commands/cluster_move_chunk_cmd.cpp b/src/mongo/s/commands/cluster_move_chunk_cmd.cpp index b5a6dbbb3e8..39f83c94343 100644 --- a/src/mongo/s/commands/cluster_move_chunk_cmd.cpp +++ b/src/mongo/s/commands/cluster_move_chunk_cmd.cpp @@ -40,15 +40,15 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/global_catalog/shard_key_pattern_query_util.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/namespace_string.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" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/cluster_commands_gen.h" diff --git a/src/mongo/s/commands/cluster_oplog_note_cmd.cpp b/src/mongo/s/commands/cluster_oplog_note_cmd.cpp index db01874353c..647dd281f0d 100644 --- a/src/mongo/s/commands/cluster_oplog_note_cmd.cpp +++ b/src/mongo/s/commands/cluster_oplog_note_cmd.cpp @@ -41,8 +41,8 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.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" diff --git a/src/mongo/s/commands/cluster_query_settings_cmds.cpp b/src/mongo/s/commands/cluster_query_settings_cmds.cpp index 1cd28b9af20..4fa03fbefb6 100644 --- a/src/mongo/s/commands/cluster_query_settings_cmds.cpp +++ b/src/mongo/s/commands/cluster_query_settings_cmds.cpp @@ -34,7 +34,6 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/privilege.h" #include "mongo/db/auth/resource_pattern.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_refresher.h" #include "mongo/db/commands.h" #include "mongo/db/commands/query_cmd/query_settings_cmds_gen.h" #include "mongo/db/database_name.h" @@ -43,6 +42,7 @@ #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_refresher.h" #include "mongo/db/topology/shard_registry.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/s/commands/cluster_query_without_shard_key_cmd.cpp b/src/mongo/s/commands/cluster_query_without_shard_key_cmd.cpp index 1e1c113f6f3..f2f47e67852 100644 --- a/src/mongo/s/commands/cluster_query_without_shard_key_cmd.cpp +++ b/src/mongo/s/commands/cluster_query_without_shard_key_cmd.cpp @@ -44,11 +44,7 @@ #include "mongo/db/commands/query_cmd/explain_gen.h" #include "mongo/db/database_name.h" #include "mongo/db/exec/document_value/document.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/global_catalog/shard_key_pattern_query_util.h" #include "mongo/db/global_catalog/type_collection_common_types_gen.h" #include "mongo/db/namespace_string.h" @@ -68,9 +64,13 @@ #include "mongo/db/query/write_ops/update_request.h" #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" +#include "mongo/db/router_role/router_role.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" diff --git a/src/mongo/s/commands/cluster_reshard_collection_cmd.cpp b/src/mongo/s/commands/cluster_reshard_collection_cmd.cpp index 40386e2a2ad..7f40e4dbf7f 100644 --- a/src/mongo/s/commands/cluster_reshard_collection_cmd.cpp +++ b/src/mongo/s/commands/cluster_reshard_collection_cmd.cpp @@ -38,11 +38,11 @@ #include "mongo/db/commands.h" #include "mongo/db/feature_flag.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/namespace_string.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" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" diff --git a/src/mongo/s/commands/cluster_rwc_defaults_commands.cpp b/src/mongo/s/commands/cluster_rwc_defaults_commands.cpp index 0896428afd2..c34e100fc16 100644 --- a/src/mongo/s/commands/cluster_rwc_defaults_commands.cpp +++ b/src/mongo/s/commands/cluster_rwc_defaults_commands.cpp @@ -41,11 +41,11 @@ #include "mongo/db/commands.h" #include "mongo/db/commands/rwc_defaults_commands_gen.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/read_write_concern_defaults.h" #include "mongo/db/read_write_concern_defaults_gen.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/db/sharding_environment/grid.h" diff --git a/src/mongo/s/commands/cluster_split_cmd.cpp b/src/mongo/s/commands/cluster_split_cmd.cpp index 1cdd856cf0c..ca3df84b867 100644 --- a/src/mongo/s/commands/cluster_split_cmd.cpp +++ b/src/mongo/s/commands/cluster_split_cmd.cpp @@ -41,17 +41,17 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/field_parser.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/shard_util.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/global_catalog/shard_key_pattern_query_util.h" #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/operation_context.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" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" diff --git a/src/mongo/s/commands/cluster_split_vector_cmd.cpp b/src/mongo/s/commands/cluster_split_vector_cmd.cpp index e4368e21ef1..12dbc9f5327 100644 --- a/src/mongo/s/commands/cluster_split_vector_cmd.cpp +++ b/src/mongo/s/commands/cluster_split_vector_cmd.cpp @@ -40,10 +40,10 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/topology/shard_registry.h" diff --git a/src/mongo/s/commands/cluster_user_management_commands.cpp b/src/mongo/s/commands/cluster_user_management_commands.cpp index ea5e8f3555e..c6972983d5c 100644 --- a/src/mongo/s/commands/cluster_user_management_commands.cpp +++ b/src/mongo/s/commands/cluster_user_management_commands.cpp @@ -42,10 +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/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/namespace_string.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/grid.h" #include "mongo/db/write_concern_options.h" diff --git a/src/mongo/s/commands/cluster_validate_cmd.cpp b/src/mongo/s/commands/cluster_validate_cmd.cpp index c67ca7b6b17..0b5c08ec099 100644 --- a/src/mongo/s/commands/cluster_validate_cmd.cpp +++ b/src/mongo/s/commands/cluster_validate_cmd.cpp @@ -39,12 +39,12 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" -#include "mongo/db/local_catalog/ddl/create_indexes_gen.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/ddl/create_indexes_gen.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/timeseries/timeseries_commands_conversion_helper.h" diff --git a/src/mongo/s/commands/cluster_write_without_shard_key_cmd.cpp b/src/mongo/s/commands/cluster_write_without_shard_key_cmd.cpp index cfa5efde8d2..a278241ac55 100644 --- a/src/mongo/s/commands/cluster_write_without_shard_key_cmd.cpp +++ b/src/mongo/s/commands/cluster_write_without_shard_key_cmd.cpp @@ -45,10 +45,7 @@ #include "mongo/db/database_name.h" #include "mongo/db/exec/document_value/document_metadata_fields.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" #include "mongo/db/matcher/extensions_callback_noop.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" @@ -63,8 +60,11 @@ #include "mongo/db/query/write_ops/parsed_update.h" #include "mongo/db/query/write_ops/update_request.h" #include "mongo/db/query/write_ops/write_ops_gen.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" diff --git a/src/mongo/s/commands/commit_quorum/cluster_set_index_commit_quorum_cmd.cpp b/src/mongo/s/commands/commit_quorum/cluster_set_index_commit_quorum_cmd.cpp index 5663af90639..2b2821579b1 100644 --- a/src/mongo/s/commands/commit_quorum/cluster_set_index_commit_quorum_cmd.cpp +++ b/src/mongo/s/commands/commit_quorum/cluster_set_index_commit_quorum_cmd.cpp @@ -39,11 +39,11 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/namespace_string.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" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/s/commands/data_movement/cluster_move_collection_cmd.cpp b/src/mongo/s/commands/data_movement/cluster_move_collection_cmd.cpp index 356f79bfd83..e7b8069b253 100644 --- a/src/mongo/s/commands/data_movement/cluster_move_collection_cmd.cpp +++ b/src/mongo/s/commands/data_movement/cluster_move_collection_cmd.cpp @@ -31,7 +31,7 @@ #include "mongo/db/commands.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/logv2/log.h" #include "mongo/s/request_types/reshard_collection_gen.h" diff --git a/src/mongo/s/commands/data_movement/cluster_rewrite_collection_cmd.cpp b/src/mongo/s/commands/data_movement/cluster_rewrite_collection_cmd.cpp index f403c6bc33e..6bb648fdbda 100644 --- a/src/mongo/s/commands/data_movement/cluster_rewrite_collection_cmd.cpp +++ b/src/mongo/s/commands/data_movement/cluster_rewrite_collection_cmd.cpp @@ -31,7 +31,7 @@ #include "mongo/db/commands.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/logv2/log.h" #include "mongo/s/request_types/reshard_collection_gen.h" diff --git a/src/mongo/s/commands/data_movement/cluster_unshard_collection_cmd.cpp b/src/mongo/s/commands/data_movement/cluster_unshard_collection_cmd.cpp index 82d8ab2de7d..c93e35cb878 100644 --- a/src/mongo/s/commands/data_movement/cluster_unshard_collection_cmd.cpp +++ b/src/mongo/s/commands/data_movement/cluster_unshard_collection_cmd.cpp @@ -31,7 +31,7 @@ #include "mongo/db/commands.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/logv2/log.h" #include "mongo/s/request_types/reshard_collection_gen.h" diff --git a/src/mongo/s/commands/document_shard_key_update_util.cpp b/src/mongo/s/commands/document_shard_key_update_util.cpp index 5e2c33f721b..d2eeae55b60 100644 --- a/src/mongo/s/commands/document_shard_key_update_util.cpp +++ b/src/mongo/s/commands/document_shard_key_update_util.cpp @@ -31,11 +31,11 @@ #include "mongo/base/status.h" #include "mongo/crypto/fle_field_schema_gen.h" #include "mongo/db/commands/txn_cmds_gen.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/write_ops/write_ops_gen.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/logv2/log.h" #include "mongo/platform/compiler.h" #include "mongo/rpc/op_msg.h" diff --git a/src/mongo/s/commands/internal_transactions_test_command_s.cpp b/src/mongo/s/commands/internal_transactions_test_command_s.cpp index 14fad081732..af5a687dda3 100644 --- a/src/mongo/s/commands/internal_transactions_test_command_s.cpp +++ b/src/mongo/s/commands/internal_transactions_test_command_s.cpp @@ -30,8 +30,8 @@ #include "mongo/base/status.h" #include "mongo/base/string_data.h" #include "mongo/db/commands.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielder.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/resource_yielder.h" #include "mongo/db/transaction/transaction_api.h" #include "mongo/executor/inline_executor.h" #include "mongo/executor/task_executor.h" diff --git a/src/mongo/s/commands/query_cmd/cluster_analyze_cmd.cpp b/src/mongo/s/commands/query_cmd/cluster_analyze_cmd.cpp index d861713c965..c2208ff6450 100644 --- a/src/mongo/s/commands/query_cmd/cluster_analyze_cmd.cpp +++ b/src/mongo/s/commands/query_cmd/cluster_analyze_cmd.cpp @@ -35,13 +35,13 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/commands.h" #include "mongo/db/feature_flag.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/legacy_runtime_constants_gen.h" #include "mongo/db/query/analyze_command_gen.h" #include "mongo/db/query/query_feature_flags_gen.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" diff --git a/src/mongo/s/commands/query_cmd/cluster_bulk_write_cmd.h b/src/mongo/s/commands/query_cmd/cluster_bulk_write_cmd.h index a9f55c6e406..3d596daba43 100644 --- a/src/mongo/s/commands/query_cmd/cluster_bulk_write_cmd.h +++ b/src/mongo/s/commands/query_cmd/cluster_bulk_write_cmd.h @@ -44,7 +44,6 @@ #include "mongo/db/curop.h" #include "mongo/db/database_name.h" #include "mongo/db/feature_flag.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" #include "mongo/db/initialize_operation_session_info.h" #include "mongo/db/namespace_string.h" #include "mongo/db/not_primary_error_tracker.h" @@ -53,6 +52,7 @@ #include "mongo/db/query/find_common.h" #include "mongo/db/query/shard_key_diagnostic_printer.h" #include "mongo/db/repl/read_concern_args.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id_gen.h" diff --git a/src/mongo/s/commands/query_cmd/cluster_count_cmd.h b/src/mongo/s/commands/query_cmd/cluster_count_cmd.h index bdda978c5ff..e657f4039cb 100644 --- a/src/mongo/s/commands/query_cmd/cluster_count_cmd.h +++ b/src/mongo/s/commands/query_cmd/cluster_count_cmd.h @@ -34,9 +34,6 @@ #include "mongo/db/auth/validated_tenancy_scope.h" #include "mongo/db/commands.h" #include "mongo/db/fle_crud.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/pipeline/expression_context_diagnostic_printer.h" #include "mongo/db/pipeline/query_request_conversion.h" @@ -46,8 +43,11 @@ #include "mongo/db/query/shard_key_diagnostic_printer.h" #include "mongo/db/query/timeseries/timeseries_translation.h" #include "mongo/db/query/view_response_formatter.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/server_feature_flags_gen.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/version_context.h" #include "mongo/db/views/resolved_view.h" #include "mongo/platform/overflow_arithmetic.h" 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 660c517a431..5d5beb2bc07 100644 --- a/src/mongo/s/commands/query_cmd/cluster_distinct_cmd.cpp +++ b/src/mongo/s/commands/query_cmd/cluster_distinct_cmd.cpp @@ -47,9 +47,6 @@ #include "mongo/db/commands.h" #include "mongo/db/database_name.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/logical_time.h" #include "mongo/db/matcher/extensions_callback_noop.h" #include "mongo/db/matcher/extensions_callback_real.h" @@ -73,12 +70,15 @@ #include "mongo/db/query/shard_key_diagnostic_printer.h" #include "mongo/db/query/timeseries/timeseries_translation.h" #include "mongo/db/query/view_response_formatter.h" -#include "mongo/db/raw_data_operation.h" #include "mongo/db/read_concern_support_result.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/read_concern_level.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/tenant_id.h" #include "mongo/db/version_context.h" diff --git a/src/mongo/s/commands/query_cmd/cluster_explain.cpp b/src/mongo/s/commands/query_cmd/cluster_explain.cpp index eda085388fa..36cf9e41360 100644 --- a/src/mongo/s/commands/query_cmd/cluster_explain.cpp +++ b/src/mongo/s/commands/query_cmd/cluster_explain.cpp @@ -39,7 +39,7 @@ #include "mongo/client/connection_string.h" #include "mongo/db/pipeline/sharded_agg_helpers.h" #include "mongo/db/query/explain_common.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.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 6785934692a..552d332a4a6 100644 --- a/src/mongo/s/commands/query_cmd/cluster_explain_cmd.cpp +++ b/src/mongo/s/commands/query_cmd/cluster_explain_cmd.cpp @@ -41,9 +41,9 @@ #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/explain_options.h" -#include "mongo/db/raw_data_operation.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/idl/command_generic_argument.h" #include "mongo/idl/idl_parser.h" #include "mongo/rpc/op_msg.h" diff --git a/src/mongo/s/commands/query_cmd/cluster_find_and_modify_cmd.cpp b/src/mongo/s/commands/query_cmd/cluster_find_and_modify_cmd.cpp index 7356f056f03..48cca5b4d7e 100644 --- a/src/mongo/s/commands/query_cmd/cluster_find_and_modify_cmd.cpp +++ b/src/mongo/s/commands/query_cmd/cluster_find_and_modify_cmd.cpp @@ -48,24 +48,24 @@ #include "mongo/db/feature_flag.h" #include "mongo/db/fle_crud.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/cluster_ddl.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" #include "mongo/db/global_catalog/shard_key_pattern_query_util.h" #include "mongo/db/global_catalog/type_collection_common_types_gen.h" #include "mongo/db/internal_transactions_feature_flag_gen.h" -#include "mongo/db/local_catalog/document_validation.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/legacy_runtime_constants_gen.h" #include "mongo/db/pipeline/variables.h" #include "mongo/db/query/shard_key_diagnostic_printer.h" #include "mongo/db/query/write_ops/write_ops_gen.h" -#include "mongo/db/raw_data_operation.h" #include "mongo/db/repl/read_concern_args.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/stats/counters.h" diff --git a/src/mongo/s/commands/query_cmd/cluster_find_cmd.h b/src/mongo/s/commands/query_cmd/cluster_find_cmd.h index 2929fc0de73..30a3c8cb309 100644 --- a/src/mongo/s/commands/query_cmd/cluster_find_cmd.h +++ b/src/mongo/s/commands/query_cmd/cluster_find_cmd.h @@ -34,9 +34,6 @@ #include "mongo/db/auth/validated_tenancy_scope.h" #include "mongo/db/commands.h" #include "mongo/db/fle_crud.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/pipeline/expression_context_diagnostic_printer.h" #include "mongo/db/pipeline/query_request_conversion.h" @@ -51,8 +48,11 @@ #include "mongo/db/query/query_stats/query_stats.h" #include "mongo/db/query/shard_key_diagnostic_printer.h" #include "mongo/db/query/util/cluster_find_util.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/server_feature_flags_gen.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/timeseries/timeseries_request_util.h" #include "mongo/db/views/resolved_view.h" #include "mongo/idl/generic_argument_gen.h" diff --git a/src/mongo/s/commands/query_cmd/cluster_index_filter_cmd.cpp b/src/mongo/s/commands/query_cmd/cluster_index_filter_cmd.cpp index 14bfc00ba44..ee0d27265da 100644 --- a/src/mongo/s/commands/query_cmd/cluster_index_filter_cmd.cpp +++ b/src/mongo/s/commands/query_cmd/cluster_index_filter_cmd.cpp @@ -39,12 +39,12 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/legacy_runtime_constants_gen.h" #include "mongo/db/query/collation/collation_spec.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/shard_id.h" diff --git a/src/mongo/s/commands/query_cmd/cluster_map_reduce_agg.cpp b/src/mongo/s/commands/query_cmd/cluster_map_reduce_agg.cpp index 10431d1f89f..fd618c57139 100644 --- a/src/mongo/s/commands/query_cmd/cluster_map_reduce_agg.cpp +++ b/src/mongo/s/commands/query_cmd/cluster_map_reduce_agg.cpp @@ -43,10 +43,7 @@ #include "mongo/db/commands/query_cmd/mr_common.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/document_value/value.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" -#include "mongo/db/local_catalog/document_validation.h" #include "mongo/db/namespace_string.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/expression_context.h" @@ -62,6 +59,9 @@ #include "mongo/db/query/explain_common.h" #include "mongo/db/query/map_reduce_output_format.h" #include "mongo/db/query/shard_key_diagnostic_printer.h" +#include "mongo/db/router_role/router_role.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/shard_role/shard_catalog/document_validation.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/version_context.h" #include "mongo/executor/task_executor_pool.h" diff --git a/src/mongo/s/commands/query_cmd/cluster_pipeline_cmd.h b/src/mongo/s/commands/query_cmd/cluster_pipeline_cmd.h index 417d4d05d0e..08f2f0a4054 100644 --- a/src/mongo/s/commands/query_cmd/cluster_pipeline_cmd.h +++ b/src/mongo/s/commands/query_cmd/cluster_pipeline_cmd.h @@ -33,10 +33,10 @@ #include "mongo/db/auth/authorization_checks.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/commands.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/lite_parsed_pipeline.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/views/resolved_view.h" #include "mongo/s/query/planner/cluster_aggregate.h" diff --git a/src/mongo/s/commands/query_cmd/cluster_plan_cache_clear_cmd.cpp b/src/mongo/s/commands/query_cmd/cluster_plan_cache_clear_cmd.cpp index c7ebef08794..4a2024da80d 100644 --- a/src/mongo/s/commands/query_cmd/cluster_plan_cache_clear_cmd.cpp +++ b/src/mongo/s/commands/query_cmd/cluster_plan_cache_clear_cmd.cpp @@ -40,12 +40,12 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/legacy_runtime_constants_gen.h" #include "mongo/db/query/collation/collation_spec.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/shard_id.h" diff --git a/src/mongo/s/commands/query_cmd/cluster_write_cmd.cpp b/src/mongo/s/commands/query_cmd/cluster_write_cmd.cpp index a312136117f..b0bcdeb18dc 100644 --- a/src/mongo/s/commands/query_cmd/cluster_write_cmd.cpp +++ b/src/mongo/s/commands/query_cmd/cluster_write_cmd.cpp @@ -42,14 +42,14 @@ #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/cluster_ddl.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" #include "mongo/db/internal_transactions_feature_flag_gen.h" #include "mongo/db/pipeline/expression_context_builder.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/sharding_environment/client/num_hosts_targeted_metrics.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" diff --git a/src/mongo/s/commands/query_cmd/cluster_write_cmd.h b/src/mongo/s/commands/query_cmd/cluster_write_cmd.h index d74f42569e4..e5c8286aafa 100644 --- a/src/mongo/s/commands/query_cmd/cluster_write_cmd.h +++ b/src/mongo/s/commands/query_cmd/cluster_write_cmd.h @@ -36,7 +36,6 @@ #include "mongo/db/commands.h" #include "mongo/db/commands/query_cmd/update_metrics.h" #include "mongo/db/commands/query_cmd/write_commands_common.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" #include "mongo/db/namespace_string.h" #include "mongo/db/not_primary_error_tracker.h" #include "mongo/db/operation_context.h" @@ -44,6 +43,7 @@ #include "mongo/db/query/explain_options.h" #include "mongo/db/query/explain_verbosity_gen.h" #include "mongo/db/query/write_ops/write_ops_gen.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" #include "mongo/db/service_context.h" #include "mongo/rpc/message.h" #include "mongo/rpc/op_msg.h" diff --git a/src/mongo/s/commands/storage_engine/cluster_data_size_cmd.cpp b/src/mongo/s/commands/storage_engine/cluster_data_size_cmd.cpp index 56bf6b90ad0..5a57833e11e 100644 --- a/src/mongo/s/commands/storage_engine/cluster_data_size_cmd.cpp +++ b/src/mongo/s/commands/storage_engine/cluster_data_size_cmd.cpp @@ -37,11 +37,11 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/dbcommands_gen.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/namespace_string.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" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/executor/remote_command_response.h" diff --git a/src/mongo/s/commands/storage_engine/cluster_fsync_cmd.cpp b/src/mongo/s/commands/storage_engine/cluster_fsync_cmd.cpp index 22349ab6fbf..a77d738ba24 100644 --- a/src/mongo/s/commands/storage_engine/cluster_fsync_cmd.cpp +++ b/src/mongo/s/commands/storage_engine/cluster_fsync_cmd.cpp @@ -41,8 +41,8 @@ #include "mongo/db/auth/resource_pattern.h" #include "mongo/db/commands.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.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/db/sharding_environment/grid.h" diff --git a/src/mongo/s/commands/strategy.cpp b/src/mongo/s/commands/strategy.cpp index 26e7b3204d4..82472724c8b 100644 --- a/src/mongo/s/commands/strategy.cpp +++ b/src/mongo/s/commands/strategy.cpp @@ -48,7 +48,6 @@ #include "mongo/db/default_max_time_ms_cluster_parameter.h" #include "mongo/db/error_labels.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/ddl/cannot_implicitly_create_collection_info.h" #include "mongo/db/global_catalog/ddl/cluster_ddl.h" #include "mongo/db/initialize_operation_session_info.h" @@ -67,6 +66,7 @@ #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/replica_set_endpoint_util.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" @@ -75,9 +75,9 @@ #include "mongo/db/stats/api_version_metrics.h" #include "mongo/db/stats/counters.h" #include "mongo/db/topology/mongos_topology_coordinator.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/transaction_validation.h" #include "mongo/db/validate_api_parameters.h" -#include "mongo/db/vector_clock/vector_clock.h" #include "mongo/db/versioning_protocol/stale_exception.h" #include "mongo/db/write_concern_options.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/s/mongos_main.cpp b/src/mongo/s/mongos_main.cpp index 67a24829be9..6ecf08349e6 100644 --- a/src/mongo/s/mongos_main.cpp +++ b/src/mongo/s/mongos_main.cpp @@ -51,20 +51,15 @@ #include "mongo/db/auth/user_cache_invalidator_job.h" #include "mongo/db/change_stream_options_manager.h" #include "mongo/db/client.h" -#include "mongo/db/cluster_parameters/cluster_server_parameter_refresher.h" #include "mongo/db/commands.h" #include "mongo/db/exec/scoped_timer.h" #include "mongo/db/extension/host/load_extension.h" #include "mongo/db/ftdc/ftdc_mongos.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader.h" -#include "mongo/db/global_catalog/catalog_cache/config_server_catalog_cache_loader_impl.h" #include "mongo/db/global_catalog/ddl/sessions_collection_sharded.h" #include "mongo/db/global_catalog/sharding_catalog_client.h" #include "mongo/db/initialize_server_global_state.h" #include "mongo/db/keys_collection_client.h" #include "mongo/db/keys_collection_client_sharded.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielders.h" #include "mongo/db/logical_time_validator.h" #include "mongo/db/operation_context.h" #include "mongo/db/process_health/fault_manager.h" @@ -72,6 +67,9 @@ #include "mongo/db/query/search/mongot_options.h" #include "mongo/db/query/search/search_task_executors.h" #include "mongo/db/read_write_concern_defaults.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/config_server_catalog_cache_loader.h" +#include "mongo/db/router_role/routing_cache/config_server_catalog_cache_loader_impl.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/session/kill_sessions.h" @@ -84,6 +82,7 @@ #include "mongo/db/session/session.h" #include "mongo/db/session/session_catalog.h" #include "mongo/db/session/session_killer.h" +#include "mongo/db/shard_role/resource_yielders.h" #include "mongo/db/sharding_environment/client/shard_factory.h" #include "mongo/db/sharding_environment/client/shard_remote.h" #include "mongo/db/sharding_environment/client/sharding_connection_hook.h" @@ -94,6 +93,7 @@ #include "mongo/db/sharding_environment/sharding_initialization.h" #include "mongo/db/sharding_environment/version_mongos.h" #include "mongo/db/startup_warnings_common.h" +#include "mongo/db/topology/cluster_parameters/cluster_server_parameter_refresher.h" #include "mongo/db/topology/mongos_topology_coordinator.h" #include "mongo/db/topology/shard_registry.h" #include "mongo/db/topology/sharding_state.h" diff --git a/src/mongo/s/multi_statement_transaction_requests_sender.cpp b/src/mongo/s/multi_statement_transaction_requests_sender.cpp index fe439e9b1c3..4bbe0deb34a 100644 --- a/src/mongo/s/multi_statement_transaction_requests_sender.cpp +++ b/src/mongo/s/multi_statement_transaction_requests_sender.cpp @@ -32,8 +32,8 @@ #include "mongo/base/status.h" #include "mongo/base/status_with.h" #include "mongo/db/baton.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielders.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/resource_yielders.h" #include "mongo/executor/remote_command_response.h" #include "mongo/s/transaction_router.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/s/query/README.md b/src/mongo/s/query/README.md index 28970f92494..951a555fb8d 100644 --- a/src/mongo/s/query/README.md +++ b/src/mongo/s/query/README.md @@ -2,7 +2,7 @@ On sharded clusters, the router will route CRUD operations to the shard(s) that own the ranges relevant to the query predicate. If the query includes the shard key, then a router will only target the shard(s) that own that shard key (or ranges of shard keys). Conversely, if the query does not include the shard key, then a router will broadcast to all shards that own data for the collection. -Routers use a cache of collection routing tables to determine what shard owns each range of the collection. This cache can sometimes be stale (e.g. after a range migration commits). In order to ensure that the query was routed correctly, the router will use the [placement versioning protocol](/src/mongo/db/versioning_protocol/README_versioning_protocols.md) when forwarding requests to the shard. This ensures that the routing table used for targeting was not stale — if it was, shards will reject the request and inform the router that its routing information is stale. +Routers use a cache of collection routing tables to determine what shard owns each range of the collection. This cache can sometimes be stale (e.g. after a range migration commits). In order to ensure that the query was routed correctly, the router will use the [placement versioning protocol](../../db/versioning_protocol/README_versioning_protocols.md) when forwarding requests to the shard. This ensures that the routing table used for targeting was not stale — if it was, shards will reject the request and inform the router that its routing information is stale. If more than one shard was targeted, then the results returned by each shard will be merged by the router which will then return the results to the client. @@ -36,5 +36,5 @@ CRUD operations with a read concern weaker than snapshot roughly match the "read ## See Also - The [MoveRange TLA+ specification](https://github.com/mongodb/mongo/blob/d40899bd45db62def8941cc6ba65c44a2cbbb83a/src/mongo/tla_plus/MoveRange/MoveRange.tla), which models the distributed query protocol and verifies the safety and liveness properties described in this readme. -- The [Sharded Transactions and DDLs readme](/src/mongo/db/global_catalog/ddl/README_transactions_and_ddl.md), covering aspects pertaining to CRUD operations in distributed transactions. -- The [RoutingContext readme](../../db/global_catalog/router_role_api/README_routing_context.md) for information about routing operations safely with the `RoutingContext` +- The [Sharded Transactions and DDLs readme](../../db/global_catalog/ddl/README_transactions_and_ddl.md), covering aspects pertaining to CRUD operations in distributed transactions. +- The [RoutingContext readme](../../db/router_role/README_routing_context.md) for information about routing operations safely with the `RoutingContext` diff --git a/src/mongo/s/query/README_aggregation.md b/src/mongo/s/query/README_aggregation.md index ff7713a14fc..3b65ce31a15 100644 --- a/src/mongo/s/query/README_aggregation.md +++ b/src/mongo/s/query/README_aggregation.md @@ -15,7 +15,7 @@ Stage implementations specify their splitting requirements by implementing the [ ## Routing of aggregations that involve multiple collections -**Note**: For information about routing aggregations and other query operations safely with the `RoutingContext`, refer to the [RoutingContext README](../../db/global_catalog/router_role_api/README_routing_context.md). +**Note**: For information about routing aggregations and other query operations safely with the `RoutingContext`, refer to the [RoutingContext README](../../db/router_role/README_routing_context.md). Some aggregation stages reference a second (or more) collections. Some examples of this are the following stages: $lookup, $graphLookup, $out, $merge, $unionWith. diff --git a/src/mongo/s/query/exec/BUILD.bazel b/src/mongo/s/query/exec/BUILD.bazel index 0e798b0dc01..d7d2647d225 100644 --- a/src/mongo/s/query/exec/BUILD.bazel +++ b/src/mongo/s/query/exec/BUILD.bazel @@ -32,9 +32,9 @@ mongo_cc_library( ], deps = [ "//src/mongo/db:server_feature_flags", - "//src/mongo/db/local_catalog:collection_uuid_mismatch_info", "//src/mongo/db/query:command_request_response", "//src/mongo/db/query:query_common", + "//src/mongo/db/shard_role/shard_catalog:collection_uuid_mismatch_info", "//src/mongo/executor:async_multicaster", "//src/mongo/executor:task_executor_interface", "//src/mongo/s:sharding_router_api", @@ -79,8 +79,8 @@ mongo_cc_library( ], deps = [ ":async_results_merger", - "//src/mongo/db/local_catalog/shard_role_api:resource_yielders", "//src/mongo/db/pipeline", + "//src/mongo/db/shard_role:resource_yielders", "//src/mongo/s:sharding_router_api", ], ) @@ -101,10 +101,10 @@ mongo_cc_library( "//src/mongo/db:commands", "//src/mongo/db:curop_failpoint_helpers", "//src/mongo/db:server_base", - "//src/mongo/db/local_catalog:collection_uuid_mismatch_info", "//src/mongo/db/query:command_request_response", "//src/mongo/db/query:query_common", "//src/mongo/db/query/query_stats", + "//src/mongo/db/shard_role/shard_catalog:collection_uuid_mismatch_info", "//src/mongo/s:sharding_router_api", "//src/mongo/util/concurrency:spin_lock", ], diff --git a/src/mongo/s/query/exec/blocking_results_merger.h b/src/mongo/s/query/exec/blocking_results_merger.h index 13be5f78c5c..10a010d9f76 100644 --- a/src/mongo/s/query/exec/blocking_results_merger.h +++ b/src/mongo/s/query/exec/blocking_results_merger.h @@ -32,10 +32,10 @@ #include "mongo/base/status.h" #include "mongo/base/status_with.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielder.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/query_stats/data_bearing_node_metrics.h" #include "mongo/db/query/tailable_mode_gen.h" +#include "mongo/db/shard_role/resource_yielder.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/executor/task_executor.h" #include "mongo/s/query/exec/async_results_merger.h" diff --git a/src/mongo/s/query/exec/document_source_merge_cursors.cpp b/src/mongo/s/query/exec/document_source_merge_cursors.cpp index d56ba7da395..5812d26bda1 100644 --- a/src/mongo/s/query/exec/document_source_merge_cursors.cpp +++ b/src/mongo/s/query/exec/document_source_merge_cursors.cpp @@ -31,9 +31,9 @@ #include "mongo/bson/bsontypes.h" #include "mongo/db/exec/document_value/document.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielders.h" #include "mongo/db/pipeline/lite_parsed_document_source.h" #include "mongo/db/pipeline/process_interface/mongo_process_interface.h" +#include "mongo/db/shard_role/resource_yielders.h" #include "mongo/idl/idl_parser.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/s/query/exec/establish_cursors.cpp b/src/mongo/s/query/exec/establish_cursors.cpp index 50e7f25544e..11f8d131d44 100644 --- a/src/mongo/s/query/exec/establish_cursors.cpp +++ b/src/mongo/s/query/exec/establish_cursors.cpp @@ -39,11 +39,11 @@ #include "mongo/client/connection_string.h" #include "mongo/client/remote_command_retry_scheduler.h" #include "mongo/db/client.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch_info.h" #include "mongo/db/query/client_cursor/cursor_id.h" #include "mongo/db/query/client_cursor/cursor_response.h" #include "mongo/db/query/client_cursor/kill_cursors_gen.h" #include "mongo/db/query/query_knobs_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/topology/shard_registry.h" #include "mongo/executor/async_multicaster.h" diff --git a/src/mongo/s/query/exec/establish_cursors.h b/src/mongo/s/query/exec/establish_cursors.h index 56b533f3655..513282df03c 100644 --- a/src/mongo/s/query/exec/establish_cursors.h +++ b/src/mongo/s/query/exec/establish_cursors.h @@ -31,9 +31,9 @@ #include "mongo/bson/bsonobj.h" #include "mongo/client/read_preference.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/service_context.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/shard_id.h" diff --git a/src/mongo/s/query/exec/establish_cursors_test.cpp b/src/mongo/s/query/exec/establish_cursors_test.cpp index 761f0fe5a51..c4927fd2d04 100644 --- a/src/mongo/s/query/exec/establish_cursors_test.cpp +++ b/src/mongo/s/query/exec/establish_cursors_test.cpp @@ -43,9 +43,9 @@ #include "mongo/client/remote_command_targeter_mock.h" #include "mongo/db/client.h" #include "mongo/db/global_catalog/type_shard.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielders.h" #include "mongo/db/query/client_cursor/cursor_id.h" #include "mongo/db/query/client_cursor/cursor_response.h" +#include "mongo/db/shard_role/resource_yielders.h" #include "mongo/db/sharding_environment/sharding_mongos_test_fixture.h" #include "mongo/executor/network_test_env.h" #include "mongo/executor/remote_command_request.h" diff --git a/src/mongo/s/query/exec/sharded_agg_test_fixture.h b/src/mongo/s/query/exec/sharded_agg_test_fixture.h index 52e9c8328f0..5264986ed5e 100644 --- a/src/mongo/s/query/exec/sharded_agg_test_fixture.h +++ b/src/mongo/s/query/exec/sharded_agg_test_fixture.h @@ -30,10 +30,10 @@ #pragma once #include "mongo/bson/json.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_test_fixture.h" #include "mongo/db/pipeline/document_source.h" #include "mongo/db/pipeline/expression_context_for_test.h" #include "mongo/db/pipeline/process_interface/stub_mongo_process_interface.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_test_fixture.h" #include "mongo/util/modules.h" namespace mongo { diff --git a/src/mongo/s/query/planner/BUILD.bazel b/src/mongo/s/query/planner/BUILD.bazel index 35ed47bb85d..98b6df2b2a5 100644 --- a/src/mongo/s/query/planner/BUILD.bazel +++ b/src/mongo/s/query/planner/BUILD.bazel @@ -18,7 +18,6 @@ mongo_cc_library( deps = [ "//src/mongo/db:fle_crud", "//src/mongo/db:shared_request_handling", - "//src/mongo/db/local_catalog:collection_uuid_mismatch_info", "//src/mongo/db/memory_tracking", "//src/mongo/db/pipeline", "//src/mongo/db/pipeline:desugarer", @@ -28,6 +27,7 @@ mongo_cc_library( "//src/mongo/db/query:shard_key_diagnostic_printer", "//src/mongo/db/query/query_settings:query_settings_service", "//src/mongo/db/query/query_shape", + "//src/mongo/db/shard_role/shard_catalog:collection_uuid_mismatch_info", "//src/mongo/db/timeseries:timeseries_options", "//src/mongo/db/views", "//src/mongo/db/views:view_catalog_helpers", @@ -46,13 +46,13 @@ mongo_cc_library( "//src/mongo/db:commands", "//src/mongo/db:curop_failpoint_helpers", "//src/mongo/db:server_base", - "//src/mongo/db/local_catalog:collection_uuid_mismatch_info", "//src/mongo/db/query:command_request_response", "//src/mongo/db/query:query_common", "//src/mongo/db/query:shard_key_diagnostic_printer", "//src/mongo/db/query/query_settings:query_settings_service", "//src/mongo/db/query/query_stats", "//src/mongo/db/query/util:cluster_find_util", + "//src/mongo/db/shard_role/shard_catalog:collection_uuid_mismatch_info", "//src/mongo/s:sharding_router_api", "//src/mongo/s/query/exec:cluster_cursor", "//src/mongo/util/concurrency:spin_lock", diff --git a/src/mongo/s/query/planner/cluster_aggregate.cpp b/src/mongo/s/query/planner/cluster_aggregate.cpp index 3df1384e32d..2bf5c84ad47 100644 --- a/src/mongo/s/query/planner/cluster_aggregate.cpp +++ b/src/mongo/s/query/planner/cluster_aggregate.cpp @@ -43,12 +43,9 @@ #include "mongo/db/exec/document_value/document.h" #include "mongo/db/feature_flag.h" #include "mongo/db/fle_crud.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/ddl/cluster_ddl.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/global_catalog/type_collection_common_types_gen.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch_info.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/aggregation_hint_translation.h" @@ -79,9 +76,12 @@ #include "mongo/db/query/query_stats/query_stats.h" #include "mongo/db/query/shard_key_diagnostic_printer.h" #include "mongo/db/query/tailable_mode_gen.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/sharding_environment/client/num_hosts_targeted_metrics.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" diff --git a/src/mongo/s/query/planner/cluster_aggregate.h b/src/mongo/s/query/planner/cluster_aggregate.h index dcb8295e45a..cf58c4ae4f7 100644 --- a/src/mongo/s/query/planner/cluster_aggregate.h +++ b/src/mongo/s/query/planner/cluster_aggregate.h @@ -34,13 +34,13 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/auth/privilege.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/aggregate_command_gen.h" #include "mongo/db/pipeline/document_source.h" #include "mongo/db/pipeline/lite_parsed_pipeline.h" +#include "mongo/db/router_role/router_role.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/views/resolved_view.h" #include "mongo/s/query/exec/cluster_client_cursor_params.h" #include "mongo/s/query/exec/document_source_merge_cursors.h" diff --git a/src/mongo/s/query/planner/cluster_aggregation_planner.cpp b/src/mongo/s/query/planner/cluster_aggregation_planner.cpp index 95609381d45..2912c9e5a08 100644 --- a/src/mongo/s/query/planner/cluster_aggregation_planner.cpp +++ b/src/mongo/s/query/planner/cluster_aggregation_planner.cpp @@ -48,9 +48,6 @@ #include "mongo/db/commands/feature_compatibility_version.h" #include "mongo/db/curop.h" #include "mongo/db/exec/document_value/value.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/collection_uuid_mismatch.h" #include "mongo/db/logical_time.h" #include "mongo/db/memory_tracking/operation_memory_usage_tracker.h" #include "mongo/db/pipeline/aggregate_command_gen.h" @@ -68,9 +65,12 @@ #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/query/find_common.h" #include "mongo/db/query/query_stats/query_stats.h" -#include "mongo/db/raw_data_operation.h" #include "mongo/db/repl/read_concern_args.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/collection_uuid_mismatch.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/sharding_environment/shard_id.h" diff --git a/src/mongo/s/query/planner/cluster_aggregation_planner.h b/src/mongo/s/query/planner/cluster_aggregation_planner.h index 92350246732..58325a0eb01 100644 --- a/src/mongo/s/query/planner/cluster_aggregation_planner.h +++ b/src/mongo/s/query/planner/cluster_aggregation_planner.h @@ -35,15 +35,15 @@ #include "mongo/db/auth/privilege.h" #include "mongo/db/exec/agg/exec_pipeline.h" #include "mongo/db/exec/document_value/document.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/pipeline.h" #include "mongo/db/pipeline/sharded_agg_helpers.h" #include "mongo/db/query/explain_options.h" +#include "mongo/db/router_role/router_role.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/s/query/exec/cluster_client_cursor_guard.h" diff --git a/src/mongo/s/query/planner/cluster_find.cpp b/src/mongo/s/query/planner/cluster_find.cpp index c7a766e8a6b..f33b073dbdf 100644 --- a/src/mongo/s/query/planner/cluster_find.cpp +++ b/src/mongo/s/query/planner/cluster_find.cpp @@ -55,10 +55,6 @@ #include "mongo/db/feature_flag.h" #include "mongo/db/generic_argument_util.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/collection_uuid_mismatch.h" -#include "mongo/db/global_catalog/router_role_api/router_role.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch_info.h" #include "mongo/db/logical_time.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/memory_tracking/operation_memory_usage_tracker.h" @@ -83,11 +79,15 @@ #include "mongo/db/query/query_stats/query_stats.h" #include "mongo/db/query/shard_key_diagnostic_printer.h" #include "mongo/db/query/util/cluster_find_util.h" -#include "mongo/db/raw_data_operation.h" #include "mongo/db/repl/read_concern_args.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/collection_uuid_mismatch.h" +#include "mongo/db/router_role/router_role.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/sharding_environment/client/num_hosts_targeted_metrics.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" diff --git a/src/mongo/s/transaction_router.cpp b/src/mongo/s/transaction_router.cpp index bce35cd002f..8d78194704b 100644 --- a/src/mongo/s/transaction_router.cpp +++ b/src/mongo/s/transaction_router.cpp @@ -37,10 +37,10 @@ #include "mongo/db/commands/txn_cmds_gen.h" #include "mongo/db/commands/txn_two_phase_commit_cmds_gen.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/catalog_cache/shard_cannot_refresh_due_to_locks_held_exception.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/read_concern_level.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/server_options.h" #include "mongo/db/session/logical_session_id.h" @@ -48,8 +48,8 @@ #include "mongo/db/session/session.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/transaction_validation.h" -#include "mongo/db/vector_clock/vector_clock.h" #include "mongo/db/versioning_protocol/stale_exception.h" #include "mongo/db/write_concern_options.h" #include "mongo/executor/remote_command_response.h" diff --git a/src/mongo/s/transaction_router_resource_yielder.h b/src/mongo/s/transaction_router_resource_yielder.h index cd4a3e58400..fdec9ebb5f4 100644 --- a/src/mongo/s/transaction_router_resource_yielder.h +++ b/src/mongo/s/transaction_router_resource_yielder.h @@ -29,8 +29,8 @@ #pragma once -#include "mongo/db/local_catalog/shard_role_api/resource_yielder.h" #include "mongo/db/operation_context.h" +#include "mongo/db/shard_role/resource_yielder.h" #include "mongo/util/modules.h" #include diff --git a/src/mongo/s/transaction_router_test.cpp b/src/mongo/s/transaction_router_test.cpp index 95629ad90b2..a1f21e05c67 100644 --- a/src/mongo/s/transaction_router_test.cpp +++ b/src/mongo/s/transaction_router_test.cpp @@ -50,7 +50,7 @@ #include "mongo/db/repl/read_concern_level.h" #include "mongo/db/server_options.h" #include "mongo/db/sharding_environment/sharding_mongos_test_fixture.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/versioning_protocol/shard_version.h" #include "mongo/db/versioning_protocol/shard_version_gen.h" #include "mongo/db/versioning_protocol/stale_exception.h" diff --git a/src/mongo/s/write_ops/BUILD.bazel b/src/mongo/s/write_ops/BUILD.bazel index cf726753104..8e57ad75d25 100644 --- a/src/mongo/s/write_ops/BUILD.bazel +++ b/src/mongo/s/write_ops/BUILD.bazel @@ -64,7 +64,7 @@ mongo_cc_library( name = "pause_migrations_during_multi_updates_enablement", srcs = [ "pause_migrations_during_multi_updates_enablement.cpp", - "//src/mongo/db/cluster_parameters:migration_blocking_operation_cluster_parameters_gen", + "//src/mongo/db/topology/cluster_parameters:migration_blocking_operation_cluster_parameters_gen", ], deps = [ "//src/mongo:base", diff --git a/src/mongo/s/write_ops/batch_write_exec.h b/src/mongo/s/write_ops/batch_write_exec.h index 866c6c2d672..2ee1366609e 100644 --- a/src/mongo/s/write_ops/batch_write_exec.h +++ b/src/mongo/s/write_ops/batch_write_exec.h @@ -32,9 +32,9 @@ #include "mongo/bson/oid.h" #include "mongo/bson/timestamp.h" #include "mongo/client/connection_string.h" -#include "mongo/db/global_catalog/router_role_api/ns_targeter.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/optime.h" +#include "mongo/db/router_role/ns_targeter.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/s/write_ops/batched_command_request.h" #include "mongo/s/write_ops/batched_command_response.h" diff --git a/src/mongo/s/write_ops/batch_write_exec_test.cpp b/src/mongo/s/write_ops/batch_write_exec_test.cpp index 931250aa876..44df1a79b4a 100644 --- a/src/mongo/s/write_ops/batch_write_exec_test.cpp +++ b/src/mongo/s/write_ops/batch_write_exec_test.cpp @@ -27,8 +27,8 @@ * it in the license file. */ -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_test_fixture.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_test_fixture.h" #include "mongo/rpc/write_concern_error_gen.h" #include "mongo/util/fail_point.h" @@ -48,9 +48,7 @@ #include "mongo/db/baton.h" #include "mongo/db/commands.h" #include "mongo/db/commands/txn_cmds_gen.h" -#include "mongo/db/global_catalog/catalog_cache/shard_cannot_refresh_due_to_locks_held_exception.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/mock_ns_targeter.h" #include "mongo/db/global_catalog/type_chunk.h" #include "mongo/db/global_catalog/type_shard.h" #include "mongo/db/logical_time.h" @@ -60,10 +58,12 @@ #include "mongo/db/query/write_ops/write_ops_parsers.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/read_concern_level.h" +#include "mongo/db/router_role/mock_ns_targeter.h" +#include "mongo/db/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.h" #include "mongo/db/service_context.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/sharding_environment/sharding_mongos_test_fixture.h" -#include "mongo/db/vector_clock/vector_clock.h" +#include "mongo/db/topology/vector_clock/vector_clock.h" #include "mongo/db/versioning_protocol/chunk_version.h" #include "mongo/db/versioning_protocol/database_version.h" #include "mongo/db/versioning_protocol/shard_version.h" diff --git a/src/mongo/s/write_ops/batch_write_op.cpp b/src/mongo/s/write_ops/batch_write_op.cpp index 3e3d8ac2481..9f5eedcf081 100644 --- a/src/mongo/s/write_ops/batch_write_op.cpp +++ b/src/mongo/s/write_ops/batch_write_op.cpp @@ -46,14 +46,14 @@ #include "mongo/crypto/fle_field_schema_gen.h" #include "mongo/db/basic_types.h" #include "mongo/db/commands/server_status/server_status_metric.h" -#include "mongo/db/global_catalog/router_role_api/collection_uuid_mismatch.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch_info.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/pipeline/legacy_runtime_constants_gen.h" #include "mongo/db/query/write_ops/write_ops.h" #include "mongo/db/query/write_ops/write_ops_gen.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/router_role/collection_uuid_mismatch.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/stats/counters.h" #include "mongo/db/write_concern_options.h" #include "mongo/s/transaction_router.h" diff --git a/src/mongo/s/write_ops/batch_write_op.h b/src/mongo/s/write_ops/batch_write_op.h index fe30b40d9c3..74b99e48f67 100644 --- a/src/mongo/s/write_ops/batch_write_op.h +++ b/src/mongo/s/write_ops/batch_write_op.h @@ -33,9 +33,9 @@ #include "mongo/base/status_with.h" #include "mongo/bson/bsonobj.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/ns_targeter.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" +#include "mongo/db/router_role/ns_targeter.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/rpc/write_concern_error_detail.h" diff --git a/src/mongo/s/write_ops/batch_write_op_test.cpp b/src/mongo/s/write_ops/batch_write_op_test.cpp index e7ba2c82ba1..a7b0642471b 100644 --- a/src/mongo/s/write_ops/batch_write_op_test.cpp +++ b/src/mongo/s/write_ops/batch_write_op_test.cpp @@ -36,15 +36,15 @@ #include "mongo/bson/oid.h" #include "mongo/bson/timestamp.h" #include "mongo/bson/util/builder.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_test_fixture.h" -#include "mongo/db/global_catalog/catalog_cache/shard_cannot_refresh_due_to_locks_held_exception.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" -#include "mongo/db/global_catalog/router_role_api/mock_ns_targeter.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/repl/read_concern_args.h" #include "mongo/db/repl/read_concern_level.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" +#include "mongo/db/router_role/mock_ns_targeter.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_test_fixture.h" +#include "mongo/db/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_test_fixture.h" #include "mongo/db/session/logical_session_id_gen.h" diff --git a/src/mongo/s/write_ops/bulk_write_exec.cpp b/src/mongo/s/write_ops/bulk_write_exec.cpp index 8240d10bff1..6f0f01e45b1 100644 --- a/src/mongo/s/write_ops/bulk_write_exec.cpp +++ b/src/mongo/s/write_ops/bulk_write_exec.cpp @@ -49,8 +49,8 @@ #include "mongo/db/query/client_cursor/cursor_server_params_gen.h" #include "mongo/db/query/write_ops/write_ops.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" -#include "mongo/db/raw_data_operation.h" #include "mongo/db/session/logical_session_id_helpers.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/sharding_environment/client/shard.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/stats/counters.h" diff --git a/src/mongo/s/write_ops/bulk_write_exec.h b/src/mongo/s/write_ops/bulk_write_exec.h index 3d4abd684c2..427c92d46b9 100644 --- a/src/mongo/s/write_ops/bulk_write_exec.h +++ b/src/mongo/s/write_ops/bulk_write_exec.h @@ -36,10 +36,10 @@ #include "mongo/db/commands/query_cmd/bulk_write_gen.h" #include "mongo/db/commands/query_cmd/bulk_write_parser.h" #include "mongo/db/fle_crud.h" -#include "mongo/db/global_catalog/router_role_api/ns_targeter.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/optime.h" +#include "mongo/db/router_role/ns_targeter.h" #include "mongo/db/session/logical_session_id.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/db/write_concern_options.h" diff --git a/src/mongo/s/write_ops/bulk_write_exec_test.cpp b/src/mongo/s/write_ops/bulk_write_exec_test.cpp index bede4380201..2337881fec1 100644 --- a/src/mongo/s/write_ops/bulk_write_exec_test.cpp +++ b/src/mongo/s/write_ops/bulk_write_exec_test.cpp @@ -54,11 +54,11 @@ #include "mongo/db/commands/query_cmd/bulk_write_crud_op.h" #include "mongo/db/commands/query_cmd/bulk_write_gen.h" #include "mongo/db/database_name.h" -#include "mongo/db/global_catalog/catalog_cache/shard_cannot_refresh_due_to_locks_held_exception.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/mock_ns_targeter.h" #include "mongo/db/global_catalog/type_shard.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" +#include "mongo/db/router_role/mock_ns_targeter.h" +#include "mongo/db/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_test_fixture.h" #include "mongo/db/session/logical_session_id_gen.h" diff --git a/src/mongo/s/write_ops/coordinate_multi_update_util.cpp b/src/mongo/s/write_ops/coordinate_multi_update_util.cpp index 875d02f608c..7b75665c67e 100644 --- a/src/mongo/s/write_ops/coordinate_multi_update_util.cpp +++ b/src/mongo/s/write_ops/coordinate_multi_update_util.cpp @@ -30,7 +30,7 @@ #include "mongo/s/write_ops/coordinate_multi_update_util.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/s/request_types/coordinate_multi_update_gen.h" diff --git a/src/mongo/s/write_ops/pause_migrations_during_multi_updates_enablement.cpp b/src/mongo/s/write_ops/pause_migrations_during_multi_updates_enablement.cpp index 546473a12e0..316c32ec7c2 100644 --- a/src/mongo/s/write_ops/pause_migrations_during_multi_updates_enablement.cpp +++ b/src/mongo/s/write_ops/pause_migrations_during_multi_updates_enablement.cpp @@ -29,8 +29,8 @@ #include "mongo/s/write_ops/pause_migrations_during_multi_updates_enablement.h" -#include "mongo/db/cluster_parameters/migration_blocking_operation_cluster_parameters_gen.h" #include "mongo/db/server_parameter.h" +#include "mongo/db/topology/cluster_parameters/migration_blocking_operation_cluster_parameters_gen.h" #include "mongo/s/transaction_router.h" #include "mongo/util/fail_point.h" diff --git a/src/mongo/s/write_ops/unified_write_executor/write_batch_executor.cpp b/src/mongo/s/write_ops/unified_write_executor/write_batch_executor.cpp index 65ed2d701c5..7fe0231a34b 100644 --- a/src/mongo/s/write_ops/unified_write_executor/write_batch_executor.cpp +++ b/src/mongo/s/write_ops/unified_write_executor/write_batch_executor.cpp @@ -31,8 +31,8 @@ #include "mongo/db/error_labels.h" #include "mongo/db/generic_argument_util.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/transaction/transaction_api.h" #include "mongo/s/request_types/coordinate_multi_update_gen.h" diff --git a/src/mongo/s/write_ops/unified_write_executor/write_batch_response_processor.cpp b/src/mongo/s/write_ops/unified_write_executor/write_batch_response_processor.cpp index c815f8c1d61..f0a9466904f 100644 --- a/src/mongo/s/write_ops/unified_write_executor/write_batch_response_processor.cpp +++ b/src/mongo/s/write_ops/unified_write_executor/write_batch_response_processor.cpp @@ -30,10 +30,10 @@ #include "mongo/s/write_ops/unified_write_executor/write_batch_response_processor.h" #include "mongo/base/error_codes.h" -#include "mongo/db/global_catalog/router_role_api/collection_uuid_mismatch.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch_info.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/client_cursor/cursor_server_params_gen.h" +#include "mongo/db/router_role/collection_uuid_mismatch.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h" #include "mongo/s/commands/query_cmd/populate_cursor.h" #include "mongo/s/transaction_router.h" #include "mongo/s/write_ops/batched_command_response.h" diff --git a/src/mongo/s/write_ops/unified_write_executor/write_batch_response_processor_test.cpp b/src/mongo/s/write_ops/unified_write_executor/write_batch_response_processor_test.cpp index 445eaca79c4..0018aeee882 100644 --- a/src/mongo/s/write_ops/unified_write_executor/write_batch_response_processor_test.cpp +++ b/src/mongo/s/write_ops/unified_write_executor/write_batch_response_processor_test.cpp @@ -31,8 +31,8 @@ #include "mongo/base/status.h" #include "mongo/db/error_labels.h" -#include "mongo/db/global_catalog/catalog_cache/shard_cannot_refresh_due_to_locks_held_exception.h" #include "mongo/db/global_catalog/ddl/cannot_implicitly_create_collection_info.h" +#include "mongo/db/router_role/routing_cache/shard_cannot_refresh_due_to_locks_held_exception.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_test_fixture.h" #include "mongo/db/versioning_protocol/shard_version_factory.h" diff --git a/src/mongo/s/write_ops/unified_write_executor/write_batch_scheduler.cpp b/src/mongo/s/write_ops/unified_write_executor/write_batch_scheduler.cpp index 9abedced452..e8ae18e375b 100644 --- a/src/mongo/s/write_ops/unified_write_executor/write_batch_scheduler.cpp +++ b/src/mongo/s/write_ops/unified_write_executor/write_batch_scheduler.cpp @@ -30,7 +30,7 @@ #include "mongo/s/write_ops/unified_write_executor/write_batch_scheduler.h" #include "mongo/db/global_catalog/ddl/cluster_ddl.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" #include "mongo/db/server_feature_flags_gen.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kQuery diff --git a/src/mongo/s/write_ops/unified_write_executor/write_op_analyzer.cpp b/src/mongo/s/write_ops/unified_write_executor/write_op_analyzer.cpp index 4829555276e..38d4fe41043 100644 --- a/src/mongo/s/write_ops/unified_write_executor/write_op_analyzer.cpp +++ b/src/mongo/s/write_ops/unified_write_executor/write_op_analyzer.cpp @@ -29,7 +29,7 @@ #include "mongo/s/write_ops/unified_write_executor/write_op_analyzer.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/s/write_ops/coordinate_multi_update_util.h" #include "mongo/s/write_ops/write_op_helper.h" diff --git a/src/mongo/s/write_ops/unified_write_executor/write_op_analyzer.h b/src/mongo/s/write_ops/unified_write_executor/write_op_analyzer.h index cc63ac2f33c..15b1c9cdcfb 100644 --- a/src/mongo/s/write_ops/unified_write_executor/write_op_analyzer.h +++ b/src/mongo/s/write_ops/unified_write_executor/write_op_analyzer.h @@ -31,8 +31,8 @@ #include "mongo/base/status_with.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" -#include "mongo/db/global_catalog/router_role_api/routing_context.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" +#include "mongo/db/router_role/routing_context.h" #include "mongo/s/query_analysis_sampler_util.h" #include "mongo/s/write_ops/pause_migrations_during_multi_updates_enablement.h" #include "mongo/s/write_ops/unified_write_executor/stats.h" diff --git a/src/mongo/s/write_ops/unified_write_executor/write_op_analyzer_test.cpp b/src/mongo/s/write_ops/unified_write_executor/write_op_analyzer_test.cpp index 28fd8c6f018..4f4e446f95c 100644 --- a/src/mongo/s/write_ops/unified_write_executor/write_op_analyzer_test.cpp +++ b/src/mongo/s/write_ops/unified_write_executor/write_op_analyzer_test.cpp @@ -30,12 +30,12 @@ #include "mongo/s/write_ops/unified_write_executor/write_op_analyzer.h" #include "mongo/bson/json.h" -#include "mongo/db/cluster_parameters/sharding_cluster_parameters_gen.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/pipeline/document_source.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/sharding_environment/sharding_mongos_test_fixture.h" #include "mongo/db/sharding_environment/sharding_test_fixture_common.h" +#include "mongo/db/topology/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/s/refresh_query_analyzer_configuration_cmd_gen.h" #include "mongo/s/session_catalog_router.h" diff --git a/src/mongo/s/write_ops/write_op.cpp b/src/mongo/s/write_ops/write_op.cpp index 0a96a83ff32..2b2adda25c0 100644 --- a/src/mongo/s/write_ops/write_op.cpp +++ b/src/mongo/s/write_ops/write_op.cpp @@ -32,11 +32,11 @@ #include "mongo/base/error_codes.h" #include "mongo/base/status.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/cluster_parameters/sharding_cluster_parameters_gen.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch_info.h" -#include "mongo/db/raw_data_operation.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h" +#include "mongo/db/shard_role/shard_catalog/raw_data_operation.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" #include "mongo/db/stats/counters.h" +#include "mongo/db/topology/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/versioning_protocol/shard_version.h" #include "mongo/s/query_analysis_sampler_util.h" #include "mongo/s/transaction_router.h" diff --git a/src/mongo/s/write_ops/write_op.h b/src/mongo/s/write_ops/write_op.h index 8dad3273b68..4c7f90d0bab 100644 --- a/src/mongo/s/write_ops/write_op.h +++ b/src/mongo/s/write_ops/write_op.h @@ -30,9 +30,9 @@ #pragma once #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/ns_targeter.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" +#include "mongo/db/router_role/ns_targeter.h" #include "mongo/db/sharding_environment/shard_id.h" #include "mongo/s/write_ops/batched_command_request.h" #include "mongo/util/modules.h" diff --git a/src/mongo/s/write_ops/write_op_helper.cpp b/src/mongo/s/write_ops/write_op_helper.cpp index 17d98784800..8636292e763 100644 --- a/src/mongo/s/write_ops/write_op_helper.cpp +++ b/src/mongo/s/write_ops/write_op_helper.cpp @@ -30,8 +30,8 @@ #include "mongo/s/write_ops/write_op_helper.h" #include "mongo/base/error_codes.h" -#include "mongo/db/cluster_parameters/sharding_cluster_parameters_gen.h" -#include "mongo/db/local_catalog/collection_uuid_mismatch_info.h" +#include "mongo/db/shard_role/shard_catalog/collection_uuid_mismatch_info.h" +#include "mongo/db/topology/cluster_parameters/sharding_cluster_parameters_gen.h" #include "mongo/db/versioning_protocol/shard_version_factory.h" namespace mongo { diff --git a/src/mongo/s/write_ops/write_op_test.cpp b/src/mongo/s/write_ops/write_op_test.cpp index 4326268649d..401bb084fd3 100644 --- a/src/mongo/s/write_ops/write_op_test.cpp +++ b/src/mongo/s/write_ops/write_op_test.cpp @@ -37,10 +37,10 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/oid.h" #include "mongo/bson/timestamp.h" -#include "mongo/db/global_catalog/router_role_api/mock_ns_targeter.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/record_id.h" +#include "mongo/db/router_role/mock_ns_targeter.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_test_fixture.h" #include "mongo/db/session/logical_session_id.h" diff --git a/src/mongo/s/write_ops/write_without_shard_key_util.cpp b/src/mongo/s/write_ops/write_without_shard_key_util.cpp index 5683e8cd1ae..c2175546ff2 100644 --- a/src/mongo/s/write_ops/write_without_shard_key_util.cpp +++ b/src/mongo/s/write_ops/write_without_shard_key_util.cpp @@ -37,13 +37,9 @@ #include "mongo/db/feature_flag.h" #include "mongo/db/field_ref.h" #include "mongo/db/field_ref_set.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" #include "mongo/db/global_catalog/chunk_manager.h" -#include "mongo/db/global_catalog/router_role_api/cluster_commands_helpers.h" -#include "mongo/db/global_catalog/router_role_api/collection_routing_info_targeter.h" #include "mongo/db/global_catalog/shard_key_pattern_query_util.h" #include "mongo/db/global_catalog/type_collection_common_types_gen.h" -#include "mongo/db/local_catalog/shard_role_api/resource_yielder.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/query/canonical_query.h" #include "mongo/db/query/collation/collation_index_key.h" @@ -51,8 +47,12 @@ #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/query/write_ops/update_request.h" #include "mongo/db/query/write_ops/write_ops_gen.h" +#include "mongo/db/router_role/cluster_commands_helpers.h" +#include "mongo/db/router_role/collection_routing_info_targeter.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" #include "mongo/db/server_options.h" #include "mongo/db/session/logical_session_id.h" +#include "mongo/db/shard_role/resource_yielder.h" #include "mongo/db/sharding_environment/grid.h" #include "mongo/db/storage/storage_parameters_gen.h" #include "mongo/db/timeseries/timeseries_gen.h" diff --git a/src/mongo/s/write_ops/write_without_shard_key_util_test.cpp b/src/mongo/s/write_ops/write_without_shard_key_util_test.cpp index ae2a1466886..66bb7e9bf0c 100644 --- a/src/mongo/s/write_ops/write_without_shard_key_util_test.cpp +++ b/src/mongo/s/write_ops/write_without_shard_key_util_test.cpp @@ -31,8 +31,6 @@ #include "mongo/bson/json.h" #include "mongo/db/feature_flag.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache.h" -#include "mongo/db/global_catalog/catalog_cache/catalog_cache_test_fixture.h" #include "mongo/db/global_catalog/chunk_manager.h" #include "mongo/db/global_catalog/shard_key_pattern.h" #include "mongo/db/global_catalog/type_collection.h" @@ -42,6 +40,8 @@ #include "mongo/db/query/write_ops/update_request.h" #include "mongo/db/query/write_ops/write_ops_gen.h" #include "mongo/db/query/write_ops/write_ops_parsers.h" +#include "mongo/db/router_role/routing_cache/catalog_cache.h" +#include "mongo/db/router_role/routing_cache/catalog_cache_test_fixture.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_test_fixture.h" #include "mongo/db/sharding_environment/sharding_feature_flags_gen.h" diff --git a/src/mongo/scripting/BUILD.bazel b/src/mongo/scripting/BUILD.bazel index 02454f38c43..4306870c03f 100644 --- a/src/mongo/scripting/BUILD.bazel +++ b/src/mongo/scripting/BUILD.bazel @@ -173,7 +173,7 @@ mongo_cc_unit_test( tags = ["mongo_unittest_second_group"], deps = [ ":scripting_common", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", ], ) diff --git a/src/mongo/scripting/engine.cpp b/src/mongo/scripting/engine.cpp index 5242b9eabb4..4526ff58323 100644 --- a/src/mongo/scripting/engine.cpp +++ b/src/mongo/scripting/engine.cpp @@ -36,11 +36,11 @@ #include "mongo/client/dbclient_base.h" #include "mongo/client/dbclient_cursor.h" #include "mongo/client/read_preference.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/query/find_command.h" #include "mongo/db/service_context.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/logv2/log.h" #include "mongo/platform/compiler.h" diff --git a/src/mongo/shell/BUILD.bazel b/src/mongo/shell/BUILD.bazel index 551acc6ac04..ed9d24417f3 100644 --- a/src/mongo/shell/BUILD.bazel +++ b/src/mongo/shell/BUILD.bazel @@ -359,7 +359,7 @@ mongo_cc_library( # please add that library here, as a private library dependency. "//src/mongo/client:clientdriver_network", "//src/mongo/client:connection_string", - "//src/mongo/db/local_catalog:index_key_validate", + "//src/mongo/db/shard_role/shard_catalog:index_key_validate", "//src/mongo/db:mongohasher", "//src/mongo/db/pipeline:change_stream_error_extra_info", "//src/mongo/db/query:command_request_response", diff --git a/src/mongo/shell/named_pipe_test_helper.cpp b/src/mongo/shell/named_pipe_test_helper.cpp index 6d2c6803560..8d966ab2aa3 100644 --- a/src/mongo/shell/named_pipe_test_helper.cpp +++ b/src/mongo/shell/named_pipe_test_helper.cpp @@ -33,10 +33,10 @@ #include "mongo/bson/bsonmisc.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/local_catalog/virtual_collection_options.h" #include "mongo/db/pipeline/external_data_source_option_gen.h" #include "mongo/db/query/virtual_collection/input_stream.h" #include "mongo/db/query/virtual_collection/multi_bson_stream_cursor.h" +#include "mongo/db/shard_role/shard_catalog/virtual_collection_options.h" #include "mongo/db/storage/record_data.h" #include "mongo/db/storage/record_store.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/tools/workload_simulation/simulation.cpp b/src/mongo/tools/workload_simulation/simulation.cpp index dc8d31b1e09..01ad3728fd4 100644 --- a/src/mongo/tools/workload_simulation/simulation.cpp +++ b/src/mongo/tools/workload_simulation/simulation.cpp @@ -29,7 +29,7 @@ #include "mongo/tools/workload_simulation/simulation.h" -#include "mongo/db/local_catalog/shard_role_api/transaction_resources.h" +#include "mongo/db/shard_role/transaction_resources.h" #include "mongo/logv2/log.h" #include "mongo/tools/workload_simulation/simulator_options.h" #include "mongo/util/pcre.h" diff --git a/src/mongo/util/concurrency/BUILD.bazel b/src/mongo/util/concurrency/BUILD.bazel index a4ab5cb55c8..531d8839e10 100644 --- a/src/mongo/util/concurrency/BUILD.bazel +++ b/src/mongo/util/concurrency/BUILD.bazel @@ -135,7 +135,7 @@ mongo_cc_benchmark( ":ticketholder", "//src/mongo/db:service_context_non_d", "//src/mongo/db/admission:execution_admission_context", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", ], ) diff --git a/src/mongo/util/net/BUILD.bazel b/src/mongo/util/net/BUILD.bazel index 3f769d5f589..61c3030dc10 100644 --- a/src/mongo/util/net/BUILD.bazel +++ b/src/mongo/util/net/BUILD.bazel @@ -408,7 +408,7 @@ mongo_cc_fuzzer_test( ], deps = [ "//src/mongo:base", - "//src/mongo/db/local_catalog/lock_manager", + "//src/mongo/db/shard_role/lock_manager", "//src/mongo/transport:transport_layer_common", "//src/mongo/util/net:ssl_manager", ],