SERVER-73238 Move some shard_key_pattern query methods out of 'grid'

1 files changed, 22 insertions, 11 deletions

diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript
index ae3e0b0fc72..5528c5128cc 100644
--- a/src/mongo/s/SConscript
+++ b/src/mongo/s/SConscript
@@ -32,14 +32,28 @@ env.Library(
         'cluster_ddl.cpp',
         'cluster_write.cpp',
         'collection_routing_info_targeter.cpp',
+        'shard_key_pattern_query_util.cpp',
+        'write_ops/batch_write_exec.cpp',
+        'write_ops/batch_write_op.cpp',
+        'write_ops/write_op.cpp',
+        'write_ops/write_without_shard_key_util.cpp',
     ],
     LIBDEPS=[
+        '$BUILD_DIR/mongo/db/commands/server_status_core',
         '$BUILD_DIR/mongo/db/fle_crud',
         '$BUILD_DIR/mongo/db/not_primary_error_tracker',
+        '$BUILD_DIR/mongo/db/pipeline/pipeline',
+        '$BUILD_DIR/mongo/db/pipeline/process_interface/mongos_process_interface',
         '$BUILD_DIR/mongo/db/timeseries/timeseries_conversion_util',
         '$BUILD_DIR/mongo/db/timeseries/timeseries_options',
         'query/cluster_query',
-        'write_ops/cluster_write_ops',
+        'sharding_router_api',
+        'write_ops/batch_write_types',
+    ],
+    LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/db/catalog/collection_uuid_mismatch_info',
+        '$BUILD_DIR/mongo/db/internal_transactions_feature_flag',
+        '$BUILD_DIR/mongo/db/transaction/transaction_api',
     ],
 )
 
@@ -181,8 +195,8 @@ env.Library(
         'analyze_shard_key_cmd.idl',
         'cannot_implicitly_create_collection_info.cpp',
         'catalog/type_changelog.cpp',
-        'catalog/type_chunk_base.idl',
         'catalog/type_chunk.cpp',
+        'catalog/type_chunk_base.idl',
         'catalog/type_collection.cpp',
         'catalog/type_collection.idl',
         'catalog/type_config_version.cpp',
@@ -204,7 +218,6 @@ env.Library(
         'refresh_query_analyzer_configuration_cmd.idl',
         'request_types/abort_reshard_collection.idl',
         'request_types/add_shard_request_type.cpp',
-        'request_types/get_stats_for_balancing.idl',
         'request_types/add_shard_to_zone_request_type.cpp',
         'request_types/auto_split_vector.idl',
         'request_types/balance_chunk_request_type.cpp',
@@ -221,7 +234,7 @@ env.Library(
         'request_types/flush_routing_table_cache_updates.idl',
         'request_types/get_database_version.idl',
         'request_types/get_historical_placement_info.idl',
-        'request_types/shardsvr_join_migrations_request.idl',
+        'request_types/get_stats_for_balancing.idl',
         'request_types/merge_chunk_request.idl',
         'request_types/migration_secondary_throttle_options.cpp',
         'request_types/move_primary.idl',
@@ -231,13 +244,14 @@ env.Library(
         'request_types/resharding_operation_time.idl',
         'request_types/set_allow_migrations.idl',
         'request_types/sharded_ddl_commands.idl',
+        'request_types/shardsvr_join_migrations_request.idl',
         'request_types/update_zone_key_range_request_type.cpp',
         'request_types/wait_for_fail_point.idl',
         'resharding/common_types.idl',
+        'resharding/resharding_coordinator_service_conflicting_op_in_progress_info.cpp',
         'resharding/resharding_feature_flag.idl',
         'resharding/resume_token.idl',
         'resharding/type_collection_fields.idl',
-        'resharding/resharding_coordinator_service_conflicting_op_in_progress_info.cpp',
         'shard_cannot_refresh_due_to_locks_held_exception.cpp',
         'shard_invalidated_for_targeting_exception.cpp',
         'shard_version.cpp',
@@ -684,14 +698,11 @@ env.CppUnitTest(
         '$BUILD_DIR/mongo/db/timeseries/timeseries_conversion_util',
         '$BUILD_DIR/mongo/db/timeseries/timeseries_options',
         '$BUILD_DIR/mongo/dbtests/mocklib',
-        '$BUILD_DIR/mongo/s/catalog/sharding_catalog_client_mock',
-        '$BUILD_DIR/mongo/s/commands/cluster_commands',
-        '$BUILD_DIR/mongo/s/commands/cluster_commands_common',
-        '$BUILD_DIR/mongo/s/write_ops/batch_write_types',
-        '$BUILD_DIR/mongo/s/write_ops/cluster_write_ops',
-        '$BUILD_DIR/mongo/s/write_ops/write_without_shard_key_util',
         '$BUILD_DIR/mongo/util/net/network',
         '$BUILD_DIR/mongo/util/periodic_runner_factory',
+        'catalog/sharding_catalog_client_mock',
+        'commands/cluster_commands',
+        'commands/cluster_commands_common',
         'coreshard',
         'load_balancer_support',
         'mongos_topology_coordinator',