diff options
author | Kaitlin Mahar <kaitlin.mahar@mongodb.com> | 2017-12-07 14:56:25 -0500 |
---|---|---|
committer | Kaitlin Mahar <kaitlin.mahar@mongodb.com> | 2017-12-13 11:41:02 -0500 |
commit | 65c64a7845ca8159028148b25d3ec1867158108d (patch) | |
tree | dc8f4abd70848187b906d9b76bcad4b15faaf05b /src/mongo/db/logical_time_validator.cpp | |
parent | 33bf1580977524b1beb84f9bcedd51547c68aeb4 (diff) | |
download | mongo-65c64a7845ca8159028148b25d3ec1867158108d.tar.gz |
SERVER-31316 Remove unused code and unnecessary inheritance in KeysCollectionManager* classes
Diffstat (limited to 'src/mongo/db/logical_time_validator.cpp')
-rw-r--r-- | src/mongo/db/logical_time_validator.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mongo/db/logical_time_validator.cpp b/src/mongo/db/logical_time_validator.cpp index 5c751eddf06..27133b5fcc0 100644 --- a/src/mongo/db/logical_time_validator.cpp +++ b/src/mongo/db/logical_time_validator.cpp @@ -37,7 +37,7 @@ #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/privilege.h" -#include "mongo/db/keys_collection_manager_sharding.h" +#include "mongo/db/keys_collection_manager.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" #include "mongo/util/assert_util.h" @@ -80,8 +80,7 @@ void LogicalTimeValidator::set(ServiceContext* service, validator = std::move(newValidator); } -LogicalTimeValidator::LogicalTimeValidator( - std::shared_ptr<KeysCollectionManagerSharding> keyManager) +LogicalTimeValidator::LogicalTimeValidator(std::shared_ptr<KeysCollectionManager> keyManager) : _keyManager(keyManager) {} SignedLogicalTime LogicalTimeValidator::_getProof(const KeysCollectionDocument& keyDoc, @@ -216,7 +215,7 @@ void LogicalTimeValidator::resetKeyManager() { } } -std::shared_ptr<KeysCollectionManagerSharding> LogicalTimeValidator::_getKeyManagerCopy() { +std::shared_ptr<KeysCollectionManager> LogicalTimeValidator::_getKeyManagerCopy() { stdx::lock_guard<stdx::mutex> lk(_mutexKeyManager); invariant(_keyManager); return _keyManager; |