SERVER-47793 Remove library dependency of sessions_collection_sharded on sessions_collection_rs

(cherry picked from commit 2f9cbb7f816f744ac08ac52a0c87eaec3258e3ef)

5 files changed, 17 insertions, 39 deletions

diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 57ea9f5d99d..2f03f10e9fb 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -1322,24 +1322,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',
@@ -1398,25 +1380,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 efefe9b8406..040a2d504c9 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 adb476b8802..9b8eb7173fc 100644
--- a/src/mongo/db/s/SConscript
+++ b/src/mongo/db/s/SConscript
@@ -326,6 +326,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 0acc4cec7c2..da15739ef85 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