SERVER-36224 Refactor Collection::updateDocument args

Previously, Collection::updateDocument expected to get a namespace and
UUID from its OplogEntryUpdateArgs, but that is not necessary, because
the collection already knows its own namespace and UUID. This caused a
problem in DurableViewCatalogImpl::upsert(), which did not set the
UUID value in the args, leading to oplog entries without their UUID
value.

1 files changed, 4 insertions, 22 deletions

diff --git a/src/mongo/db/op_observer.h b/src/mongo/db/op_observer.h
index ebc0590bad0..8f85478334a 100644
--- a/src/mongo/db/op_observer.h
+++ b/src/mongo/db/op_observer.h
@@ -52,31 +52,13 @@ class OpTime;
  * Holds document update information used in logging.
  */
 struct OplogUpdateEntryArgs {
-    enum class StoreDocOption { None, PreImage, PostImage };
+    CollectionUpdateArgs updateArgs;
 
-    // Name of the collection in which document is being updated.
     NamespaceString nss;
+    CollectionUUID uuid;
 
-    OptionalCollectionUUID uuid;
-
-    StmtId stmtId = kUninitializedStmtId;
-
-    // The document before modifiers were applied.
-    boost::optional<BSONObj> preImageDoc;
-
-    // Fully updated document with damages (update modifiers) applied.
-    BSONObj updatedDoc;
-
-    // Document containing update modifiers -- e.g. $set and $unset
-    BSONObj update;
-
-    // Document containing the _id field of the doc being updated.
-    BSONObj criteria;
-
-    // True if this update comes from a chunk migration.
-    bool fromMigrate = false;
-
-    StoreDocOption storeDocOption = StoreDocOption::None;
+    OplogUpdateEntryArgs(CollectionUpdateArgs updateArgs, NamespaceString nss, CollectionUUID uuid)
+        : updateArgs(std::move(updateArgs)), nss(std::move(nss)), uuid(std::move(uuid)) {}
 };
 
 struct TTLCollModInfo {