diff options
Diffstat (limited to 'src/mongo/db/s/operation_sharding_state_test.cpp')
| -rw-r--r-- | src/mongo/db/s/operation_sharding_state_test.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/mongo/db/s/operation_sharding_state_test.cpp b/src/mongo/db/s/operation_sharding_state_test.cpp index 837a65c64dc..28275a27007 100644 --- a/src/mongo/db/s/operation_sharding_state_test.cpp +++ b/src/mongo/db/s/operation_sharding_state_test.cpp @@ -47,7 +47,8 @@ TEST_F(OperationShardingStateTest, ScopedSetShardRoleDbVersion) { } TEST_F(OperationShardingStateTest, ScopedSetShardRoleShardVersion) { - ShardVersion shardVersion(ChunkVersion({OID::gen(), Timestamp(1, 0)}, {1, 0})); + CollectionGeneration gen(OID::gen(), Timestamp(1, 0)); + ShardVersion shardVersion({gen, {1, 0}}, {gen, boost::none}); ScopedSetShardRole scopedSetShardRole(operationContext(), kNss, shardVersion, boost::none); auto& oss = OperationShardingState::get(operationContext()); @@ -58,13 +59,15 @@ TEST_F(OperationShardingStateTest, ScopedSetShardRoleChangeShardVersionSameNames auto& oss = OperationShardingState::get(operationContext()); { - ShardVersion shardVersion1(ChunkVersion({OID::gen(), Timestamp(10, 0)}, {1, 0})); + CollectionGeneration gen1(OID::gen(), Timestamp(10, 0)); + ShardVersion shardVersion1({gen1, {1, 0}}, {gen1, boost::none}); ScopedSetShardRole scopedSetShardRole1( operationContext(), kNss, shardVersion1, boost::none); ASSERT_EQ(shardVersion1, *oss.getShardVersion(kNss)); } { - ShardVersion shardVersion2(ChunkVersion({OID::gen(), Timestamp(20, 0)}, {1, 0})); + CollectionGeneration gen2(OID::gen(), Timestamp(20, 0)); + ShardVersion shardVersion2({gen2, {1, 0}}, {gen2, boost::none}); ScopedSetShardRole scopedSetShardRole2( operationContext(), kNss, shardVersion2, boost::none); ASSERT_EQ(shardVersion2, *oss.getShardVersion(kNss)); @@ -72,8 +75,10 @@ TEST_F(OperationShardingStateTest, ScopedSetShardRoleChangeShardVersionSameNames } TEST_F(OperationShardingStateTest, ScopedSetShardRoleRecursiveShardVersionDifferentNamespaces) { - ShardVersion shardVersion1(ChunkVersion({OID::gen(), Timestamp(10, 0)}, {1, 0})); - ShardVersion shardVersion2(ChunkVersion({OID::gen(), Timestamp(20, 0)}, {1, 0})); + CollectionGeneration gen1(OID::gen(), Timestamp(10, 0)); + CollectionGeneration gen2(OID::gen(), Timestamp(20, 0)); + ShardVersion shardVersion1({gen1, {1, 0}}, {gen1, boost::none}); + ShardVersion shardVersion2({gen2, {1, 0}}, {gen2, boost::none}); ScopedSetShardRole scopedSetShardRole1(operationContext(), kNss, shardVersion1, boost::none); ScopedSetShardRole scopedSetShardRole2( |