summaryrefslogtreecommitdiff
path: root/src/mongo/db/s
diff options
context:
space:
mode:
authorAllison Easton <allison.easton@mongodb.com>2023-02-06 07:20:41 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2023-02-06 07:56:34 +0000
commit56ccff6386903c3d7465e20d694ebe6833d91e35 (patch)
tree099a42b8f2bd7747bf2f54f8b44a0b8f7950525a /src/mongo/db/s
parent6853acbf8e747da44e0d89ae7d4ed5c94a321f98 (diff)
downloadmongo-56ccff6386903c3d7465e20d694ebe6833d91e35.tar.gz
SERVER-73573 Fix global index unittest helpers
Diffstat (limited to 'src/mongo/db/s')
-rw-r--r--src/mongo/db/s/resharding/resharding_recipient_service_external_state_test.cpp48
1 files changed, 37 insertions, 11 deletions
diff --git a/src/mongo/db/s/resharding/resharding_recipient_service_external_state_test.cpp b/src/mongo/db/s/resharding/resharding_recipient_service_external_state_test.cpp
index ac4171ef6a4..4a457b0da84 100644
--- a/src/mongo/db/s/resharding/resharding_recipient_service_external_state_test.cpp
+++ b/src/mongo/db/s/resharding/resharding_recipient_service_external_state_test.cpp
@@ -185,7 +185,8 @@ public:
return std::vector<BSONObj>{coll.toBSON(), chunkObj};
}());
- expectCollectionAndIndexesAggregation(tempNss, epoch, timestamp, uuid, skey, {});
+ expectCollectionAndIndexesAggregation(
+ tempNss, epoch, timestamp, uuid, skey, boost::none, {});
future.default_timed_get();
}
@@ -331,8 +332,13 @@ TEST_F(RecipientServiceExternalStateTest, CreateLocalReshardingCollectionBasic)
<< "_id_"))},
HostAndPort(shards[1].getHost()));
expectListIndexes(kOrigNss, kOrigUUID, indexes, HostAndPort(shards[0].getHost()));
- expectCollectionAndIndexesAggregation(
- kReshardingNss, kReshardingEpoch, kReshardingTimestamp, kReshardingUUID, kShardKey, {});
+ expectCollectionAndIndexesAggregation(kReshardingNss,
+ kReshardingEpoch,
+ kReshardingTimestamp,
+ kReshardingUUID,
+ kShardKey,
+ boost::none,
+ {});
});
verifyTempReshardingCollectionAndMetadata();
@@ -394,8 +400,13 @@ TEST_F(RecipientServiceExternalStateTest,
expectRefreshReturnForOriginalColl(
kOrigNss, kShardKey, kOrigUUID, kOrigEpoch, kOrigTimestamp);
expectListIndexes(kOrigNss, kOrigUUID, indexes, HostAndPort(shards[0].getHost()));
- expectCollectionAndIndexesAggregation(
- kReshardingNss, kReshardingEpoch, kReshardingTimestamp, kReshardingUUID, kShardKey, {});
+ expectCollectionAndIndexesAggregation(kReshardingNss,
+ kReshardingEpoch,
+ kReshardingTimestamp,
+ kReshardingUUID,
+ kShardKey,
+ boost::none,
+ {});
});
verifyTempReshardingCollectionAndMetadata();
@@ -466,8 +477,13 @@ TEST_F(RecipientServiceExternalStateTest,
<< "_id_"))},
HostAndPort(shards[1].getHost()));
expectListIndexes(kOrigNss, kOrigUUID, indexes, HostAndPort(shards[0].getHost()));
- expectCollectionAndIndexesAggregation(
- kReshardingNss, kReshardingEpoch, kReshardingTimestamp, kReshardingUUID, kShardKey, {});
+ expectCollectionAndIndexesAggregation(kReshardingNss,
+ kReshardingEpoch,
+ kReshardingTimestamp,
+ kReshardingUUID,
+ kShardKey,
+ boost::none,
+ {});
});
verifyTempReshardingCollectionAndMetadata();
@@ -540,8 +556,13 @@ TEST_F(RecipientServiceExternalStateTest,
<< "_id_"))},
HostAndPort(shards[1].getHost()));
expectListIndexes(kOrigNss, kOrigUUID, indexes, HostAndPort(shards[0].getHost()));
- expectCollectionAndIndexesAggregation(
- kReshardingNss, kReshardingEpoch, kReshardingTimestamp, kReshardingUUID, kShardKey, {});
+ expectCollectionAndIndexesAggregation(kReshardingNss,
+ kReshardingEpoch,
+ kReshardingTimestamp,
+ kReshardingUUID,
+ kShardKey,
+ boost::none,
+ {});
});
verifyTempReshardingCollectionAndMetadata();
@@ -604,8 +625,13 @@ TEST_F(RecipientServiceExternalStateTest,
<< "_id_"))},
HostAndPort(shards[1].getHost()));
expectListIndexes(kOrigNss, kOrigUUID, indexes, HostAndPort(shards[0].getHost()));
- expectCollectionAndIndexesAggregation(
- kReshardingNss, kReshardingEpoch, kReshardingTimestamp, kReshardingUUID, kShardKey, {});
+ expectCollectionAndIndexesAggregation(kReshardingNss,
+ kReshardingEpoch,
+ kReshardingTimestamp,
+ kReshardingUUID,
+ kShardKey,
+ boost::none,
+ {});
});
verifyTempReshardingCollectionAndMetadata();