SERVER-69151 Remove 'analyze_shard_key' library

10 files changed, 11 insertions, 24 deletions

diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript
index 2d0419ea5da..b3508f5f8ba 100644
--- a/src/mongo/db/s/SConscript
+++ b/src/mongo/db/s/SConscript
@@ -342,19 +342,6 @@ env.Library(
 )
 
 env.Library(
-    target='analyze_shard_key',
-    source=[
-        'analyze_shard_key_cmd.idl',
-        'analyze_shard_key_feature_flag.idl',
-        'configure_query_analyzer_cmd.idl',
-    ],
-    LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/server_base',
-        '$BUILD_DIR/mongo/idl/feature_flag',
-    ],
-)
-
-env.Library(
     target='sharding_commands_d',
     source=[
         'add_shard_cmd.cpp',
@@ -520,7 +507,6 @@ env.Library(
         '$BUILD_DIR/mongo/s/commands/sharded_cluster_sharding_commands',
         '$BUILD_DIR/mongo/s/sharding_initialization',
         '$BUILD_DIR/mongo/s/sharding_router_api',
-        'analyze_shard_key',
         'forwardable_operation_metadata',
         'sharding_logging',
         'sharding_runtime_d',
diff --git a/src/mongo/db/s/analyze_shard_key_cmd.cpp b/src/mongo/db/s/analyze_shard_key_cmd.cpp
index ebc9a2b5d42..cafb2c1a91e 100644
--- a/src/mongo/db/s/analyze_shard_key_cmd.cpp
+++ b/src/mongo/db/s/analyze_shard_key_cmd.cpp
@@ -32,10 +32,10 @@
 #include "mongo/db/auth/authorization_session.h"
 #include "mongo/db/commands.h"
 #include "mongo/db/db_raii.h"
-#include "mongo/db/s/analyze_shard_key_cmd_gen.h"
-#include "mongo/db/s/analyze_shard_key_feature_flag_gen.h"
 #include "mongo/db/s/shard_key_index_util.h"
 #include "mongo/logv2/log.h"
+#include "mongo/s/analyze_shard_key_cmd_gen.h"
+#include "mongo/s/analyze_shard_key_feature_flag_gen.h"
 
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kCommand
 
diff --git a/src/mongo/db/s/configure_query_analyzer_cmd.cpp b/src/mongo/db/s/configure_query_analyzer_cmd.cpp
index 5f8ad320cd7..34a4274eea9 100644
--- a/src/mongo/db/s/configure_query_analyzer_cmd.cpp
+++ b/src/mongo/db/s/configure_query_analyzer_cmd.cpp
@@ -33,10 +33,10 @@
 #include "mongo/db/commands.h"
 #include "mongo/db/db_raii.h"
 #include "mongo/db/list_collections_gen.h"
-#include "mongo/db/s/analyze_shard_key_feature_flag_gen.h"
-#include "mongo/db/s/configure_query_analyzer_cmd_gen.h"
 #include "mongo/logv2/log.h"
+#include "mongo/s/analyze_shard_key_feature_flag_gen.h"
 #include "mongo/s/cluster_commands_helpers.h"
+#include "mongo/s/configure_query_analyzer_cmd_gen.h"
 #include "mongo/s/grid.h"
 
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kCommand
diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript
index b6b67f59c8a..d8ed42e46d1 100644
--- a/src/mongo/s/SConscript
+++ b/src/mongo/s/SConscript
@@ -135,6 +135,8 @@ env.Library(
 env.Library(
     target='common_s',
     source=[
+        'analyze_shard_key_cmd.idl',
+        'analyze_shard_key_feature_flag.idl',
         'cannot_implicitly_create_collection_info.cpp',
         'catalog/mongo_version_range.cpp',
         'catalog/type_changelog.cpp',
@@ -151,6 +153,7 @@ env.Library(
         'catalog/type_tags.cpp',
         'chunk_version.cpp',
         'chunk_version.idl',
+        'configure_query_analyzer_cmd.idl',
         'database_version.cpp',
         'database_version.idl',
         'index_version.cpp',
@@ -207,7 +210,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/index_commands_idl',
         '$BUILD_DIR/mongo/db/query/query_request',
         '$BUILD_DIR/mongo/db/repl/optime',
-        '$BUILD_DIR/mongo/db/s/analyze_shard_key',
         '$BUILD_DIR/mongo/db/server_options',
     ],
     LIBDEPS_PRIVATE=[
diff --git a/src/mongo/db/s/analyze_shard_key_cmd.idl b/src/mongo/s/analyze_shard_key_cmd.idl
index f15fcb7e78c..f15fcb7e78c 100644
--- a/src/mongo/db/s/analyze_shard_key_cmd.idl
+++ b/src/mongo/s/analyze_shard_key_cmd.idl
diff --git a/src/mongo/db/s/analyze_shard_key_feature_flag.idl b/src/mongo/s/analyze_shard_key_feature_flag.idl
index 96433110210..96433110210 100644
--- a/src/mongo/db/s/analyze_shard_key_feature_flag.idl
+++ b/src/mongo/s/analyze_shard_key_feature_flag.idl
diff --git a/src/mongo/s/commands/SConscript b/src/mongo/s/commands/SConscript
index 05cd828b268..a37bee825c2 100644
--- a/src/mongo/s/commands/SConscript
+++ b/src/mongo/s/commands/SConscript
@@ -226,7 +226,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/auth/saslauth',
         '$BUILD_DIR/mongo/db/commands',
         '$BUILD_DIR/mongo/db/commands/servers',
-        '$BUILD_DIR/mongo/db/s/analyze_shard_key',
         '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/rpc/client_metadata',
         '$BUILD_DIR/mongo/rpc/rewrite_state_change_errors',
diff --git a/src/mongo/s/commands/cluster_analyze_shard_key_cmd.cpp b/src/mongo/s/commands/cluster_analyze_shard_key_cmd.cpp
index 073dcdbea7e..70b5192d6c1 100644
--- a/src/mongo/s/commands/cluster_analyze_shard_key_cmd.cpp
+++ b/src/mongo/s/commands/cluster_analyze_shard_key_cmd.cpp
@@ -31,9 +31,9 @@
 
 #include "mongo/db/auth/authorization_session.h"
 #include "mongo/db/commands.h"
-#include "mongo/db/s/analyze_shard_key_cmd_gen.h"
-#include "mongo/db/s/analyze_shard_key_feature_flag_gen.h"
 #include "mongo/logv2/log.h"
+#include "mongo/s/analyze_shard_key_cmd_gen.h"
+#include "mongo/s/analyze_shard_key_feature_flag_gen.h"
 #include "mongo/s/cluster_commands_helpers.h"
 #include "mongo/s/grid.h"
 
diff --git a/src/mongo/s/commands/cluster_configure_query_analyzer_cmd.cpp b/src/mongo/s/commands/cluster_configure_query_analyzer_cmd.cpp
index eaacc2ff522..6b7feb4b2ce 100644
--- a/src/mongo/s/commands/cluster_configure_query_analyzer_cmd.cpp
+++ b/src/mongo/s/commands/cluster_configure_query_analyzer_cmd.cpp
@@ -31,9 +31,9 @@
 
 #include "mongo/db/auth/authorization_session.h"
 #include "mongo/db/commands.h"
-#include "mongo/db/s/analyze_shard_key_feature_flag_gen.h"
-#include "mongo/db/s/configure_query_analyzer_cmd_gen.h"
 #include "mongo/logv2/log.h"
+#include "mongo/s/analyze_shard_key_feature_flag_gen.h"
+#include "mongo/s/configure_query_analyzer_cmd_gen.h"
 #include "mongo/s/grid.h"
 
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kCommand
diff --git a/src/mongo/db/s/configure_query_analyzer_cmd.idl b/src/mongo/s/configure_query_analyzer_cmd.idl
index c0564c23d01..c0564c23d01 100644
--- a/src/mongo/db/s/configure_query_analyzer_cmd.idl
+++ b/src/mongo/s/configure_query_analyzer_cmd.idl