Set AttributeHeader _fileName member when extracting tags

from GenericHeader.

5 files changed, 6 insertions, 6 deletions

diff --git a/searchlib/src/tests/attribute/attribute_header/attribute_header_test.cpp b/searchlib/src/tests/attribute/attribute_header/attribute_header_test.cpp
index 3c8c9ff17e0..16a04a746f3 100644
--- a/searchlib/src/tests/attribute/attribute_header/attribute_header_test.cpp
+++ b/searchlib/src/tests/attribute/attribute_header/attribute_header_test.cpp
@@ -49,7 +49,7 @@ void
 verify_roundtrip_serialization(const HnswIPO& hnsw_params_in)
 {
     auto gen_header = populate_header(hnsw_params_in);
-    auto attr_header = AttributeHeader::extractTags(gen_header);
+    auto attr_header = AttributeHeader::extractTags(gen_header, file_name);
 
     EXPECT_EQ(tensor_cfg.basicType(), attr_header.getBasicType());
     EXPECT_EQ(tensor_cfg.collectionType(), attr_header.getCollectionType());
diff --git a/searchlib/src/vespa/searchlib/attribute/attribute_header.cpp b/searchlib/src/vespa/searchlib/attribute/attribute_header.cpp
index b68923b90bf..e40717e6375 100644
--- a/searchlib/src/vespa/searchlib/attribute/attribute_header.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attribute_header.cpp
@@ -191,9 +191,9 @@ AttributeHeader::internalExtractTags(const vespalib::GenericHeader &header)
 }
 
 AttributeHeader
-AttributeHeader::extractTags(const vespalib::GenericHeader &header)
+AttributeHeader::extractTags(const vespalib::GenericHeader &header, const vespalib::string &file_name)
 {
-    AttributeHeader result;
+    AttributeHeader result(file_name);
     result.internalExtractTags(header);
     return result;
 }
diff --git a/searchlib/src/vespa/searchlib/attribute/attribute_header.h b/searchlib/src/vespa/searchlib/attribute/attribute_header.h
index 00da28baf80..7c0b8f3084b 100644
--- a/searchlib/src/vespa/searchlib/attribute/attribute_header.h
+++ b/searchlib/src/vespa/searchlib/attribute/attribute_header.h
@@ -69,7 +69,7 @@ public:
     bool getPredicateParamsSet() const { return _predicateParamsSet; }
     bool getCollectionTypeParamsSet() const { return _collectionTypeParamsSet; }
     const std::optional<HnswIndexParams>& get_hnsw_index_params() const { return _hnsw_index_params; }
-    static AttributeHeader extractTags(const vespalib::GenericHeader &header);
+    static AttributeHeader extractTags(const vespalib::GenericHeader &header, const vespalib::string &file_name);
     void addTags(vespalib::GenericHeader &header) const;
 };
 
diff --git a/searchlib/src/vespa/searchlib/attribute/predicate_attribute.cpp b/searchlib/src/vespa/searchlib/attribute/predicate_attribute.cpp
index d9024af724b..6268a6da701 100644
--- a/searchlib/src/vespa/searchlib/attribute/predicate_attribute.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/predicate_attribute.cpp
@@ -194,7 +194,7 @@ PredicateAttribute::onLoad(vespalib::Executor *)
     buffer.moveFreeToData(size);
 
     const GenericHeader &header = loaded_buffer->getHeader();
-    auto attributeHeader = attribute::AttributeHeader::extractTags(header);
+    auto attributeHeader = attribute::AttributeHeader::extractTags(header, getBaseFileName());
     uint32_t version = attributeHeader.getVersion();
 
     setCreateSerialNum(attributeHeader.getCreateSerialNum());
diff --git a/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp b/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp
index 0f4326aac40..5217c44df97 100644
--- a/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp
@@ -75,7 +75,7 @@ BlobSequenceReader::BlobSequenceReader(AttributeVector& attr, bool has_index)
     : ReaderBase(attr),
       _use_index_file(has_index && has_index_file(attr) &&
                       can_use_index_save_file(attr.getConfig(),
-                                              search::attribute::AttributeHeader::extractTags(getDatHeader()))),
+                                              search::attribute::AttributeHeader::extractTags(getDatHeader(), attr.getBaseFileName()))),
       _index_file(_use_index_file ?
                   attribute::LoadUtils::openFile(attr, DenseTensorAttributeSaver::index_file_suffix()) :
                   std::unique_ptr<Fast_BufferedFile>())