From 17f49ab8b16a6f45371771d8c152cfbf4ed186af Mon Sep 17 00:00:00 2001 From: Mihai Andrei Date: Thu, 30 Jun 2022 20:38:44 +0000 Subject: SERVER-50301 Delete code which handles $v:1 update oplog entries --- src/mongo/db/fle_crud.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/mongo/db/fle_crud.cpp') diff --git a/src/mongo/db/fle_crud.cpp b/src/mongo/db/fle_crud.cpp index f1f9cf96f2d..761efbeb843 100644 --- a/src/mongo/db/fle_crud.cpp +++ b/src/mongo/db/fle_crud.cpp @@ -842,7 +842,7 @@ write_ops::UpdateCommandReply processUpdate(FLEQueryInterface* queryImpl, auto pushUpdate = EDCServerCollection::finalizeForUpdate(updateModifier, serverPayload); newUpdateOpEntry.setU(mongo::write_ops::UpdateModification( - pushUpdate, write_ops::UpdateModification::ClassicTag(), false)); + pushUpdate, write_ops::UpdateModification::ModifierUpdateTag{})); } else { auto replacementDocument = updateModification.getUpdateReplacement(); EDCServerCollection::validateEncryptedFieldInfo( @@ -857,7 +857,7 @@ write_ops::UpdateCommandReply processUpdate(FLEQueryInterface* queryImpl, EDCServerCollection::finalizeForInsert(replacementDocument, serverPayload); newUpdateOpEntry.setU(mongo::write_ops::UpdateModification( - safeContentReplace, write_ops::UpdateModification::ClassicTag(), true)); + safeContentReplace, write_ops::UpdateModification::ReplacementTag{})); } // Step 3 ---- @@ -908,7 +908,7 @@ write_ops::UpdateCommandReply processUpdate(FLEQueryInterface* queryImpl, pullUpdateOpEntry.setMulti(false); pullUpdateOpEntry.setQ(BSON("_id"_sd << idElement)); pullUpdateOpEntry.setU(mongo::write_ops::UpdateModification( - pullUpdate, write_ops::UpdateModification::ClassicTag(), false)); + pullUpdate, write_ops::UpdateModification::ModifierUpdateTag{})); newUpdateRequest.setUpdates({pullUpdateOpEntry}); newUpdateRequest.getWriteCommandRequestBase().setStmtId(boost::none); newUpdateRequest.setLegacyRuntimeConstants(boost::none); @@ -1089,7 +1089,7 @@ write_ops::FindAndModifyCommandReply processFindAndModify( // Step 2 ---- newUpdateModification = write_ops::UpdateModification( - pushUpdate, write_ops::UpdateModification::ClassicTag(), false); + pushUpdate, write_ops::UpdateModification::ModifierUpdateTag{}); } else { auto replacementDocument = updateModification.getUpdateReplacement(); EDCServerCollection::validateEncryptedFieldInfo( @@ -1104,7 +1104,7 @@ write_ops::FindAndModifyCommandReply processFindAndModify( EDCServerCollection::finalizeForInsert(replacementDocument, serverPayload); newUpdateModification = write_ops::UpdateModification( - safeContentReplace, write_ops::UpdateModification::ClassicTag(), true); + safeContentReplace, write_ops::UpdateModification::ReplacementTag{}); } // Step 3 ---- @@ -1165,7 +1165,7 @@ write_ops::FindAndModifyCommandReply processFindAndModify( pullUpdateOpEntry.setMulti(false); pullUpdateOpEntry.setQ(BSON("_id"_sd << idElement)); pullUpdateOpEntry.setU(mongo::write_ops::UpdateModification( - pullUpdate, write_ops::UpdateModification::ClassicTag(), false)); + pullUpdate, write_ops::UpdateModification::ModifierUpdateTag{})); newUpdateRequest.setUpdates({pullUpdateOpEntry}); newUpdateRequest.setLegacyRuntimeConstants(boost::none); newUpdateRequest.getWriteCommandRequestBase().setStmtId(boost::none); -- cgit v1.2.1