Remove attribute vector saveAs method with two arguments.

4 files changed, 2 insertions, 17 deletions

diff --git a/searchlib/src/tests/attribute/attribute_test.cpp b/searchlib/src/tests/attribute/attribute_test.cpp
index 32ac836302a..5d0c4336a34 100644
--- a/searchlib/src/tests/attribute/attribute_test.cpp
+++ b/searchlib/src/tests/attribute/attribute_test.cpp
@@ -725,7 +725,7 @@ AttributeTest::testMemorySaver(const AttributePtr & a, const AttributePtr & b)
     LOG(info, "testMemorySaver: vector '%s'", a->getName().c_str());
 
     AttributeMemorySaveTarget saveTarget;
-    EXPECT_TRUE(a->saveAs(b->getBaseFileName(), saveTarget));
+    EXPECT_TRUE(a->save(saveTarget, b->getBaseFileName()));
     FastOS_StatInfo statInfo;
     vespalib::string datFile = vespalib::make_string("%s.dat", b->getBaseFileName().c_str());
     EXPECT_TRUE(!FastOS_File::Stat(datFile.c_str(), &statInfo));
diff --git a/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp b/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp
index 13800c0979c..14a1f113f1d 100644
--- a/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp
+++ b/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp
@@ -597,7 +597,7 @@ EnumeratedSaveTest::saveBoth(AttributePtr v)
         search::AttributeMemorySaveTarget ms;
         search::TuneFileAttributes tune;
         search::index::DummyFileHeaderContext fileHeaderContext;
-        EXPECT_TRUE(v2->saveAs(basename + "_ee", ms));
+        EXPECT_TRUE(v2->save(ms, basename + "_ee"));
         EXPECT_TRUE(ms.writeToFile(tune, fileHeaderContext));
     }
     return saveMem(*v2);
diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
index ba0e7087f9e..f447a3b6bf9 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
@@ -390,15 +390,6 @@ AttributeVector::saveAs(vespalib::stringref baseFileName)
 }
 
 bool
-AttributeVector::saveAs(vespalib::stringref baseFileName,
-                        IAttributeSaveTarget & saveTarget)
-{
-    _baseFileName = baseFileName;
-    return save(saveTarget, baseFileName);
-}
-
-
-bool
 AttributeVector::save()
 {
     TuneFileAttributes tune;
diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.h b/searchlib/src/vespa/searchlib/attribute/attributevector.h
index 8311bd9b1e1..a9964f209f8 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributevector.h
+++ b/searchlib/src/vespa/searchlib/attribute/attributevector.h
@@ -439,12 +439,6 @@ public:
      */
     bool saveAs(vespalib::stringref baseFileName);
 
-    /**
-     * Updates the base file name of this attribute vector and saves
-     * it using the given saveTarget
-     */
-    bool saveAs(vespalib::stringref baseFileName, IAttributeSaveTarget &saveTarget);
-
     /** Saves this attribute vector to file(s) **/
     bool save();