summaryrefslogtreecommitdiff
path: root/src/mongo/db/s/balancer
diff options
context:
space:
mode:
authorBilly Donahue <billy.donahue@mongodb.com>2019-03-27 12:21:37 -0400
committerBilly Donahue <billy.donahue@mongodb.com>2019-03-28 10:13:21 -0400
commitf922827d45ce752e148185dfa3a785f7c9cf29fd (patch)
treeb3ae7fdba18d9ef3384af6e0d009d091e5df14a3 /src/mongo/db/s/balancer
parentf2f422d92b639edba0a10d40a43803723cb15baf (diff)
downloadmongo-f922827d45ce752e148185dfa3a785f7c9cf29fd.tar.gz
SERVER-40357 expand all calls to MONGO_DISALLOW_COPYING
produced by: hits="$(git grep -n MONGO_DISALLOW_COPYING | cut -d: -f1 )" for f in "$hits"; do sed -i.orig ' s/^\( *\)MONGO_DISALLOW_COPYING(\(.*\));/\1\2(const \2\&) = delete;\n\1\2\& operator=(const \2\&) = delete;/; ' $f done
Diffstat (limited to 'src/mongo/db/s/balancer')
-rw-r--r--src/mongo/db/s/balancer/balancer.h4
-rw-r--r--src/mongo/db/s/balancer/balancer_chunk_selection_policy.h4
-rw-r--r--src/mongo/db/s/balancer/balancer_chunk_selection_policy_impl.cpp3
-rw-r--r--src/mongo/db/s/balancer/balancer_policy.h4
-rw-r--r--src/mongo/db/s/balancer/cluster_statistics.h4
-rw-r--r--src/mongo/db/s/balancer/migration_manager.h4
-rw-r--r--src/mongo/db/s/balancer/scoped_migration_request.h3
7 files changed, 14 insertions, 12 deletions
diff --git a/src/mongo/db/s/balancer/balancer.h b/src/mongo/db/s/balancer/balancer.h
index 91a8e9280b6..2b6738def19 100644
--- a/src/mongo/db/s/balancer/balancer.h
+++ b/src/mongo/db/s/balancer/balancer.h
@@ -29,7 +29,6 @@
#pragma once
-#include "mongo/base/disallow_copying.h"
#include "mongo/db/s/balancer/balancer_chunk_selection_policy.h"
#include "mongo/db/s/balancer/balancer_random.h"
#include "mongo/db/s/balancer/migration_manager.h"
@@ -55,7 +54,8 @@ class Status;
* loaded shards. It would issue a request for a chunk migration per round, if it found so.
*/
class Balancer {
- MONGO_DISALLOW_COPYING(Balancer);
+ Balancer(const Balancer&) = delete;
+ Balancer& operator=(const Balancer&) = delete;
public:
Balancer(ServiceContext* serviceContext);
diff --git a/src/mongo/db/s/balancer/balancer_chunk_selection_policy.h b/src/mongo/db/s/balancer/balancer_chunk_selection_policy.h
index eff68e36462..2557cebd602 100644
--- a/src/mongo/db/s/balancer/balancer_chunk_selection_policy.h
+++ b/src/mongo/db/s/balancer/balancer_chunk_selection_policy.h
@@ -32,7 +32,6 @@
#include <boost/optional.hpp>
#include <vector>
-#include "mongo/base/disallow_copying.h"
#include "mongo/db/s/balancer/balancer_policy.h"
#include "mongo/s/catalog/type_chunk.h"
#include "mongo/s/chunk_version.h"
@@ -51,7 +50,8 @@ class StatusWith;
* 'balanced' means.
*/
class BalancerChunkSelectionPolicy {
- MONGO_DISALLOW_COPYING(BalancerChunkSelectionPolicy);
+ BalancerChunkSelectionPolicy(const BalancerChunkSelectionPolicy&) = delete;
+ BalancerChunkSelectionPolicy& operator=(const BalancerChunkSelectionPolicy&) = delete;
public:
/**
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 56dbb896b30..93fdf758f9c 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
@@ -117,7 +117,8 @@ StatusWith<DistributionStatus> createCollectionDistributionStatus(
* splitting a chunk does not yield the same chunk anymore.
*/
class SplitCandidatesBuffer {
- MONGO_DISALLOW_COPYING(SplitCandidatesBuffer);
+ SplitCandidatesBuffer(const SplitCandidatesBuffer&) = delete;
+ SplitCandidatesBuffer& operator=(const SplitCandidatesBuffer&) = delete;
public:
SplitCandidatesBuffer(NamespaceString nss, ChunkVersion collectionVersion)
diff --git a/src/mongo/db/s/balancer/balancer_policy.h b/src/mongo/db/s/balancer/balancer_policy.h
index dbeeb6d86cc..28592a34743 100644
--- a/src/mongo/db/s/balancer/balancer_policy.h
+++ b/src/mongo/db/s/balancer/balancer_policy.h
@@ -32,7 +32,6 @@
#include <set>
#include <vector>
-#include "mongo/base/disallow_copying.h"
#include "mongo/bson/bsonobj.h"
#include "mongo/bson/simple_bsonobj_comparator.h"
#include "mongo/db/namespace_string.h"
@@ -76,7 +75,8 @@ typedef std::map<ShardId, std::vector<ChunkType>> ShardToChunksMap;
* query utilization statististics and to decide what to balance.
*/
class DistributionStatus {
- MONGO_DISALLOW_COPYING(DistributionStatus);
+ DistributionStatus(const DistributionStatus&) = delete;
+ DistributionStatus& operator=(const DistributionStatus&) = delete;
public:
DistributionStatus(NamespaceString nss, ShardToChunksMap shardToChunksMap);
diff --git a/src/mongo/db/s/balancer/cluster_statistics.h b/src/mongo/db/s/balancer/cluster_statistics.h
index 4531d496403..32f6cb9f7c5 100644
--- a/src/mongo/db/s/balancer/cluster_statistics.h
+++ b/src/mongo/db/s/balancer/cluster_statistics.h
@@ -34,7 +34,6 @@
#include <string>
#include <vector>
-#include "mongo/base/disallow_copying.h"
#include "mongo/s/client/shard.h"
namespace mongo {
@@ -50,7 +49,8 @@ class StatusWith;
* the statistics collection. There should be one instance of this object per service context.
*/
class ClusterStatistics {
- MONGO_DISALLOW_COPYING(ClusterStatistics);
+ ClusterStatistics(const ClusterStatistics&) = delete;
+ ClusterStatistics& operator=(const ClusterStatistics&) = delete;
public:
/**
diff --git a/src/mongo/db/s/balancer/migration_manager.h b/src/mongo/db/s/balancer/migration_manager.h
index 81adb434c33..4f6c1288571 100644
--- a/src/mongo/db/s/balancer/migration_manager.h
+++ b/src/mongo/db/s/balancer/migration_manager.h
@@ -33,7 +33,6 @@
#include <map>
#include <vector>
-#include "mongo/base/disallow_copying.h"
#include "mongo/bson/bsonobj.h"
#include "mongo/db/namespace_string.h"
#include "mongo/db/s/balancer/balancer_policy.h"
@@ -64,7 +63,8 @@ typedef std::map<MigrationIdentifier, Status> MigrationStatuses;
* Manages and executes parallel migrations for the balancer.
*/
class MigrationManager {
- MONGO_DISALLOW_COPYING(MigrationManager);
+ MigrationManager(const MigrationManager&) = delete;
+ MigrationManager& operator=(const MigrationManager&) = delete;
public:
MigrationManager(ServiceContext* serviceContext);
diff --git a/src/mongo/db/s/balancer/scoped_migration_request.h b/src/mongo/db/s/balancer/scoped_migration_request.h
index ecbb3f4c9ea..bfb58ba103c 100644
--- a/src/mongo/db/s/balancer/scoped_migration_request.h
+++ b/src/mongo/db/s/balancer/scoped_migration_request.h
@@ -46,7 +46,8 @@ namespace mongo {
* This class should only be used by the Balancer!
*/
class ScopedMigrationRequest {
- MONGO_DISALLOW_COPYING(ScopedMigrationRequest);
+ ScopedMigrationRequest(const ScopedMigrationRequest&) = delete;
+ ScopedMigrationRequest& operator=(const ScopedMigrationRequest&) = delete;
public:
/**