SERVER-36815 Remove references to oplog entry's hash field

1 files changed, 12 insertions, 12 deletions

diff --git a/src/mongo/db/repl/initial_syncer.h b/src/mongo/db/repl/initial_syncer.h
index 308fdb6adaf..c84658092fb 100644
--- a/src/mongo/db/repl/initial_syncer.h
+++ b/src/mongo/db/repl/initial_syncer.h
@@ -144,14 +144,14 @@ class InitialSyncer {
 
 public:
     /**
-     * Callback function to report last applied optime (with hash) of initial sync.
+     * Callback function to report last applied optime of initial sync.
      */
-    typedef stdx::function<void(const StatusWith<OpTimeWithHash>& lastApplied)> OnCompletionFn;
+    typedef stdx::function<void(const StatusWith<OpTime>& lastApplied)> OnCompletionFn;
 
     /**
      * Callback completion guard for initial syncer.
      */
-    using OnCompletionGuard = CallbackCompletionGuard<StatusWith<OpTimeWithHash>>;
+    using OnCompletionGuard = CallbackCompletionGuard<StatusWith<OpTime>>;
 
     using StartCollectionClonerFn = DatabaseCloner::StartCollectionClonerFn;
 
@@ -360,7 +360,7 @@ private:
     /**
      * Tears down internal state before reporting final status to caller.
      */
-    void _tearDown_inlock(OperationContext* opCtx, const StatusWith<OpTimeWithHash>& lastApplied);
+    void _tearDown_inlock(OperationContext* opCtx, const StatusWith<OpTime>& lastApplied);
 
     /**
      * Callback to start a single initial sync attempt.
@@ -410,7 +410,7 @@ private:
      */
     void _fcvFetcherCallback(const StatusWith<Fetcher::QueryResponse>& result,
                              std::shared_ptr<OnCompletionGuard> onCompletionGuard,
-                             const OpTimeWithHash& lastOpTimeWithHash);
+                             const OpTime& lastOpTime);
 
     /**
      * Callback for oplog fetcher.
@@ -443,7 +443,7 @@ private:
      * Callback for MultiApplier completion.
      */
     void _multiApplierCallback(const Status& status,
-                               OpTimeWithHash lastApplied,
+                               OpTime lastApplied,
                                std::uint32_t numApplied,
                                std::shared_ptr<OnCompletionGuard> onCompletionGuard);
 
@@ -469,12 +469,12 @@ private:
      * Reports result of current initial sync attempt. May schedule another initial sync attempt
      * depending on shutdown state and whether we've exhausted all initial sync retries.
      */
-    void _finishInitialSyncAttempt(const StatusWith<OpTimeWithHash>& lastApplied);
+    void _finishInitialSyncAttempt(const StatusWith<OpTime>& lastApplied);
 
     /**
      * Invokes completion callback and transitions state to State::kComplete.
      */
-    void _finishCallback(StatusWith<OpTimeWithHash> lastApplied);
+    void _finishCallback(StatusWith<OpTime> lastApplied);
 
     // Obtains a valid sync source from the sync source selector.
     // Returns error if a sync source cannot be found.
@@ -590,8 +590,8 @@ private:
     ReplicationProcess* _replicationProcess;                                    // (S)
 
     // This is invoked with the final status of the initial sync. If startup() fails, this callback
-    // is never invoked. The caller gets the last applied optime with hash when the initial sync
-    // completes successfully or an error status.
+    // is never invoked. The caller gets the last applied optime when the initial sync completes
+    // successfully or an error status.
     // '_onCompletion' is cleared on completion (in _finishCallback()) in order to release any
     // resources that might be held by the callback function object.
     OnCompletionFn _onCompletion;  // (M)
@@ -620,8 +620,8 @@ private:
     std::unique_ptr<Fetcher> _fCVFetcher;                 // (S)
     std::unique_ptr<MultiApplier> _applier;               // (M)
     HostAndPort _syncSource;                              // (M)
-    OpTimeWithHash _lastFetched;                          // (MX)
-    OpTimeWithHash _lastApplied;                          // (MX)
+    OpTime _lastFetched;                                  // (MX)
+    OpTime _lastApplied;                                  // (MX)
     std::unique_ptr<OplogBuffer> _oplogBuffer;            // (M)
     std::unique_ptr<OplogApplier::Observer> _observer;    // (S)
     std::unique_ptr<OplogApplier> _oplogApplier;          // (M)