diff options
author | Sophia Tan <sophia_tll@hotmail.com> | 2023-05-12 19:44:44 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-05-15 23:20:28 +0000 |
commit | 6be86d8987dbad1c33160ef1779b598bc7cfa6b4 (patch) | |
tree | b3484e6c70e402ddf66482df828c3b3f221457b3 /src/mongo/db/global_index.cpp | |
parent | ba0986ac66e3a22d211ad3707ad037fdc10910af (diff) | |
download | mongo-6be86d8987dbad1c33160ef1779b598bc7cfa6b4.tar.gz |
SERVER-75276 writeConflictRetry should properly be using a NamespaceStringOrUUID instead of a StringData
Diffstat (limited to 'src/mongo/db/global_index.cpp')
-rw-r--r-- | src/mongo/db/global_index.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/db/global_index.cpp b/src/mongo/db/global_index.cpp index a31e7e3889c..e788cf4f640 100644 --- a/src/mongo/db/global_index.cpp +++ b/src/mongo/db/global_index.cpp @@ -120,7 +120,7 @@ void createContainer(OperationContext* opCtx, const UUID& indexUUID) { LOGV2(6789200, "Create global index container", "indexUUID"_attr = indexUUID); // Create the container. - return writeConflictRetry(opCtx, "createGlobalIndexContainer", nss.ns(), [&]() { + return writeConflictRetry(opCtx, "createGlobalIndexContainer", nss, [&]() { const auto indexKeySpec = BSON("v" << 2 << "name" << kContainerIndexKeyFieldName.toString() + "_1" << "key" << BSON(kContainerIndexKeyFieldName << 1) << "unique" << true); @@ -188,7 +188,7 @@ void dropContainer(OperationContext* opCtx, const UUID& indexUUID) { LOGV2(6789300, "Drop global index container", "indexUUID"_attr = indexUUID); // Drop the container. - return writeConflictRetry(opCtx, "dropGlobalIndexContainer", nss.ns(), [&]() { + return writeConflictRetry(opCtx, "dropGlobalIndexContainer", nss, [&]() { AutoGetCollection autoColl(opCtx, nss, MODE_X); if (!autoColl) { // Idempotent command, return OK if the collection is non-existing. @@ -230,7 +230,7 @@ void insertKey(OperationContext* opCtx, const auto indexEntry = buildIndexEntry(key, docKey); // Insert the index entry. - writeConflictRetry(opCtx, "insertGlobalIndexKey", ns.toString(), [&] { + writeConflictRetry(opCtx, "insertGlobalIndexKey", ns, [&] { WriteUnitOfWork wuow(opCtx); AutoGetCollection autoColl(opCtx, ns, MODE_IX); auto& container = autoColl.getCollection(); @@ -300,7 +300,7 @@ void deleteKey(OperationContext* opCtx, const auto ns = NamespaceString::makeGlobalIndexNSS(indexUUID); // Find and delete the index entry. - writeConflictRetry(opCtx, "deleteGlobalIndexKey", ns.toString(), [&] { + writeConflictRetry(opCtx, "deleteGlobalIndexKey", ns, [&] { WriteUnitOfWork wuow(opCtx); const auto coll = acquireCollection( |