SERVER-58779 Store the original user index definition on the transformed index definition on the buckets collection

1 files changed, 13 insertions, 1 deletions

diff --git a/src/mongo/db/catalog/collection_impl.cpp b/src/mongo/db/catalog/collection_impl.cpp
index 95d1ab98095..ba8addcc4bb 100644
--- a/src/mongo/db/catalog/collection_impl.cpp
+++ b/src/mongo/db/catalog/collection_impl.cpp
@@ -1631,7 +1631,7 @@ StatusWith<std::vector<BSONObj>> CollectionImpl::addCollationDefaultsToIndexSpec
                 << "failed to add collation information to index spec for index creation: "
                 << originalIndexSpec);
         }
-        const auto& newIndexSpec = validateResult.getValue();
+        BSONObj newIndexSpec = validateResult.getValue();
 
         auto keyPattern = newIndexSpec[IndexDescriptor::kKeyPatternFieldName].Obj();
         if (IndexDescriptor::isIdIndexPattern(keyPattern)) {
@@ -1656,6 +1656,18 @@ StatusWith<std::vector<BSONObj>> CollectionImpl::addCollationDefaultsToIndexSpec
             }
         }
 
+        if (originalIndexSpec.hasField(IndexDescriptor::kOriginalSpecFieldName)) {
+            // Validation was already performed above.
+            BSONObj newOriginalIndexSpec = invariant(index_key_validate::validateIndexSpecCollation(
+                opCtx,
+                originalIndexSpec.getObjectField(IndexDescriptor::kOriginalSpecFieldName),
+                collator));
+
+            BSONObj specToAdd =
+                BSON(IndexDescriptor::kOriginalSpecFieldName << newOriginalIndexSpec);
+            newIndexSpec = newIndexSpec.addField(specToAdd.firstElement());
+        }
+
         newIndexSpecs.push_back(newIndexSpec);
     }