diff options
Diffstat (limited to 'src/mongo/db/s/resharding')
21 files changed, 37 insertions, 37 deletions
diff --git a/src/mongo/db/s/resharding/resharding_collection_cloner.cpp b/src/mongo/db/s/resharding/resharding_collection_cloner.cpp index d72826aabb4..54381a5f6c0 100644 --- a/src/mongo/db/s/resharding/resharding_collection_cloner.cpp +++ b/src/mongo/db/s/resharding/resharding_collection_cloner.cpp @@ -40,7 +40,6 @@ #include "mongo/db/client.h" #include "mongo/db/curop.h" #include "mongo/db/exec/document_value/document.h" -#include "mongo/db/logical_session_id_helpers.h" #include "mongo/db/pipeline/aggregation_request_helper.h" #include "mongo/db/pipeline/document_source_match.h" #include "mongo/db/pipeline/document_source_replace_root.h" @@ -54,6 +53,7 @@ #include "mongo/db/s/resharding/resharding_server_parameters_gen.h" #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/service_context.h" +#include "mongo/db/session/logical_session_id_helpers.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/executor/task_executor.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/s/resharding/resharding_coordinator_service.cpp b/src/mongo/db/s/resharding/resharding_coordinator_service.cpp index 270c6c91198..55d1ced54d8 100644 --- a/src/mongo/db/s/resharding/resharding_coordinator_service.cpp +++ b/src/mongo/db/s/resharding/resharding_coordinator_service.cpp @@ -34,7 +34,6 @@ #include "mongo/bson/json.h" #include "mongo/db/auth/authorization_session_impl.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/logical_session_cache.h" #include "mongo/db/ops/write_ops.h" #include "mongo/db/repl/primary_only_service.h" #include "mongo/db/repl/repl_client_info.h" @@ -51,6 +50,7 @@ #include "mongo/db/s/sharding_data_transform_metrics.h" #include "mongo/db/s/sharding_ddl_util.h" #include "mongo/db/s/sharding_logging.h" +#include "mongo/db/session/logical_session_cache.h" #include "mongo/db/storage/duplicate_key_error_info.h" #include "mongo/db/vector_clock.h" #include "mongo/db/write_concern_options.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 f7e4aaf9f0e..e342747e266 100644 --- a/src/mongo/db/s/resharding/resharding_coordinator_service_test.cpp +++ b/src/mongo/db/s/resharding/resharding_coordinator_service_test.cpp @@ -31,7 +31,6 @@ #include <functional> #include "mongo/db/dbdirectclient.h" -#include "mongo/db/logical_session_cache_noop.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" @@ -45,7 +44,8 @@ #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/s/transaction_coordinator_service.h" #include "mongo/db/service_context.h" -#include "mongo/db/session_catalog_mongod.h" +#include "mongo/db/session/logical_session_cache_noop.h" +#include "mongo/db/session/session_catalog_mongod.h" #include "mongo/idl/server_parameter_test_util.h" #include "mongo/logv2/log.h" #include "mongo/s/catalog/type_collection.h" diff --git a/src/mongo/db/s/resharding/resharding_coordinator_test.cpp b/src/mongo/db/s/resharding/resharding_coordinator_test.cpp index bd6919f02af..80fd3970a61 100644 --- a/src/mongo/db/s/resharding/resharding_coordinator_test.cpp +++ b/src/mongo/db/s/resharding/resharding_coordinator_test.cpp @@ -31,7 +31,6 @@ #include "mongo/client/remote_command_targeter_mock.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/logical_session_cache_noop.h" #include "mongo/db/repl/storage_interface_impl.h" #include "mongo/db/repl/storage_interface_mock.h" #include "mongo/db/s/config/config_server_test_fixture.h" @@ -40,7 +39,8 @@ #include "mongo/db/s/resharding/resharding_coordinator_service.h" #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/s/transaction_coordinator_service.h" -#include "mongo/db/session_catalog_mongod.h" +#include "mongo/db/session/logical_session_cache_noop.h" +#include "mongo/db/session/session_catalog_mongod.h" #include "mongo/logv2/log.h" #include "mongo/s/catalog/type_collection.h" #include "mongo/s/catalog/type_shard.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 7126e13a091..876e2338bdf 100644 --- a/src/mongo/db/s/resharding/resharding_data_copy_util.cpp +++ b/src/mongo/db/s/resharding/resharding_data_copy_util.cpp @@ -43,9 +43,9 @@ #include "mongo/db/s/resharding/resharding_txn_cloner_progress_gen.h" #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/s/session_catalog_migration.h" -#include "mongo/db/session_catalog_mongod.h" +#include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/session/session_txn_record_gen.h" #include "mongo/db/storage/write_unit_of_work.h" -#include "mongo/db/transaction/session_txn_record_gen.h" #include "mongo/db/transaction/transaction_participant.h" #include "mongo/logv2/redaction.h" #include "mongo/util/scopeguard.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 9f2a332ef6c..807ddaf6bfc 100644 --- a/src/mongo/db/s/resharding/resharding_data_copy_util.h +++ b/src/mongo/db/s/resharding/resharding_data_copy_util.h @@ -36,9 +36,9 @@ #include "mongo/db/catalog/collection_catalog.h" #include "mongo/db/exec/document_value/document.h" #include "mongo/db/exec/document_value/value.h" -#include "mongo/db/logical_session_id.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/s/shard_filtering_metadata_refresh.h" +#include "mongo/db/session/logical_session_id.h" #include "mongo/s/resharding/common_types_gen.h" #include "mongo/util/functional.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 fbaa3ddedc8..51300394adc 100644 --- a/src/mongo/db/s/resharding/resharding_destined_recipient_test.cpp +++ b/src/mongo/db/s/resharding/resharding_destined_recipient_test.cpp @@ -41,7 +41,7 @@ #include "mongo/db/s/shard_server_test_fixture.h" #include "mongo/db/s/sharding_state.h" #include "mongo/db/s/sharding_write_router.h" -#include "mongo/db/session_catalog_mongod.h" +#include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/transaction/transaction_participant.h" #include "mongo/s/catalog/sharding_catalog_client_mock.h" #include "mongo/s/catalog/type_shard.h" diff --git a/src/mongo/db/s/resharding/resharding_oplog_application.cpp b/src/mongo/db/s/resharding/resharding_oplog_application.cpp index ae4bc5f3d4e..98eaa15b83c 100644 --- a/src/mongo/db/s/resharding/resharding_oplog_application.cpp +++ b/src/mongo/db/s/resharding/resharding_oplog_application.cpp @@ -33,7 +33,6 @@ #include "mongo/db/concurrency/exception_util.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/db/logical_session_cache.h" #include "mongo/db/namespace_string.h" #include "mongo/db/ops/delete.h" #include "mongo/db/ops/delete_request_gen.h" @@ -44,7 +43,8 @@ #include "mongo/db/repl/oplog_applier_utils.h" #include "mongo/db/s/operation_sharding_state.h" #include "mongo/db/s/resharding/resharding_server_parameters_gen.h" -#include "mongo/db/session_catalog_mongod.h" +#include "mongo/db/session/logical_session_cache.h" +#include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/stats/counters.h" #include "mongo/db/transaction/transaction_participant.h" #include "mongo/logv2/log.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 12c1d94c323..620ccd969d5 100644 --- a/src/mongo/db/s/resharding/resharding_oplog_applier_test.cpp +++ b/src/mongo/db/s/resharding/resharding_oplog_applier_test.cpp @@ -34,7 +34,6 @@ #include "mongo/db/catalog_raii.h" #include "mongo/db/db_raii.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/logical_session_cache_noop.h" #include "mongo/db/repl/oplog_applier.h" #include "mongo/db/repl/session_update_tracker.h" #include "mongo/db/repl/storage_interface_impl.h" @@ -46,7 +45,8 @@ #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/s/sharding_mongod_test_fixture.h" #include "mongo/db/s/sharding_state.h" -#include "mongo/db/session_catalog_mongod.h" +#include "mongo/db/session/logical_session_cache_noop.h" +#include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/transaction/transaction_participant.h" #include "mongo/db/update/update_oplog_entry_serialization.h" #include "mongo/db/vector_clock_metadata_hook.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 963240e224f..f15f09b8031 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 @@ -33,8 +33,6 @@ #include "mongo/bson/bsonmisc.h" #include "mongo/db/catalog/collection_options.h" #include "mongo/db/catalog_raii.h" -#include "mongo/db/logical_session_cache_noop.h" -#include "mongo/db/logical_session_id.h" #include "mongo/db/op_observer/op_observer_registry.h" #include "mongo/db/op_observer/oplog_writer_impl.h" #include "mongo/db/persistent_task_store.h" @@ -49,7 +47,9 @@ #include "mongo/db/s/resharding/resharding_oplog_session_application.h" #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/service_context_d_test_fixture.h" -#include "mongo/db/session_catalog_mongod.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/transaction/transaction_participant.h" #include "mongo/db/vector_clock_metadata_hook.h" #include "mongo/executor/network_interface_factory.h" diff --git a/src/mongo/db/s/resharding/resharding_oplog_batch_preparer.cpp b/src/mongo/db/s/resharding/resharding_oplog_batch_preparer.cpp index 8f9afdce99c..ca382ace57c 100644 --- a/src/mongo/db/s/resharding/resharding_oplog_batch_preparer.cpp +++ b/src/mongo/db/s/resharding/resharding_oplog_batch_preparer.cpp @@ -34,11 +34,11 @@ #include <third_party/murmurhash3/MurmurHash3.h> #include "mongo/bson/bsonelement_comparator.h" -#include "mongo/db/logical_session_id.h" #include "mongo/db/ops/write_ops_retryability.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/repl/apply_ops.h" #include "mongo/db/s/resharding/resharding_server_parameters_gen.h" +#include "mongo/db/session/logical_session_id.h" #include "mongo/logv2/redaction.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/s/resharding/resharding_oplog_batch_preparer_test.cpp b/src/mongo/db/s/resharding/resharding_oplog_batch_preparer_test.cpp index de77aa2af55..2b42c344a2e 100644 --- a/src/mongo/db/s/resharding/resharding_oplog_batch_preparer_test.cpp +++ b/src/mongo/db/s/resharding/resharding_oplog_batch_preparer_test.cpp @@ -29,11 +29,11 @@ #include "mongo/platform/basic.h" -#include "mongo/db/logical_session_id_helpers.h" #include "mongo/db/ops/write_ops_retryability.h" #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/s/resharding/resharding_oplog_batch_preparer.h" #include "mongo/db/s/resharding/resharding_server_parameters_gen.h" +#include "mongo/db/session/logical_session_id_helpers.h" #include "mongo/idl/server_parameter_test_util.h" #include "mongo/unittest/unittest.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 437540edb76..43968dd99d5 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 @@ -31,7 +31,6 @@ #include "mongo/db/catalog/collection_options.h" #include "mongo/db/catalog/collection_write_path.h" #include "mongo/db/catalog_raii.h" -#include "mongo/db/logical_session_cache_noop.h" #include "mongo/db/op_observer/op_observer_registry.h" #include "mongo/db/op_observer/oplog_writer_impl.h" #include "mongo/db/persistent_task_store.h" @@ -48,7 +47,8 @@ #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/s/sharding_state.h" #include "mongo/db/service_context_d_test_fixture.h" -#include "mongo/db/session_catalog_mongod.h" +#include "mongo/db/session/logical_session_cache_noop.h" +#include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/update/update_oplog_entry_serialization.h" #include "mongo/s/catalog/type_chunk.h" #include "mongo/s/chunk_manager.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 d56ec50531d..85116d5cf4e 100644 --- a/src/mongo/db/s/resharding/resharding_oplog_fetcher_test.cpp +++ b/src/mongo/db/s/resharding/resharding_oplog_fetcher_test.cpp @@ -37,7 +37,6 @@ #include "mongo/db/db_raii.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/dbhelpers.h" -#include "mongo/db/logical_session_cache_noop.h" #include "mongo/db/op_observer/op_observer_impl.h" #include "mongo/db/pipeline/document_source_mock.h" #include "mongo/db/repl/storage_interface_impl.h" @@ -48,7 +47,8 @@ #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/s/shard_server_test_fixture.h" #include "mongo/db/service_context.h" -#include "mongo/db/session_catalog_mongod.h" +#include "mongo/db/session/logical_session_cache_noop.h" +#include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/storage/write_unit_of_work.h" #include "mongo/s/catalog/sharding_catalog_client_mock.h" #include "mongo/s/catalog/type_shard.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 4093e8b6176..c2f15a0b507 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 @@ -34,8 +34,6 @@ #include "mongo/db/catalog_raii.h" #include "mongo/db/exec/document_value/document.h" -#include "mongo/db/logical_session_id.h" -#include "mongo/db/logical_session_id_helpers.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/repl/session_update_tracker.h" @@ -43,7 +41,9 @@ #include "mongo/db/s/resharding/donor_oplog_id_gen.h" #include "mongo/db/s/resharding/resharding_oplog_session_application.h" #include "mongo/db/service_context_d_test_fixture.h" -#include "mongo/db/session_catalog_mongod.h" +#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/transaction/transaction_participant.h" #include "mongo/unittest/death_test.h" #include "mongo/unittest/unittest.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 62776bba466..33bab5f9491 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 @@ -39,7 +39,7 @@ #include "mongo/db/s/resharding/resharding_recipient_service_external_state.h" #include "mongo/db/s/resharding/resharding_util.h" #include "mongo/db/service_context_d_test_fixture.h" -#include "mongo/db/session_catalog_mongod.h" +#include "mongo/db/session/session_catalog_mongod.h" #include "mongo/logv2/log.h" #include "mongo/s/catalog_cache_test_fixture.h" #include "mongo/s/database_version.h" diff --git a/src/mongo/db/s/resharding/resharding_txn_cloner.cpp b/src/mongo/db/s/resharding/resharding_txn_cloner.cpp index e8f98fb3619..8a015e52af5 100644 --- a/src/mongo/db/s/resharding/resharding_txn_cloner.cpp +++ b/src/mongo/db/s/resharding/resharding_txn_cloner.cpp @@ -39,7 +39,6 @@ #include "mongo/db/client.h" #include "mongo/db/concurrency/d_concurrency.h" #include "mongo/db/curop.h" -#include "mongo/db/logical_session_id.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/persistent_task_store.h" @@ -55,8 +54,9 @@ #include "mongo/db/s/resharding/resharding_server_parameters_gen.h" #include "mongo/db/s/resharding/resharding_txn_cloner_progress_gen.h" #include "mongo/db/s/session_catalog_migration_destination.h" -#include "mongo/db/session_catalog_mongod.h" -#include "mongo/db/transaction/session_txn_record_gen.h" +#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/transaction/transaction_participant.h" #include "mongo/logv2/log.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/s/resharding/resharding_txn_cloner.h b/src/mongo/db/s/resharding/resharding_txn_cloner.h index 2653ba9fc0a..17a0f7573d1 100644 --- a/src/mongo/db/s/resharding/resharding_txn_cloner.h +++ b/src/mongo/db/s/resharding/resharding_txn_cloner.h @@ -34,11 +34,11 @@ #include "mongo/bson/timestamp.h" #include "mongo/db/cancelable_operation_context.h" -#include "mongo/db/logical_session_id_gen.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/pipeline.h" #include "mongo/db/service_context.h" -#include "mongo/db/transaction/session_txn_record_gen.h" +#include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/session/session_txn_record_gen.h" #include "mongo/s/resharding/common_types_gen.h" #include "mongo/util/future.h" diff --git a/src/mongo/db/s/resharding/resharding_txn_cloner_progress.idl b/src/mongo/db/s/resharding/resharding_txn_cloner_progress.idl index 640dda5f651..d9a7604c283 100644 --- a/src/mongo/db/s/resharding/resharding_txn_cloner_progress.idl +++ b/src/mongo/db/s/resharding/resharding_txn_cloner_progress.idl @@ -33,7 +33,7 @@ global: cpp_namespace: "mongo" imports: - - "mongo/db/logical_session_id.idl" + - "mongo/db/session/logical_session_id.idl" - "mongo/idl/basic_types.idl" - "mongo/s/resharding/common_types.idl" - "mongo/s/sharding_types.idl" 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 ee0c6c00b83..8f2ad7c64ef 100644 --- a/src/mongo/db/s/resharding/resharding_txn_cloner_test.cpp +++ b/src/mongo/db/s/resharding/resharding_txn_cloner_test.cpp @@ -35,7 +35,6 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/cancelable_operation_context.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/logical_session_cache_noop.h" #include "mongo/db/persistent_task_store.h" #include "mongo/db/pipeline/process_interface/shardsvr_process_interface.h" #include "mongo/db/repl/storage_interface_impl.h" @@ -45,8 +44,9 @@ #include "mongo/db/s/resharding/resharding_txn_cloner_progress_gen.h" #include "mongo/db/s/shard_server_test_fixture.h" #include "mongo/db/s/sharding_state.h" -#include "mongo/db/session_catalog_mongod.h" -#include "mongo/db/transaction/session_txn_record_gen.h" +#include "mongo/db/session/logical_session_cache_noop.h" +#include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/session/session_txn_record_gen.h" #include "mongo/db/transaction/transaction_participant.h" #include "mongo/db/vector_clock_metadata_hook.h" #include "mongo/executor/network_interface_factory.h" diff --git a/src/mongo/db/s/resharding/resharding_util_test.cpp b/src/mongo/db/s/resharding/resharding_util_test.cpp index 69daa55bd00..82e8180027e 100644 --- a/src/mongo/db/s/resharding/resharding_util_test.cpp +++ b/src/mongo/db/s/resharding/resharding_util_test.cpp @@ -43,7 +43,7 @@ #include "mongo/db/s/config/config_server_test_fixture.h" #include "mongo/db/s/resharding/resharding_txn_cloner.h" #include "mongo/db/s/resharding/resharding_util.h" -#include "mongo/db/transaction/session_txn_record_gen.h" +#include "mongo/db/session/session_txn_record_gen.h" #include "mongo/s/catalog/type_shard.h" #include "mongo/s/shard_id.h" #include "mongo/unittest/unittest.h" |