Revert "SERVER-31281 Use separate wallclock time to track the last use of a transaction"

This reverts commit 0935d7067068b3cb62a802a8696dd39c8d7e1944.

1 files changed, 10 insertions, 21 deletions

diff --git a/src/mongo/db/op_observer_impl.cpp b/src/mongo/db/op_observer_impl.cpp
index 6da9b7f9599..5621f9da8a2 100644
--- a/src/mongo/db/op_observer_impl.cpp
+++ b/src/mongo/db/op_observer_impl.cpp
@@ -77,17 +77,13 @@ void onWriteOpCompleted(OperationContext* opCtx,
                         const NamespaceString& nss,
                         Session* session,
                         std::vector<StmtId> stmtIdsWritten,
-                        const repl::OpTime& lastStmtIdWriteOpTime,
-                        Date_t lastStmtIdWriteDate) {
+                        const repl::OpTime& lastStmtIdWriteOpTime) {
     if (lastStmtIdWriteOpTime.isNull())
         return;
 
     if (session) {
-        session->onWriteOpCompletedOnPrimary(opCtx,
-                                             *opCtx->getTxnNumber(),
-                                             std::move(stmtIdsWritten),
-                                             lastStmtIdWriteOpTime,
-                                             lastStmtIdWriteDate);
+        session->onWriteOpCompletedOnPrimary(
+            opCtx, *opCtx->getTxnNumber(), std::move(stmtIdsWritten), lastStmtIdWriteOpTime);
     }
 }
 
@@ -308,10 +304,8 @@ void OpObserverImpl::onInserts(OperationContext* opCtx,
                                bool fromMigrate) {
     Session* const session = opCtx->getTxnNumber() ? OperationContextSession::get(opCtx) : nullptr;
 
-    const auto lastWriteDate = getWallClockTimeForOpLog(opCtx);
-
-    const auto opTimeList =
-        repl::logInsertOps(opCtx, nss, uuid, session, begin, end, fromMigrate, lastWriteDate);
+    const auto opTimeList = repl::logInsertOps(
+        opCtx, nss, uuid, session, begin, end, fromMigrate, getWallClockTimeForOpLog(opCtx));
 
     auto css = CollectionShardingState::get(opCtx, nss.ns());
 
@@ -325,7 +319,7 @@ void OpObserverImpl::onInserts(OperationContext* opCtx,
         }
     }
 
-    const auto lastOpTime = opTimeList.empty() ? repl::OpTime() : opTimeList.back();
+    auto lastOpTime = opTimeList.empty() ? repl::OpTime() : opTimeList.back();
     if (nss.coll() == "system.js") {
         Scope::storedFuncMod(opCtx);
     } else if (nss.coll() == DurableViewCatalog::viewsCollectionName()) {
@@ -345,7 +339,7 @@ void OpObserverImpl::onInserts(OperationContext* opCtx,
         return stmt.stmtId;
     });
 
-    onWriteOpCompleted(opCtx, nss, session, stmtIdsWritten, lastOpTime, lastWriteDate);
+    onWriteOpCompleted(opCtx, nss, session, stmtIdsWritten, lastOpTime);
 }
 
 void OpObserverImpl::onUpdate(OperationContext* opCtx, const OplogUpdateEntryArgs& args) {
@@ -395,12 +389,8 @@ void OpObserverImpl::onUpdate(OperationContext* opCtx, const OplogUpdateEntryArg
         SessionCatalog::get(opCtx)->invalidateSessions(opCtx, args.updatedDoc);
     }
 
-    onWriteOpCompleted(opCtx,
-                       args.nss,
-                       session,
-                       std::vector<StmtId>{args.stmtId},
-                       opTime.writeOpTime,
-                       opTime.wallClockTime);
+    onWriteOpCompleted(
+        opCtx, args.nss, session, std::vector<StmtId>{args.stmtId}, opTime.writeOpTime);
 }
 
 auto OpObserverImpl::aboutToDelete(OperationContext* opCtx,
@@ -444,8 +434,7 @@ void OpObserverImpl::onDelete(OperationContext* opCtx,
         SessionCatalog::get(opCtx)->invalidateSessions(opCtx, deleteState.documentKey);
     }
 
-    onWriteOpCompleted(
-        opCtx, nss, session, std::vector<StmtId>{stmtId}, opTime.writeOpTime, opTime.wallClockTime);
+    onWriteOpCompleted(opCtx, nss, session, std::vector<StmtId>{stmtId}, opTime.writeOpTime);
 }
 
 void OpObserverImpl::onInternalOpMessage(OperationContext* opCtx,