diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-12-12 12:09:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-12 12:09:32 +0100 |
| commit | 59251646dd29cdeb84ccb9600276955c599293c5 (patch) | |
| tree | 72ee08d48ad7bb00caae1ed77367452623971b1a | |
| parent | c2523f853ce2190dd50caf1f5a661baf50475db3 (diff) | |
| parent | e1eda20f6f641ff9f09e903c975b8b565958b463 (diff) | |
Merge pull request #20475 from vespa-engine/toregge/deinline-destructors-and-add-dependency
Deinline destructors for AttributeCollectionSpecFactory and
5 files changed, 7 insertions, 0 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/attribute/CMakeLists.txt index 4f8bc362655..856c89eae37 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/CMakeLists.txt +++ b/searchcore/src/vespa/searchcore/proton/attribute/CMakeLists.txt @@ -38,4 +38,5 @@ vespa_add_library(searchcore_attribute STATIC sequential_attributes_initializer.cpp DEPENDS searchcore_flushengine + searchcore_pcommon ) diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_collection_spec_factory.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_collection_spec_factory.cpp index e30c246e53a..da1b733ca0a 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_collection_spec_factory.cpp +++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_collection_spec_factory.cpp @@ -16,6 +16,8 @@ AttributeCollectionSpecFactory::AttributeCollectionSpecFactory( { } +AttributeCollectionSpecFactory::~AttributeCollectionSpecFactory() = default; + AttributeCollectionSpec::UP AttributeCollectionSpecFactory::create(const AttributesConfig &attrCfg, uint32_t docIdLimit, diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_collection_spec_factory.h b/searchcore/src/vespa/searchcore/proton/attribute/attribute_collection_spec_factory.h index aed99ea7d52..3565b533e02 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_collection_spec_factory.h +++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_collection_spec_factory.h @@ -25,6 +25,7 @@ private: public: AttributeCollectionSpecFactory(const AllocStrategy& alloc_strategy, bool fastAccessOnly); + ~AttributeCollectionSpecFactory(); AttributeCollectionSpec::UP create(const AttributesConfig &attrCfg, uint32_t docIdLimit, diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_manager_initializer.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_manager_initializer.cpp index 59804517d26..d8c2d4e6e72 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_manager_initializer.cpp +++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_manager_initializer.cpp @@ -165,6 +165,8 @@ AttributeManagerInitializer::AttributeManagerInitializer(SerialNum configSerialN _attrMgr = std::make_shared<AttributeManager>(*baseAttrMgr, *attrSpec, tasksBuilder); } +AttributeManagerInitializer::~AttributeManagerInitializer() = default; + void AttributeManagerInitializer::run() { diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_manager_initializer.h b/searchcore/src/vespa/searchcore/proton/attribute/attribute_manager_initializer.h index 5e5361dfff3..cd2e044dee6 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_manager_initializer.h +++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_manager_initializer.h @@ -42,6 +42,7 @@ public: bool fastAccessAttributesOnly, searchcorespi::index::IThreadService &master, std::shared_ptr<AttributeManager::SP> attrMgrResult); + ~AttributeManagerInitializer() override; virtual void run() override; }; |