diff options
author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2020-04-28 02:22:04 -0400 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-04-28 10:46:18 +0000 |
commit | 2f9cbb7f816f744ac08ac52a0c87eaec3258e3ef (patch) | |
tree | 0792cd6e27c582a549ed7c9d76ac8d13f2a11917 /src | |
parent | 54efb1c92a592f62f05c1eb9aeb92527c6008c08 (diff) | |
download | mongo-2f9cbb7f816f744ac08ac52a0c87eaec3258e3ef.tar.gz |
SERVER-47793 Remove library dependency of sessions_collection_sharded on sessions_collection_rs
Diffstat (limited to 'src')
-rw-r--r-- | src/mongo/SConscript | 33 | ||||
-rw-r--r-- | src/mongo/db/SConscript | 37 | ||||
-rw-r--r-- | src/mongo/db/logical_session_cache_factory_mongod.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/s/SConscript | 15 | ||||
-rw-r--r-- | src/mongo/db/s/sessions_collection_config_server.cpp (renamed from src/mongo/db/sessions_collection_config_server.cpp) | 2 | ||||
-rw-r--r-- | src/mongo/db/s/sessions_collection_config_server.h (renamed from src/mongo/db/sessions_collection_config_server.h) | 0 | ||||
-rw-r--r-- | src/mongo/s/SConscript | 6 |
7 files changed, 35 insertions, 60 deletions
diff --git a/src/mongo/SConscript b/src/mongo/SConscript index da604bc2800..b6abe388ec4 100644 --- a/src/mongo/SConscript +++ b/src/mongo/SConscript @@ -351,10 +351,11 @@ if env.TargetOSIs('windows'): mongod = env.Program( target="mongod", source=[ - "db/db.cpp", - "db/read_write_concern_defaults_cache_lookup_mongod.cpp", + 'db/db.cpp', + 'db/logical_session_cache_factory_mongod.cpp', + 'db/read_write_concern_defaults_cache_lookup_mongod.cpp', ] + env.WindowsResourceFile("db/db.rc"), - LIBDEPS=[ + LIBDEPS_PRIVATE=[ '$BUILD_DIR/third_party/shim_snappy', 'base', 'db/auth/auth_op_observer', @@ -368,15 +369,15 @@ mongod = env.Program( 'db/catalog/index_key_validate', 'db/client_metadata_propagation_egress_hook', 'db/collection_index_usage_tracker', - 'db/commands/mongod', 'db/commands/mongod_fcv', + 'db/commands/mongod', 'db/commands/server_status_servers', 'db/common', 'db/concurrency/flow_control_ticketholder', 'db/concurrency/lock_manager', 'db/concurrency/write_conflict_exception', - 'db/curop', 'db/curop_metrics', + 'db/curop', 'db/db_raii', 'db/dbdirectclient', 'db/dbhelpers', @@ -384,15 +385,16 @@ mongod = env.Program( 'db/free_mon/free_mon_mongod', 'db/ftdc/ftdc_mongod', 'db/fts/ftsmongod', + 'db/index_builds_coordinator_mongod', 'db/index/index_access_method', + 'db/index/index_access_methods', 'db/index/index_descriptor', - 'db/index_builds_coordinator_mongod', 'db/initialize_server_security_state', 'db/initialize_snmp', 'db/introspect', 'db/keys_collection_client_direct', 'db/kill_sessions_local', - 'db/logical_session_cache_factory_mongod', + 'db/logical_session_cache_impl', 'db/logical_time_metadata_hook', 'db/matcher/expressions_mongod_only', 'db/mirror_maestro', @@ -412,21 +414,24 @@ mongod = env.Program( 'db/repl/oplog_buffer_collection', 'db/repl/oplog_buffer_proxy', 'db/repl/repl_coordinator_impl', - 'db/repl/repl_coordinator_interface', 'db/repl/repl_set_commands', 'db/repl/repl_settings', 'db/repl/rs_rollback', 'db/repl/rslog', 'db/repl/serveronly_repl', - 'db/repl/storage_interface', 'db/repl/storage_interface_impl', 'db/repl/topology_coordinator', + 'db/replica_set_aware_service', 'db/rw_concern_d', 'db/s/balancer', 'db/s/op_observer_sharding_impl', + 'db/s/sessions_collection_config_server', 'db/s/sharding_commands_d', 'db/s/sharding_runtime_d', 'db/service_context_d', + 'db/service_liaison_mongod', + 'db/sessions_collection_rs', + 'db/sessions_collection_standalone', 'db/startup_warnings_mongod', 'db/stats/counters', 'db/stats/serveronly_stats', @@ -435,8 +440,8 @@ mongod = env.Program( 'db/storage/biggie/storage_biggie', 'db/storage/devnull/storage_devnull', 'db/storage/ephemeral_for_test/storage_ephemeral_for_test', - 'db/storage/flow_control', 'db/storage/flow_control_parameters', + 'db/storage/flow_control', 'db/storage/storage_control', 'db/storage/storage_engine_lock_file', 'db/storage/storage_engine_metadata', @@ -447,15 +452,15 @@ mongod = env.Program( 'db/traffic_recorder', 'db/ttl_collection_cache', 'db/ttl_d', - 'db/update/update_driver', 'db/update_index_data', + 'db/update/update_driver', 'db/views/views_mongod', 'db/windows_options' if env.TargetOSIs('windows') else [], 'executor/network_interface_factory', 'mongod_options_init', 'rpc/rpc', - 's/catalog/sharding_catalog_client_impl', 's/commands/shared_cluster_commands', + 's/sessions_collection_sharded', 'scripting/scripting_server', 'transport/message_compressor_options_server', 'transport/service_entry_point', @@ -471,10 +476,6 @@ mongod = env.Program( 'util/version_impl', 'watchdog/watchdog_mongod', ], - LIBDEPS_PRIVATE=[ - 'db/index/index_access_methods', - 'db/replica_set_aware_service', - ], AIB_COMPONENT="mongod", AIB_COMPONENTS_EXTRA=[ "core", diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index 561122013e4..6306e0c863d 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -1333,24 +1333,6 @@ env.Library( ) env.Library( - target='sessions_collection_config_server', - source=[ - 'sessions_collection_config_server.cpp', - ], - LIBDEPS=[ - '$BUILD_DIR/mongo/s/client/sharding_client', - '$BUILD_DIR/mongo/s/coreshard', - '$BUILD_DIR/mongo/s/sessions_collection_sharded', - 'dbdirectclient', - 'sessions_collection' - ], - LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/s/sharding_router_api', - '$BUILD_DIR/mongo/db/pipeline/sharded_agg_helpers', - ] -) - -env.Library( target='logical_session_cache', source=[ 'logical_session_cache.cpp', @@ -1409,25 +1391,6 @@ env.Library( ], ) -envWithAsio.Library( - target='logical_session_cache_factory_mongod', - source=[ - 'logical_session_cache_factory_mongod.cpp', - ], - LIBDEPS=[ - '$BUILD_DIR/mongo/s/sessions_collection_sharded', - 'logical_session_cache', - 'logical_session_cache_impl', - 'service_liaison_mongod', - 'sessions_collection_config_server', - 'sessions_collection_rs', - 'sessions_collection_standalone', - ], - LIBDEPS_PRIVATE=[ - 'transaction', - ], -) - env.Library( target='logical_time', source=[ diff --git a/src/mongo/db/logical_session_cache_factory_mongod.cpp b/src/mongo/db/logical_session_cache_factory_mongod.cpp index d95858462ef..e79f0e3fbdb 100644 --- a/src/mongo/db/logical_session_cache_factory_mongod.cpp +++ b/src/mongo/db/logical_session_cache_factory_mongod.cpp @@ -36,9 +36,9 @@ #include <memory> #include "mongo/db/logical_session_cache_impl.h" +#include "mongo/db/s/sessions_collection_config_server.h" #include "mongo/db/service_liaison_mongod.h" #include "mongo/db/session_catalog_mongod.h" -#include "mongo/db/sessions_collection_config_server.h" #include "mongo/db/sessions_collection_rs.h" #include "mongo/db/sessions_collection_standalone.h" #include "mongo/s/sessions_collection_sharded.h" diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript index e25c82936b9..f0365ad3ea1 100644 --- a/src/mongo/db/s/SConscript +++ b/src/mongo/db/s/SConscript @@ -323,6 +323,21 @@ env.Library( ) env.Library( + target='sessions_collection_config_server', + source=[ + 'sessions_collection_config_server.cpp', + ], + LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/db/dbdirectclient', + '$BUILD_DIR/mongo/db/pipeline/sharded_agg_helpers', + '$BUILD_DIR/mongo/db/sessions_collection', + '$BUILD_DIR/mongo/s/client/sharding_client', + '$BUILD_DIR/mongo/s/coreshard', + '$BUILD_DIR/mongo/s/sessions_collection_sharded', + ] +) + +env.Library( target='sharding_logging', source=[ 'sharding_logging.cpp', diff --git a/src/mongo/db/sessions_collection_config_server.cpp b/src/mongo/db/s/sessions_collection_config_server.cpp index dd60b13282c..95ee087e5ae 100644 --- a/src/mongo/db/sessions_collection_config_server.cpp +++ b/src/mongo/db/s/sessions_collection_config_server.cpp @@ -31,7 +31,7 @@ #include "mongo/platform/basic.h" -#include "mongo/db/sessions_collection_config_server.h" +#include "mongo/db/s/sessions_collection_config_server.h" #include "mongo/client/query.h" #include "mongo/db/commands.h" diff --git a/src/mongo/db/sessions_collection_config_server.h b/src/mongo/db/s/sessions_collection_config_server.h index 9f09df55117..9f09df55117 100644 --- a/src/mongo/db/sessions_collection_config_server.h +++ b/src/mongo/db/s/sessions_collection_config_server.h diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript index 4adfd50ab8e..1195db2d84a 100644 --- a/src/mongo/s/SConscript +++ b/src/mongo/s/SConscript @@ -441,13 +441,9 @@ env.Library( source=[ 'sessions_collection_sharded.cpp', ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', + LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/logical_session_id', '$BUILD_DIR/mongo/db/sessions_collection', - ], - LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/sessions_collection_rs', 'sharding_api', ], ) |