diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2020-10-30 11:48:09 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-11-03 16:39:42 +0000 |
| commit | ab6d6baf541e762b272738da8d9c5b257caa3be4 (patch) | |
| tree | 0f9a824c741fc4a5ced8fb792b82893bfc228f0e /src/mongo/db/pipeline | |
| parent | cd587a2171ea96b86ac82508eef065a601e4f3df (diff) | |
| download | mongo-ab6d6baf541e762b272738da8d9c5b257caa3be4.tar.gz | |
SERVER-50027 Convert the CollectionType's UUID field to IDL
... and make it required
Diffstat (limited to 'src/mongo/db/pipeline')
| -rw-r--r-- | src/mongo/db/pipeline/dispatch_shard_pipeline_test.cpp | 3 | ||||
| -rw-r--r-- | src/mongo/db/pipeline/sharded_union_test.cpp | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/mongo/db/pipeline/dispatch_shard_pipeline_test.cpp b/src/mongo/db/pipeline/dispatch_shard_pipeline_test.cpp index 1bfc5ab8ea3..c9933f19f5e 100644 --- a/src/mongo/db/pipeline/dispatch_shard_pipeline_test.cpp +++ b/src/mongo/db/pipeline/dispatch_shard_pipeline_test.cpp @@ -216,8 +216,9 @@ TEST_F(DispatchShardPipelineTest, WrappedDispatchDoesRetryOnStaleConfigError) { // Mock the expected config server queries. const OID epoch = OID::gen(); + const UUID uuid = UUID::gen(); const ShardKeyPattern shardKeyPattern(BSON("_id" << 1)); - expectGetCollection(kTestAggregateNss, epoch, shardKeyPattern); + expectGetCollection(kTestAggregateNss, epoch, uuid, shardKeyPattern); expectFindSendBSONObjVector(kConfigHostAndPort, [&]() { ChunkVersion version(1, 0, epoch); diff --git a/src/mongo/db/pipeline/sharded_union_test.cpp b/src/mongo/db/pipeline/sharded_union_test.cpp index a3c0ad65af8..5d0744ae0fc 100644 --- a/src/mongo/db/pipeline/sharded_union_test.cpp +++ b/src/mongo/db/pipeline/sharded_union_test.cpp @@ -163,8 +163,9 @@ TEST_F(ShardedUnionTest, RetriesSubPipelineOnStaleConfigError) { // Mock the expected config server queries. const OID epoch = OID::gen(); + const UUID uuid = UUID::gen(); const ShardKeyPattern shardKeyPattern(BSON("_id" << 1)); - expectGetCollection(kTestAggregateNss, epoch, shardKeyPattern); + expectGetCollection(kTestAggregateNss, epoch, uuid, shardKeyPattern); expectFindSendBSONObjVector(kConfigHostAndPort, [&]() { ChunkVersion version(1, 0, epoch); @@ -239,8 +240,9 @@ TEST_F(ShardedUnionTest, CorrectlySplitsSubPipelineIfRefreshedDistributionRequir // Mock the expected config server queries. Update the distribution as if a chunk [0, 10] was // created and moved to the first shard. const OID epoch = OID::gen(); + const UUID uuid = UUID::gen(); const ShardKeyPattern shardKeyPattern(BSON("_id" << 1)); - expectGetCollection(kTestAggregateNss, epoch, shardKeyPattern); + expectGetCollection(kTestAggregateNss, epoch, uuid, shardKeyPattern); expectFindSendBSONObjVector(kConfigHostAndPort, [&]() { ChunkVersion version(1, 0, epoch); @@ -329,8 +331,9 @@ TEST_F(ShardedUnionTest, AvoidsSplittingSubPipelineIfRefreshedDistributionDoesNo // Mock the expected config server queries. Update the distribution so that all chunks are on // the same shard. const OID epoch = OID::gen(); + const UUID uuid = UUID::gen(); const ShardKeyPattern shardKeyPattern(BSON("_id" << 1)); - expectGetCollection(kTestAggregateNss, epoch, shardKeyPattern); + expectGetCollection(kTestAggregateNss, epoch, uuid, shardKeyPattern); expectFindSendBSONObjVector(kConfigHostAndPort, [&]() { ChunkVersion version(1, 0, epoch); |