diff options
| author | Lucas de Castro Borges <lucas@gnuabordo.com.br> | 2025-02-11 15:07:35 -0300 |
|---|---|---|
| committer | Lucas de Castro Borges <lucas@gnuabordo.com.br> | 2025-02-11 15:07:35 -0300 |
| commit | 4cb8841196d0625dfa3825aa326f071cd27c7b8b (patch) | |
| tree | 1682a647d4463397c119183369ae6f750d5fdcff /src/mongo/embedded/embedded.cpp | |
| parent | aa03c6362cbaa767638e6eed9b031d86dd2643d1 (diff) | |
| parent | 8f0827553e09872941945a093b647a4211a9db7f (diff) | |
Update upstream source from tag 'upstream/6.0.0'master
Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322
Diffstat (limited to 'src/mongo/embedded/embedded.cpp')
| -rw-r--r-- | src/mongo/embedded/embedded.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mongo/embedded/embedded.cpp b/src/mongo/embedded/embedded.cpp index 53954a9f07e..20395926254 100644 --- a/src/mongo/embedded/embedded.cpp +++ b/src/mongo/embedded/embedded.cpp @@ -39,6 +39,7 @@ #include "mongo/db/catalog/collection_catalog.h" #include "mongo/db/catalog/collection_impl.h" #include "mongo/db/catalog/database_holder_impl.h" +#include "mongo/db/catalog/health_log.h" #include "mongo/db/catalog/index_key_validate.h" #include "mongo/db/client.h" #include "mongo/db/commands/feature_compatibility_version.h" @@ -46,6 +47,7 @@ #include "mongo/db/concurrency/lock_state.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/global_settings.h" +#include "mongo/db/index/index_access_method_factory_impl.h" #include "mongo/db/kill_sessions_local.h" #include "mongo/db/logical_session_cache_impl.h" #include "mongo/db/op_observer_impl.h" @@ -101,6 +103,7 @@ MONGO_INITIALIZER_GENERAL(ForkServer, ("EndStartupOptionHandling"), ("default")) void setUpCatalog(ServiceContext* serviceContext) { DatabaseHolder::set(serviceContext, std::make_unique<DatabaseHolderImpl>()); + IndexAccessMethodFactory::set(serviceContext, std::make_unique<IndexAccessMethodFactoryImpl>()); Collection::Factory::set(serviceContext, std::make_unique<CollectionImpl::FactoryImpl>()); } @@ -125,7 +128,7 @@ GlobalInitializerRegisterer filterAllowedIndexFieldNamesEmbeddedInitializer( "FilterAllowedIndexFieldNamesEmbedded", [](InitializerContext* service) { index_key_validate::filterAllowedIndexFieldNames = - [](std::map<StringData, std::set<IndexType>>& allowedIndexFieldNames) { + [](std::set<StringData>& allowedIndexFieldNames) { allowedIndexFieldNames.erase(IndexDescriptor::kBackgroundFieldName); allowedIndexFieldNames.erase(IndexDescriptor::kExpireAfterSecondsFieldName); }; @@ -166,8 +169,7 @@ void shutdown(ServiceContext* srvContext) { LogicalSessionCache::set(serviceContext, nullptr); - repl::ReplicationCoordinator::get(serviceContext) - ->shutdown(shutdownOpCtx.get(), nullptr /* shutdownTimeElapsedBuilder */); + repl::ReplicationCoordinator::get(serviceContext)->shutdown(shutdownOpCtx.get()); IndexBuildsCoordinator::get(serviceContext)->shutdown(shutdownOpCtx.get()); // Global storage engine may not be started in all cases before we exit |