SERVER-23905 Move RecoveryUnit storage to OperationContext from its subclasses.

1 files changed, 1 insertions, 17 deletions

diff --git a/src/mongo/db/operation_context_impl.cpp b/src/mongo/db/operation_context_impl.cpp
index 3451dfbecbe..fec4cff0957 100644
--- a/src/mongo/db/operation_context_impl.cpp
+++ b/src/mongo/db/operation_context_impl.cpp
@@ -74,7 +74,7 @@ OperationContextImpl::OperationContextImpl()
     : OperationContext(
           &cc(), nextOpId.fetchAndAdd(1), clientOperationInfoDecoration(cc()).getLocker()) {
     StorageEngine* storageEngine = getServiceContext()->getGlobalStorageEngine();
-    _recovery.reset(storageEngine->newRecoveryUnit());
+    setRecoveryUnit(storageEngine->newRecoveryUnit(), kNotInUnitOfWork);
 
     auto client = getClient();
     stdx::lock_guard<Client> lk(*client);
@@ -88,22 +88,6 @@ OperationContextImpl::~OperationContextImpl() {
     client->resetOperationContext();
 }
 
-RecoveryUnit* OperationContextImpl::recoveryUnit() const {
-    return _recovery.get();
-}
-
-RecoveryUnit* OperationContextImpl::releaseRecoveryUnit() {
-    return _recovery.release();
-}
-
-OperationContext::RecoveryUnitState OperationContextImpl::setRecoveryUnit(RecoveryUnit* unit,
-                                                                          RecoveryUnitState state) {
-    _recovery.reset(unit);
-    RecoveryUnitState oldState = _ruState;
-    _ruState = state;
-    return oldState;
-}
-
 ProgressMeter* OperationContextImpl::setMessage_inlock(const char* msg,
                                                        const std::string& name,
                                                        unsigned long long progressMeterTotal,