diff options
Diffstat (limited to 'src/mongo/db/catalog/index_catalog_entry_impl.cpp')
| -rw-r--r-- | src/mongo/db/catalog/index_catalog_entry_impl.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/mongo/db/catalog/index_catalog_entry_impl.cpp b/src/mongo/db/catalog/index_catalog_entry_impl.cpp index e104623ef2d..daf74714c84 100644 --- a/src/mongo/db/catalog/index_catalog_entry_impl.cpp +++ b/src/mongo/db/catalog/index_catalog_entry_impl.cpp @@ -39,7 +39,7 @@ #include "mongo/base/init.h" #include "mongo/db/catalog/collection.h" #include "mongo/db/concurrency/d_concurrency.h" -#include "mongo/db/concurrency/exception_util.h" +#include "mongo/db/concurrency/write_conflict_exception.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/index/index_descriptor.h" #include "mongo/db/matcher/expression.h" @@ -122,7 +122,7 @@ IndexCatalogEntryImpl::IndexCatalogEntryImpl(OperationContext* const opCtx, } } -void IndexCatalogEntryImpl::setAccessMethod(std::unique_ptr<IndexAccessMethod> accessMethod) { +void IndexCatalogEntryImpl::init(std::unique_ptr<IndexAccessMethod> accessMethod) { invariant(!_accessMethod); _accessMethod = std::move(accessMethod); } @@ -179,10 +179,6 @@ void IndexCatalogEntryImpl::setIsReady(bool newIsReady) { _isReady = newIsReady; } -void IndexCatalogEntryImpl::setIsFrozen(bool newIsFrozen) { - _isFrozen = newIsFrozen; -} - void IndexCatalogEntryImpl::setMultikey(OperationContext* opCtx, const CollectionPtr& collection, const KeyStringSet& multikeyMetadataKeys, @@ -374,8 +370,7 @@ Status IndexCatalogEntryImpl::_setMultikeyInMultiDocumentTransaction( } std::shared_ptr<Ident> IndexCatalogEntryImpl::getSharedIdent() const { - return _accessMethod ? std::shared_ptr<Ident>{shared_from_this(), _accessMethod->getIdentPtr()} - : nullptr; + return {shared_from_this(), _accessMethod->getIdentPtr()}; // aliasing constructor } // ---- |