Use unique_ptr for Config in AttributeVector

14 files changed, 44 insertions, 32 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_collection_spec.h b/searchcore/src/vespa/searchcore/proton/attribute/attribute_collection_spec.h
index 607be32e952..1357d56c472 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_collection_spec.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_collection_spec.h
@@ -4,7 +4,6 @@
 
 #include "attribute_spec.h"
 #include <vespa/searchlib/common/serialnum.h>
-#include <memory>
 #include <vector>
 
 namespace proton {
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 3565b533e02..1264be08683 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
@@ -3,10 +3,10 @@
 #pragma once
 
 #include "attribute_collection_spec.h"
-#include <vespa/searchcommon/attribute/config.h>
 #include <vespa/searchcore/proton/common/alloc_strategy.h>
 #include <vespa/searchlib/common/serialnum.h>
-#include <vespa/config-attributes.h>
+
+namespace vespa::config::search::internal { class InternalAttributesType; };
 
 namespace proton {
 
@@ -17,19 +17,16 @@ namespace proton {
 class AttributeCollectionSpecFactory
 {
 private:
-    typedef vespa::config::search::AttributesConfig AttributesConfig;
+    using AttributesConfig = vespa::config::search::internal::InternalAttributesType;
 
     const AllocStrategy        _alloc_strategy;
     const bool                 _fastAccessOnly;
 
 public:
-    AttributeCollectionSpecFactory(const AllocStrategy& alloc_strategy,
-                                   bool fastAccessOnly);
+    AttributeCollectionSpecFactory(const AllocStrategy& alloc_strategy, bool fastAccessOnly);
     ~AttributeCollectionSpecFactory();
 
-    AttributeCollectionSpec::UP create(const AttributesConfig &attrCfg,
-                                       uint32_t docIdLimit,
-                                       search::SerialNum serialNum) const;
+    std::unique_ptr<AttributeCollectionSpec> create(const AttributesConfig &attrCfg, uint32_t docIdLimit, search::SerialNum serialNum) const;
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_config_inspector.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_config_inspector.cpp
index f4692013cdf..444b8973a9c 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_config_inspector.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_config_inspector.cpp
@@ -2,10 +2,12 @@
 
 #include "attribute_config_inspector.h"
 #include <vespa/searchlib/attribute/configconverter.h>
+#include <vespa/searchcommon/attribute/config.h>
 #include <vespa/config-attributes.h>
 #include <vespa/vespalib/stllike/hash_map.hpp>
 
 using search::attribute::ConfigConverter;
+using search::attribute::Config;
 
 namespace proton {
 
@@ -13,18 +15,18 @@ AttributeConfigInspector::AttributeConfigInspector(const AttributesConfig& confi
     : _hash()
 {
     for (auto& attr : config.attribute) {
-        auto res = _hash.insert(std::make_pair(attr.name, ConfigConverter::convert(attr)));
+        auto res = _hash.insert(std::make_pair(attr.name, std::make_unique<Config>(ConfigConverter::convert(attr))));
         assert(res.second);
     }
 }
 
 AttributeConfigInspector::~AttributeConfigInspector() = default;
 
-const search::attribute::Config*
+const Config*
 AttributeConfigInspector::get_config(const vespalib::string& name) const
 {
     auto itr = _hash.find(name);
-    return (itr != _hash.end()) ? &itr->second : nullptr;
+    return (itr != _hash.end()) ? itr->second.get() : nullptr;
 }
 
 }
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_config_inspector.h b/searchcore/src/vespa/searchcore/proton/attribute/attribute_config_inspector.h
index 42c920fcc5f..23c0fb3b685 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_config_inspector.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_config_inspector.h
@@ -4,9 +4,9 @@
 
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/vespalib/stllike/hash_map.h>
-#include <vespa/searchcommon/attribute/config.h>
 
 namespace vespa::config::search::internal { class InternalAttributesType; }
+namespace search::attribute { class Config; }
 
 namespace proton {
 
@@ -15,12 +15,13 @@ namespace proton {
  * from config server.
  */
 class AttributeConfigInspector {
-    vespalib::hash_map<vespalib::string, search::attribute::Config> _hash;
+    using Config = search::attribute::Config;
+    vespalib::hash_map<vespalib::string, std::unique_ptr<Config>> _hash;
 public:
     using AttributesConfig = const vespa::config::search::internal::InternalAttributesType;
     AttributeConfigInspector(const AttributesConfig& config);
     ~AttributeConfigInspector();
-    const search::attribute::Config* get_config(const vespalib::string& name) const;
+    const Config* get_config(const vespalib::string& name) const;
 };
 
 }
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_initializer.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_initializer.cpp
index 713582bf1ce..4752c06ec18 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_initializer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_initializer.cpp
@@ -9,6 +9,7 @@
 #include <vespa/vespalib/data/fileheader.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/searchcommon/attribute/persistent_predicate_params.h>
+#include <vespa/searchcommon/attribute/config.h>
 #include <vespa/searchlib/util/fileutil.h>
 #include <vespa/searchlib/attribute/attribute_header.h>
 #include <vespa/searchlib/attribute/attributevector.h>
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 d8c2d4e6e72..fb99ca51e3a 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_manager_initializer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_manager_initializer.cpp
@@ -132,7 +132,7 @@ AttributeInitializerTasksBuilder::add(AttributeInitializer::UP initializer) {
 
 }
 
-AttributeCollectionSpec::UP
+std::unique_ptr<AttributeCollectionSpec>
 AttributeManagerInitializer::createAttributeSpec() const
 {
     uint32_t docIdLimit = 1; // The real docIdLimit is used after attributes are loaded to pad them
@@ -161,8 +161,8 @@ AttributeManagerInitializer::AttributeManagerInitializer(SerialNum configSerialN
 {
     addDependency(documentMetaStoreInitTask);
     AttributeInitializerTasksBuilder tasksBuilder(*this, documentMetaStoreInitTask, documentMetaStore, _attributesResult);
-    AttributeCollectionSpec::UP attrSpec = createAttributeSpec();
-    _attrMgr = std::make_shared<AttributeManager>(*baseAttrMgr, *attrSpec, tasksBuilder);
+    std::unique_ptr<AttributeCollectionSpec> attrSpec = createAttributeSpec();
+    _attrMgr = std::make_shared<AttributeManager>(*baseAttrMgr, std::move(*attrSpec), tasksBuilder);
 }
 
 AttributeManagerInitializer::~AttributeManagerInitializer() = default;
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp
index 92989da9b99..59378930785 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp
@@ -10,6 +10,7 @@
 #include "imported_attributes_repo.h"
 #include "sequential_attributes_initializer.h"
 #include <vespa/searchcommon/attribute/i_attribute_functor.h>
+#include <vespa/searchcommon/attribute/config.h>
 #include <vespa/searchcore/proton/flushengine/shrink_lid_space_flush_target.h>
 #include <vespa/searchlib/attribute/attribute_read_guard.h>
 #include <vespa/searchlib/attribute/attributecontext.h>
@@ -24,6 +25,7 @@
 #include <vespa/vespalib/util/gate.h>
 #include <vespa/vespalib/util/isequencedtaskexecutor.h>
 #include <vespa/vespalib/util/threadexecutor.h>
+#include <cassert>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.attribute.attributemanager");
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
index 1888b2c4a52..dafb0affc0f 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
@@ -5,8 +5,6 @@
 #include "operation_listener.h"
 #include "search_context.h"
 #include "document_meta_store_versions.h"
-#include <vespa/fastos/file.h>
-#include <vespa/persistence/spi/bucket_limits.h>
 #include <vespa/searchcore/proton/bucketdb/bucketsessionbase.h>
 #include <vespa/searchcore/proton/bucketdb/joinbucketssession.h>
 #include <vespa/searchcore/proton/bucketdb/remove_batch_entry.h>
@@ -16,6 +14,8 @@
 #include <vespa/searchlib/common/i_gid_to_lid_mapper.h>
 #include <vespa/searchlib/query/query_term_simple.h>
 #include <vespa/searchlib/util/bufferwriter.h>
+#include <vespa/searchcommon/attribute/config.h>
+#include <vespa/persistence/spi/bucket_limits.h>
 #include <vespa/vespalib/btree/btree.hpp>
 #include <vespa/vespalib/btree/btreebuilder.hpp>
 #include <vespa/vespalib/btree/btreenodeallocator.hpp>
@@ -24,6 +24,7 @@
 #include <vespa/vespalib/datastore/buffer_type.hpp>
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/vespalib/util/rcuvector.hpp>
+#include <vespa/fastos/file.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.documentmetastore");
@@ -403,7 +404,13 @@ DocumentMetaStore::unload()
     unloadBucket(*_bucketDB, prev, prevDelta);
 }
 
+DocumentMetaStore::DocumentMetaStore(BucketDBOwnerSP bucketDB)
+    : DocumentMetaStore(std::move(bucketDB), getFixedName())
+{}
 
+DocumentMetaStore::DocumentMetaStore(BucketDBOwnerSP bucketDB, const vespalib::string &name)
+    : DocumentMetaStore(std::move(bucketDB), name, search::GrowStrategy())
+{}
 DocumentMetaStore::DocumentMetaStore(BucketDBOwnerSP bucketDB,
                                      const vespalib::string &name,
                                      const GrowStrategy &grow,
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h
index adb2778c2d2..d1672eeb6dd 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h
@@ -9,9 +9,9 @@
 #include "lid_hold_list.h"
 #include "raw_document_meta_data.h"
 #include <vespa/searchcore/proton/common/subdbtype.h>
-#include <vespa/searchlib/attribute/singlesmallnumericattribute.h>
 #include <vespa/searchlib/queryeval/blueprint.h>
 #include <vespa/searchlib/docstore/ibucketizer.h>
+#include <vespa/searchcommon/common/growstrategy.h>
 #include <vespa/vespalib/util/rcuvector.h>
 
 namespace proton::bucketdb {
@@ -148,9 +148,11 @@ public:
         sizeof(uint32_t) + GlobalId::LENGTH + sizeof(uint8_t) +
         sizeof(Timestamp);
 
+    DocumentMetaStore(BucketDBOwnerSP bucketDB);
+    DocumentMetaStore(BucketDBOwnerSP bucketDB, const vespalib::string & name);
     DocumentMetaStore(BucketDBOwnerSP bucketDB,
-                      const vespalib::string & name=getFixedName(),
-                      const search::GrowStrategy & grow=search::GrowStrategy(),
+                      const vespalib::string & name,
+                      const search::GrowStrategy & grow,
                       SubDbType subDbType = SubDbType::READY);
     ~DocumentMetaStore();
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.cpp b/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.cpp
index 228a46123a4..73d08785d5f 100644
--- a/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.cpp
@@ -16,7 +16,6 @@
 #include <vespa/searchcore/proton/matching/sessionmanager.h>
 #include <vespa/searchcore/proton/reprocessing/attribute_reprocessing_initializer.h>
 #include <vespa/searchcore/proton/reprocessing/reprocess_documents_task.h>
-#include <vespa/searchlib/docstore/document_store_visitor_progress.h>
 #include <vespa/vespalib/util/destructor_callbacks.h>
 
 #include <vespa/log/log.h>
@@ -104,7 +103,7 @@ FastAccessDocSubDB::setupAttributeManager(AttributeManager::SP attrMgrResult)
 }
 
 
-AttributeCollectionSpec::UP
+std::unique_ptr<AttributeCollectionSpec>
 FastAccessDocSubDB::createAttributeSpec(const AttributesConfig &attrCfg, const AllocStrategy& alloc_strategy, SerialNum serialNum) const
 {
     uint32_t docIdLimit(_dms->getCommittedDocIdLimit());
@@ -267,10 +266,10 @@ FastAccessDocSubDB::applyConfig(const DocumentDBConfig &newConfigSnapshot, const
         FastAccessDocSubDBConfigurer configurer(_fastAccessFeedView,
                 std::make_unique<AttributeWriterFactory>(), getSubDbName());
         proton::IAttributeManager::SP oldMgr = extractAttributeManager(_fastAccessFeedView.get());
-        AttributeCollectionSpec::UP attrSpec =
+        std::unique_ptr<AttributeCollectionSpec> attrSpec =
             createAttributeSpec(newConfigSnapshot.getAttributesConfig(), alloc_strategy, serialNum);
         IReprocessingInitializer::UP initializer =
-                configurer.reconfigure(newConfigSnapshot, oldConfigSnapshot, *attrSpec);
+                configurer.reconfigure(newConfigSnapshot, oldConfigSnapshot, std::move(*attrSpec));
         if (initializer->hasReprocessors()) {
             tasks.push_back(IReprocessingTask::SP(createReprocessingTask(*initializer,
                     newConfigSnapshot.getDocumentTypeRepoSP()).release()));
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.cpp b/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.cpp
index 2d5f9ff826b..89c8f3de0b1 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/searchable_doc_subdb_configurer.cpp
@@ -144,7 +144,7 @@ reconfigure(const DocumentDBConfig &newConfig,
 {
     assert(!params.shouldAttributeManagerChange());
     AttributeCollectionSpec attrSpec(AttributeCollectionSpec::AttributeList(), 0, 0);
-    reconfigure(newConfig, oldConfig, attrSpec, params, resolver);
+    reconfigure(newConfig, oldConfig, std::move(attrSpec), params, resolver);
 }
 
 namespace {
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp
index 6e87f33e1c6..ca731d1e379 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp
@@ -147,10 +147,10 @@ SearchableDocSubDB::applyConfig(const DocumentDBConfig &newConfigSnapshot, const
     }
     if (params.shouldAttributeManagerChange()) {
         proton::IAttributeManager::SP oldMgr = getAttributeManager();
-        AttributeCollectionSpec::UP attrSpec =
+        std::unique_ptr<AttributeCollectionSpec> attrSpec =
             createAttributeSpec(newConfigSnapshot.getAttributesConfig(), alloc_strategy, serialNum);
         IReprocessingInitializer::UP initializer =
-                _configurer.reconfigure(newConfigSnapshot, oldConfigSnapshot, *attrSpec, params, resolver);
+                _configurer.reconfigure(newConfigSnapshot, oldConfigSnapshot, std::move(*attrSpec), params, resolver);
         if (initializer && initializer->hasReprocessors()) {
             tasks.emplace_back(createReprocessingTask(*initializer, newConfigSnapshot.getDocumentTypeRepoSP()));
         }
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
index 2736a1eaa6f..9f8afa0ad19 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
@@ -24,6 +24,7 @@
 #include <vespa/searchlib/common/flush_token.h>
 #include <vespa/searchlib/docstore/document_store_visitor_progress.h>
 #include <vespa/searchlib/util/fileheadertk.h>
+#include <vespa/searchcommon/attribute/config.h>
 #include <vespa/vespalib/io/fileutil.h>
 #include <vespa/vespalib/util/exceptions.h>
 
diff --git a/searchcore/src/vespa/searchcore/proton/test/mock_attribute_manager.h b/searchcore/src/vespa/searchcore/proton/test/mock_attribute_manager.h
index 0e2491e62fa..4549f24d4e3 100644
--- a/searchcore/src/vespa/searchcore/proton/test/mock_attribute_manager.h
+++ b/searchcore/src/vespa/searchcore/proton/test/mock_attribute_manager.h
@@ -1,10 +1,11 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <vespa/vespalib/util/hdr_abort.h>
-#include <vespa/searchlib/test/mock_attribute_manager.h>
 #include <vespa/searchcore/proton/attribute/i_attribute_manager.h>
 #include <vespa/searchcore/proton/attribute/imported_attributes_repo.h>
+#include <vespa/searchlib/test/mock_attribute_manager.h>
+#include <vespa/vespalib/util/hdr_abort.h>
+#include <cassert>
 
 namespace proton::test {