Pass file name to attribute vector save method.

4 files changed, 8 insertions, 11 deletions

diff --git a/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp b/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp
index 7fb915a6175..13800c0979c 100644
--- a/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp
+++ b/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp
@@ -566,7 +566,7 @@ MemAttr::SP
 EnumeratedSaveTest::saveMem(AttributeVector &v)
 {
     MemAttr::SP res(new MemAttr);
-    EXPECT_TRUE(v.save(*res));
+    EXPECT_TRUE(v.save(*res, v.getBaseFileName()));
     return res;
 }
 
@@ -577,7 +577,7 @@ EnumeratedSaveTest::checkMem(AttributeVector &v, const MemAttr &e,
 {
     MemAttr m;
     v.enableEnumeratedSave(enumerated);
-    EXPECT_TRUE(v.save(m));
+    EXPECT_TRUE(v.save(m, v.getBaseFileName()));
     v.enableEnumeratedSave(false);
     ASSERT_TRUE(m == e);
 }
diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
index 62b55964f32..ba0e7087f9e 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
@@ -394,7 +394,7 @@ AttributeVector::saveAs(vespalib::stringref baseFileName,
                         IAttributeSaveTarget & saveTarget)
 {
     _baseFileName = baseFileName;
-    return save(saveTarget);
+    return save(saveTarget, baseFileName);
 }
 
 
@@ -404,15 +404,14 @@ AttributeVector::save()
     TuneFileAttributes tune;
     DummyFileHeaderContext fileHeaderContext;
     AttributeFileSaveTarget saveTarget(tune, fileHeaderContext);
-    return save(saveTarget);
+    return save(saveTarget, getBaseFileName());
 }
 
 
 bool
-AttributeVector::save(IAttributeSaveTarget &saveTarget)
+AttributeVector::save(IAttributeSaveTarget &saveTarget, vespalib::stringref fileName)
 {
     commit();
-    vespalib::string fileName = getBaseFileName();
     // First check if new style save is available.
     std::unique_ptr<AttributeSaver> saver(onInitSave(fileName));
     if (saver) {
diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.h b/searchlib/src/vespa/searchlib/attribute/attributevector.h
index 3182f64ad6f..8311bd9b1e1 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributevector.h
+++ b/searchlib/src/vespa/searchlib/attribute/attributevector.h
@@ -448,8 +448,8 @@ public:
     /** Saves this attribute vector to file(s) **/
     bool save();
 
-    /** Saves this attribute vector using the given saveTarget **/
-    bool save(IAttributeSaveTarget & saveTarget);
+    /** Saves this attribute vector using the given saveTarget and fileName **/
+    bool save(IAttributeSaveTarget & saveTarget, vespalib::stringref fileName);
 
     attribute::AttributeHeader createAttributeHeader(vespalib::stringref fileName) const;
 
diff --git a/searchlib/src/vespa/searchlib/attribute/sourceselector.cpp b/searchlib/src/vespa/searchlib/attribute/sourceselector.cpp
index 70db6e87559..1b4e221d99e 100644
--- a/searchlib/src/vespa/searchlib/attribute/sourceselector.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/sourceselector.cpp
@@ -59,9 +59,7 @@ SourceSelector::SaveInfo::SaveInfo(const vespalib::string & baseFileName,
     : _header(baseFileName, defaultSource, baseId, docIdLimit),
       _memSaver()
 {
-    vespalib::string attrName = sourceStore.getBaseFileName();
-    sourceStore.saveAs(_header._baseFileName, _memSaver);
-    sourceStore.setBaseFileName(attrName);
+    sourceStore.save(_memSaver, _header._baseFileName);
 }
 
 bool