diff options
Diffstat (limited to 'src/mongo/db/s/balancer')
-rw-r--r-- | src/mongo/db/s/balancer/balancer.cpp | 8 | ||||
-rw-r--r-- | src/mongo/db/s/balancer/balancer_chunk_selection_policy_impl.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/s/balancer/migration_manager_test.cpp | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/mongo/db/s/balancer/balancer.cpp b/src/mongo/db/s/balancer/balancer.cpp index 43f924132aa..b8e0a57f5b8 100644 --- a/src/mongo/db/s/balancer/balancer.cpp +++ b/src/mongo/db/s/balancer/balancer.cpp @@ -34,6 +34,7 @@ #include "mongo/db/s/balancer/balancer.h" #include <algorithm> +#include <memory> #include <string> #include "mongo/base/status_with.h" @@ -51,7 +52,6 @@ #include "mongo/s/client/shard_registry.h" #include "mongo/s/grid.h" #include "mongo/s/shard_util.h" -#include "mongo/stdx/memory.h" #include "mongo/util/concurrency/idle_thread_block.h" #include "mongo/util/exit.h" #include "mongo/util/log.h" @@ -154,9 +154,9 @@ void warnOnMultiVersion(const vector<ClusterStatistics::ShardStatistics>& cluste Balancer::Balancer(ServiceContext* serviceContext) : _balancedLastTime(0), _random(std::random_device{}()), - _clusterStats(stdx::make_unique<ClusterStatisticsImpl>(_random)), + _clusterStats(std::make_unique<ClusterStatisticsImpl>(_random)), _chunkSelectionPolicy( - stdx::make_unique<BalancerChunkSelectionPolicyImpl>(_clusterStats.get(), _random)), + std::make_unique<BalancerChunkSelectionPolicyImpl>(_clusterStats.get(), _random)), _migrationManager(serviceContext) {} Balancer::~Balancer() { @@ -167,7 +167,7 @@ Balancer::~Balancer() { void Balancer::create(ServiceContext* serviceContext) { invariant(!getBalancer(serviceContext)); - getBalancer(serviceContext) = stdx::make_unique<Balancer>(serviceContext); + getBalancer(serviceContext) = std::make_unique<Balancer>(serviceContext); } Balancer* Balancer::get(ServiceContext* serviceContext) { diff --git a/src/mongo/db/s/balancer/balancer_chunk_selection_policy_impl.cpp b/src/mongo/db/s/balancer/balancer_chunk_selection_policy_impl.cpp index 3162ca40daf..e6d358e982b 100644 --- a/src/mongo/db/s/balancer/balancer_chunk_selection_policy_impl.cpp +++ b/src/mongo/db/s/balancer/balancer_chunk_selection_policy_impl.cpp @@ -34,6 +34,7 @@ #include "mongo/db/s/balancer/balancer_chunk_selection_policy_impl.h" #include <algorithm> +#include <memory> #include <vector> #include "mongo/base/status_with.h" @@ -43,7 +44,6 @@ #include "mongo/s/catalog/type_tags.h" #include "mongo/s/catalog_cache.h" #include "mongo/s/grid.h" -#include "mongo/stdx/memory.h" #include "mongo/util/log.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/s/balancer/migration_manager_test.cpp b/src/mongo/db/s/balancer/migration_manager_test.cpp index ec2bdc8b12d..3e25160c065 100644 --- a/src/mongo/db/s/balancer/migration_manager_test.cpp +++ b/src/mongo/db/s/balancer/migration_manager_test.cpp @@ -29,6 +29,8 @@ #include "mongo/platform/basic.h" +#include <memory> + #include "mongo/client/remote_command_targeter_mock.h" #include "mongo/db/commands.h" #include "mongo/db/s/balancer/migration_manager.h" @@ -42,7 +44,6 @@ #include "mongo/s/config_server_test_fixture.h" #include "mongo/s/database_version_helpers.h" #include "mongo/s/request_types/move_chunk_request.h" -#include "mongo/stdx/memory.h" #include "mongo/util/scopeguard.h" namespace mongo { @@ -160,7 +161,7 @@ private: void MigrationManagerTest::setUp() { ConfigServerTestFixture::setUp(); - _migrationManager = stdx::make_unique<MigrationManager>(getServiceContext()); + _migrationManager = std::make_unique<MigrationManager>(getServiceContext()); _migrationManager->startRecoveryAndAcquireDistLocks(operationContext()); _migrationManager->finishRecovery(operationContext(), 0, kDefaultSecondaryThrottle); } |