diff options
Diffstat (limited to 'src/mongo')
-rw-r--r-- | src/mongo/db/SConscript | 26 | ||||
-rw-r--r-- | src/mongo/db/commands/SConscript | 5 | ||||
-rw-r--r-- | src/mongo/db/initialize_operation_session_info.cpp (renamed from src/mongo/db/session/initialize_operation_session_info.cpp) | 4 | ||||
-rw-r--r-- | src/mongo/db/initialize_operation_session_info.h (renamed from src/mongo/db/session/initialize_operation_session_info.h) | 0 | ||||
-rw-r--r-- | src/mongo/db/s/session_catalog_migration_destination_test.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/service_entry_point_common.cpp | 3 | ||||
-rw-r--r-- | src/mongo/db/session/SConscript | 1 | ||||
-rw-r--r-- | src/mongo/db/session/logical_session_id_test.cpp | 7 | ||||
-rw-r--r-- | src/mongo/embedded/SConscript | 1 | ||||
-rw-r--r-- | src/mongo/s/SConscript | 9 | ||||
-rw-r--r-- | src/mongo/s/commands/strategy.cpp | 2 |
11 files changed, 24 insertions, 36 deletions
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index 58a090cdced..d0e8b323673 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -875,12 +875,15 @@ env.Library( 's/transaction_coordinator_curop.cpp', 's/transaction_coordinator_factory.cpp', 's/transaction_coordinator_worker_curop_repository.cpp', + 'transaction_resources.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/s/grid', 'concurrency/lock_manager', 'index/index_access_method', + 'rw_concern_d', 'shard_role_api_stor_ex', + 'views/views', ], LIBDEPS_PRIVATE=[ 'server_base', @@ -891,13 +894,12 @@ env.Library( env.Library( target='shard_role', source=[ - 'catalog_raii.cpp', 'catalog/catalog_helper.cpp', 'catalog/collection_uuid_mismatch.cpp', 'catalog/collection_yield_restore.cpp', + 'catalog_raii.cpp', 'db_raii.cpp', 'shard_role.cpp', - 'transaction_resources.cpp', ], LIBDEPS=[ 'catalog/collection_catalog', @@ -905,7 +907,6 @@ env.Library( 'shard_role_api', 'stats/top', 'storage/write_unit_of_work', - 'views/views', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/catalog/collection_uuid_mismatch_info', @@ -1830,23 +1831,24 @@ env.Library( 'error_labels.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/db/pipeline/lite_parsed_document_source', - '$BUILD_DIR/mongo/db/query/op_metrics', - '$BUILD_DIR/mongo/db/session/logical_session_id', 'commands', + 'pipeline/lite_parsed_document_source', + 'query/op_metrics', + 'session/logical_session_id', ], ) env.Library( target='shared_request_handling', source=[ + 'initialize_operation_session_info.cpp', 'transaction_validation.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', 'api_parameters', 'error_labels', - 'session/logical_session_cache_impl', + 'repl/repl_coordinator_interface', + 'session/logical_session_cache', ], ) @@ -2271,11 +2273,11 @@ env.Library( ) env.Library( - target="mongod_initializers", + target='mongod_initializers', source=[ # NOTE: If you add an additional source file here, please delete # the file db/mongod_initializers.cpp. - "mongod_initializers.cpp", + 'mongod_initializers.cpp', ], LIBDEPS_PRIVATE=[ # NOTE: If you need to add a static or mongo initializer to mongod startup, @@ -2357,7 +2359,6 @@ env.Library( 'serverless/shard_split_commands', 'service_liaison_mongod', 'session/kill_sessions_local', - 'session/logical_session_cache_impl', 'session/sessions_collection_rs', 'session/sessions_collection_standalone', 'shard_role', @@ -2413,6 +2414,7 @@ env.Library( '$BUILD_DIR/mongo/db/pipeline/change_stream_expired_pre_image_remover', '$BUILD_DIR/mongo/db/query/stats/query_stats', '$BUILD_DIR/mongo/db/s/query_analysis_writer', + '$BUILD_DIR/mongo/db/session/logical_session_cache_impl', '$BUILD_DIR/mongo/db/set_change_stream_state_coordinator', '$BUILD_DIR/mongo/idl/cluster_server_parameter', '$BUILD_DIR/mongo/idl/cluster_server_parameter_initializer', @@ -2691,9 +2693,7 @@ if wiredtiger: '$BUILD_DIR/mongo/db/repl/storage_interface_impl', '$BUILD_DIR/mongo/db/repl/tenant_migration_access_blocker', '$BUILD_DIR/mongo/db/s/shard_server_test_fixture', - '$BUILD_DIR/mongo/db/session/logical_session_cache', '$BUILD_DIR/mongo/db/session/logical_session_cache_impl', - '$BUILD_DIR/mongo/db/session/logical_session_id', '$BUILD_DIR/mongo/db/session/logical_session_id_helpers', '$BUILD_DIR/mongo/db/session/session_catalog', '$BUILD_DIR/mongo/db/session/session_catalog_mongod', diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript index 78933f289ea..a1b52019334 100644 --- a/src/mongo/db/commands/SConscript +++ b/src/mongo/db/commands/SConscript @@ -84,8 +84,6 @@ env.Library( '$BUILD_DIR/mongo/db/server_base', '$BUILD_DIR/mongo/db/session/kill_sessions', '$BUILD_DIR/mongo/db/session/logical_session_cache', - '$BUILD_DIR/mongo/db/session/logical_session_cache_impl', - '$BUILD_DIR/mongo/db/session/logical_session_id', '$BUILD_DIR/mongo/db/session/logical_session_id_helpers', '$BUILD_DIR/mongo/db/stats/counters', '$BUILD_DIR/mongo/db/transaction/transaction_api', @@ -136,8 +134,7 @@ env.Library( '$BUILD_DIR/mongo/db/repl/isself', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', '$BUILD_DIR/mongo/db/server_base', - '$BUILD_DIR/mongo/db/session/logical_session_cache_impl', - '$BUILD_DIR/mongo/db/session/logical_session_id', + '$BUILD_DIR/mongo/db/session/logical_session_cache', '$BUILD_DIR/mongo/db/session/logical_session_id_helpers', '$BUILD_DIR/mongo/db/session/session_catalog', '$BUILD_DIR/mongo/db/shared_request_handling', diff --git a/src/mongo/db/session/initialize_operation_session_info.cpp b/src/mongo/db/initialize_operation_session_info.cpp index 523534b0bc6..9ed86b4475d 100644 --- a/src/mongo/db/session/initialize_operation_session_info.cpp +++ b/src/mongo/db/initialize_operation_session_info.cpp @@ -27,9 +27,7 @@ * it in the license file. */ -#include "mongo/platform/basic.h" - -#include "mongo/db/session/initialize_operation_session_info.h" +#include "mongo/db/initialize_operation_session_info.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/operation_context.h" diff --git a/src/mongo/db/session/initialize_operation_session_info.h b/src/mongo/db/initialize_operation_session_info.h index b2c1fcde67d..b2c1fcde67d 100644 --- a/src/mongo/db/session/initialize_operation_session_info.h +++ b/src/mongo/db/initialize_operation_session_info.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 09bbd62441b..28987a18a9d 100644 --- a/src/mongo/db/s/session_catalog_migration_destination_test.cpp +++ b/src/mongo/db/s/session_catalog_migration_destination_test.cpp @@ -36,6 +36,7 @@ #include "mongo/db/concurrency/d_concurrency.h" #include "mongo/db/db_raii.h" #include "mongo/db/dbdirectclient.h" +#include "mongo/db/initialize_operation_session_info.h" #include "mongo/db/ops/write_ops_exec.h" #include "mongo/db/ops/write_ops_gen.h" #include "mongo/db/repl/oplog_entry.h" @@ -47,7 +48,6 @@ #include "mongo/db/s/shard_server_test_fixture.h" #include "mongo/db/s/sharding_statistics.h" #include "mongo/db/server_options.h" -#include "mongo/db/session/initialize_operation_session_info.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" diff --git a/src/mongo/db/service_entry_point_common.cpp b/src/mongo/db/service_entry_point_common.cpp index a23da80ed18..11a859255fb 100644 --- a/src/mongo/db/service_entry_point_common.cpp +++ b/src/mongo/db/service_entry_point_common.cpp @@ -54,6 +54,7 @@ #include "mongo/db/dbdirectclient.h" #include "mongo/db/error_labels.h" #include "mongo/db/initialize_api_parameters.h" +#include "mongo/db/initialize_operation_session_info.h" #include "mongo/db/introspect.h" #include "mongo/db/jsobj.h" #include "mongo/db/logical_time_validator.h" @@ -81,8 +82,6 @@ #include "mongo/db/s/transaction_coordinator_factory.h" #include "mongo/db/server_feature_flags_gen.h" #include "mongo/db/service_entry_point_common.h" -#include "mongo/db/session/initialize_operation_session_info.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/stats/api_version_metrics.h" diff --git a/src/mongo/db/session/SConscript b/src/mongo/db/session/SConscript index 8e7d243c93b..858ac084f1f 100644 --- a/src/mongo/db/session/SConscript +++ b/src/mongo/db/session/SConscript @@ -122,7 +122,6 @@ env.Library( env.Library( target='logical_session_cache_impl', source=[ - 'initialize_operation_session_info.cpp', 'logical_session_cache_impl.cpp', ], LIBDEPS=[ diff --git a/src/mongo/db/session/logical_session_id_test.cpp b/src/mongo/db/session/logical_session_id_test.cpp index f66be646367..f64d5fe2266 100644 --- a/src/mongo/db/session/logical_session_id_test.cpp +++ b/src/mongo/db/session/logical_session_id_test.cpp @@ -27,12 +27,8 @@ * it in the license file. */ -#include "mongo/platform/basic.h" - #include <string> -#include "mongo/db/session/logical_session_id.h" - #include "mongo/crypto/mechanism_scram.h" #include "mongo/crypto/sha1_block.h" #include "mongo/crypto/sha256_block.h" @@ -45,13 +41,12 @@ #include "mongo/db/auth/authz_session_external_state_mock.h" #include "mongo/db/auth/sasl_options.h" #include "mongo/db/auth/user.h" +#include "mongo/db/initialize_operation_session_info.h" #include "mongo/db/jsobj.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_test_fixture.h" #include "mongo/db/service_liaison_mock.h" -#include "mongo/db/session/initialize_operation_session_info.h" -#include "mongo/db/session/logical_session_cache.h" #include "mongo/db/session/logical_session_cache_impl.h" #include "mongo/db/session/logical_session_id_helpers.h" #include "mongo/db/session/sessions_collection_mock.h" diff --git a/src/mongo/embedded/SConscript b/src/mongo/embedded/SConscript index df799736c3b..e09e48bccd1 100644 --- a/src/mongo/embedded/SConscript +++ b/src/mongo/embedded/SConscript @@ -101,7 +101,6 @@ env.Library( '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/service_entry_point_common', '$BUILD_DIR/mongo/db/service_liaison_mongod', - '$BUILD_DIR/mongo/db/session/logical_session_cache', '$BUILD_DIR/mongo/db/session/logical_session_cache_impl', '$BUILD_DIR/mongo/db/session/sessions_collection_standalone', '$BUILD_DIR/mongo/db/startup_recovery', diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript index 2ef620fa6eb..cc3596046fd 100644 --- a/src/mongo/s/SConscript +++ b/src/mongo/s/SConscript @@ -410,9 +410,11 @@ env.Library( source=[ 'sessions_collection_sharded.cpp', ], - LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/session/logical_session_id', + LIBDEPS=[ '$BUILD_DIR/mongo/db/session/sessions_collection', + ], + LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/db/server_base', 'sharding_api', ], ) @@ -472,8 +474,6 @@ env.Library( '$BUILD_DIR/mongo/db/server_options', '$BUILD_DIR/mongo/db/server_options_base', '$BUILD_DIR/mongo/db/service_liaison_mongos', - '$BUILD_DIR/mongo/db/session/logical_session_cache', - '$BUILD_DIR/mongo/db/session/logical_session_cache_impl', '$BUILD_DIR/mongo/db/session/session_catalog', '$BUILD_DIR/mongo/db/startup_warnings_common', '$BUILD_DIR/mongo/db/stats/counters', @@ -540,6 +540,7 @@ env.Library( '$BUILD_DIR/mongo/db/read_write_concern_defaults', '$BUILD_DIR/mongo/db/serverinit', '$BUILD_DIR/mongo/db/service_liaison_mongos', + '$BUILD_DIR/mongo/db/session/logical_session_cache_impl', '$BUILD_DIR/mongo/db/session/session_catalog', '$BUILD_DIR/mongo/db/startup_warnings_common', '$BUILD_DIR/mongo/idl/cluster_server_parameter_refresher', diff --git a/src/mongo/s/commands/strategy.cpp b/src/mongo/s/commands/strategy.cpp index 5534cc42dca..5d7b80d0cda 100644 --- a/src/mongo/s/commands/strategy.cpp +++ b/src/mongo/s/commands/strategy.cpp @@ -47,6 +47,7 @@ #include "mongo/db/curop.h" #include "mongo/db/error_labels.h" #include "mongo/db/initialize_api_parameters.h" +#include "mongo/db/initialize_operation_session_info.h" #include "mongo/db/logical_time_validator.h" #include "mongo/db/matcher/extensions_callback_noop.h" #include "mongo/db/namespace_string.h" @@ -58,7 +59,6 @@ #include "mongo/db/query/query_request_helper.h" #include "mongo/db/read_write_concern_defaults.h" #include "mongo/db/repl/repl_server_parameters_gen.h" -#include "mongo/db/session/initialize_operation_session_info.h" #include "mongo/db/session/logical_session_id_helpers.h" #include "mongo/db/stats/api_version_metrics.h" #include "mongo/db/stats/counters.h" |