diff options
Diffstat (limited to 'src/mongo/db/SConscript')
| -rw-r--r-- | src/mongo/db/SConscript | 70 |
1 files changed, 48 insertions, 22 deletions
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index 1518f7bfcb0..ecbf5667bc5 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -26,7 +26,6 @@ env.SConscript( 'concurrency', 'cst', 'exec', - 'free_mon', 'fts', 'ftdc', 'geo', @@ -828,6 +827,7 @@ env.Library( '$BUILD_DIR/mongo/db/catalog/local_oplog_info', '$BUILD_DIR/mongo/db/commands/server_status', '$BUILD_DIR/mongo/db/commands/test_commands_enabled', + '$BUILD_DIR/mongo/db/concurrency/exception_util', '$BUILD_DIR/mongo/db/index/index_access_method', '$BUILD_DIR/mongo/db/repl/replica_set_aware_service', '$BUILD_DIR/mongo/idl/idl_parser', @@ -896,6 +896,7 @@ env.Library( '$BUILD_DIR/mongo/executor/task_executor_pool', '$BUILD_DIR/mongo/s/grid', '$BUILD_DIR/mongo/s/sharding_router_api', + 'dbdirectclient', 'logical_session_id', ], ) @@ -990,7 +991,6 @@ env.Library( LIBDEPS=[ 'catalog/index_key_validate', 'catalog/multi_index_block', - 'concurrency/write_conflict_exception', 'db_raii', 'index_builds_coordinator_interface', ], @@ -1045,7 +1045,7 @@ env.Library( LIBDEPS_PRIVATE=[ 'bson/dotted_path_support', 'catalog/collection_options', - 'index/index_descriptor', + 'index/index_access_method', 's/sharding_api_d', ], ) @@ -1061,6 +1061,7 @@ env.Library( '$BUILD_DIR/mongo/db/pipeline/change_stream_preimage', '$BUILD_DIR/mongo/db/repl/tenant_migration_access_blocker', '$BUILD_DIR/mongo/db/timeseries/bucket_catalog', + '$BUILD_DIR/mongo/db/timeseries/timeseries_extended_range', '$BUILD_DIR/mongo/s/coreshard', '$BUILD_DIR/mongo/s/grid', 'batched_write_context', @@ -1076,6 +1077,7 @@ env.Library( LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/catalog/commit_quorum_options', '$BUILD_DIR/mongo/db/catalog/import_collection_oplog_entry', + '$BUILD_DIR/mongo/db/concurrency/exception_util', '$BUILD_DIR/mongo/db/pipeline/change_stream_pre_image_helpers', 'dbhelpers', 'internal_transactions_feature_flag', @@ -1228,6 +1230,7 @@ env.Library( '$BUILD_DIR/mongo/db/catalog/index_build_entry_idl', '$BUILD_DIR/mongo/db/catalog/index_build_oplog_entry', '$BUILD_DIR/mongo/db/catalog/multi_index_block', + '$BUILD_DIR/mongo/db/concurrency/exception_util', '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/dbhelpers', '$BUILD_DIR/mongo/db/repl/cloner_utils', @@ -1259,6 +1262,7 @@ env.Library( "$BUILD_DIR/mongo/db/catalog/commit_quorum_options", "$BUILD_DIR/mongo/db/catalog/index_build_entry_idl", "$BUILD_DIR/mongo/db/catalog/local_oplog_info", + "$BUILD_DIR/mongo/db/concurrency/exception_util", "$BUILD_DIR/mongo/db/storage/write_unit_of_work", "catalog_raii", "db_raii", @@ -1284,6 +1288,7 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/client/authentication', + '$BUILD_DIR/mongo/db/concurrency/exception_util', 'catalog/database_holder', 'commands/list_collections_filter', 'index_builds_coordinator_interface', @@ -1309,7 +1314,7 @@ env.Library( ], LIBDEPS_PRIVATE=[ "$BUILD_DIR/mongo/db/catalog/collection_options", - "$BUILD_DIR/mongo/db/concurrency/write_conflict_exception", + "$BUILD_DIR/mongo/db/concurrency/exception_util", "$BUILD_DIR/mongo/db/stats/resource_consumption_metrics", "db_raii", ], @@ -1323,7 +1328,6 @@ env.Library( ], LIBDEPS=[ "concurrency/lock_manager", - "concurrency/write_conflict_exception", "curop", 'read_write_concern_defaults', "repl/read_concern_args", @@ -1348,11 +1352,11 @@ env.Library( 'read_concern_mongod.idl', ], LIBDEPS_PRIVATE=[ + "$BUILD_DIR/mongo/db/concurrency/exception_util", "$BUILD_DIR/mongo/db/repl/tenant_migration_access_blocker", "$BUILD_DIR/mongo/idl/server_parameter", "$BUILD_DIR/mongo/s/grid", "catalog_raii", - "concurrency/write_conflict_exception", "curop", "repl/repl_coordinator_interface", "repl/speculative_majority_read_info", @@ -1413,9 +1417,11 @@ env.Library( LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/commands/fsync_locked', '$BUILD_DIR/mongo/db/record_id_helpers', + '$BUILD_DIR/mongo/db/repl/replica_set_aware_service', '$BUILD_DIR/mongo/db/repl/tenant_migration_access_blocker', '$BUILD_DIR/mongo/db/s/sharding_runtime_d', '$BUILD_DIR/mongo/idl/server_parameter', + 'catalog/catalog_helpers', 'catalog/database_holder', 'commands/server_status_core', 'service_context', @@ -1438,6 +1444,16 @@ env.Library( ],) env.Library( + target='shard_filterer', + source=[ + 'exec/shard_filterer_impl.cpp', + ], + LIBDEPS_PRIVATE=[ + 's/sharding_api_d', + ], +) + +env.Library( target='query_exec', source=[ 'clientcursor.cpp', @@ -1476,7 +1492,6 @@ env.Library( 'exec/return_key.cpp', 'exec/sample_from_timeseries_bucket.cpp', 'exec/shard_filter.cpp', - 'exec/shard_filterer_impl.cpp', 'exec/skip.cpp', 'exec/sort.cpp', 'exec/sort_key_generator.cpp', @@ -1539,7 +1554,6 @@ env.Library( LIBDEPS=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/auth/auth_checks', - '$BUILD_DIR/mongo/db/index/index_access_methods', '$BUILD_DIR/mongo/scripting/scripting', '$BUILD_DIR/mongo/util/background_job', '$BUILD_DIR/mongo/util/elapsed_tracker', @@ -1552,7 +1566,6 @@ env.Library( 'catalog/index_catalog', 'catalog/index_catalog_entry', 'commands', - 'concurrency/write_conflict_exception', 'curop', 'curop_failpoint_helpers', 'cursor_server_params', @@ -1565,8 +1578,7 @@ env.Library( 'exec/sort_executor', 'exec/working_set', 'fts/base_fts', - 'index/index_descriptor', - 'index/key_generator', + 'index/index_access_method', 'logical_session_cache', 'matcher/expressions_mongod_only', 'ops/parsed_update', @@ -1578,6 +1590,7 @@ env.Library( 'query/sbe_stage_builder_helpers', 'repl/repl_coordinator_interface', 's/sharding_api_d', + 'shard_filterer', 'shared_request_handling', 'stats/serveronly_stats', 'storage/remove_saver', @@ -1588,6 +1601,7 @@ env.Library( '$BUILD_DIR/mongo/db/catalog/database_holder', '$BUILD_DIR/mongo/db/catalog/local_oplog_info', '$BUILD_DIR/mongo/db/commands/server_status_core', + '$BUILD_DIR/mongo/db/concurrency/exception_util', '$BUILD_DIR/mongo/db/stats/resource_consumption_metrics', '$BUILD_DIR/mongo/db/storage/record_store_base', '$BUILD_DIR/mongo/db/timeseries/timeseries_options', @@ -1607,8 +1621,10 @@ env.Library( '$BUILD_DIR/mongo/db/catalog/database_holder', '$BUILD_DIR/mongo/db/catalog/multi_index_block', '$BUILD_DIR/mongo/db/commands/mongod_fcv', + '$BUILD_DIR/mongo/db/concurrency/exception_util', '$BUILD_DIR/mongo/db/repl/repl_settings', '$BUILD_DIR/mongo/db/storage/storage_repair_observer', + '$BUILD_DIR/mongo/db/timeseries/timeseries_extended_range', 'dbdirectclient', 'dbhelpers', 'index_builds_coordinator_interface', @@ -1995,6 +2011,19 @@ env.Library( ) env.Library( + target='keys_collection_util', + source=[ + 'keys_collection_util.cpp', + ], + LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/db/catalog_raii', + '$BUILD_DIR/mongo/db/concurrency/exception_util', + 'dbhelpers', + 'keys_collection_document', + ], +) + +env.Library( target='keys_collection_client_direct', source=[ 'keys_collection_client_direct.cpp', @@ -2158,8 +2187,7 @@ env.Library( LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/catalog/catalog_impl', '$BUILD_DIR/mongo/db/commands/mongod', - '$BUILD_DIR/mongo/db/index/index_access_method_factory', - '$BUILD_DIR/mongo/db/index/index_access_methods', + '$BUILD_DIR/mongo/db/index/index_access_method', '$BUILD_DIR/mongo/db/s/sharding_runtime_d', '$BUILD_DIR/mongo/db/storage/devnull/storage_devnull', '$BUILD_DIR/mongo/db/storage/ephemeral_for_test/storage_ephemeral_for_test', @@ -2276,6 +2304,8 @@ env.Library( 'update/update_driver', ], LIBDEPS_PRIVATE=[ + 'concurrency/exception_util', + 'curop', 'repl/image_collection_entry', ], ) @@ -2367,6 +2397,7 @@ env.Library( '$BUILD_DIR/mongo/util/ntservice', '$BUILD_DIR/mongo/util/options_parser/options_parser_init', '$BUILD_DIR/mongo/util/periodic_runner_factory', + '$BUILD_DIR/mongo/util/pin_code_segments' if env.TargetOSIs('linux') else [], '$BUILD_DIR/mongo/util/testing_options', '$BUILD_DIR/mongo/util/version_impl', '$BUILD_DIR/mongo/watchdog/watchdog_mongod', @@ -2387,19 +2418,15 @@ env.Library( 'common', 'concurrency/flow_control_ticketholder', 'concurrency/lock_manager', - 'concurrency/write_conflict_exception', 'curop', 'curop_metrics', 'db_raii', 'dbdirectclient', 'dbhelpers', 'exec/working_set', - 'free_mon/free_mon_mongod', 'ftdc/ftdc_mongod', 'fts/ftsmongod', 'index/index_access_method', - 'index/index_access_methods', - 'index/index_descriptor', 'index_builds_coordinator_mongod', 'initialize_snmp', 'introspect', @@ -2506,10 +2533,8 @@ env.Library( 'concurrency/lock_manager', 'fcv_op_observer', 'fle_crud_mongod', - 'free_mon/free_mon_mongod', 'ftdc/ftdc_mongod', - 'index/index_access_method_factory', - 'index/index_access_methods', + 'index/index_access_method', 'index_builds_coordinator_mongod', 'initialize_snmp', 'keys_collection_client_direct', @@ -2616,8 +2641,7 @@ env.Library( '$BUILD_DIR/mongo/db/auth/authmocks', '$BUILD_DIR/mongo/db/catalog/catalog_impl', '$BUILD_DIR/mongo/db/catalog/database_holder', - '$BUILD_DIR/mongo/db/index/index_access_method_factory', - '$BUILD_DIR/mongo/db/index/index_access_methods', + '$BUILD_DIR/mongo/db/index/index_access_method', '$BUILD_DIR/mongo/db/repl/replmocks', '$BUILD_DIR/mongo/db/s/sharding_api_d', '$BUILD_DIR/mongo/db/storage/ephemeral_for_test/storage_ephemeral_for_test', @@ -2704,6 +2728,7 @@ if wiredtiger: 'transaction_history_iterator_test.cpp', 'transaction_participant_retryable_writes_test.cpp', 'transaction_participant_test.cpp', + 'ttl_collection_cache_test.cpp', 'update_index_data_test.cpp', 'user_write_block_mode_op_observer_test.cpp', 'vector_clock_mongod_test.cpp', @@ -2799,6 +2824,7 @@ if wiredtiger: 'time_proof_service', 'transaction', 'transaction_api', + 'ttl_collection_cache', 'update_index_data', 'user_write_block_mode_op_observer', 'vector_clock', |