SERVER-32479 Make all library names unique

20 files changed, 43 insertions, 44 deletions

diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 223d0a2c4bf..76140c06b03 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -617,7 +617,7 @@ env.Library(
         "op_observer_impl.cpp",
     ],
     LIBDEPS=[
-        'repl/serveronly',
+        'repl/serveronly_repl',
         'views/views_mongod',
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/catalog/uuid_catalog',
@@ -829,7 +829,7 @@ env.Library(
         "write_ops",
         "ops/write_ops_parsers",
         "pipeline/aggregation",
-        "pipeline/serveronly",
+        "pipeline/serveronly_pipeline",
         "prefetch",
         "query/query",
         "repair_database",
@@ -842,18 +842,18 @@ env.Library(
         "repl/repl_settings",
         "repl/rs_rollback",
         "repl/rslog",
-        "repl/serveronly",
+        "repl/serveronly_repl",
         "repl/storage_interface",
         "repl/sync_tail",
         "repl/topology_coordinator",
         "rw_concern_d",
         "s/collection_metadata",
-        "s/commands",
+        "s/commands_db_s",
         "s/sharding",
         "service_context_d",
         "startup_warnings_mongod",
         "stats/counters",
-        "stats/serveronly",
+        "stats/serveronly_stats",
         "stats/top",
         "storage/devnull/storage_devnull",
         "storage/ephemeral_for_test/storage_ephemeral_for_test",
diff --git a/src/mongo/db/catalog/SConscript b/src/mongo/db/catalog/SConscript
index 2ba434e2e30..b8d66ce5cd7 100644
--- a/src/mongo/db/catalog/SConscript
+++ b/src/mongo/db/catalog/SConscript
@@ -256,7 +256,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/query/query',
         '$BUILD_DIR/mongo/db/repl/drop_pending_collection_reaper',
         '$BUILD_DIR/mongo/db/repl/oplog',
-        '$BUILD_DIR/mongo/db/repl/serveronly',
+        '$BUILD_DIR/mongo/db/repl/serveronly_repl',
         '$BUILD_DIR/mongo/db/s/balancer',
         '$BUILD_DIR/mongo/db/service_context',
         '$BUILD_DIR/mongo/db/storage/key_string',
diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript
index eeb21f938f9..cbc9e91c239 100644
--- a/src/mongo/db/commands/SConscript
+++ b/src/mongo/db/commands/SConscript
@@ -216,7 +216,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/index_d',
         '$BUILD_DIR/mongo/db/lasterror',
         '$BUILD_DIR/mongo/db/ops/write_ops_parsers',
-        '$BUILD_DIR/mongo/db/pipeline/serveronly',
+        '$BUILD_DIR/mongo/db/pipeline/serveronly_pipeline',
         '$BUILD_DIR/mongo/db/repair_database',
         '$BUILD_DIR/mongo/db/repl/dbcheck',
         '$BUILD_DIR/mongo/db/repl/isself',
@@ -224,7 +224,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/repl/repl_coordinator_impl',
         '$BUILD_DIR/mongo/db/rw_concern_d',
         '$BUILD_DIR/mongo/db/server_options_core',
-        '$BUILD_DIR/mongo/db/stats/serveronly',
+        '$BUILD_DIR/mongo/db/stats/serveronly_stats',
         '$BUILD_DIR/mongo/db/storage/mmap_v1/storage_mmapv1',
         '$BUILD_DIR/mongo/db/views/views_mongod',
         '$BUILD_DIR/mongo/db/write_ops',
diff --git a/src/mongo/db/exec/SConscript b/src/mongo/db/exec/SConscript
index 04dd3a7e647..52fb644d548 100644
--- a/src/mongo/db/exec/SConscript
+++ b/src/mongo/db/exec/SConscript
@@ -93,7 +93,7 @@ env.Library(
         "$BUILD_DIR/mongo/db/concurrency/write_conflict_exception",
         "$BUILD_DIR/mongo/db/commands",
         "$BUILD_DIR/mongo/db/curop",
-        "$BUILD_DIR/mongo/db/fts/base",
+        "$BUILD_DIR/mongo/db/fts/base_fts",
         "$BUILD_DIR/mongo/db/index/index_descriptor",
         "$BUILD_DIR/mongo/db/index/key_generator",
         "$BUILD_DIR/mongo/db/pipeline/pipeline",
@@ -101,7 +101,7 @@ env.Library(
         "$BUILD_DIR/mongo/db/update/update_driver",
         "$BUILD_DIR/mongo/scripting/scripting",
         "$BUILD_DIR/mongo/db/storage/storage_options",
-        "$BUILD_DIR/mongo/s/common",
+        "$BUILD_DIR/mongo/s/common_s",
         '$BUILD_DIR/third_party/s2/s2',
         '$BUILD_DIR/mongo/db/query/query_common',
         #'$BUILD_DIR/mongo/db/write_ops', # CYCLE
diff --git a/src/mongo/db/fts/SConscript b/src/mongo/db/fts/SConscript
index 8b9a7c1c103..1a6d0ce6599 100644
--- a/src/mongo/db/fts/SConscript
+++ b/src/mongo/db/fts/SConscript
@@ -38,7 +38,7 @@ env.Alias('generated-sources', generateStopWordsList)
 
 baseEnv=env.Clone()
 baseEnv.InjectThirdPartyIncludePaths(libraries=['stemmer'])
-baseEnv.Library('base', [
+baseEnv.Library('base_fts', [
         'fts_index_format.cpp',
         'fts_matcher.cpp',
         'fts_query_impl.cpp',
@@ -77,7 +77,7 @@ env.Library(
 
 env.Library('ftsmongod', [
     'ftsmongod.cpp',
-        ], LIBDEPS=["base","$BUILD_DIR/mongo/base"])
+        ], LIBDEPS=["base_fts","$BUILD_DIR/mongo/base"])
 
 env.CppUnitTest(target='fts_test',
                 source=[
@@ -99,6 +99,6 @@ env.CppUnitTest(target='fts_test',
                 LIBDEPS=[
                     "$BUILD_DIR/mongo/db/fts/fts_query_noop",
                     "$BUILD_DIR/mongo/db/matcher/expressions",
-                    "base",
+                    "base_fts",
                 ],
-)
\ No newline at end of file
+)
diff --git a/src/mongo/db/index/SConscript b/src/mongo/db/index/SConscript
index 49e4eff68fb..aaf0b99b701 100644
--- a/src/mongo/db/index/SConscript
+++ b/src/mongo/db/index/SConscript
@@ -26,7 +26,7 @@ env.Library(
         LIBDEPS=[
             '$BUILD_DIR/mongo/base',
             '$BUILD_DIR/mongo/db/bson/dotted_path_support',
-            '$BUILD_DIR/mongo/db/fts/base',
+            '$BUILD_DIR/mongo/db/fts/base_fts',
             '$BUILD_DIR/mongo/db/geo/geoparser',
             '$BUILD_DIR/mongo/db/index_names',
             '$BUILD_DIR/mongo/db/mongohasher',
diff --git a/src/mongo/db/matcher/SConscript b/src/mongo/db/matcher/SConscript
index 2922ae05732..f2371745c70 100644
--- a/src/mongo/db/matcher/SConscript
+++ b/src/mongo/db/matcher/SConscript
@@ -164,7 +164,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/auth/authorization_manager_global',
         '$BUILD_DIR/mongo/db/concurrency/lock_manager',
         '$BUILD_DIR/mongo/db/db_raii',
-        '$BUILD_DIR/mongo/db/fts/base',
+        '$BUILD_DIR/mongo/db/fts/base_fts',
         '$BUILD_DIR/mongo/scripting/scripting_server',
         'expressions',
         '$BUILD_DIR/mongo/db/catalog/collection',
diff --git a/src/mongo/db/pipeline/SConscript b/src/mongo/db/pipeline/SConscript
index 88d11529131..09f68229ad7 100644
--- a/src/mongo/db/pipeline/SConscript
+++ b/src/mongo/db/pipeline/SConscript
@@ -510,7 +510,7 @@ env.CppUnitTest(
 )
 
 env.Library(
-    target='serveronly',
+    target='serveronly_pipeline',
     source=[
         'document_source_cursor.cpp',
         'pipeline_d.cpp',
@@ -523,7 +523,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/dbdirectclient',
         '$BUILD_DIR/mongo/db/index/index_access_methods',
         '$BUILD_DIR/mongo/db/matcher/expressions_mongod_only',
-        '$BUILD_DIR/mongo/db/stats/serveronly',
+        '$BUILD_DIR/mongo/db/stats/serveronly_stats',
     ],
 )
 
diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript
index 007584df837..d99ec052301 100644
--- a/src/mongo/db/repl/SConscript
+++ b/src/mongo/db/repl/SConscript
@@ -557,7 +557,6 @@ env.Library(
         'optime',
         'replication_process',
         'replmocks',
-        #'serveronly', # CYCLE
         'storage_interface_impl',
         '$BUILD_DIR/mongo/db/service_context',
         '$BUILD_DIR/mongo/db/service_context_d_test_fixture',
@@ -1087,7 +1086,7 @@ env.Library(
         'repl_settings',
         'replica_set_messages',
         'replication_process',
-        'serveronly',
+        'serveronly_repl',
     ],
 )
 
@@ -1535,7 +1534,7 @@ env.CppUnitTest(
 )
 
 env.Library(
-    target="serveronly",
+    target="serveronly_repl",
     source=[
         "master_slave.cpp",
         'noop_writer.cpp',
diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript
index 2894cd66a2d..dfc83d2b4af 100644
--- a/src/mongo/db/s/SConscript
+++ b/src/mongo/db/s/SConscript
@@ -14,7 +14,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/common',
         '$BUILD_DIR/mongo/db/range_arithmetic',
         '$BUILD_DIR/mongo/db/service_context',
-        '$BUILD_DIR/mongo/s/common',
+        '$BUILD_DIR/mongo/s/common_s',
         '$BUILD_DIR/mongo/s/routing_table',
     ],
 )
@@ -41,7 +41,7 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/bson/util/bson_extract',
-        '$BUILD_DIR/mongo/s/common',
+        '$BUILD_DIR/mongo/s/common_s',
     ],
 )
 
@@ -54,7 +54,7 @@ env.Library(
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/s/write_ops/batch_write_types',
         '$BUILD_DIR/mongo/bson/util/bson_extract',
-        '$BUILD_DIR/mongo/s/common',
+        '$BUILD_DIR/mongo/s/common_s',
     ],
 )
 
@@ -156,7 +156,7 @@ env.CppUnitTest(
 )
 
 env.Library(
-    target='commands',
+    target='commands_db_s',
     source=[
         'check_sharding_index_command.cpp',
         'cleanup_orphaned_cmd.cpp',
@@ -289,7 +289,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/clientcursor',
         '$BUILD_DIR/mongo/db/dbhelpers',
         '$BUILD_DIR/mongo/db/exec/exec',
-        '$BUILD_DIR/mongo/db/pipeline/serveronly',
+        '$BUILD_DIR/mongo/db/pipeline/serveronly_pipeline',
         '$BUILD_DIR/mongo/db/query/query',
         '$BUILD_DIR/mongo/db/rw_concern_d',
         '$BUILD_DIR/mongo/s/catalog/sharding_catalog_manager',
diff --git a/src/mongo/db/stats/SConscript b/src/mongo/db/stats/SConscript
index d91a7df5322..d8b78a186ee 100644
--- a/src/mongo/db/stats/SConscript
+++ b/src/mongo/db/stats/SConscript
@@ -89,7 +89,7 @@ env.CppUnitTest(
 )
 
 env.Library(
-    target='serveronly',
+    target='serveronly_stats',
     source=[
         "latency_server_status_section.cpp",
         "lock_server_status_section.cpp",
diff --git a/src/mongo/executor/SConscript b/src/mongo/executor/SConscript
index dd4205c5bf9..3311078ea58 100644
--- a/src/mongo/executor/SConscript
+++ b/src/mongo/executor/SConscript
@@ -86,7 +86,7 @@ env.Library('network_interface_mock',
             ])
 
 env.Library(
-    target='connection_pool',
+    target='connection_pool_executor',
     source=[
        'connection_pool.cpp',
     ],
@@ -105,7 +105,7 @@ env.CppUnitTest(
         'connection_pool_test_fixture.cpp',
     ],
     LIBDEPS=[
-        'connection_pool',
+        'connection_pool_executor',
     ],
 )
 
@@ -164,7 +164,7 @@ env.Library(
         '$BUILD_DIR/third_party/shim_asio',
         'async_stream',
         'async_timer_asio',
-        'connection_pool',
+        'connection_pool_executor',
         'network_interface',
         'task_executor_interface',
     ])
@@ -310,7 +310,7 @@ env.CppUnitTest(
     LIBDEPS=[
         '$BUILD_DIR/mongo/util/concurrency/thread_pool_test_fixture',
         'async_timer_mock',
-        'connection_pool',
+        'connection_pool_executor',
         'network_interface_asio',
         'network_interface_thread_pool',
         '$BUILD_DIR/mongo/executor/thread_pool_task_executor',
diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript
index cf17015bcc4..721510e47b1 100644
--- a/src/mongo/s/SConscript
+++ b/src/mongo/s/SConscript
@@ -64,7 +64,7 @@ env.Library(
 )
 
 env.Library(
-    target='common',
+    target='common_s',
     source=[
         'catalog/mongo_version_range.cpp',
         'catalog/type_changelog.cpp',
@@ -206,7 +206,7 @@ env.CppUnitTest(
         'shard_id_test.cpp',
     ],
     LIBDEPS=[
-        'common',
+        'common_s',
     ]
 )
 
@@ -232,7 +232,7 @@ env.CppUnitTest(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/query/query_test_service_context',
-        'common',
+        'common_s',
     ]
 )
 
@@ -248,7 +248,7 @@ env.CppUnitTest('request_types_test',
         'request_types/update_zone_key_range_request_test.cpp',
     ],
     LIBDEPS=[
-        'common',
+        'common_s',
     ],
 )
 
@@ -260,7 +260,7 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/storage/key_string',
-        'common',
+        'common_s',
     ],
 )
 
@@ -286,7 +286,7 @@ env.Library(
         '$BUILD_DIR/mongo/s/catalog/sharding_catalog_client',
         '$BUILD_DIR/mongo/s/query/cluster_cursor_manager',
         '$BUILD_DIR/mongo/util/concurrency/thread_pool',
-        'common',
+        'common_s',
         'routing_table',
         #'client/sharding_client', # CYCLE
     ],
diff --git a/src/mongo/s/catalog/SConscript b/src/mongo/s/catalog/SConscript
index aed7e63ab86..801ade62c4c 100644
--- a/src/mongo/s/catalog/SConscript
+++ b/src/mongo/s/catalog/SConscript
@@ -64,7 +64,7 @@ env.Library(
         'dist_lock_catalog_mock.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/s/common',
+        '$BUILD_DIR/mongo/s/common_s',
         '$BUILD_DIR/mongo/unittest/unittest',
         'dist_lock_catalog_interface',
     ]
diff --git a/src/mongo/s/write_ops/SConscript b/src/mongo/s/write_ops/SConscript
index f13ba6c096f..5229bdfab6e 100644
--- a/src/mongo/s/write_ops/SConscript
+++ b/src/mongo/s/write_ops/SConscript
@@ -17,7 +17,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/common',
         '$BUILD_DIR/mongo/db/ops/write_ops_parsers',
         '$BUILD_DIR/mongo/db/repl/optime',
-        '$BUILD_DIR/mongo/s/common',
+        '$BUILD_DIR/mongo/s/common_s',
     ],
 )
 
diff --git a/src/third_party/s2/SConscript b/src/third_party/s2/SConscript
index 7da9e7e5832..e348f4c51c5 100644
--- a/src/third_party/s2/SConscript
+++ b/src/third_party/s2/SConscript
@@ -53,7 +53,7 @@ env.Library( "s2",
 	"s2regioncoverer.cc",
 	"s2regionintersection.cc",
 	"s2regionunion.cc",
-    ], LIBDEPS=['$BUILD_DIR/third_party/s2/base/base',
+    ], LIBDEPS=['$BUILD_DIR/third_party/s2/base/base_s2',
 		'$BUILD_DIR/third_party/s2/strings/strings',
 		'$BUILD_DIR/third_party/s2/util/coding/coding',
 		'$BUILD_DIR/third_party/s2/util/math/math'])
diff --git a/src/third_party/s2/base/SConscript b/src/third_party/s2/base/SConscript
index c2f2b152b0c..217cc864236 100755
--- a/src/third_party/s2/base/SConscript
+++ b/src/third_party/s2/base/SConscript
@@ -7,7 +7,7 @@ env = env.Clone()
 env.Append(CCFLAGS=['-Isrc/third_party/s2'])
 
 env.Library(
-    "base",
+    "base_s2",
     [ 
 	"int128.cc",
 	"logging.cc",
diff --git a/src/third_party/s2/strings/SConscript b/src/third_party/s2/strings/SConscript
index 21b5ae7c8dc..2a44d9af587 100755
--- a/src/third_party/s2/strings/SConscript
+++ b/src/third_party/s2/strings/SConscript
@@ -15,6 +15,6 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/third_party/s2/base/base',
+        '$BUILD_DIR/third_party/s2/base/base_s2',
     ],
 )
diff --git a/src/third_party/s2/util/coding/SConscript b/src/third_party/s2/util/coding/SConscript
index 91ac4a791d0..8dc773bf5b6 100755
--- a/src/third_party/s2/util/coding/SConscript
+++ b/src/third_party/s2/util/coding/SConscript
@@ -20,5 +20,5 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/third_party/s2/base/base',
+        '$BUILD_DIR/third_party/s2/base/base_s2',
     ])
diff --git a/src/third_party/s2/util/math/SConscript b/src/third_party/s2/util/math/SConscript
index c87ad5e56ec..b76175a95a0 100755
--- a/src/third_party/s2/util/math/SConscript
+++ b/src/third_party/s2/util/math/SConscript
@@ -20,5 +20,5 @@ env.Library("math",
           ],
           LIBDEPS=[
               '$BUILD_DIR/mongo/base',
-              '$BUILD_DIR/third_party/s2/base/base',
+              '$BUILD_DIR/third_party/s2/base/base_s2',
           ])