From bdbc1fc5dd5ca8adf4302c7f7d766257d246f337 Mon Sep 17 00:00:00 2001 From: Kaloian Manassiev Date: Thu, 11 Aug 2022 15:28:25 +0000 Subject: SERVER-68634 Move insertDocumentForBulkLoader out of CollectionImpl --- src/mongo/db/s/SConscript | 8 ++++++-- src/mongo/db/s/balancer/balancer_commands_scheduler_impl.cpp | 4 +--- src/mongo/db/s/config/sharding_catalog_manager.cpp | 6 +----- src/mongo/db/s/drop_collection_coordinator.cpp | 3 --- src/mongo/db/s/rename_collection_coordinator.cpp | 2 -- src/mongo/db/s/resharding/resharding_coordinator_service.cpp | 1 - src/mongo/db/s/sharding_util_refresh_test.cpp | 4 ---- src/mongo/db/s/shardsvr_collmod_command.cpp | 3 --- 8 files changed, 8 insertions(+), 23 deletions(-) (limited to 'src/mongo/db/s') diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript index ccefef8ffe3..38b844a09a3 100644 --- a/src/mongo/db/s/SConscript +++ b/src/mongo/db/s/SConscript @@ -37,7 +37,6 @@ env.Library( '$BUILD_DIR/mongo/db/range_arithmetic', '$BUILD_DIR/mongo/db/repl/replica_set_aware_service', '$BUILD_DIR/mongo/s/grid', - '$BUILD_DIR/mongo/s/sharding_routing_table', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/write_block_bypass', @@ -177,7 +176,6 @@ env.Library( '$BUILD_DIR/mongo/s/sharding_initialization', 'sharding_api_d', 'sharding_catalog_manager', - 'sharding_logging', 'transaction_coordinator', ], LIBDEPS_PRIVATE=[ @@ -194,6 +192,7 @@ env.Library( '$BUILD_DIR/mongo/db/timeseries/bucket_catalog', '$BUILD_DIR/mongo/idl/server_parameter', '$BUILD_DIR/mongo/util/future_util', + 'sharding_logging', ], ) @@ -497,6 +496,7 @@ env.Library( '$BUILD_DIR/mongo/s/sharding_initialization', '$BUILD_DIR/mongo/s/sharding_router_api', 'forwardable_operation_metadata', + 'sharding_logging', 'sharding_runtime_d', 'user_writes_recoverable_critical_section', ], @@ -552,6 +552,9 @@ env.Library( LIBDEPS=[ 'sharding_mongod_test_fixture', ], + LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/s/catalog/sharding_catalog_client_impl', + ], ) env.Library( @@ -564,6 +567,7 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/op_observer/oplog_writer_impl', + '$BUILD_DIR/mongo/s/catalog/sharding_catalog_client_impl', ], ) diff --git a/src/mongo/db/s/balancer/balancer_commands_scheduler_impl.cpp b/src/mongo/db/s/balancer/balancer_commands_scheduler_impl.cpp index 3bc4f16bc89..03f7715365c 100644 --- a/src/mongo/db/s/balancer/balancer_commands_scheduler_impl.cpp +++ b/src/mongo/db/s/balancer/balancer_commands_scheduler_impl.cpp @@ -27,8 +27,8 @@ * it in the license file. */ - #include "mongo/db/s/balancer/balancer_commands_scheduler_impl.h" + #include "mongo/db/client.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/s/sharding_util.h" @@ -43,9 +43,7 @@ #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kSharding - namespace mongo { - namespace { MONGO_FAIL_POINT_DEFINE(pauseSubmissionsFailPoint); diff --git a/src/mongo/db/s/config/sharding_catalog_manager.cpp b/src/mongo/db/s/config/sharding_catalog_manager.cpp index 55044bcba44..b3fdbfc5c47 100644 --- a/src/mongo/db/s/config/sharding_catalog_manager.cpp +++ b/src/mongo/db/s/config/sharding_catalog_manager.cpp @@ -27,10 +27,6 @@ * it in the license file. */ -#include "mongo/db/ops/write_ops_parsers.h" - -#include "mongo/platform/basic.h" - #include "mongo/db/s/config/sharding_catalog_manager.h" #include @@ -43,6 +39,7 @@ #include "mongo/db/internal_transactions_feature_flag_gen.h" #include "mongo/db/operation_context.h" #include "mongo/db/ops/write_ops.h" +#include "mongo/db/ops/write_ops_parsers.h" #include "mongo/db/query/query_request_helper.h" #include "mongo/db/repl/repl_client_info.h" #include "mongo/db/s/balancer/type_migration.h" @@ -68,7 +65,6 @@ #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kSharding - namespace mongo { namespace { diff --git a/src/mongo/db/s/drop_collection_coordinator.cpp b/src/mongo/db/s/drop_collection_coordinator.cpp index 70cf4e2ea34..49c7a273ffa 100644 --- a/src/mongo/db/s/drop_collection_coordinator.cpp +++ b/src/mongo/db/s/drop_collection_coordinator.cpp @@ -27,7 +27,6 @@ * it in the license file. */ - #include "mongo/db/s/drop_collection_coordinator.h" #include "mongo/db/catalog/collection_uuid_mismatch.h" @@ -35,7 +34,6 @@ #include "mongo/db/s/sharding_ddl_util.h" #include "mongo/db/s/sharding_logging.h" #include "mongo/db/s/sharding_state.h" -#include "mongo/db/s/sharding_util.h" #include "mongo/logv2/log.h" #include "mongo/s/catalog/sharding_catalog_client.h" #include "mongo/s/client/shard_registry.h" @@ -44,7 +42,6 @@ #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kSharding - namespace mongo { DropReply DropCollectionCoordinator::dropCollectionLocally(OperationContext* opCtx, diff --git a/src/mongo/db/s/rename_collection_coordinator.cpp b/src/mongo/db/s/rename_collection_coordinator.cpp index ef06faf2b88..155b6f546ef 100644 --- a/src/mongo/db/s/rename_collection_coordinator.cpp +++ b/src/mongo/db/s/rename_collection_coordinator.cpp @@ -43,7 +43,6 @@ #include "mongo/db/s/sharding_ddl_util.h" #include "mongo/db/s/sharding_logging.h" #include "mongo/db/s/sharding_state.h" -#include "mongo/db/s/sharding_util.h" #include "mongo/idl/idl_parser.h" #include "mongo/logv2/log.h" #include "mongo/s/catalog/sharding_catalog_client.h" @@ -53,7 +52,6 @@ #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kSharding - namespace mongo { namespace { diff --git a/src/mongo/db/s/resharding/resharding_coordinator_service.cpp b/src/mongo/db/s/resharding/resharding_coordinator_service.cpp index 67bd7c2ba54..270c6c91198 100644 --- a/src/mongo/db/s/resharding/resharding_coordinator_service.cpp +++ b/src/mongo/db/s/resharding/resharding_coordinator_service.cpp @@ -51,7 +51,6 @@ #include "mongo/db/s/sharding_data_transform_metrics.h" #include "mongo/db/s/sharding_ddl_util.h" #include "mongo/db/s/sharding_logging.h" -#include "mongo/db/s/sharding_util.h" #include "mongo/db/storage/duplicate_key_error_info.h" #include "mongo/db/vector_clock.h" #include "mongo/db/write_concern_options.h" diff --git a/src/mongo/db/s/sharding_util_refresh_test.cpp b/src/mongo/db/s/sharding_util_refresh_test.cpp index 81d96fca8cd..bb2673be07c 100644 --- a/src/mongo/db/s/sharding_util_refresh_test.cpp +++ b/src/mongo/db/s/sharding_util_refresh_test.cpp @@ -27,9 +27,6 @@ * it in the license file. */ - -#include "mongo/platform/basic.h" - #include "mongo/client/remote_command_targeter_mock.h" #include "mongo/db/s/config/config_server_test_fixture.h" #include "mongo/db/s/sharding_util.h" @@ -40,7 +37,6 @@ #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kTest - namespace mongo { namespace { diff --git a/src/mongo/db/s/shardsvr_collmod_command.cpp b/src/mongo/db/s/shardsvr_collmod_command.cpp index 91f1dcc7f6f..76851922697 100644 --- a/src/mongo/db/s/shardsvr_collmod_command.cpp +++ b/src/mongo/db/s/shardsvr_collmod_command.cpp @@ -27,7 +27,6 @@ * it in the license file. */ - #include "mongo/db/auth/authorization_checks.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/coll_mod_gen.h" @@ -37,14 +36,12 @@ #include "mongo/db/curop.h" #include "mongo/db/s/collmod_coordinator.h" #include "mongo/db/s/sharding_state.h" -#include "mongo/db/s/sharding_util.h" #include "mongo/db/timeseries/catalog_helper.h" #include "mongo/logv2/log.h" #include "mongo/s/sharding_feature_flags_gen.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kSharding - namespace mongo { namespace { -- cgit v1.2.1