diff options
Diffstat (limited to 'src/mongo/db')
-rw-r--r-- | src/mongo/db/catalog/SConscript | 1 | ||||
-rw-r--r-- | src/mongo/db/catalog/index_catalog_impl.cpp | 29 | ||||
-rw-r--r-- | src/mongo/db/db.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/index/SConscript | 11 | ||||
-rw-r--r-- | src/mongo/db/index/index_access_method.h | 17 | ||||
-rw-r--r-- | src/mongo/db/index/index_access_method_factory.cpp | 53 | ||||
-rw-r--r-- | src/mongo/db/index/index_access_method_factory_impl.cpp | 69 | ||||
-rw-r--r-- | src/mongo/db/index/index_access_method_factory_impl.h | 45 | ||||
-rw-r--r-- | src/mongo/db/service_context_d_test_fixture.cpp | 2 |
9 files changed, 202 insertions, 27 deletions
diff --git a/src/mongo/db/catalog/SConscript b/src/mongo/db/catalog/SConscript index 55f96caf927..af02608ff4b 100644 --- a/src/mongo/db/catalog/SConscript +++ b/src/mongo/db/catalog/SConscript @@ -416,6 +416,7 @@ env.Library( '$BUILD_DIR/mongo/db/curop', '$BUILD_DIR/mongo/db/db_raii', '$BUILD_DIR/mongo/db/index/index_access_method', + '$BUILD_DIR/mongo/db/index/index_access_method_factory', '$BUILD_DIR/mongo/db/index_d', '$BUILD_DIR/mongo/db/op_observer', '$BUILD_DIR/mongo/db/repl/drop_pending_collection_reaper', diff --git a/src/mongo/db/catalog/index_catalog_impl.cpp b/src/mongo/db/catalog/index_catalog_impl.cpp index 0691f21c5e8..91788649c95 100644 --- a/src/mongo/db/catalog/index_catalog_impl.cpp +++ b/src/mongo/db/catalog/index_catalog_impl.cpp @@ -49,15 +49,8 @@ #include "mongo/db/clientcursor.h" #include "mongo/db/curop.h" #include "mongo/db/field_ref.h" -#include "mongo/db/index/2d_access_method.h" -#include "mongo/db/index/btree_access_method.h" -#include "mongo/db/index/fts_access_method.h" -#include "mongo/db/index/hash_access_method.h" -#include "mongo/db/index/haystack_access_method.h" #include "mongo/db/index/index_access_method.h" #include "mongo/db/index/index_descriptor.h" -#include "mongo/db/index/s2_access_method.h" -#include "mongo/db/index/wildcard_access_method.h" #include "mongo/db/index_legacy.h" #include "mongo/db/index_names.h" #include "mongo/db/jsobj.h" @@ -173,26 +166,8 @@ IndexCatalogEntry* IndexCatalogImpl::_setupInMemoryStructures( SortedDataInterface* sdi = engine->getEngine()->getGroupedSortedDataInterface(opCtx, ident, desc, entry->getPrefix()); - const std::string& type = desc->getAccessMethodName(); - std::unique_ptr<IndexAccessMethod> accessMethod; - if ("" == type) - accessMethod.reset(new BtreeAccessMethod(entry.get(), sdi)); - else if (IndexNames::HASHED == type) - accessMethod.reset(new HashAccessMethod(entry.get(), sdi)); - else if (IndexNames::GEO_2DSPHERE == type) - accessMethod.reset(new S2AccessMethod(entry.get(), sdi)); - else if (IndexNames::TEXT == type) - accessMethod.reset(new FTSAccessMethod(entry.get(), sdi)); - else if (IndexNames::GEO_HAYSTACK == type) - accessMethod.reset(new HaystackAccessMethod(entry.get(), sdi)); - else if (IndexNames::GEO_2D == type) - accessMethod.reset(new TwoDAccessMethod(entry.get(), sdi)); - else if (IndexNames::WILDCARD == type) - accessMethod.reset(new WildcardAccessMethod(entry.get(), sdi)); - else { - log() << "Can't find index for keyPattern " << desc->keyPattern(); - fassertFailed(51072); - } + std::unique_ptr<IndexAccessMethod> accessMethod = + IndexAccessMethodFactory::get(opCtx)->make(entry.get(), sdi); entry->init(std::move(accessMethod)); diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp index ad3fa439f22..5d58f604880 100644 --- a/src/mongo/db/db.cpp +++ b/src/mongo/db/db.cpp @@ -74,6 +74,7 @@ #include "mongo/db/free_mon/free_mon_mongod.h" #include "mongo/db/ftdc/ftdc_mongod.h" #include "mongo/db/global_settings.h" +#include "mongo/db/index/index_access_method_factory_impl.h" #include "mongo/db/index_builds_coordinator_mongod.h" #include "mongo/db/index_names.h" #include "mongo/db/initialize_server_global_state.h" @@ -783,6 +784,7 @@ void startupConfigActions(const std::vector<std::string>& args) { void setUpCatalog(ServiceContext* serviceContext) { DatabaseHolder::set(serviceContext, std::make_unique<DatabaseHolderImpl>()); + IndexAccessMethodFactory::set(serviceContext, std::make_unique<IndexAccessMethodFactoryImpl>()); } auto makeReplicationExecutor(ServiceContext* serviceContext) { diff --git a/src/mongo/db/index/SConscript b/src/mongo/db/index/SConscript index a125c71bbaa..b9e79ee6116 100644 --- a/src/mongo/db/index/SConscript +++ b/src/mongo/db/index/SConscript @@ -93,6 +93,16 @@ env.CppUnitTest( ], ) +env.Library( + target='index_access_method_factory', + source=[ + 'index_access_method_factory.cpp', + ], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + ], +) + serveronlyEnv = env.Clone() serveronlyEnv.InjectThirdParty(libraries=['snappy']) serveronlyEnv.Library( @@ -127,6 +137,7 @@ env.Library( "fts_access_method.cpp", "hash_access_method.cpp", "haystack_access_method.cpp", + "index_access_method_factory_impl.cpp", "s2_access_method.cpp", "wildcard_access_method.cpp", ], diff --git a/src/mongo/db/index/index_access_method.h b/src/mongo/db/index/index_access_method.h index 527e73ed146..fc6aeb36db8 100644 --- a/src/mongo/db/index/index_access_method.h +++ b/src/mongo/db/index/index_access_method.h @@ -364,6 +364,23 @@ public: }; /** + * Factory class that constructs an IndexAccessMethod depending on the type of index. + */ +class IndexAccessMethodFactory { +public: + IndexAccessMethodFactory() = default; + virtual ~IndexAccessMethodFactory() = default; + + static IndexAccessMethodFactory* get(ServiceContext* service); + static IndexAccessMethodFactory* get(OperationContext* opCtx); + static void set(ServiceContext* service, + std::unique_ptr<IndexAccessMethodFactory> collectionFactory); + + virtual std::unique_ptr<IndexAccessMethod> make(IndexCatalogEntry* entry, + SortedDataInterface* sortedDataInterface) = 0; +}; + +/** * Records number of keys inserted and duplicate keys inserted, if applicable. */ struct InsertResult { diff --git a/src/mongo/db/index/index_access_method_factory.cpp b/src/mongo/db/index/index_access_method_factory.cpp new file mode 100644 index 00000000000..986ed2d8967 --- /dev/null +++ b/src/mongo/db/index/index_access_method_factory.cpp @@ -0,0 +1,53 @@ +/** + * Copyright (C) 2019-present MongoDB, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the Server Side Public License, version 1, + * as published by MongoDB, Inc. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Server Side Public License for more details. + * + * You should have received a copy of the Server Side Public License + * along with this program. If not, see + * <http://www.mongodb.com/licensing/server-side-public-license>. + * + * As a special exception, the copyright holders give permission to link the + * code of portions of this program with the OpenSSL library under certain + * conditions as described in each individual source file and distribute + * linked combinations including the program with the OpenSSL library. You + * must comply with the Server Side Public License in all respects for + * all of the code used other than as permitted herein. If you modify file(s) + * with this exception, you may extend this exception to your version of the + * file(s), but you are not obligated to do so. If you do not wish to do so, + * delete this exception statement from your version. If you delete this + * exception statement from all source files in the program, then also delete + * it in the license file. + */ + +#include "mongo/platform/basic.h" + +#include "mongo/db/index/index_access_method.h" + +namespace mongo { +namespace { +const auto getFactory = + ServiceContext::declareDecoration<std::unique_ptr<IndexAccessMethodFactory>>(); +} // namespace + +IndexAccessMethodFactory* IndexAccessMethodFactory::get(ServiceContext* service) { + return getFactory(service).get(); +} + +IndexAccessMethodFactory* IndexAccessMethodFactory::get(OperationContext* opCtx) { + return getFactory(opCtx->getServiceContext()).get(); +} + +void IndexAccessMethodFactory::set(ServiceContext* service, + std::unique_ptr<IndexAccessMethodFactory> newFactory) { + auto& factory = getFactory(service); + factory = std::move(newFactory); +} +} // namespace mongo diff --git a/src/mongo/db/index/index_access_method_factory_impl.cpp b/src/mongo/db/index/index_access_method_factory_impl.cpp new file mode 100644 index 00000000000..485bfac25b7 --- /dev/null +++ b/src/mongo/db/index/index_access_method_factory_impl.cpp @@ -0,0 +1,69 @@ +/** + * Copyright (C) 2019-present MongoDB, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the Server Side Public License, version 1, + * as published by MongoDB, Inc. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Server Side Public License for more details. + * + * You should have received a copy of the Server Side Public License + * along with this program. If not, see + * <http://www.mongodb.com/licensing/server-side-public-license>. + * + * As a special exception, the copyright holders give permission to link the + * code of portions of this program with the OpenSSL library under certain + * conditions as described in each individual source file and distribute + * linked combinations including the program with the OpenSSL library. You + * must comply with the Server Side Public License in all respects for + * all of the code used other than as permitted herein. If you modify file(s) + * with this exception, you may extend this exception to your version of the + * file(s), but you are not obligated to do so. If you do not wish to do so, + * delete this exception statement from your version. If you delete this + * exception statement from all source files in the program, then also delete + * it in the license file. + */ + +#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kIndex + +#include "mongo/platform/basic.h" + +#include "mongo/db/index/index_access_method_factory_impl.h" + +#include "mongo/db/index/2d_access_method.h" +#include "mongo/db/index/btree_access_method.h" +#include "mongo/db/index/fts_access_method.h" +#include "mongo/db/index/hash_access_method.h" +#include "mongo/db/index/haystack_access_method.h" +#include "mongo/db/index/s2_access_method.h" +#include "mongo/db/index/wildcard_access_method.h" +#include "mongo/util/log.h" + +namespace mongo { + +std::unique_ptr<IndexAccessMethod> IndexAccessMethodFactoryImpl::make( + IndexCatalogEntry* entry, SortedDataInterface* sortedDataInterface) { + auto desc = entry->descriptor(); + const std::string& type = desc->getAccessMethodName(); + if ("" == type) + return std::make_unique<BtreeAccessMethod>(entry, sortedDataInterface); + else if (IndexNames::HASHED == type) + return std::make_unique<HashAccessMethod>(entry, sortedDataInterface); + else if (IndexNames::GEO_2DSPHERE == type) + return std::make_unique<S2AccessMethod>(entry, sortedDataInterface); + else if (IndexNames::TEXT == type) + return std::make_unique<FTSAccessMethod>(entry, sortedDataInterface); + else if (IndexNames::GEO_HAYSTACK == type) + return std::make_unique<HaystackAccessMethod>(entry, sortedDataInterface); + else if (IndexNames::GEO_2D == type) + return std::make_unique<TwoDAccessMethod>(entry, sortedDataInterface); + else if (IndexNames::WILDCARD == type) + return std::make_unique<WildcardAccessMethod>(entry, sortedDataInterface); + log() << "Can't find index for keyPattern " << desc->keyPattern(); + fassertFailed(31021); +} + +} // namespace mongo diff --git a/src/mongo/db/index/index_access_method_factory_impl.h b/src/mongo/db/index/index_access_method_factory_impl.h new file mode 100644 index 00000000000..7c89e702d0e --- /dev/null +++ b/src/mongo/db/index/index_access_method_factory_impl.h @@ -0,0 +1,45 @@ +/** + * Copyright (C) 2019-present MongoDB, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the Server Side Public License, version 1, + * as published by MongoDB, Inc. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Server Side Public License for more details. + * + * You should have received a copy of the Server Side Public License + * along with this program. If not, see + * <http://www.mongodb.com/licensing/server-side-public-license>. + * + * As a special exception, the copyright holders give permission to link the + * code of portions of this program with the OpenSSL library under certain + * conditions as described in each individual source file and distribute + * linked combinations including the program with the OpenSSL library. You + * must comply with the Server Side Public License in all respects for + * all of the code used other than as permitted herein. If you modify file(s) + * with this exception, you may extend this exception to your version of the + * file(s), but you are not obligated to do so. If you do not wish to do so, + * delete this exception statement from your version. If you delete this + * exception statement from all source files in the program, then also delete + * it in the license file. + */ + +#pragma once + +#include "mongo/db/index/index_access_method.h" + +namespace mongo { + +class IndexAccessMethodFactoryImpl : public IndexAccessMethodFactory { +public: + IndexAccessMethodFactoryImpl() = default; + ~IndexAccessMethodFactoryImpl() = default; + + std::unique_ptr<IndexAccessMethod> make(IndexCatalogEntry* entry, + SortedDataInterface* SortedDataInterface) final; +}; + +} // namespace mongo diff --git a/src/mongo/db/service_context_d_test_fixture.cpp b/src/mongo/db/service_context_d_test_fixture.cpp index 9f12ca6ea41..38a3e824620 100644 --- a/src/mongo/db/service_context_d_test_fixture.cpp +++ b/src/mongo/db/service_context_d_test_fixture.cpp @@ -38,6 +38,7 @@ #include "mongo/db/catalog/collection_catalog.h" #include "mongo/db/catalog/database_holder_impl.h" #include "mongo/db/concurrency/d_concurrency.h" +#include "mongo/db/index/index_access_method_factory_impl.h" #include "mongo/db/index_builds_coordinator_mongod.h" #include "mongo/db/logical_clock.h" #include "mongo/db/op_observer_registry.h" @@ -79,6 +80,7 @@ ServiceContextMongoDTest::ServiceContextMongoDTest(std::string engine, RepairAct initializeStorageEngine(serviceContext, StorageEngineInitFlags::kNone); DatabaseHolder::set(serviceContext, std::make_unique<DatabaseHolderImpl>()); + IndexAccessMethodFactory::set(serviceContext, std::make_unique<IndexAccessMethodFactoryImpl>()); IndexBuildsCoordinator::set(serviceContext, std::make_unique<IndexBuildsCoordinatorMongod>()); } |