SERVER-30424 Remove opCtx/serviceContext null checks from db.cpp since ServiceContext must always exist

1 files changed, 0 insertions, 21 deletions

diff --git a/src/mongo/db/s/operation_sharding_state.cpp b/src/mongo/db/s/operation_sharding_state.cpp
index 4b8e6304111..f465cc22a24 100644
--- a/src/mongo/db/s/operation_sharding_state.cpp
+++ b/src/mongo/db/s/operation_sharding_state.cpp
@@ -130,25 +130,4 @@ void OperationShardingState::_clear() {
     _ns = NamespaceString();
 }
 
-OperationShardingState::IgnoreVersioningBlock::IgnoreVersioningBlock(OperationContext* opCtx,
-                                                                     const NamespaceString& ns)
-    : _opCtx(opCtx), _ns(ns) {
-    auto& oss = OperationShardingState::get(opCtx);
-    _hadOriginalVersion = oss._hasVersion;
-    if (_hadOriginalVersion) {
-        _originalVersion = oss.getShardVersion(ns);
-    }
-    oss.setShardVersion(ns, ChunkVersion::IGNORED());
-}
-
-OperationShardingState::IgnoreVersioningBlock::~IgnoreVersioningBlock() {
-    auto& oss = OperationShardingState::get(_opCtx);
-    invariant(ChunkVersion::isIgnoredVersion(oss.getShardVersion(_ns)));
-    if (_hadOriginalVersion) {
-        oss.setShardVersion(_ns, _originalVersion);
-    } else {
-        oss._clear();
-    }
-}
-
 }  // namespace mongo