From 58b36b8bbc6ca7159e100ada6dc15852af0a8661 Mon Sep 17 00:00:00 2001 From: Kaloian Manassiev Date: Fri, 11 Aug 2017 16:43:18 -0400 Subject: SERVER-30424 Remove opCtx/serviceContext null checks from db.cpp since ServiceContext must always exist --- src/mongo/db/s/operation_sharding_state.cpp | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'src/mongo/db/s/operation_sharding_state.cpp') 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 -- cgit v1.2.1