Merge pull request #10398 from vespa-engine/toregge/add-workaround-for-aligned-entry-ref

Rename UniqueStoreSaver to UniqueStoreEnumerator.

3 files changed, 13 insertions, 13 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/reference_attribute.cpp b/searchlib/src/vespa/searchlib/attribute/reference_attribute.cpp
index 8b1b272be52..406400cef00 100644
--- a/searchlib/src/vespa/searchlib/attribute/reference_attribute.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/reference_attribute.cpp
@@ -55,8 +55,8 @@ ReferenceAttribute::~ReferenceAttribute()
     _referenceMappings.clearBuilder();
     incGeneration(); // Force freeze
     const auto &store = _store;
-    const auto saver = _store.getSaver();
-    saver.foreach_key([&store,this](EntryRef ref)
+    const auto enumerator = _store.getEnumerator();
+    enumerator.foreach_key([&store,this](EntryRef ref)
                       {   const Reference &entry = store.get(ref);
                           _referenceMappings.clearMapping(entry);
                       });
@@ -478,6 +478,6 @@ using Reference = attribute::Reference;
 template class UniqueStoreAllocator<Reference, EntryRefT<22>>;
 template class UniqueStore<Reference, EntryRefT<22>>;
 template class UniqueStoreBuilder<UniqueStoreAllocator<Reference, EntryRefT<22>>>;
-template class UniqueStoreSaver<Reference, EntryRefT<22>>;
+template class UniqueStoreEnumerator<EntryRefT<22>>;
 
 }
diff --git a/searchlib/src/vespa/searchlib/attribute/reference_attribute_saver.cpp b/searchlib/src/vespa/searchlib/attribute/reference_attribute_saver.cpp
index cb8bb6661d6..e0a6ea193e0 100644
--- a/searchlib/src/vespa/searchlib/attribute/reference_attribute_saver.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/reference_attribute_saver.cpp
@@ -21,7 +21,7 @@ ReferenceAttributeSaver(GenerationHandler::Guard &&guard,
     : AttributeSaver(std::move(guard), header),
       _indices(std::move(indices)),
       _store(store),
-      _saver(store.getSaver())
+      _enumerator(store.getEnumerator())
 {
 }
 
@@ -49,13 +49,13 @@ public:
     }
 };
 
-template <class Store, class Saver>
+template <class Store, class Enumerator>
 void
-writeUdat(IAttributeSaveTarget &saveTarget, const Store &store, const Saver &saver)
+writeUdat(IAttributeSaveTarget &saveTarget, const Store &store, const Enumerator &enumerator)
 {
     std::unique_ptr<BufferWriter>
         udatWriter(saveTarget.udatWriter().allocBufferWriter());
-    saver.foreach_key(ValueWriter<Store>(store, *udatWriter));
+    enumerator.foreach_key(ValueWriter<Store>(store, *udatWriter));
     udatWriter->flush();
 }
 
@@ -64,13 +64,13 @@ writeUdat(IAttributeSaveTarget &saveTarget, const Store &store, const Saver &sav
 bool
 ReferenceAttributeSaver::onSave(IAttributeSaveTarget &saveTarget)
 {
-    writeUdat(saveTarget, _store, _saver);
+    writeUdat(saveTarget, _store, _enumerator);
     std::unique_ptr<search::BufferWriter> datWriter(saveTarget.datWriter().
                                                     allocBufferWriter());
 
-    _saver.enumerateValues();
+    _enumerator.enumerateValues();
     for (const auto &ref : _indices) {
-        uint32_t enumValue = _saver.mapEntryRefToEnumValue(ref);
+        uint32_t enumValue = _enumerator.mapEntryRefToEnumValue(ref);
         datWriter->write(&enumValue, sizeof(uint32_t));
     }
     datWriter->flush();
diff --git a/searchlib/src/vespa/searchlib/attribute/reference_attribute_saver.h b/searchlib/src/vespa/searchlib/attribute/reference_attribute_saver.h
index 42a26911669..4847663e6e6 100644
--- a/searchlib/src/vespa/searchlib/attribute/reference_attribute_saver.h
+++ b/searchlib/src/vespa/searchlib/attribute/reference_attribute_saver.h
@@ -5,7 +5,7 @@
 #include "attributesaver.h"
 #include <vespa/document/base/globalid.h>
 #include <vespa/vespalib/datastore/unique_store.h>
-#include <vespa/vespalib/datastore/unique_store_saver.h>
+#include <vespa/vespalib/datastore/unique_store_enumerator.h>
 #include <vespa/vespalib/util/rcuvector.h>
 #include "reference_attribute.h"
 #include "reference.h"
@@ -32,10 +32,10 @@ private:
     using GlobalId = document::GlobalId;
     using IndicesCopyVector = ReferenceAttribute::IndicesCopyVector;
     using Store = ReferenceAttribute::ReferenceStore;
-    using Saver = Store::Saver;
+    using Enumerator = Store::Enumerator;
     IndicesCopyVector _indices;
     const Store &_store;
-    Saver _saver;
+    Enumerator _enumerator;
 
     virtual bool onSave(IAttributeSaveTarget &saveTarget) override;
 public: