diff options
| author | Shin Yee Tan <shinyee.tan@mongodb.com> | 2022-08-17 16:56:46 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-08-17 18:00:05 +0000 |
| commit | 27d4e9bb36bc09d27c17edb4ecd38ea120fd6b28 (patch) | |
| tree | ec83e5086b782a583cd94b7e938196f3be25314f /src/mongo/db/repl | |
| parent | 96debbaa3974a4c2cea4d79ddc4bd2765ad70351 (diff) | |
| download | mongo-27d4e9bb36bc09d27c17edb4ecd38ea120fd6b28.tar.gz | |
SERVER-68214 move session_catalog*, session*, logical_session* to mongo/db/session directory
Diffstat (limited to 'src/mongo/db/repl')
30 files changed, 50 insertions, 50 deletions
diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript index d4b3d4b9fcc..0e9cc894058 100644 --- a/src/mongo/db/repl/SConscript +++ b/src/mongo/db/repl/SConscript @@ -540,11 +540,11 @@ env.Library( '$BUILD_DIR/mongo/db/catalog/import_collection_oplog_entry', '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/index_builds_coordinator_interface', - '$BUILD_DIR/mongo/db/kill_sessions_local', '$BUILD_DIR/mongo/db/multitenancy', '$BUILD_DIR/mongo/db/ops/write_ops', '$BUILD_DIR/mongo/db/repl/tenant_migration_access_blocker', '$BUILD_DIR/mongo/db/s/sharding_runtime_d', + '$BUILD_DIR/mongo/db/session/kill_sessions_local', '$BUILD_DIR/mongo/db/storage/historical_ident_tracker', '$BUILD_DIR/mongo/idl/server_parameter', 'drop_pending_collection_reaper', @@ -649,8 +649,8 @@ env.Library( LIBDEPS=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/common', - '$BUILD_DIR/mongo/db/logical_session_id', '$BUILD_DIR/mongo/db/namespace_string', + '$BUILD_DIR/mongo/db/session/logical_session_id', 'oplog_entry', 'optime', ], @@ -731,11 +731,11 @@ env.Library( '$BUILD_DIR/mongo/db/common', '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/index/index_descriptor', - '$BUILD_DIR/mongo/db/kill_sessions_local', '$BUILD_DIR/mongo/db/mongod_options', '$BUILD_DIR/mongo/db/prepare_conflict_tracker', '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/service_context', + '$BUILD_DIR/mongo/db/session/kill_sessions_local', '$BUILD_DIR/mongo/executor/task_executor_interface', '$BUILD_DIR/mongo/rpc/command_status', '$BUILD_DIR/mongo/rpc/metadata', @@ -758,7 +758,7 @@ env.Library( '$BUILD_DIR/mongo/db/catalog/local_oplog_info', '$BUILD_DIR/mongo/db/commands/test_commands_enabled', '$BUILD_DIR/mongo/db/index_builds_coordinator_interface', - '$BUILD_DIR/mongo/db/session_catalog', + '$BUILD_DIR/mongo/db/session/session_catalog', '$BUILD_DIR/mongo/db/storage/journal_flusher', '$BUILD_DIR/mongo/idl/server_parameter', 'delayable_timeout_callback', @@ -1506,12 +1506,12 @@ env.Library( '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/curop', '$BUILD_DIR/mongo/db/free_mon/free_mon_mongod', - '$BUILD_DIR/mongo/db/kill_sessions_local', '$BUILD_DIR/mongo/db/logical_time', '$BUILD_DIR/mongo/db/not_primary_error_tracker', '$BUILD_DIR/mongo/db/op_observer/op_observer', '$BUILD_DIR/mongo/db/query_exec', '$BUILD_DIR/mongo/db/service_context', + '$BUILD_DIR/mongo/db/session/kill_sessions_local', '$BUILD_DIR/mongo/db/stats/counters', '$BUILD_DIR/mongo/db/system_index', '$BUILD_DIR/mongo/db/vector_clock', @@ -1720,7 +1720,6 @@ if wiredtiger: '$BUILD_DIR/mongo/db/index/index_access_methods', '$BUILD_DIR/mongo/db/index_build_entry_helpers', '$BUILD_DIR/mongo/db/index_builds_coordinator_mongod', - '$BUILD_DIR/mongo/db/logical_session_id_helpers', '$BUILD_DIR/mongo/db/logical_time', '$BUILD_DIR/mongo/db/multitenancy', '$BUILD_DIR/mongo/db/op_observer/op_observer_impl', @@ -1730,6 +1729,7 @@ if wiredtiger: '$BUILD_DIR/mongo/db/s/sharding_runtime_d', '$BUILD_DIR/mongo/db/service_context_d_test_fixture', '$BUILD_DIR/mongo/db/service_context_test_fixture', + '$BUILD_DIR/mongo/db/session/logical_session_id_helpers', '$BUILD_DIR/mongo/db/stats/counters', '$BUILD_DIR/mongo/db/storage/storage_control', '$BUILD_DIR/mongo/db/transaction/transaction', @@ -2020,7 +2020,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/logical_session_id', + '$BUILD_DIR/mongo/db/session/logical_session_id', '$BUILD_DIR/mongo/idl/idl_parser', 'oplog_entry', ], diff --git a/src/mongo/db/repl/apply_ops.cpp b/src/mongo/db/repl/apply_ops.cpp index fe04751ae12..f7874d41153 100644 --- a/src/mongo/db/repl/apply_ops.cpp +++ b/src/mongo/db/repl/apply_ops.cpp @@ -51,7 +51,7 @@ #include "mongo/db/query/collation/collation_spec.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/service_context.h" -#include "mongo/db/session_catalog_mongod.h" +#include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/transaction/transaction_participant.h" #include "mongo/logv2/log.h" #include "mongo/rpc/get_status_from_command_result.h" diff --git a/src/mongo/db/repl/idempotency_test_fixture.cpp b/src/mongo/db/repl/idempotency_test_fixture.cpp index 18f920b1ffd..71c5f5f47a9 100644 --- a/src/mongo/db/repl/idempotency_test_fixture.cpp +++ b/src/mongo/db/repl/idempotency_test_fixture.cpp @@ -47,7 +47,6 @@ #include "mongo/db/db_raii.h" #include "mongo/db/index_builds_coordinator.h" #include "mongo/db/jsobj.h" -#include "mongo/db/logical_session_id.h" #include "mongo/db/query/internal_plans.h" #include "mongo/db/repl/bgsync.h" #include "mongo/db/repl/drop_pending_collection_reaper.h" @@ -59,6 +58,7 @@ #include "mongo/db/repl/replication_consistency_markers_mock.h" #include "mongo/db/repl/replication_coordinator_mock.h" #include "mongo/db/repl/storage_interface.h" +#include "mongo/db/session/logical_session_id.h" #include "mongo/util/md5.hpp" namespace mongo { diff --git a/src/mongo/db/repl/idempotency_test_fixture.h b/src/mongo/db/repl/idempotency_test_fixture.h index 93766f8d51e..52b0ccb2c4f 100644 --- a/src/mongo/db/repl/idempotency_test_fixture.h +++ b/src/mongo/db/repl/idempotency_test_fixture.h @@ -38,11 +38,11 @@ #include "mongo/bson/simple_bsonobj_comparator.h" #include "mongo/bson/timestamp.h" #include "mongo/db/catalog/collection_options.h" -#include "mongo/db/logical_session_id.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/util/duration.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/repl/image_collection_entry.idl b/src/mongo/db/repl/image_collection_entry.idl index 50a0a1802fc..e1bba459ed7 100644 --- a/src/mongo/db/repl/image_collection_entry.idl +++ b/src/mongo/db/repl/image_collection_entry.idl @@ -33,7 +33,7 @@ global: imports: - "mongo/idl/basic_types.idl" - - "mongo/db/logical_session_id.idl" + - "mongo/db/session/logical_session_id.idl" - "mongo/db/repl/oplog_entry.idl" structs: diff --git a/src/mongo/db/repl/initial_syncer.cpp b/src/mongo/db/repl/initial_syncer.cpp index a5fa6c4766a..709893dde28 100644 --- a/src/mongo/db/repl/initial_syncer.cpp +++ b/src/mongo/db/repl/initial_syncer.cpp @@ -63,7 +63,7 @@ #include "mongo/db/repl/sync_source_selector.h" #include "mongo/db/repl/tenant_migration_access_blocker_util.h" #include "mongo/db/repl/transaction_oplog_application.h" -#include "mongo/db/transaction/session_txn_record_gen.h" +#include "mongo/db/session/session_txn_record_gen.h" #include "mongo/executor/task_executor.h" #include "mongo/executor/thread_pool_task_executor.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/repl/oplog.h b/src/mongo/db/repl/oplog.h index c3c9c2de13a..f3af3ff146f 100644 --- a/src/mongo/db/repl/oplog.h +++ b/src/mongo/db/repl/oplog.h @@ -37,11 +37,11 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/timestamp.h" #include "mongo/db/catalog/collection_options.h" -#include "mongo/db/logical_session_id.h" #include "mongo/db/repl/oplog_entry.h" #include "mongo/db/repl/oplog_entry_or_grouped_inserts.h" #include "mongo/db/repl/optime.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/session/logical_session_id.h" namespace mongo { class Collection; diff --git a/src/mongo/db/repl/oplog_applier_impl.cpp b/src/mongo/db/repl/oplog_applier_impl.cpp index 8dfbdbd24f6..e12c57e0384 100644 --- a/src/mongo/db/repl/oplog_applier_impl.cpp +++ b/src/mongo/db/repl/oplog_applier_impl.cpp @@ -38,11 +38,11 @@ #include "mongo/db/change_stream_change_collection_manager.h" #include "mongo/db/client.h" #include "mongo/db/db_raii.h" -#include "mongo/db/logical_session_id.h" #include "mongo/db/repl/apply_ops.h" #include "mongo/db/repl/oplog_applier_utils.h" #include "mongo/db/repl/repl_server_parameters_gen.h" #include "mongo/db/repl/transaction_oplog_application.h" +#include "mongo/db/session/logical_session_id.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 63aa5ed2092..cec936a5ce1 100644 --- a/src/mongo/db/repl/oplog_applier_impl_test.cpp +++ b/src/mongo/db/repl/oplog_applier_impl_test.cpp @@ -49,7 +49,6 @@ #include "mongo/db/db_raii.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/jsobj.h" -#include "mongo/db/logical_session_id_helpers.h" #include "mongo/db/ops/write_ops.h" #include "mongo/db/pipeline/change_stream_preimage_gen.h" #include "mongo/db/query/internal_plans.h" @@ -64,9 +63,10 @@ #include "mongo/db/repl/replication_process.h" #include "mongo/db/repl/storage_interface.h" #include "mongo/db/service_context_d_test_fixture.h" -#include "mongo/db/session_catalog_mongod.h" +#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/stats/counters.h" -#include "mongo/db/transaction/session_txn_record_gen.h" #include "mongo/db/transaction/transaction_participant_gen.h" #include "mongo/db/update/update_oplog_entry_serialization.h" #include "mongo/idl/server_parameter_test_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 7f78085ff7e..1b5449fa739 100644 --- a/src/mongo/db/repl/oplog_applier_impl_test_fixture.h +++ b/src/mongo/db/repl/oplog_applier_impl_test_fixture.h @@ -32,12 +32,12 @@ #include "mongo/base/status.h" #include "mongo/db/concurrency/lock_manager_defs.h" #include "mongo/db/db_raii.h" -#include "mongo/db/logical_session_id.h" #include "mongo/db/op_observer/op_observer_noop.h" #include "mongo/db/repl/oplog_applier_impl.h" #include "mongo/db/repl/replication_consistency_markers.h" #include "mongo/db/service_context_d_test_fixture.h" -#include "mongo/db/transaction/session_txn_record_gen.h" +#include "mongo/db/session/logical_session_id.h" +#include "mongo/db/session/session_txn_record_gen.h" namespace mongo { diff --git a/src/mongo/db/repl/oplog_entry.h b/src/mongo/db/repl/oplog_entry.h index 9e90b15a310..ef96c66e39c 100644 --- a/src/mongo/db/repl/oplog_entry.h +++ b/src/mongo/db/repl/oplog_entry.h @@ -32,11 +32,11 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/simple_bsonobj_comparator.h" #include "mongo/db/catalog/collection_options.h" -#include "mongo/db/logical_session_id.h" #include "mongo/db/repl/apply_ops_gen.h" #include "mongo/db/repl/oplog_entry_gen.h" #include "mongo/db/repl/optime.h" #include "mongo/db/server_feature_flags_gen.h" +#include "mongo/db/session/logical_session_id.h" #include "mongo/util/overloaded_visitor.h" namespace mongo { diff --git a/src/mongo/db/repl/oplog_entry.idl b/src/mongo/db/repl/oplog_entry.idl index 987f5806cbf..8b74b363609 100644 --- a/src/mongo/db/repl/oplog_entry.idl +++ b/src/mongo/db/repl/oplog_entry.idl @@ -33,7 +33,7 @@ global: imports: - "mongo/idl/basic_types.idl" - - "mongo/db/logical_session_id.idl" + - "mongo/db/session/logical_session_id.idl" - "mongo/db/pipeline/value.idl" - "mongo/db/repl/optime_base.idl" - "mongo/db/repl/replication_types.idl" diff --git a/src/mongo/db/repl/oplog_entry_test_helpers.h b/src/mongo/db/repl/oplog_entry_test_helpers.h index 0375ed8a30f..578f1fdd701 100644 --- a/src/mongo/db/repl/oplog_entry_test_helpers.h +++ b/src/mongo/db/repl/oplog_entry_test_helpers.h @@ -30,10 +30,10 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/logical_session_id.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/oplog_entry.h" #include "mongo/db/repl/optime.h" +#include "mongo/db/session/logical_session_id.h" #include "mongo/util/uuid.h" namespace mongo { 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 4b65b140249..e4430c8aef8 100644 --- a/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp +++ b/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp @@ -57,7 +57,6 @@ #include "mongo/db/free_mon/free_mon_mongod.h" #include "mongo/db/index_builds_coordinator.h" #include "mongo/db/jsobj.h" -#include "mongo/db/kill_sessions_local.h" #include "mongo/db/logical_time_validator.h" #include "mongo/db/op_observer/op_observer.h" #include "mongo/db/query/query_feature_flags_gen.h" @@ -92,7 +91,8 @@ #include "mongo/db/s/transaction_coordinator_service.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" -#include "mongo/db/session_catalog_mongod.h" +#include "mongo/db/session/kill_sessions_local.h" +#include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/storage/control/journal_flusher.h" #include "mongo/db/storage/flow_control.h" #include "mongo/db/storage/storage_engine.h" diff --git a/src/mongo/db/repl/replication_coordinator_impl.cpp b/src/mongo/db/repl/replication_coordinator_impl.cpp index 622c32db0dd..2a8eec4863b 100644 --- a/src/mongo/db/repl/replication_coordinator_impl.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl.cpp @@ -59,7 +59,6 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/index/index_descriptor.h" #include "mongo/db/index_builds_coordinator.h" -#include "mongo/db/kill_sessions_local.h" #include "mongo/db/mongod_options_storage_gen.h" #include "mongo/db/prepare_conflict_tracker.h" #include "mongo/db/read_write_concern_defaults.h" @@ -89,7 +88,8 @@ #include "mongo/db/repl/update_position_args.h" #include "mongo/db/repl/vote_requester.h" #include "mongo/db/server_options.h" -#include "mongo/db/session_catalog.h" +#include "mongo/db/session/kill_sessions_local.h" +#include "mongo/db/session/session_catalog.h" #include "mongo/db/shutdown_in_progress_quiesce_info.h" #include "mongo/db/storage/control/journal_flusher.h" #include "mongo/db/storage/storage_options.h" diff --git a/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp b/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp index 2051b421805..59c30e9cd41 100644 --- a/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp @@ -45,7 +45,6 @@ #include "mongo/db/commands/test_commands_enabled.h" #include "mongo/db/global_settings.h" #include "mongo/db/index_builds_coordinator.h" -#include "mongo/db/kill_sessions_local.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/heartbeat_response_action.h" #include "mongo/db/repl/repl_server_parameters_gen.h" @@ -60,6 +59,7 @@ #include "mongo/db/repl/topology_coordinator.h" #include "mongo/db/repl/vote_requester.h" #include "mongo/db/service_context.h" +#include "mongo/db/session/kill_sessions_local.h" #include "mongo/db/storage/control/journal_flusher.h" #include "mongo/logv2/log.h" #include "mongo/platform/mutex.h" diff --git a/src/mongo/db/repl/replication_info.cpp b/src/mongo/db/repl/replication_info.cpp index f65648b7c24..868aa7691af 100644 --- a/src/mongo/db/repl/replication_info.cpp +++ b/src/mongo/db/repl/replication_info.cpp @@ -45,7 +45,6 @@ #include "mongo/db/dbhelpers.h" #include "mongo/db/exec/working_set_common.h" #include "mongo/db/jsobj.h" -#include "mongo/db/logical_session_id.h" #include "mongo/db/namespace_string.h" #include "mongo/db/not_primary_error_tracker.h" #include "mongo/db/ops/write_ops.h" @@ -60,6 +59,7 @@ #include "mongo/db/repl/replication_process.h" #include "mongo/db/repl/storage_interface.h" #include "mongo/db/s/global_user_write_block_state.h" +#include "mongo/db/session/logical_session_id.h" #include "mongo/db/storage/storage_options.h" #include "mongo/db/wire_version.h" #include "mongo/executor/network_interface.h" diff --git a/src/mongo/db/repl/replication_recovery.cpp b/src/mongo/db/repl/replication_recovery.cpp index efa3b502ecd..3ac6b996133 100644 --- a/src/mongo/db/repl/replication_recovery.cpp +++ b/src/mongo/db/repl/replication_recovery.cpp @@ -50,7 +50,7 @@ #include "mongo/db/repl/storage_interface.h" #include "mongo/db/repl/transaction_oplog_application.h" #include "mongo/db/server_recovery.h" -#include "mongo/db/session.h" +#include "mongo/db/session/session.h" #include "mongo/db/storage/control/journal_flusher.h" #include "mongo/db/storage/durable_history_pin.h" #include "mongo/db/storage/storage_parameters_gen.h" diff --git a/src/mongo/db/repl/replication_recovery_test.cpp b/src/mongo/db/repl/replication_recovery_test.cpp index f5c98d978a4..5e57d595ef2 100644 --- a/src/mongo/db/repl/replication_recovery_test.cpp +++ b/src/mongo/db/repl/replication_recovery_test.cpp @@ -45,11 +45,11 @@ #include "mongo/db/repl/replication_recovery.h" #include "mongo/db/repl/storage_interface_impl.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/db/session/session_txn_record_gen.h" #include "mongo/db/storage/durable_history_pin.h" #include "mongo/db/storage/storage_options.h" #include "mongo/db/storage/storage_parameters_gen.h" -#include "mongo/db/transaction/session_txn_record_gen.h" #include "mongo/db/transaction/transaction_participant.h" #include "mongo/db/update/update_oplog_entry_serialization.h" #include "mongo/unittest/death_test.h" diff --git a/src/mongo/db/repl/rollback_impl.cpp b/src/mongo/db/repl/rollback_impl.cpp index 8c24e24e88f..07d3eb76fd7 100644 --- a/src/mongo/db/repl/rollback_impl.cpp +++ b/src/mongo/db/repl/rollback_impl.cpp @@ -45,7 +45,6 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/index_builds_coordinator.h" -#include "mongo/db/kill_sessions_local.h" #include "mongo/db/logical_time_validator.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/apply_ops.h" @@ -59,10 +58,11 @@ #include "mongo/db/repl/transaction_oplog_application.h" #include "mongo/db/s/type_shard_identity.h" #include "mongo/db/server_recovery.h" -#include "mongo/db/session_catalog_mongod.h" +#include "mongo/db/session/kill_sessions_local.h" +#include "mongo/db/session/session_catalog_mongod.h" +#include "mongo/db/session/session_txn_record_gen.h" #include "mongo/db/storage/historical_ident_tracker.h" #include "mongo/db/storage/remove_saver.h" -#include "mongo/db/transaction/session_txn_record_gen.h" #include "mongo/db/transaction/transaction_history_iterator.h" #include "mongo/logv2/log.h" #include "mongo/s/catalog/type_config_version.h" diff --git a/src/mongo/db/repl/rollback_impl_test.cpp b/src/mongo/db/repl/rollback_impl_test.cpp index 8763f8b840d..768d9e4c2a6 100644 --- a/src/mongo/db/repl/rollback_impl_test.cpp +++ b/src/mongo/db/repl/rollback_impl_test.cpp @@ -36,8 +36,6 @@ #include "mongo/db/catalog/collection_mock.h" #include "mongo/db/catalog/drop_collection.h" #include "mongo/db/index/index_descriptor.h" -#include "mongo/db/logical_session_id_gen.h" -#include "mongo/db/logical_session_id_helpers.h" #include "mongo/db/repl/drop_pending_collection_reaper.h" #include "mongo/db/repl/oplog_entry.h" #include "mongo/db/repl/oplog_interface_local.h" @@ -47,6 +45,8 @@ #include "mongo/db/s/operation_sharding_state.h" #include "mongo/db/s/type_shard_identity.h" #include "mongo/db/service_context.h" +#include "mongo/db/session/logical_session_id_gen.h" +#include "mongo/db/session/logical_session_id_helpers.h" #include "mongo/logv2/log.h" #include "mongo/s/catalog/type_config_version.h" #include "mongo/stdx/thread.h" diff --git a/src/mongo/db/repl/rs_rollback.cpp b/src/mongo/db/repl/rs_rollback.cpp index d3b380459e2..cbd584834cd 100644 --- a/src/mongo/db/repl/rs_rollback.cpp +++ b/src/mongo/db/repl/rs_rollback.cpp @@ -52,7 +52,6 @@ #include "mongo/db/dbhelpers.h" #include "mongo/db/exec/working_set_common.h" #include "mongo/db/index_builds_coordinator.h" -#include "mongo/db/logical_session_id.h" #include "mongo/db/logical_time_validator.h" #include "mongo/db/ops/delete.h" #include "mongo/db/ops/update.h" @@ -69,7 +68,8 @@ #include "mongo/db/repl/roll_back_local_operations.h" #include "mongo/db/repl/rollback_source.h" #include "mongo/db/s/shard_identity_rollback_notifier.h" -#include "mongo/db/session_catalog_mongod.h" +#include "mongo/db/session/logical_session_id.h" +#include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/storage/control/journal_flusher.h" #include "mongo/db/storage/remove_saver.h" #include "mongo/db/transaction/transaction_participant.h" diff --git a/src/mongo/db/repl/session_update_tracker.cpp b/src/mongo/db/repl/session_update_tracker.cpp index 1ad7b4a95b2..cd0d02e95d1 100644 --- a/src/mongo/db/repl/session_update_tracker.cpp +++ b/src/mongo/db/repl/session_update_tracker.cpp @@ -36,8 +36,8 @@ #include "mongo/db/ops/write_ops_retryability.h" #include "mongo/db/repl/oplog_entry.h" #include "mongo/db/server_options.h" -#include "mongo/db/session.h" -#include "mongo/db/transaction/session_txn_record_gen.h" +#include "mongo/db/session/session.h" +#include "mongo/db/session/session_txn_record_gen.h" #include "mongo/db/transaction/transaction_participant_gen.h" #include "mongo/db/update/update_oplog_entry_serialization.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/repl/session_update_tracker.h b/src/mongo/db/repl/session_update_tracker.h index b792a3b3235..c3d16da1465 100644 --- a/src/mongo/db/repl/session_update_tracker.h +++ b/src/mongo/db/repl/session_update_tracker.h @@ -34,8 +34,8 @@ #include <vector> #include "mongo/bson/bsonobj.h" -#include "mongo/db/logical_session_id.h" #include "mongo/db/repl/oplog_entry.h" +#include "mongo/db/session/logical_session_id.h" #include "mongo/util/uuid.h" namespace mongo { diff --git a/src/mongo/db/repl/storage_timestamp_test.cpp b/src/mongo/db/repl/storage_timestamp_test.cpp index 1a63b3b764e..e3e695be9b0 100644 --- a/src/mongo/db/repl/storage_timestamp_test.cpp +++ b/src/mongo/db/repl/storage_timestamp_test.cpp @@ -77,8 +77,8 @@ #include "mongo/db/s/collection_sharding_state_factory_shard.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_d_test_fixture.h" -#include "mongo/db/session.h" -#include "mongo/db/session_catalog_mongod.h" +#include "mongo/db/session/session.h" +#include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/storage/snapshot_manager.h" #include "mongo/db/storage/storage_engine_impl.h" #include "mongo/db/transaction/transaction_participant.h" diff --git a/src/mongo/db/repl/tenant_migration_recipient_service.cpp b/src/mongo/db/repl/tenant_migration_recipient_service.cpp index 068853273b2..7f3b1e2474f 100644 --- a/src/mongo/db/repl/tenant_migration_recipient_service.cpp +++ b/src/mongo/db/repl/tenant_migration_recipient_service.cpp @@ -69,9 +69,9 @@ #include "mongo/db/repl/tenant_migration_state_machine_gen.h" #include "mongo/db/repl/tenant_migration_statistics.h" #include "mongo/db/repl/wait_for_majority_service.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/wiredtiger/wiredtiger_import.h" -#include "mongo/db/transaction/session_txn_record_gen.h" #include "mongo/db/transaction/transaction_participant.h" #include "mongo/db/vector_clock_mutable.h" #include "mongo/db/write_concern_options.h" diff --git a/src/mongo/db/repl/tenant_migration_recipient_service_test.cpp b/src/mongo/db/repl/tenant_migration_recipient_service_test.cpp index 50135f651db..acc80047451 100644 --- a/src/mongo/db/repl/tenant_migration_recipient_service_test.cpp +++ b/src/mongo/db/repl/tenant_migration_recipient_service_test.cpp @@ -55,7 +55,7 @@ #include "mongo/db/repl/tenant_migration_state_machine_gen.h" #include "mongo/db/repl/wait_for_majority_service.h" #include "mongo/db/service_context_d_test_fixture.h" -#include "mongo/db/transaction/session_txn_record_gen.h" +#include "mongo/db/session/session_txn_record_gen.h" #include "mongo/dbtests/mock/mock_conn_registry.h" #include "mongo/dbtests/mock/mock_replica_set.h" #include "mongo/executor/network_interface.h" diff --git a/src/mongo/db/repl/tenant_oplog_applier.cpp b/src/mongo/db/repl/tenant_oplog_applier.cpp index 6f3e1b9c9b8..098439436ee 100644 --- a/src/mongo/db/repl/tenant_oplog_applier.cpp +++ b/src/mongo/db/repl/tenant_oplog_applier.cpp @@ -51,7 +51,7 @@ #include "mongo/db/repl/tenant_migration_decoration.h" #include "mongo/db/repl/tenant_migration_recipient_service.h" #include "mongo/db/repl/tenant_oplog_batcher.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/logv2/log.h" #include "mongo/util/concurrency/thread_pool.h" diff --git a/src/mongo/db/repl/tenant_oplog_applier_test.cpp b/src/mongo/db/repl/tenant_oplog_applier_test.cpp index bf77f11a540..c56dc234c02 100644 --- a/src/mongo/db/repl/tenant_oplog_applier_test.cpp +++ b/src/mongo/db/repl/tenant_oplog_applier_test.cpp @@ -33,7 +33,6 @@ #include <vector> #include "mongo/db/dbdirectclient.h" -#include "mongo/db/logical_session_id_helpers.h" #include "mongo/db/op_observer/op_observer_noop.h" #include "mongo/db/op_observer/op_observer_registry.h" #include "mongo/db/repl/oplog_applier_impl_test_fixture.h" @@ -48,7 +47,8 @@ #include "mongo/db/repl/tenant_oplog_batcher.h" #include "mongo/db/service_context_d_test_fixture.h" #include "mongo/db/service_context_test_fixture.h" -#include "mongo/db/session_catalog_mongod.h" +#include "mongo/db/session/logical_session_id_helpers.h" +#include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/tenant_id.h" #include "mongo/db/update/update_oplog_entry_serialization.h" #include "mongo/executor/thread_pool_task_executor_test_fixture.h" diff --git a/src/mongo/db/repl/transaction_oplog_application.cpp b/src/mongo/db/repl/transaction_oplog_application.cpp index 6e647cf8432..3c363078a6f 100644 --- a/src/mongo/db/repl/transaction_oplog_application.cpp +++ b/src/mongo/db/repl/transaction_oplog_application.cpp @@ -40,7 +40,7 @@ #include "mongo/db/repl/apply_ops.h" #include "mongo/db/repl/storage_interface_impl.h" #include "mongo/db/repl/timestamp_block.h" -#include "mongo/db/session_catalog_mongod.h" +#include "mongo/db/session/session_catalog_mongod.h" #include "mongo/db/transaction/transaction_history_iterator.h" #include "mongo/db/transaction/transaction_participant.h" #include "mongo/logv2/log.h" |