SERVER-56453 move LocalOplogInfo build target and implementation from repl/ to catalog/

4 files changed, 38 insertions, 37 deletions

diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 8cc08e6c689..bff313b5f04 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -673,9 +673,9 @@ env.Library(
         'views/views',
     ],
     LIBDEPS_PRIVATE=[
-        'catalog/database_holder',
-        'repl/local_oplog_info',
-        's/sharding_api_d',
+        '$BUILD_DIR/mongo/db/catalog/database_holder',
+        '$BUILD_DIR/mongo/db/catalog/local_oplog_info',
+        '$BUILD_DIR/mongo/db/s/sharding_api_d',
     ]
 )
 
@@ -694,22 +694,22 @@ env.Library(
     ],
     LIBDEPS=[
         'commands/txn_cmd_request',
-        'repl/local_oplog_info',
         'repl/oplog_entry',
         'session_catalog',
     ],
     LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/db/catalog/collection_catalog',
+        '$BUILD_DIR/mongo/db/catalog/database_holder',
+        '$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/index/index_access_method',
         '$BUILD_DIR/mongo/idl/idl_parser',
         '$BUILD_DIR/mongo/idl/server_parameter',
         '$BUILD_DIR/mongo/util/concurrency/thread_pool',
-        'catalog/collection_catalog',
-        'catalog/database_holder',
         'catalog_raii',
-        'commands/server_status',
-        'commands/test_commands_enabled',
         'curop_failpoint_helpers',
         'dbdirectclient',
-        'index/index_access_method',
         'lasterror',
         'query_exec',
         'repl/repl_server_parameters',
@@ -993,12 +993,12 @@ env.Library(
         "$BUILD_DIR/mongo/base",
         "$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/storage/write_unit_of_work",
         "catalog_raii",
         "db_raii",
         "dbhelpers",
         "namespace_string",
-        "repl/local_oplog_info",
         "service_context",
     ],
 )
@@ -1306,13 +1306,13 @@ env.Library(
         'update/update_driver',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/repl/local_oplog_info',
-        'catalog/database_holder',
-        'commands/server_status_core',
+        '$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/stats/resource_consumption_metrics',
         'kill_sessions',
         'lasterror',
         'record_id_helpers',
-        'stats/resource_consumption_metrics',
     ],
 )
 
diff --git a/src/mongo/db/catalog/SConscript b/src/mongo/db/catalog/SConscript
index ca19d9b7770..4ba9210f1d5 100644
--- a/src/mongo/db/catalog/SConscript
+++ b/src/mongo/db/catalog/SConscript
@@ -447,6 +447,21 @@ env.Library(
 )
 
 env.Library(
+    target='local_oplog_info',
+    source=[
+        'local_oplog_info.cpp',
+    ],
+    LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/db/logical_time',
+        '$BUILD_DIR/mongo/db/repl/optime',
+        '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface',
+        '$BUILD_DIR/mongo/db/storage/flow_control',
+        '$BUILD_DIR/mongo/db/vector_clock_mutable',
+        'collection',
+    ],
+)
+
+env.Library(
     target='catalog_helpers',
     source=[
         'capped_utils.cpp',
@@ -474,8 +489,8 @@ env.Library(
         'multi_index_block',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/repl/local_oplog_info',
         'database_holder',
+        'local_oplog_info',
     ],
 )
 
diff --git a/src/mongo/db/repl/local_oplog_info.cpp b/src/mongo/db/catalog/local_oplog_info.cpp
index 0c4eb1ccc8c..eeff7e28ee0 100644
--- a/src/mongo/db/repl/local_oplog_info.cpp
+++ b/src/mongo/db/catalog/local_oplog_info.cpp
@@ -27,9 +27,7 @@
  *    it in the license file.
  */
 
-#define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kReplication
-
-#include "mongo/platform/basic.h"
+#define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kCatalog
 
 #include "mongo/db/repl/local_oplog_info.h"
 
diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript
index 855791510a4..67b2c9f9580 100644
--- a/src/mongo/db/repl/SConscript
+++ b/src/mongo/db/repl/SConscript
@@ -18,21 +18,6 @@ env.Library(
 )
 
 env.Library(
-    target='local_oplog_info',
-    source=[
-        'local_oplog_info.cpp',
-    ],
-    LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/catalog/collection',
-        '$BUILD_DIR/mongo/db/logical_time',
-        '$BUILD_DIR/mongo/db/storage/flow_control',
-        '$BUILD_DIR/mongo/db/vector_clock_mutable',
-        'optime',
-        'repl_coordinator_interface',
-    ],
-)
-
-env.Library(
     target='tenant_migration_decoration',
     source=[
         'tenant_migration_decoration.cpp',
@@ -57,6 +42,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/catalog/database_holder',
         '$BUILD_DIR/mongo/db/catalog/import_collection_oplog_entry',
         '$BUILD_DIR/mongo/db/catalog/index_build_oplog_entry',
+        '$BUILD_DIR/mongo/db/catalog/local_oplog_info',
         '$BUILD_DIR/mongo/db/catalog/multi_index_block',
         '$BUILD_DIR/mongo/db/commands/feature_compatibility_parsers',
         '$BUILD_DIR/mongo/db/db_raii',
@@ -71,7 +57,6 @@ env.Library(
         '$BUILD_DIR/mongo/rpc/command_status',
         'dbcheck',
         'image_collection_entry',
-        'local_oplog_info',
         'repl_coordinator_interface',
         'repl_server_parameters',
         'repl_settings',
@@ -710,11 +695,11 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/catalog/collection_catalog',
+        '$BUILD_DIR/mongo/db/catalog/local_oplog_info',
         '$BUILD_DIR/mongo/db/commands/test_commands_enabled',
         '$BUILD_DIR/mongo/db/index_builds_coordinator_interface',
         '$BUILD_DIR/mongo/db/storage/journal_flusher',
         '$BUILD_DIR/mongo/idl/server_parameter',
-        'local_oplog_info',
         'repl_server_parameters',
         'replica_set_aware_service',
         'split_horizon',
@@ -1385,13 +1370,15 @@ env.Library(
         '$BUILD_DIR/mongo/executor/network_interface_factory',
         '$BUILD_DIR/mongo/executor/thread_pool_task_executor',
         '$BUILD_DIR/mongo/util/future_util',
-        'local_oplog_info',
         'optime',
         'repl_coordinator_interface',
         'tenant_migration_decoration',
         'tenant_migration_errors',
         'tenant_migration_state_machine_idl'
     ],
+    LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/db/catalog/local_oplog_info',
+    ],
 )
 
 env.Library(
@@ -1407,6 +1394,7 @@ env.Library(
         'tenant_migration_utils',
     ],
     LIBDEPS_PRIVATE=[
+        "$BUILD_DIR/mongo/db/catalog/local_oplog_info",
         "$BUILD_DIR/mongo/db/index_builds_coordinator_interface",
     ],
 )
@@ -1458,12 +1446,12 @@ env.Library(
         'tenant_migration_access_blocker',
     ],
     LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/db/catalog/local_oplog_info',
         '$BUILD_DIR/mongo/db/commands/mongod_fcv',
         '$BUILD_DIR/mongo/db/index_builds_coordinator_interface',
         '$BUILD_DIR/mongo/db/s/sharding_runtime_d',
         '$BUILD_DIR/mongo/db/storage/flow_control',
         '$BUILD_DIR/mongo/db/storage/storage_control',
-        'local_oplog_info',
         'repl_server_parameters',
     ],
 )