diff options
| author | auto-revert-processor <dev-prod-dag@mongodb.com> | 2023-05-18 01:59:49 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-05-18 02:54:21 +0000 |
| commit | a741f91c4c09913424751730aabccd594e94ab78 (patch) | |
| tree | 93a23e52e3a8d077bea2f722912a88a6e270a8dc /src/mongo/db/catalog | |
| parent | d7bf13d97da047abfe9098a6b5f98678e89cd987 (diff) | |
| download | mongo-master.tar.gz | |
Revert "SERVER-77224 Rename lock_state.h/.cpp to locker_impl.h/.cpp to match the class name"HEADmaster
This reverts commit de55cd2ac227dcc8cae2fd021abc291e86b2abb2.
Diffstat (limited to 'src/mongo/db/catalog')
| -rw-r--r-- | src/mongo/db/catalog/capped_collection_test.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/db/catalog/collection_catalog_bm.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/db/catalog/rename_collection.cpp | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/mongo/db/catalog/capped_collection_test.cpp b/src/mongo/db/catalog/capped_collection_test.cpp index 3d23339c768..b95317f207d 100644 --- a/src/mongo/db/catalog/capped_collection_test.cpp +++ b/src/mongo/db/catalog/capped_collection_test.cpp @@ -27,11 +27,13 @@ * it in the license file. */ +#include "mongo/platform/basic.h" + #include "mongo/db/catalog/capped_visibility.h" #include "mongo/db/catalog/catalog_test_fixture.h" #include "mongo/db/catalog/collection.h" #include "mongo/db/catalog/collection_write_path.h" -#include "mongo/db/concurrency/locker_impl.h" +#include "mongo/db/concurrency/lock_state.h" #include "mongo/db/db_raii.h" #include "mongo/db/record_id_helpers.h" #include "mongo/db/repl/replication_coordinator_mock.h" diff --git a/src/mongo/db/catalog/collection_catalog_bm.cpp b/src/mongo/db/catalog/collection_catalog_bm.cpp index 0fd4bf9d9bc..57898636095 100644 --- a/src/mongo/db/catalog/collection_catalog_bm.cpp +++ b/src/mongo/db/catalog/collection_catalog_bm.cpp @@ -32,7 +32,7 @@ #include "mongo/db/catalog/collection_catalog.h" #include "mongo/db/catalog/collection_mock.h" #include "mongo/db/concurrency/d_concurrency.h" -#include "mongo/db/concurrency/locker_impl.h" +#include "mongo/db/concurrency/lock_state.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/catalog/rename_collection.cpp b/src/mongo/db/catalog/rename_collection.cpp index 8c171c2532f..c0f0f633423 100644 --- a/src/mongo/db/catalog/rename_collection.cpp +++ b/src/mongo/db/catalog/rename_collection.cpp @@ -42,6 +42,7 @@ #include "mongo/db/catalog/unique_collection_name.h" #include "mongo/db/client.h" #include "mongo/db/concurrency/exception_util.h" +#include "mongo/db/concurrency/lock_state.h" #include "mongo/db/curop.h" #include "mongo/db/db_raii.h" #include "mongo/db/index/index_descriptor.h" @@ -53,9 +54,10 @@ #include "mongo/db/ops/insert.h" #include "mongo/db/query/query_knobs_gen.h" #include "mongo/db/repl/replication_coordinator.h" +#include "mongo/db/s/database_sharding_state.h" +#include "mongo/db/s/operation_sharding_state.h" #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" -#include "mongo/db/shard_role.h" #include "mongo/db/storage/storage_parameters_gen.h" #include "mongo/logv2/log.h" #include "mongo/util/fail_point.h" |