SERVER-31030 Use full OpTime instead of just Timestamps to refer to oplog entries

1 files changed, 8 insertions, 10 deletions

diff --git a/src/mongo/db/transaction_history_iterator.cpp b/src/mongo/db/transaction_history_iterator.cpp
index 4d66c0eadde..3220597dd61 100644
--- a/src/mongo/db/transaction_history_iterator.cpp
+++ b/src/mongo/db/transaction_history_iterator.cpp
@@ -38,11 +38,11 @@
 
 namespace mongo {
 
-TransactionHistoryIterator::TransactionHistoryIterator(Timestamp startingOpTimeTs)
-    : _nextOpTimeTs(std::move(startingOpTimeTs)) {}
+TransactionHistoryIterator::TransactionHistoryIterator(repl::OpTime startingOpTime)
+    : _nextOpTime(std::move(startingOpTime)) {}
 
 bool TransactionHistoryIterator::hasNext() const {
-    return !_nextOpTimeTs.isNull();
+    return !_nextOpTime.isNull();
 }
 
 repl::OplogEntry TransactionHistoryIterator::next(OperationContext* opCtx) {
@@ -50,26 +50,24 @@ repl::OplogEntry TransactionHistoryIterator::next(OperationContext* opCtx) {
 
     DBDirectClient client(opCtx);
     // TODO: SERVER-29843 oplogReplay option might be needed to activate fast ts search.
-    auto oplogBSON =
-        client.findOne(NamespaceString::kRsOplogNamespace.ns(),
-                       BSON(repl::OplogEntryBase::kTimestampFieldName << _nextOpTimeTs));
+    auto oplogBSON = client.findOne(NamespaceString::kRsOplogNamespace.ns(), _nextOpTime.asQuery());
 
     uassert(ErrorCodes::IncompleteTransactionHistory,
             str::stream() << "oplog no longer contains the complete write history of this "
-                             "transaction, log with ts "
-                          << _nextOpTimeTs.toBSON()
+                             "transaction, log with opTime "
+                          << _nextOpTime.toBSON()
                           << " cannot be found",
             !oplogBSON.isEmpty());
 
     auto oplogEntry = uassertStatusOK(repl::OplogEntry::parse(oplogBSON));
-    const auto& oplogPrevTsOption = oplogEntry.getPrevWriteTsInTransaction();
+    const auto& oplogPrevTsOption = oplogEntry.getPrevWriteOpTimeInTransaction();
     uassert(
         ErrorCodes::FailedToParse,
         str::stream() << "Missing prevTs field on oplog entry of previous write in transcation: "
                       << redact(oplogBSON),
         oplogPrevTsOption);
 
-    _nextOpTimeTs = oplogPrevTsOption.value();
+    _nextOpTime = oplogPrevTsOption.value();
 
     return oplogEntry;
 }