diff options
| author | Allison Easton <allison.easton@mongodb.com> | 2021-09-21 13:39:28 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-09-21 14:39:04 +0000 |
| commit | 9e1d37df7bf5bb4c8312f155bd671214f75ea296 (patch) | |
| tree | c0895615554be30d482ec9923af19ea75b9745ae /src/mongo/s/request_types/balance_chunk_request_test.cpp | |
| parent | bfef41e47abf95ec8f8114552d44df6c58409c9c (diff) | |
| download | mongo-9e1d37df7bf5bb4c8312f155bd671214f75ea296.tar.gz | |
SERVER-52847 Make timestamp required in CollectionType and ShardCollectionType IDL
Diffstat (limited to 'src/mongo/s/request_types/balance_chunk_request_test.cpp')
| -rw-r--r-- | src/mongo/s/request_types/balance_chunk_request_test.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/mongo/s/request_types/balance_chunk_request_test.cpp b/src/mongo/s/request_types/balance_chunk_request_test.cpp index 1021d8feef0..236b7fbc1d0 100644 --- a/src/mongo/s/request_types/balance_chunk_request_test.cpp +++ b/src/mongo/s/request_types/balance_chunk_request_test.cpp @@ -43,7 +43,7 @@ namespace { using unittest::assertGet; TEST(BalanceChunkRequest, ParseFromConfigCommandNoSecondaryThrottle) { - const ChunkVersion version(1, 0, OID::gen(), boost::none /* timestamp */); + const ChunkVersion version(1, 0, OID::gen(), Timestamp()); auto request = assertGet(BalanceChunkRequest::parseFromConfigCommand( BSON("_configsvrMoveChunk" << 1 << "ns" @@ -51,7 +51,7 @@ TEST(BalanceChunkRequest, ParseFromConfigCommandNoSecondaryThrottle) { << "min" << BSON("a" << -100LL) << "max" << BSON("a" << 100LL) << "shard" << "TestShard0000" << "lastmod" << Date_t::fromMillisSinceEpoch(version.toLong()) << "lastmodEpoch" - << version.epoch()))); + << version.epoch() << "lastmodTimestamp" << version.getTimestamp()))); const auto& chunk = request.getChunk(); ASSERT_EQ("TestDB.TestColl", request.getNss()->ns()); ASSERT_BSONOBJ_EQ(BSON("a" << -100LL), chunk.getMin()); @@ -66,13 +66,14 @@ TEST(BalanceChunkRequest, ParseFromConfigCommandNoSecondaryThrottle) { TEST(BalanceChunkRequest, ParseFromConfigCommandWithUUID) { const auto uuid = UUID::gen(); - const ChunkVersion version(1, 0, OID::gen(), boost::none /* timestamp */); + const ChunkVersion version(1, 0, OID::gen(), Timestamp()); auto request = assertGet(BalanceChunkRequest::parseFromConfigCommand( BSON("_configsvrMoveChunk" << 1 << "uuid" << uuid << "min" << BSON("a" << -100LL) << "max" << BSON("a" << 100LL) << "shard" << "TestShard0000" << "lastmod" << Date_t::fromMillisSinceEpoch(version.toLong()) - << "lastmodEpoch" << version.epoch()))); + << "lastmodEpoch" << version.epoch() << "lastmodTimestamp" + << version.getTimestamp()))); const auto& chunk = request.getChunk(); ASSERT_EQ(uuid, chunk.getCollectionUUID()); ASSERT_BSONOBJ_EQ(BSON("a" << -100LL), chunk.getMin()); @@ -86,7 +87,7 @@ TEST(BalanceChunkRequest, ParseFromConfigCommandWithUUID) { } TEST(BalanceChunkRequest, ParseFromConfigCommandWithSecondaryThrottle) { - const ChunkVersion version(1, 0, OID::gen(), boost::none /* timestamp */); + const ChunkVersion version(1, 0, OID::gen(), Timestamp()); auto request = assertGet(BalanceChunkRequest::parseFromConfigCommand( BSON("_configsvrMoveChunk" << 1 << "ns" @@ -94,7 +95,8 @@ TEST(BalanceChunkRequest, ParseFromConfigCommandWithSecondaryThrottle) { << "min" << BSON("a" << -100LL) << "max" << BSON("a" << 100LL) << "shard" << "TestShard0000" << "lastmod" << Date_t::fromMillisSinceEpoch(version.toLong()) << "lastmodEpoch" - << version.epoch() << "secondaryThrottle" + << version.epoch() << "lastmodTimestamp" << version.getTimestamp() + << "secondaryThrottle" << BSON("_secondaryThrottle" << true << "writeConcern" << BSON("w" << 2))))); const auto& chunk = request.getChunk(); ASSERT_EQ("TestDB.TestColl", request.getNss()->ns()); |