Revert "SERVER-39705 Always observe multikey changes in IndexBuildInterceptor::sideWrite."

This reverts commit 11f1122708d82b1e499fed6438854d08a55168d2.

1 files changed, 4 insertions, 7 deletions

diff --git a/src/mongo/db/index/index_build_interceptor.cpp b/src/mongo/db/index/index_build_interceptor.cpp
index 8d8f538691f..aaf57c66564 100644
--- a/src/mongo/db/index/index_build_interceptor.cpp
+++ b/src/mongo/db/index/index_build_interceptor.cpp
@@ -384,10 +384,11 @@ Status IndexBuildInterceptor::sideWrite(OperationContext* opCtx,
     // `multikeyMetadataKeys` when inserting.
     *numKeysOut = keys.size() + (op == Op::kInsert ? multikeyMetadataKeys.size() : 0);
 
+    if (*numKeysOut == 0) {
+        return Status::OK();
+    }
+
     {
-        // SERVER-39705: It's worth noting that a document may not generate any keys, but be
-        // described as being multikey. This step must be done to maintain parity with `validate`s
-        // expectations.
         stdx::unique_lock<stdx::mutex> lk(_multikeyPathMutex);
         if (_multikeyPaths) {
             MultikeyPathTracker::mergeMultikeyPaths(&_multikeyPaths.get(), multikeyPaths);
@@ -398,10 +399,6 @@ Status IndexBuildInterceptor::sideWrite(OperationContext* opCtx,
         }
     }
 
-    if (*numKeysOut == 0) {
-        return Status::OK();
-    }
-
     std::vector<BSONObj> toInsert;
     for (const auto& key : keys) {
         // Documents inserted into this table must be consumed in insert-order.