From bf85beecbc790d974dcd031b7adc4d3d7c72f7fb Mon Sep 17 00:00:00 2001
From: Tor Egge <Tor.Egge@yahoo-inc.com>
Date: Tue, 28 Mar 2017 09:45:26 +0000
Subject: Rename search::IAttributeSaveTarget::Config to
 search::attribute::AttributeHeader.

---
 .../searchcore/proton/documentmetastore/documentmetastore.cpp |  2 +-
 .../searchcore/proton/documentmetastore/documentmetastore.h   |  1 -
 .../proton/documentmetastore/documentmetastoresaver.cpp       | 11 ++++++-----
 .../proton/documentmetastore/documentmetastoresaver.h         |  6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'searchcore')

diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
index 5fc4dceea7a..209d2cf07f3 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp
@@ -235,7 +235,7 @@ DocumentMetaStore::onInitSave()
 {
     GenerationHandler::Guard guard(getGuard());
     return std::make_unique<DocumentMetaStoreSaver>
-        (std::move(guard), createSaveTargetConfig(),
+        (std::move(guard), createAttributeHeader(),
          _gidToLidMap.getFrozenView().begin(), _metaDataStore);
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h
index 789706503cf..200535c7ae5 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h
@@ -12,7 +12,6 @@
 #include "raw_document_meta_data.h"
 #include <vespa/searchcore/proton/bucketdb/bucket_db_owner.h>
 #include <vespa/searchcore/proton/common/subdbtype.h>
-#include <vespa/searchlib/attribute/iattributesavetarget.h>
 #include <vespa/searchlib/common/rcuvector.h>
 #include <vespa/searchlib/attribute/singlesmallnumericattribute.h>
 #include <vespa/searchlib/queryeval/blueprint.h>
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoresaver.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoresaver.cpp
index ce7869e848e..4ca5d07d090 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoresaver.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoresaver.cpp
@@ -3,6 +3,7 @@
 #include "documentmetastoresaver.h"
 #include <vespa/searchlib/util/bufferwriter.h>
 #include "document_meta_store_versions.h"
+#include <vespa/searchlib/attribute/iattributesavetarget.h>
 
 using vespalib::GenerationHandler;
 using search::IAttributeSaveTarget;
@@ -67,15 +68,15 @@ public:
 
 DocumentMetaStoreSaver::
 DocumentMetaStoreSaver(vespalib::GenerationHandler::Guard &&guard,
-                             const search::IAttributeSaveTarget::Config &cfg,
-                             const GidIterator &gidIterator,
-                             const MetaDataStore &metaDataStore)
-    : AttributeSaver(std::move(guard), cfg),
+                       const search::attribute::AttributeHeader &header,
+                       const GidIterator &gidIterator,
+                       const MetaDataStore &metaDataStore)
+    : AttributeSaver(std::move(guard), header),
       _gidIterator(gidIterator),
       _metaDataStore(metaDataStore),
       _writeDocSize(true)
 {
-    if (cfg.getVersion() == documentmetastore::NO_DOCUMENT_SIZE_TRACKING_VERSION) {
+    if (header.getVersion() == documentmetastore::NO_DOCUMENT_SIZE_TRACKING_VERSION) {
         _writeDocSize = false;
     }
 }
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoresaver.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoresaver.h
index ddec7032faa..9a8aba5387f 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoresaver.h
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoresaver.h
@@ -35,9 +35,9 @@ private:
     virtual bool onSave(search::IAttributeSaveTarget &saveTarget) override;
 public:
     DocumentMetaStoreSaver(vespalib::GenerationHandler::Guard &&guard,
-                                 const search::IAttributeSaveTarget::Config &cfg,
-                                 const GidIterator &gidIterator,
-                                 const MetaDataStore &metaDataStore);
+                           const search::attribute::AttributeHeader &header,
+                           const GidIterator &gidIterator,
+                           const MetaDataStore &metaDataStore);
 
     virtual ~DocumentMetaStoreSaver();
 };
-- 
cgit v1.2.3