SERVER-63428 Robustify oplog applying code for update operation

2 files changed, 3 insertions, 11 deletions

diff --git a/src/mongo/db/update/update_driver.cpp b/src/mongo/db/update/update_driver.cpp
index f2eded44c39..5ce9dc8aa84 100644
--- a/src/mongo/db/update/update_driver.cpp
+++ b/src/mongo/db/update/update_driver.cpp
@@ -154,12 +154,12 @@ void UpdateDriver::parse(
     uassert(51198, "Constant values may only be specified for pipeline updates", !constants);
 
     // Check if the update expression is a full object replacement.
-    if (isDocReplacement(updateMod)) {
+    if (updateMod.type() == write_ops::UpdateModification::Type::kReplacement) {
         uassert(ErrorCodes::FailedToParse,
                 "multi update is not supported for replacement-style update",
                 !multi);
 
-        _updateExecutor = std::make_unique<ObjectReplaceExecutor>(updateMod.getUpdateClassic());
+        _updateExecutor = std::make_unique<ObjectReplaceExecutor>(updateMod.getUpdateReplacement());
 
         // Register the fact that this driver will only do full object replacements.
         _updateType = UpdateType::kReplacement;
@@ -185,7 +185,7 @@ void UpdateDriver::parse(
     // checked whether this is a delta update so we check that the $v field isn't present, or has a
     // value of 1.
 
-    auto updateExpr = updateMod.getUpdateClassic();
+    auto updateExpr = updateMod.getUpdateModifier();
     BSONElement versionElement = updateExpr[kUpdateOplogEntryVersionFieldName];
     if (versionElement) {
         uassert(ErrorCodes::FailedToParse,
@@ -321,10 +321,4 @@ void UpdateDriver::setCollator(const CollatorInterface* collator) {
     }
 }
 
-bool UpdateDriver::isDocReplacement(const write_ops::UpdateModification& updateMod) {
-    return (updateMod.type() == write_ops::UpdateModification::Type::kClassic &&
-            *updateMod.getUpdateClassic().firstElementFieldName() != '$') ||
-        updateMod.type() == write_ops::UpdateModification::Type::kPipeline;
-}
-
 }  // namespace mongo
diff --git a/src/mongo/db/update/update_driver.h b/src/mongo/db/update/update_driver.h
index d512d89b1cf..94d1f73c8d4 100644
--- a/src/mongo/db/update/update_driver.h
+++ b/src/mongo/db/update/update_driver.h
@@ -150,8 +150,6 @@ public:
         return _updateType;
     }
 
-    static bool isDocReplacement(const write_ops::UpdateModification& updateMod);
-
     bool modsAffectIndices() const {
         return _affectIndices;
     }