From ab6d6baf541e762b272738da8d9c5b257caa3be4 Mon Sep 17 00:00:00 2001 From: Kaloian Manassiev Date: Fri, 30 Oct 2020 11:48:09 -0400 Subject: SERVER-50027 Convert the CollectionType's UUID field to IDL ... and make it required --- src/mongo/s/catalog_cache_test_fixture.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mongo/s/catalog_cache_test_fixture.h') diff --git a/src/mongo/s/catalog_cache_test_fixture.h b/src/mongo/s/catalog_cache_test_fixture.h index fb6c53a6dad..a42af988697 100644 --- a/src/mongo/s/catalog_cache_test_fixture.h +++ b/src/mongo/s/catalog_cache_test_fixture.h @@ -119,7 +119,7 @@ protected: NamespaceString nss, const BSONObj& shardKey, boost::optional primaryShardId = boost::none, - boost::optional uuid = boost::none); + UUID uuid = UUID::gen()); /** * Mocks network responses for loading a sharded database and collection from the config server. @@ -127,8 +127,8 @@ protected: void expectGetDatabase(NamespaceString nss, std::string primaryShard = "0"); void expectGetCollection(NamespaceString nss, OID epoch, - const ShardKeyPattern& shardKeyPattern, - boost::optional uuid = boost::none); + UUID uuid, + const ShardKeyPattern& shardKeyPattern); const HostAndPort kConfigHostAndPort{"DummyConfig", 1234}; }; -- cgit v1.2.1