diff options
Diffstat (limited to 'src/mongo/s/write_ops/write_op_test.cpp')
| -rw-r--r-- | src/mongo/s/write_ops/write_op_test.cpp | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/src/mongo/s/write_ops/write_op_test.cpp b/src/mongo/s/write_ops/write_op_test.cpp index 7e62062cddc..b262e0f4544 100644 --- a/src/mongo/s/write_ops/write_op_test.cpp +++ b/src/mongo/s/write_ops/write_op_test.cpp @@ -124,9 +124,12 @@ TEST_F(WriteOpTest, TargetSingle) { // Multi-write targeting test where our query goes to one shard TEST_F(WriteOpTest, TargetMultiOneShard) { - ShardEndpoint endpointA(ShardId("shardA"), ChunkVersion(10, 0, OID()), boost::none); - ShardEndpoint endpointB(ShardId("shardB"), ChunkVersion(20, 0, OID()), boost::none); - ShardEndpoint endpointC(ShardId("shardB"), ChunkVersion(20, 0, OID()), boost::none); + ShardEndpoint endpointA( + ShardId("shardA"), ChunkVersion(10, 0, OID(), boost::none /* timestamp */), boost::none); + ShardEndpoint endpointB( + ShardId("shardB"), ChunkVersion(20, 0, OID(), boost::none /* timestamp */), boost::none); + ShardEndpoint endpointC( + ShardId("shardB"), ChunkVersion(20, 0, OID(), boost::none /* timestamp */), boost::none); BatchedCommandRequest request([&] { write_ops::Delete deleteOp(kNss); @@ -157,9 +160,12 @@ TEST_F(WriteOpTest, TargetMultiOneShard) { // Multi-write targeting test where our write goes to more than one shard TEST_F(WriteOpTest, TargetMultiAllShards) { - ShardEndpoint endpointA(ShardId("shardA"), ChunkVersion(10, 0, OID()), boost::none); - ShardEndpoint endpointB(ShardId("shardB"), ChunkVersion(20, 0, OID()), boost::none); - ShardEndpoint endpointC(ShardId("shardB"), ChunkVersion(20, 0, OID()), boost::none); + ShardEndpoint endpointA( + ShardId("shardA"), ChunkVersion(10, 0, OID(), boost::none /* timestamp */), boost::none); + ShardEndpoint endpointB( + ShardId("shardB"), ChunkVersion(20, 0, OID(), boost::none /* timestamp */), boost::none); + ShardEndpoint endpointC( + ShardId("shardB"), ChunkVersion(20, 0, OID(), boost::none /* timestamp */), boost::none); BatchedCommandRequest request([&] { write_ops::Delete deleteOp(kNss); @@ -197,8 +203,10 @@ TEST_F(WriteOpTest, TargetMultiAllShards) { } TEST_F(WriteOpTest, TargetMultiAllShardsAndErrorSingleChildOp) { - ShardEndpoint endpointA(ShardId("shardA"), ChunkVersion(10, 0, OID()), boost::none); - ShardEndpoint endpointB(ShardId("shardB"), ChunkVersion(20, 0, OID()), boost::none); + ShardEndpoint endpointA( + ShardId("shardA"), ChunkVersion(10, 0, OID(), boost::none /* timestamp */), boost::none); + ShardEndpoint endpointB( + ShardId("shardB"), ChunkVersion(20, 0, OID(), boost::none /* timestamp */), boost::none); BatchedCommandRequest request([&] { write_ops::Delete deleteOp(kNss); @@ -347,9 +355,12 @@ private: }; TEST_F(WriteOpTransactionTest, TargetMultiDoesNotTargetAllShards) { - ShardEndpoint endpointA(ShardId("shardA"), ChunkVersion(10, 0, OID()), boost::none); - ShardEndpoint endpointB(ShardId("shardB"), ChunkVersion(20, 0, OID()), boost::none); - ShardEndpoint endpointC(ShardId("shardB"), ChunkVersion(20, 0, OID()), boost::none); + ShardEndpoint endpointA( + ShardId("shardA"), ChunkVersion(10, 0, OID(), boost::none /* timestamp */), boost::none); + ShardEndpoint endpointB( + ShardId("shardB"), ChunkVersion(20, 0, OID(), boost::none /* timestamp */), boost::none); + ShardEndpoint endpointC( + ShardId("shardB"), ChunkVersion(20, 0, OID(), boost::none /* timestamp */), boost::none); BatchedCommandRequest request([&] { write_ops::Delete deleteOp(kNss); @@ -385,8 +396,10 @@ TEST_F(WriteOpTransactionTest, TargetMultiDoesNotTargetAllShards) { } TEST_F(WriteOpTransactionTest, TargetMultiAllShardsAndErrorSingleChildOp) { - ShardEndpoint endpointA(ShardId("shardA"), ChunkVersion(10, 0, OID()), boost::none); - ShardEndpoint endpointB(ShardId("shardB"), ChunkVersion(20, 0, OID()), boost::none); + ShardEndpoint endpointA( + ShardId("shardA"), ChunkVersion(10, 0, OID(), boost::none /* timestamp */), boost::none); + ShardEndpoint endpointB( + ShardId("shardB"), ChunkVersion(20, 0, OID(), boost::none /* timestamp */), boost::none); BatchedCommandRequest request([&] { write_ops::Delete deleteOp(kNss); |