SERVER-63764 merge catalog_collection_helper library into catalog_helpers

This reduces the link graph size to stay under the macos dyld limit.
Changes LIBDEPS edges added in commit e840bb65779035e3f5e7d1fb9b6951c291957a74.

8 files changed, 28 insertions, 36 deletions

diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 436a1fb8ff3..3d2d4d2244b 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -2368,6 +2368,7 @@ env.Library(
         '$BUILD_DIR/mongo/util/signal_handlers',
         '$BUILD_DIR/mongo/watchdog/watchdog_mongod',
         'auth/auth_op_observer',
+        'catalog/catalog_helpers',
         'catalog/catalog_impl',
         'catalog/collection',
         'catalog/health_log',
diff --git a/src/mongo/db/catalog/SConscript b/src/mongo/db/catalog/SConscript
index 53ebd0ee51e..efe84325a34 100644
--- a/src/mongo/db/catalog/SConscript
+++ b/src/mongo/db/catalog/SConscript
@@ -133,10 +133,10 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/db/catalog/index_repair',
         '$BUILD_DIR/mongo/db/catalog_raii',
         '$BUILD_DIR/mongo/db/concurrency/write_conflict_exception',
         '$BUILD_DIR/mongo/db/storage/storage_repair_observer',
+        'index_repair',
         'multi_index_block',
     ]
 )
@@ -201,7 +201,6 @@ env.Library(
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/audit',
-        '$BUILD_DIR/mongo/db/catalog/collection_query_info',
         '$BUILD_DIR/mongo/db/collection_index_usage_tracker',
         '$BUILD_DIR/mongo/db/common',
         '$BUILD_DIR/mongo/db/index/index_access_method',
@@ -212,6 +211,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/vector_clock',
         'collection',
         'collection_catalog',
+        'collection_query_info',
     ]
 )
 
@@ -246,7 +246,6 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/db/catalog/collection_query_info',
         '$BUILD_DIR/mongo/db/catalog_raii',
         '$BUILD_DIR/mongo/db/concurrency/write_conflict_exception',
         '$BUILD_DIR/mongo/db/curop',
@@ -263,6 +262,7 @@ env.Library(
         '$BUILD_DIR/mongo/util/progress_meter',
         'collection',
         'collection_catalog',
+        'collection_query_info',
         'index_build_block',
         'index_catalog',
     ]
