Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 73 insertions, 82 deletions

diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index f25da06afbe..1518f7bfcb0 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -26,6 +26,7 @@ env.SConscript(
         'concurrency',
         'cst',
         'exec',
+        'free_mon',
         'fts',
         'ftdc',
         'geo',
@@ -125,7 +126,6 @@ env.Library(
         "dbmessage.cpp",
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/bson/bson_validate',
         '$BUILD_DIR/mongo/db/server_options_core',
         '$BUILD_DIR/mongo/transport/transport_layer_common',
         '$BUILD_DIR/mongo/util/net/network',
@@ -167,13 +167,45 @@ env.Library(
 )
 
 env.Library(
+    target='curop',
+    source=[
+        'curop.cpp',
+
+    ],
+    LIBDEPS=[
+        '$BUILD_DIR/mongo/bson/mutable/mutable_bson',
+        '$BUILD_DIR/mongo/db/commands',
+        '$BUILD_DIR/mongo/db/concurrency/lock_manager',
+        '$BUILD_DIR/mongo/db/query/command_request_response',
+        '$BUILD_DIR/mongo/db/service_context',
+        '$BUILD_DIR/mongo/db/stats/timer_stats',
+        '$BUILD_DIR/mongo/rpc/client_metadata',
+        '$BUILD_DIR/mongo/transport/service_executor',
+        '$BUILD_DIR/mongo/util/diagnostic_info' if get_option(
+            'use-diagnostic-latches') == 'on' else [],
+        '$BUILD_DIR/mongo/util/fail_point',
+        '$BUILD_DIR/mongo/util/net/network',
+        '$BUILD_DIR/mongo/util/progress_meter',
+        'generic_cursor',
+        'profile_filter',
+        'server_options',
+    ],
+    LIBDEPS_PRIVATE=[
+        'auth/auth',
+        'auth/user_acquisition_stats',
+        'prepare_conflict_tracker',
+        'stats/resource_consumption_metrics',
+    ],
+)
+
+env.Library(
     target='curop_failpoint_helpers',
     source=[
         'curop_failpoint_helpers.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/db/query/query_stats/query_stats',
         '$BUILD_DIR/mongo/util/fail_point',
+        'curop',
     ],
 )
 
@@ -699,6 +731,7 @@ env.Library(
     ],
     LIBDEPS=[
         'catalog_raii',
+        'curop',
         's/sharding_api_d',
         'stats/top',
     ],
@@ -795,7 +828,6 @@ 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',
@@ -864,7 +896,6 @@ 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',
     ],
 )
@@ -925,7 +956,7 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/client/clientdriver_minimal',
-        '$BUILD_DIR/mongo/db/query/query_stats/query_stats',
+        'curop',
         'not_primary_error_tracker',
         'ops/write_ops_parsers',
     ],
@@ -957,9 +988,9 @@ env.Library(
         'system_index.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/db/exec/scoped_timer',
         'catalog/index_key_validate',
         'catalog/multi_index_block',
+        'concurrency/write_conflict_exception',
         'db_raii',
         'index_builds_coordinator_interface',
     ],
@@ -973,6 +1004,7 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/transport/service_entry_point',
+        'curop',
         'curop_metrics',
         'rw_concern_d',
         'storage/storage_engine_common',
@@ -1013,7 +1045,7 @@ env.Library(
     LIBDEPS_PRIVATE=[
         'bson/dotted_path_support',
         'catalog/collection_options',
-        'index/index_access_method',
+        'index/index_descriptor',
         's/sharding_api_d',
     ],
 )
@@ -1025,12 +1057,10 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
         '$BUILD_DIR/mongo/db/catalog/collection_catalog',
         '$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',
@@ -1046,7 +1076,6 @@ 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',
@@ -1139,7 +1168,6 @@ env.Library(
         'repl/repl_server_parameters',
         'repl/replica_set_messages',
         'shared_request_handling',
-        'stats/read_preference_metrics',
         'transaction',
     ],
 )
@@ -1170,11 +1198,11 @@ env.Library(
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/catalog/collection_catalog',
         '$BUILD_DIR/mongo/db/catalog/index_build_entry_idl',
-        '$BUILD_DIR/mongo/db/query/query_stats/query_stats',
         '$BUILD_DIR/mongo/db/repl/tenant_migration_access_blocker',
         '$BUILD_DIR/mongo/db/s/forwardable_operation_metadata',
         '$BUILD_DIR/mongo/db/storage/two_phase_index_build_knobs_idl',
         '$BUILD_DIR/mongo/executor/task_executor_interface',
+        'curop',
         'db_raii',
         'index_build_entry_helpers',
         'resumable_index_builds_idl',
@@ -1200,7 +1228,6 @@ 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',
@@ -1232,7 +1259,6 @@ 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",
@@ -1258,7 +1284,6 @@ 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',
@@ -1272,8 +1297,8 @@ env.Library(
         "curop_metrics.cpp",
     ],
     LIBDEPS_PRIVATE=[
-        "$BUILD_DIR/mongo/db/query/query_stats/query_stats",
         "commands/server_status_core",
+        "curop",
     ]
 )
 
@@ -1284,7 +1309,7 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         "$BUILD_DIR/mongo/db/catalog/collection_options",
-        "$BUILD_DIR/mongo/db/concurrency/exception_util",
+        "$BUILD_DIR/mongo/db/concurrency/write_conflict_exception",
         "$BUILD_DIR/mongo/db/stats/resource_consumption_metrics",
         "db_raii",
     ],
