diff options
Diffstat (limited to 'src/mongo/db/s/resharding/resharding_coordinator_service_test.cpp')
| -rw-r--r-- | src/mongo/db/s/resharding/resharding_coordinator_service_test.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/mongo/db/s/resharding/resharding_coordinator_service_test.cpp b/src/mongo/db/s/resharding/resharding_coordinator_service_test.cpp index dc16d5fe271..1fc380093bf 100644 --- a/src/mongo/db/s/resharding/resharding_coordinator_service_test.cpp +++ b/src/mongo/db/s/resharding/resharding_coordinator_service_test.cpp @@ -27,9 +27,6 @@ * it in the license file. */ - -#include "mongo/platform/basic.h" - #include <boost/optional.hpp> #include <functional> @@ -59,7 +56,6 @@ #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kTest - namespace mongo { namespace { @@ -203,7 +199,7 @@ public: {DonorShardEntry(ShardId("shard0000"), {})}, {RecipientShardEntry(ShardId("shard0001"), {})}); doc.setCommonReshardingMetadata(meta); - emplaceCloneTimestampIfExists(doc, cloneTimestamp); + resharding::emplaceCloneTimestampIfExists(doc, cloneTimestamp); return doc; } @@ -372,10 +368,11 @@ public: TypeCollectionReshardingFields reshardingFields(coordinatorDoc.getReshardingUUID()); reshardingFields.setState(coordinatorDoc.getState()); - reshardingFields.setDonorFields(TypeCollectionDonorFields( - coordinatorDoc.getTempReshardingNss(), - coordinatorDoc.getReshardingKey(), - extractShardIdsFromParticipantEntries(coordinatorDoc.getRecipientShards()))); + reshardingFields.setDonorFields( + TypeCollectionDonorFields(coordinatorDoc.getTempReshardingNss(), + coordinatorDoc.getReshardingKey(), + resharding::extractShardIdsFromParticipantEntries( + coordinatorDoc.getRecipientShards()))); auto originalNssCatalogEntry = makeOriginalCollectionCatalogEntry( coordinatorDoc, @@ -414,7 +411,7 @@ public: _newShardKey.isShardKey(shardKey.toBSON()) ? _newChunkRanges : _oldChunkRanges; // Create two chunks, one on each shard with the given namespace and epoch - ChunkVersion version(1, 0, epoch, timestamp); + ChunkVersion version({epoch, timestamp}, {1, 0}); ChunkType chunk1(uuid, chunkRanges[0], version, ShardId("shard0000")); chunk1.setName(ids[0]); version.incMinor(); |