@@ -303,19 +303,6 @@ env.Benchmark(
 )
 
 env.Library(
-    target='collection_catalog_helper',
-    source=[
-        'collection_catalog_helper.cpp',
-    ],
-    LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/concurrency/lock_manager',
-        '$BUILD_DIR/mongo/db/views/views',
-        'collection',
-        'collection_catalog',
-    ],
-)
-
-env.Library(
     target='catalog_control',
     source=[
         "catalog_control.cpp",
@@ -361,9 +348,6 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/db/catalog/collection_catalog',
-        '$BUILD_DIR/mongo/db/catalog/collection_catalog_helper',
-        '$BUILD_DIR/mongo/db/catalog/index_repair',
         '$BUILD_DIR/mongo/db/collection_index_usage_tracker',
         '$BUILD_DIR/mongo/db/commands/server_status_core',
         '$BUILD_DIR/mongo/db/concurrency/lock_manager',
@@ -392,10 +376,13 @@ env.Library(
         '$BUILD_DIR/mongo/db/transaction',
         '$BUILD_DIR/mongo/db/ttl_collection_cache',
         '$BUILD_DIR/mongo/db/vector_clock',
+        '$BUILD_DIR/mongo/db/views/views',
         '$BUILD_DIR/mongo/db/views/views_mongod',
+        'catalog_helpers',
         'catalog_stats',
         'clustered_collection_options',
         'collection',
+        'collection_catalog',
         'collection_options',
         'database_holder',
         'health_log',
@@ -403,6 +390,7 @@ env.Library(
         'index_catalog',
         'index_catalog_entry',
         'index_key_validate',
+        'index_repair',
         'local_oplog_info',
         'throttle_cursor',
         'validate_idl',
@@ -434,7 +422,6 @@ env.Library(
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/bson/util/bson_column',
-        '$BUILD_DIR/mongo/db/catalog/index_key_validate',
         '$BUILD_DIR/mongo/db/concurrency/write_conflict_exception',
         '$BUILD_DIR/mongo/db/curop',
         '$BUILD_DIR/mongo/db/db_raii',
@@ -449,6 +436,7 @@ env.Library(
         'catalog_impl',
         'collection_options',
         'index_catalog',
+        'index_key_validate',
         'throttle_cursor',
         'validate_state',
     ]
@@ -487,6 +475,7 @@ env.Library(
     target='catalog_helpers',
     source=[
         'capped_utils.cpp',
+        'collection_catalog_helper.cpp',
         'coll_mod.cpp',
         'coll_mod_index.cpp',
         'coll_mod_op_observer.cpp',
@@ -500,9 +489,6 @@ env.Library(
         'rename_collection.cpp',
         'list_indexes.cpp',
     ],
-    LIBDEPS=[
-        'collection_catalog_helper',
-    ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/db_raii',
@@ -547,12 +533,12 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/db/catalog/index_catalog',
         '$BUILD_DIR/mongo/db/collection_index_usage_tracker',
         '$BUILD_DIR/mongo/db/concurrency/lock_manager',
         '$BUILD_DIR/mongo/db/curop',
         '$BUILD_DIR/mongo/db/fts/base_fts',
         '$BUILD_DIR/mongo/db/service_context',
+        'index_catalog',
     ],
 )
 
@@ -660,7 +646,6 @@ if wiredtiger:
             'catalog_test_fixture',
             'collection',
             'collection_catalog',
-            'collection_catalog_helper',
             'collection_options',
             'collection_validation',
             'commit_quorum_options',
diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript
index c41e498cd2a..e90a49c6c60 100644
--- a/src/mongo/db/commands/SConscript
+++ b/src/mongo/db/commands/SConscript
@@ -369,7 +369,6 @@ env.Library(
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/api_parameters',
         '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
-        '$BUILD_DIR/mongo/db/catalog/collection_catalog_helper',
         '$BUILD_DIR/mongo/db/catalog/collection_query_info',
         '$BUILD_DIR/mongo/db/catalog/collection_validation',
         '$BUILD_DIR/mongo/db/catalog/database_holder',
@@ -551,7 +550,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/catalog/catalog_control',
         '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
         '$BUILD_DIR/mongo/db/catalog/catalog_impl',
-        '$BUILD_DIR/mongo/db/catalog/collection_catalog_helper',
         '$BUILD_DIR/mongo/db/catalog/database_holder',
         '$BUILD_DIR/mongo/db/catalog/index_key_validate',
         '$BUILD_DIR/mongo/db/change_stream_options_manager',
@@ -784,11 +782,14 @@ env.CppUnitTest(
     ],
     LIBDEPS=[
         "$BUILD_DIR/mongo/db/auth/authmocks",
+        "$BUILD_DIR/mongo/db/catalog/collection",
         "$BUILD_DIR/mongo/db/commands/list_collections_filter",
+        "$BUILD_DIR/mongo/db/dbdirectclient",
         "$BUILD_DIR/mongo/db/multitenancy",
         "$BUILD_DIR/mongo/db/op_observer",
         "$BUILD_DIR/mongo/db/query/query_planner",
         "$BUILD_DIR/mongo/db/query/query_test_service_context",
+        "$BUILD_DIR/mongo/db/query_exec",
         "$BUILD_DIR/mongo/db/repl/drop_pending_collection_reaper",
         "$BUILD_DIR/mongo/db/repl/replmocks",
         "$BUILD_DIR/mongo/db/repl/storage_interface_impl",
diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript
index 62e7746b1a0..06036cb9cb3 100644
--- a/src/mongo/db/repl/SConscript
+++ b/src/mongo/db/repl/SConscript
@@ -237,19 +237,19 @@ env.Library(
         'collection_bulk_loader_impl.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
-        '$BUILD_DIR/mongo/db/catalog/multi_index_block',
-        '$BUILD_DIR/mongo/db/common',
-        '$BUILD_DIR/mongo/db/dbhelpers',
-        '$BUILD_DIR/mongo/db/query_exec',
         'oplog',
         'rollback_idl',
         'storage_interface',
     ],
     LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
         '$BUILD_DIR/mongo/db/catalog/database_holder',
+        '$BUILD_DIR/mongo/db/catalog/multi_index_block',
+        '$BUILD_DIR/mongo/db/common',
+        '$BUILD_DIR/mongo/db/dbhelpers',
         '$BUILD_DIR/mongo/db/index_builds_coordinator_interface',
         '$BUILD_DIR/mongo/db/multitenancy',
+        '$BUILD_DIR/mongo/db/query_exec',
         '$BUILD_DIR/mongo/db/record_id_helpers',
         '$BUILD_DIR/mongo/db/storage/oplog_cap_maintainer_thread',
         '$BUILD_DIR/mongo/db/storage/record_store_base',
@@ -425,7 +425,6 @@ env.Library(
         'rs_rollback.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
         '$BUILD_DIR/mongo/db/catalog/database_holder',
         '$BUILD_DIR/mongo/db/dbhelpers',
         '$BUILD_DIR/mongo/db/query_exec',
@@ -438,6 +437,7 @@ env.Library(
         'rollback_impl',
     ],
     LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
         '$BUILD_DIR/mongo/db/catalog/index_build_oplog_entry',
         '$BUILD_DIR/mongo/db/index_builds_coordinator_interface',
         '$BUILD_DIR/mongo/db/multitenancy',
@@ -1459,7 +1459,6 @@ env.Library(
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/client/clientdriver_network',
         '$BUILD_DIR/mongo/db/auth/auth',
-        '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
         '$BUILD_DIR/mongo/db/cloner',
         '$BUILD_DIR/mongo/db/concurrency/lock_manager',
         '$BUILD_DIR/mongo/db/curop',
@@ -1495,6 +1494,7 @@ env.Library(
         'tenant_migration_access_blocker',
     ],
     LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
         '$BUILD_DIR/mongo/db/catalog/local_oplog_info',
         '$BUILD_DIR/mongo/db/commands/mongod_fcv',
         '$BUILD_DIR/mongo/db/commands/rwc_defaults_commands',
@@ -1664,6 +1664,7 @@ if wiredtiger:
             '$BUILD_DIR/mongo/client/replica_set_monitor_protocol_test_util',
             '$BUILD_DIR/mongo/db/auth/authmocks',
             '$BUILD_DIR/mongo/db/auth/authorization_manager_global',
+            '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
             '$BUILD_DIR/mongo/db/catalog_raii',
             '$BUILD_DIR/mongo/db/commands/feature_compatibility_parsers',
             '$BUILD_DIR/mongo/db/commands/mongod_fcv',
diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript
index 25dab295653..cc2b45f727f 100644
--- a/src/mongo/db/s/SConscript
+++ b/src/mongo/db/s/SConscript
@@ -530,6 +530,7 @@ env.CppUnitTest(
     LIBDEPS=[
         '$BUILD_DIR/mongo/client/remote_command_targeter_mock',
         '$BUILD_DIR/mongo/db/auth/authmocks',
+        '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
         '$BUILD_DIR/mongo/db/commands/server_status',
         '$BUILD_DIR/mongo/db/keys_collection_client_direct',
         '$BUILD_DIR/mongo/db/logical_session_cache_impl',
diff --git a/src/mongo/db/storage/SConscript b/src/mongo/db/storage/SConscript
index 4abd243be06..ee3bed22687 100644
--- a/src/mongo/db/storage/SConscript
+++ b/src/mongo/db/storage/SConscript
@@ -586,7 +586,7 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/audit',
-        '$BUILD_DIR/mongo/db/catalog/collection_catalog_helper',
+        '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
         '$BUILD_DIR/mongo/db/catalog/index_catalog',
         '$BUILD_DIR/mongo/db/multitenancy',
         '$BUILD_DIR/mongo/db/resumable_index_builds_idl',
diff --git a/src/mongo/db/storage/wiredtiger/SConscript b/src/mongo/db/storage/wiredtiger/SConscript
index a5affa7c59e..bbda707a308 100644
--- a/src/mongo/db/storage/wiredtiger/SConscript
+++ b/src/mongo/db/storage/wiredtiger/SConscript
@@ -202,12 +202,14 @@ wtEnv.Library(
         'wiredtiger_import.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
         '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/repl/oplog',
         '$BUILD_DIR/mongo/db/storage/bson_collection_catalog_entry',
         'storage_wiredtiger_core',
     ],
+    LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
+    ],
 )
 
 
diff --git a/src/mongo/db/timeseries/SConscript b/src/mongo/db/timeseries/SConscript
index 84745946b65..e9572660176 100644
--- a/src/mongo/db/timeseries/SConscript
+++ b/src/mongo/db/timeseries/SConscript
@@ -124,6 +124,7 @@ env.CppUnitTest(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/catalog/catalog_test_fixture',
+        '$BUILD_DIR/mongo/db/catalog_raii',
         'bucket_catalog',
         'timeseries_conversion_util',
         'timeseries_options',