@@ -1297,14 +1322,15 @@ env.Library(
         "write_concern.cpp",
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/db/query/query_stats/query_stats',
-        'concurrency/lock_manager',
+        "concurrency/lock_manager",
+        "concurrency/write_conflict_exception",
+        "curop",
         'read_write_concern_defaults',
-        'repl/read_concern_args',
-        'repl/repl_coordinator_interface',
-        'repl/speculative_majority_read_info',
-        'stats/timer_stats',
-        'storage/storage_options',
+        "repl/read_concern_args",
+        "repl/repl_coordinator_interface",
+        "repl/speculative_majority_read_info",
+        "stats/timer_stats",
+        "storage/storage_options",
     ],
     LIBDEPS_PRIVATE=[
         "$BUILD_DIR/mongo/db/storage/storage_control",
@@ -1322,11 +1348,12 @@ 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",
         "s/sharding_api_d",
@@ -1386,11 +1413,9 @@ 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',
@@ -1405,7 +1430,6 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/bson/bson_validate',
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/catalog/clustered_collection_options',
@@ -1414,16 +1438,6 @@ 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',
@@ -1462,6 +1476,7 @@ 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',
@@ -1524,6 +1539,7 @@ 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',
@@ -1536,6 +1552,8 @@ env.Library(
         'catalog/index_catalog',
         'catalog/index_catalog_entry',
         'commands',
+        'concurrency/write_conflict_exception',
+        'curop',
         'curop_failpoint_helpers',
         'cursor_server_params',
         'db_raii',
@@ -1547,7 +1565,8 @@ env.Library(
         'exec/sort_executor',
         'exec/working_set',
         'fts/base_fts',
-        'index/index_access_method',
+        'index/index_descriptor',
+        'index/key_generator',
         'logical_session_cache',
         'matcher/expressions_mongod_only',
         'ops/parsed_update',
@@ -1559,7 +1578,6 @@ 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',
@@ -1568,10 +1586,8 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/catalog/database_holder',
-        '$BUILD_DIR/mongo/db/catalog/health_log_interface',
         '$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',
@@ -1591,11 +1607,8 @@ 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/exec/scoped_timer',
         '$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',
@@ -1810,8 +1823,8 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/pipeline/lite_parsed_document_source',
-        '$BUILD_DIR/mongo/db/query/query_stats/query_stats',
         'commands',
+        'curop',
         'logical_session_id',
     ],
 )
@@ -1982,19 +1995,6 @@ 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',
@@ -2133,17 +2133,6 @@ env.Library(
 )
 
 env.Library(
-    target='feature_compatibility_version_metrics',
-    source=[
-        'feature_compatibility_version_metrics.cpp',
-    ],
-    LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/commands/server_status_core',
-        'server_options_core',
-    ],
-)
-
-env.Library(
     target='service_context_test_fixture',
     source=[
         'service_context_test_fixture.cpp',
@@ -2169,7 +2158,8 @@ 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',
+        '$BUILD_DIR/mongo/db/index/index_access_method_factory',
+        '$BUILD_DIR/mongo/db/index/index_access_methods',
         '$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',
@@ -2279,7 +2269,6 @@ env.Library(
         'concurrency/lock_manager',
         'introspect',
         'matcher/expressions_mongod_only',
-        'mongod_options',
         'query/command_request_response',
         'query_exec',
         'repl/repl_coordinator_interface',
@@ -2287,8 +2276,6 @@ env.Library(
         'update/update_driver',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/query/query_stats/query_stats',
-        'concurrency/exception_util',
         'repl/image_collection_entry',
     ],
 )
@@ -2380,7 +2367,6 @@ 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',
@@ -2391,7 +2377,7 @@ env.Library(
         'catalog/catalog_impl',
         'catalog/collection_options',
         'catalog/document_validation',
-        'catalog/health_log_interface',
+        'catalog/health_log',
         'catalog/index_key_validate',
         'client_metadata_propagation_egress_hook',
         'collection_index_usage_tracker',
@@ -2401,15 +2387,19 @@ env.Library(
         'common',
         'concurrency/flow_control_ticketholder',
         'concurrency/lock_manager',
+        'concurrency/write_conflict_exception',
+        'curop',
         'curop_metrics',
         'db_raii',
         'dbdirectclient',
         'dbhelpers',
         'exec/working_set',
-        'feature_compatibility_version_metrics',
+        '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',
@@ -2510,15 +2500,16 @@ env.Library(
         'catalog/catalog_impl',
         'catalog/collection',
         'catalog/health_log',
-        'catalog/health_log_interface',
         'commands/mongod',
         'commands/shell_protocol',
         'concurrency/flow_control_ticketholder',
         'concurrency/lock_manager',
         'fcv_op_observer',
         'fle_crud_mongod',
+        'free_mon/free_mon_mongod',
         'ftdc/ftdc_mongod',
-        'index/index_access_method',
+        'index/index_access_method_factory',
+        'index/index_access_methods',
         'index_builds_coordinator_mongod',
         'initialize_snmp',
         'keys_collection_client_direct',
@@ -2625,7 +2616,8 @@ 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',
+        '$BUILD_DIR/mongo/db/index/index_access_method_factory',
+        '$BUILD_DIR/mongo/db/index/index_access_methods',
         '$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',
@@ -2712,7 +2704,6 @@ 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',
@@ -2754,6 +2745,7 @@ if wiredtiger:
             'collection_index_usage_tracker',
             'commands',
             'common',
+            'curop',
             'dbdirectclient',
             'dbmessage',
             'fcv_op_observer',
@@ -2807,7 +2799,6 @@ if wiredtiger:
             'time_proof_service',
             'transaction',
             'transaction_api',
-            'ttl_collection_cache',
             'update_index_data',
             'user_write_block_mode_op_observer',
             'vector_clock',