Revert "SERVER-29908 Create skeleton libraries for the sharding subsystem"

This reverts commit da12466c2f109ada2d487db9c6fd92200f5b6b1d.

1 files changed, 20 insertions, 65 deletions

diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript
index 3724c672737..8c40b164e7a 100644
--- a/src/mongo/s/SConscript
+++ b/src/mongo/s/SConscript
@@ -17,54 +17,6 @@ env.SConscript(
     ],
 )
 
-# This is the main library to use for consumers of sharding. It will pull the routing and targeting
-# functionality.
-#
-# This is the only library, which should be referenced directly outside of mongo/s/ and mongo/db/s/
-env.Library(
-    target='sharding_api',
-    source=[
-
-    ],
-    LIBDEPS=[
-        'sharding_routing_table',
-    ],
-)
-
-# This library contains legacy sharding functionality, which should not be included in any new
-# development.
-env.Library(
-    target='sharding_legacy_api',
-    source=[
-        'client/parallel.cpp',
-        'client/shard_connection.cpp',
-        'client/version_manager.cpp',
-    ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/client/clientdriver',
-        '$BUILD_DIR/mongo/db/lasterror',
-        'cluster_last_error_info',
-        'grid',
-        'sharding_api',
-    ],
-)
-
-env.Library(
-    target='sharding_routing_table',
-    source=[
-        'chunk.cpp',
-        'chunk_manager.cpp',
-        'shard_key_pattern.cpp',
-    ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/db/matcher/expressions',
-        '$BUILD_DIR/mongo/db/query/query_planner',
-        '$BUILD_DIR/mongo/db/storage/key_string',
-        '$BUILD_DIR/mongo/db/update/update_common',
-        'common_s',
-    ],
-)
-
 # Functionality for initializing global sharding state
 env.Library(
     target='sharding_initialization',
@@ -269,6 +221,23 @@ env.CppUnitTest('request_types_test',
 )
 
 env.Library(
+    target='routing_table',
+    source=[
+        'chunk.cpp',
+        'chunk_manager.cpp',
+        'shard_key_pattern.cpp',
+    ],
+    LIBDEPS=[
+        '$BUILD_DIR/mongo/db/matcher/expressions',
+        '$BUILD_DIR/mongo/db/query/query_planner',
+        '$BUILD_DIR/mongo/db/storage/key_string',
+        '$BUILD_DIR/mongo/db/update/update_common',
+        'common_s',
+    ],
+)
+
+
+env.Library(
     target='sharding_task_executor',
     source=[
         'sharding_task_executor.cpp',
@@ -277,7 +246,7 @@ env.Library(
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/executor/thread_pool_task_executor',
         '$BUILD_DIR/mongo/s/client/sharding_client',
-        'cluster_last_error_info',
+        '$BUILD_DIR/mongo/s/cluster_last_error_info',
     ],
 )
 
@@ -306,7 +275,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/logical_time_metadata_hook',
         'client/shard_interface',
         'query/cluster_cursor_manager',
-        'sharding_routing_table',
+        'routing_table',
     ],
 )
 
@@ -330,7 +299,7 @@ env.Library(
 )
 
 env.CppUnitTest(
-    target='sharding_routing_table_test',
+    target='routing_table_test',
     source=[
         'catalog_cache_refresh_test.cpp',
         'catalog_cache_test_fixture.cpp',
@@ -398,17 +367,3 @@ env.CppUnitTest(
         'sharding_test_fixture',
     ]
 )
-
-env.CppUnitTest(
-    target='sharding_legacy_api_test',
-    source=[
-        'client/shard_connection_test.cpp',
-    ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/db/service_context_noop_init',
-        '$BUILD_DIR/mongo/dbtests/mocklib',
-        '$BUILD_DIR/mongo/util/net/network',
-        'client/sharding_connection_hook',
-        'sharding_legacy_api',
-    ]
-)