diff options
author | Xiangyu Yao <xiangyu.yao@mongodb.com> | 2019-07-11 18:37:42 -0400 |
---|---|---|
committer | Xiangyu Yao <xiangyu.yao@mongodb.com> | 2019-07-15 13:30:02 -0400 |
commit | 70a3df4dd5d102b2370a871c9182be281100a487 (patch) | |
tree | 4101519c5505800900caf30b1730c5fc6cdaeb5a /src/mongo/db/system_index.cpp | |
parent | bb4ba528dd4254c33ac77026f94bc287b590ff3c (diff) | |
download | mongo-70a3df4dd5d102b2370a871c9182be281100a487.tar.gz |
SERVER-42194 Make Collection always hold a UUID (rather than optional UUID)
Diffstat (limited to 'src/mongo/db/system_index.cpp')
-rw-r--r-- | src/mongo/db/system_index.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/system_index.cpp b/src/mongo/db/system_index.cpp index d6f6ebca0d2..a09cc9c64dc 100644 --- a/src/mongo/db/system_index.cpp +++ b/src/mongo/db/system_index.cpp @@ -182,7 +182,7 @@ Status verifySystemIndexes(OperationContext* opCtx) { if (indexes.empty()) { try { systemUsersFuture = generateSystemIndexForExistingCollection( - opCtx, collection->uuid().get(), systemUsers, v3SystemUsersIndexSpec); + opCtx, collection->uuid(), systemUsers, v3SystemUsersIndexSpec); } catch (...) { return exceptionToStatus(); } @@ -200,7 +200,7 @@ Status verifySystemIndexes(OperationContext* opCtx) { if (indexes.empty()) { try { systemRolesFuture = generateSystemIndexForExistingCollection( - opCtx, collection->uuid().get(), systemRoles, v3SystemRolesIndexSpec); + opCtx, collection->uuid(), systemRoles, v3SystemRolesIndexSpec); } catch (...) { return exceptionToStatus(); } @@ -252,7 +252,7 @@ void createSystemIndexes(OperationContext* opCtx, Collection* collection) { } if (!indexSpec.isEmpty()) { opCtx->getServiceContext()->getOpObserver()->onCreateIndex( - opCtx, ns, *(collection->uuid()), indexSpec, false /* fromMigrate */); + opCtx, ns, collection->uuid(), indexSpec, false /* fromMigrate */); // Note that the opObserver is called prior to creating the index. This ensures the index // write gets the same storage timestamp as the oplog entry. fassert(40456, |