SERVER-47873 Eliminate the Collection* saved in IndexDescriptor

1 files changed, 19 insertions, 0 deletions

diff --git a/src/mongo/db/storage/index_entry_comparison.cpp b/src/mongo/db/storage/index_entry_comparison.cpp
index 86e0e502290..face7000937 100644
--- a/src/mongo/db/storage/index_entry_comparison.cpp
+++ b/src/mongo/db/storage/index_entry_comparison.cpp
@@ -255,4 +255,23 @@ Status buildDupKeyErrorStatus(const KeyString::Value& keyString,
     return buildDupKeyErrorStatus(key, collectionNamespace, indexName, keyPattern, indexCollation);
 }
 
+Status buildDupKeyErrorStatus(OperationContext* opCtx,
+                              const KeyString::Value& keyString,
+                              const Ordering& ordering,
+                              const IndexDescriptor* desc) {
+    const BSONObj key = KeyString::toBson(
+        keyString.getBuffer(), keyString.getSize(), ordering, keyString.getTypeBits());
+    return buildDupKeyErrorStatus(opCtx, key, desc);
+}
+
+Status buildDupKeyErrorStatus(OperationContext* opCtx,
+                              const BSONObj& key,
+                              const IndexDescriptor* desc) {
+    NamespaceString nss;
+    // In testing these may be nullptr, and being a bit more lenient during error handling is OK.
+    if (desc && desc->getEntry())
+        nss = desc->getEntry()->getNSSFromCatalog(opCtx);
+    return buildDupKeyErrorStatus(
+        key, nss, desc->indexName(), desc->keyPattern(), desc->collation());
+}
 }  // namespace mongo