Rename fillEnumIdx() -> load_enumerated_data().

10 files changed, 58 insertions, 75 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/multienumattribute.h b/searchlib/src/vespa/searchlib/attribute/multienumattribute.h
index 66f133c60fa..8fd370d0e80 100644
--- a/searchlib/src/vespa/searchlib/attribute/multienumattribute.h
+++ b/searchlib/src/vespa/searchlib/attribute/multienumattribute.h
@@ -74,8 +74,8 @@ protected:
     }
 
     void fillValues(LoadedVector & loaded) override;
-    void fillEnumIdx(ReaderBase &attrReader, const EnumIndexVector &eidxs, LoadedEnumAttributeVector &loaded) override;
-    void fillEnumIdx(ReaderBase &attrReader, const EnumIndexVector &eidxs, EnumVector &enumHist) override;
+    void load_enumerated_data(ReaderBase &attrReader, const EnumIndexVector &eidxs, LoadedEnumAttributeVector &loaded) override;
+    void load_enumerated_data(ReaderBase &attrReader, const EnumIndexVector &eidxs, EnumVector &enumHist) override;
     virtual void mergeMemoryStats(vespalib::MemoryUsage & total) { (void) total; }
 
 public:
diff --git a/searchlib/src/vespa/searchlib/attribute/multienumattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multienumattribute.hpp
index fbfd5516c05..9d210e61ae0 100644
--- a/searchlib/src/vespa/searchlib/attribute/multienumattribute.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/multienumattribute.hpp
@@ -91,9 +91,9 @@ MultiValueEnumAttribute<B, M>::fillValues(LoadedVector & loaded)
 
 template <typename B, typename M>
 void
-MultiValueEnumAttribute<B, M>::fillEnumIdx(ReaderBase &attrReader,
-                                           const EnumIndexVector &eidxs,
-                                           LoadedEnumAttributeVector &loaded)
+MultiValueEnumAttribute<B, M>::load_enumerated_data(ReaderBase& attrReader,
+                                                    const EnumIndexVector& eidxs,
+                                                    LoadedEnumAttributeVector& loaded)
 {
     uint32_t maxvc = attribute::loadFromEnumeratedMultiValue(this->_mvMapping, attrReader, vespalib::ConstArrayRef<EnumIndex>(eidxs), attribute::SaveLoadedEnum(loaded));
     this->checkSetMaxValueCount(maxvc);
@@ -101,9 +101,9 @@ MultiValueEnumAttribute<B, M>::fillEnumIdx(ReaderBase &attrReader,
 
 template <typename B, typename M>
 void
-MultiValueEnumAttribute<B, M>::fillEnumIdx(ReaderBase &attrReader,
-                                           const EnumIndexVector &eidxs,
-                                           EnumVector &enumHist)
+MultiValueEnumAttribute<B, M>::load_enumerated_data(ReaderBase& attrReader,
+                                                    const EnumIndexVector& eidxs,
+                                                    EnumVector& enumHist)
 {
     uint32_t maxvc = attribute::loadFromEnumeratedMultiValue(this->_mvMapping, attrReader, vespalib::ConstArrayRef<EnumIndex>(eidxs), attribute::SaveEnumHist(enumHist));
     this->checkSetMaxValueCount(maxvc);
diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericenumattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multinumericenumattribute.hpp
index 83f7563de12..6de62736b4b 100644
--- a/searchlib/src/vespa/searchlib/attribute/multinumericenumattribute.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/multinumericenumattribute.hpp
@@ -69,10 +69,10 @@ MultiValueNumericEnumAttribute<B, M>::onLoadEnumerated(ReaderBase &attrReader)
     EnumVector enumHist;
     if (this->hasPostings()) {
         loaded.reserve(numValues);
-        this->fillEnumIdx(attrReader, eidxs, loaded);
+        this->load_enumerated_data(attrReader, eidxs, loaded);
     } else {
         EnumVector(eidxs.size(), 0).swap(enumHist);
-        this->fillEnumIdx(attrReader, eidxs, enumHist);
+        this->load_enumerated_data(attrReader, eidxs, enumHist);
     }
     EnumIndexVector().swap(eidxs);
     if (this->hasPostings()) {
diff --git a/searchlib/src/vespa/searchlib/attribute/numericbase.cpp b/searchlib/src/vespa/searchlib/attribute/numericbase.cpp
index ee22550cc90..eb30469962e 100644
--- a/searchlib/src/vespa/searchlib/attribute/numericbase.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/numericbase.cpp
@@ -3,6 +3,9 @@
 
 #include "numericbase.hpp"
 
+#include <vespa/log/log.h>
+LOG_SETUP(".searchlib.attribute.numericbase");
+
 namespace search {
 
 IMPLEMENT_IDENTIFIABLE_ABSTRACT(NumericAttribute, AttributeVector);
@@ -10,54 +13,37 @@ IMPLEMENT_IDENTIFIABLE_ABSTRACT(NumericAttribute, AttributeVector);
 using attribute::LoadedEnumAttributeVector;
 
 void
-NumericAttribute::fillEnum0(const void *src,
-                           size_t srcLen,
-                           EnumIndexVector &eidxs)
+NumericAttribute::fillEnum0(const void*, size_t, EnumIndexVector&)
 {
-    (void) src;
-    (void) srcLen;
-    (void) eidxs;
-    fprintf(stderr, "NumericAttribute::fillEnum0\n");
+    LOG_ABORT("Should not be reached");
 }
 
-
 void
-NumericAttribute::fillEnumIdx(ReaderBase &attrReader,
-                             const EnumIndexVector &eidxs,
-                             LoadedEnumAttributeVector &loaded)
+NumericAttribute::load_enumerated_data(ReaderBase&,
+                                       const EnumIndexVector&,
+                                       LoadedEnumAttributeVector&)
 {
-    (void) attrReader;
-    (void) eidxs;
-    (void) loaded;
-    fprintf(stderr, "NumericAttribute::fillEnumIdx (loaded)\n");
+    LOG_ABORT("Should not be reached");
 }
 
-
 void
-NumericAttribute::fillEnumIdx(ReaderBase &attrReader,
-                             const EnumIndexVector &eidxs,
-                             EnumVector &enumHist)
+NumericAttribute::load_enumerated_data(ReaderBase&,
+                                       const EnumIndexVector&,
+                                       EnumVector&)
 {
-    (void) attrReader;
-    (void) eidxs;
-    (void) enumHist;
-    fprintf(stderr, "NumericAttribute::fillEnumIdx (enumHist)\n");
+    LOG_ABORT("Should not be reached");
 }
 
-
 void
-NumericAttribute::fillPostingsFixupEnum(const LoadedEnumAttributeVector &
-                                        loaded)
+NumericAttribute::fillPostingsFixupEnum(const LoadedEnumAttributeVector&)
 {
-    (void) loaded;
-    fprintf(stderr, "NumericAttribute::fillPostingsFixupEnum\n");
+    LOG_ABORT("Should not be reached");
 }
 
 void
-NumericAttribute::fixupEnumRefCounts(const EnumVector &enumHist)
+NumericAttribute::fixupEnumRefCounts(const EnumVector&)
 {
-    (void) enumHist;
-    fprintf(stderr, "NumericAttribute::fixupEnumRefCounts\n");
+    LOG_ABORT("Should not be reached");
 }
 
 template class NumericAttribute::Range<int8_t>;
diff --git a/searchlib/src/vespa/searchlib/attribute/numericbase.h b/searchlib/src/vespa/searchlib/attribute/numericbase.h
index 687dd0face6..702ce41693f 100644
--- a/searchlib/src/vespa/searchlib/attribute/numericbase.h
+++ b/searchlib/src/vespa/searchlib/attribute/numericbase.h
@@ -23,9 +23,9 @@ protected:
     { }
 
     virtual void fillEnum0(const void *src, size_t srcLen, EnumIndexVector &eidxs);
-    virtual void fillEnumIdx(ReaderBase &attrReader, const EnumIndexVector &eidxs,
-                             attribute::LoadedEnumAttributeVector &loaded);
-    virtual void fillEnumIdx(ReaderBase &attrReader, const EnumIndexVector &eidxs, EnumVector &enumHist);
+    virtual void load_enumerated_data(ReaderBase& attrReader, const EnumIndexVector& eidxs,
+                                      attribute::LoadedEnumAttributeVector& loaded);
+    virtual void load_enumerated_data(ReaderBase& attrReader, const EnumIndexVector& eidxs, EnumVector& enumHist);
     virtual void fillPostingsFixupEnum(const attribute::LoadedEnumAttributeVector &loaded);
     virtual void fixupEnumRefCounts(const EnumVector &enumHist);
     bool onAddDoc(DocId) override { return true; }
diff --git a/searchlib/src/vespa/searchlib/attribute/singleenumattribute.h b/searchlib/src/vespa/searchlib/attribute/singleenumattribute.h
index 6882158a474..43f0ef3e178 100644
--- a/searchlib/src/vespa/searchlib/attribute/singleenumattribute.h
+++ b/searchlib/src/vespa/searchlib/attribute/singleenumattribute.h
@@ -87,13 +87,13 @@ protected:
 
     void fillValues(LoadedVector & loaded) override;
 
-    void fillEnumIdx(ReaderBase &attrReader,
-                     const IEnumStore::IndexVector &eidxs,
-                     LoadedEnumAttributeVector &loaded) override;
+    void load_enumerated_data(ReaderBase& attrReader,
+                              const IEnumStore::IndexVector& eidxs,
+                              LoadedEnumAttributeVector& loaded) override;
     
-    void fillEnumIdx(ReaderBase &attrReader,
-                     const IEnumStore::IndexVector &eidxs,
-                     IEnumStore::EnumVector &enumHist) override;
+    void load_enumerated_data(ReaderBase& attrReader,
+                              const IEnumStore::IndexVector& eidxs,
+                              IEnumStore::EnumVector& enumHist) override;
     
     /**
      * Called when a new document has been added.
diff --git a/searchlib/src/vespa/searchlib/attribute/singleenumattribute.hpp b/searchlib/src/vespa/searchlib/attribute/singleenumattribute.hpp
index 19035d28875..13e552b68f6 100644
--- a/searchlib/src/vespa/searchlib/attribute/singleenumattribute.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/singleenumattribute.hpp
@@ -200,9 +200,9 @@ SingleValueEnumAttribute<B>::fillValues(LoadedVector & loaded)
 
 template <typename B>
 void
-SingleValueEnumAttribute<B>::fillEnumIdx(ReaderBase &attrReader,
-                                         const IEnumStore::IndexVector &eidxs,
-                                         LoadedEnumAttributeVector &loaded)
+SingleValueEnumAttribute<B>::load_enumerated_data(ReaderBase& attrReader,
+                                                  const IEnumStore::IndexVector& eidxs,
+                                                  LoadedEnumAttributeVector& loaded)
 {
     attribute::loadFromEnumeratedSingleValue(_enumIndices,
                                              getGenerationHolder(),
@@ -214,9 +214,9 @@ SingleValueEnumAttribute<B>::fillEnumIdx(ReaderBase &attrReader,
 
 template <typename B>
 void
-SingleValueEnumAttribute<B>::fillEnumIdx(ReaderBase &attrReader,
-                                         const IEnumStore::IndexVector &eidxs,
-                                         IEnumStore::EnumVector &enumHist)
+SingleValueEnumAttribute<B>::load_enumerated_data(ReaderBase& attrReader,
+                                                  const IEnumStore::IndexVector& eidxs,
+                                                  IEnumStore::EnumVector& enumHist)
 {
     attribute::loadFromEnumeratedSingleValue(_enumIndices,
                                              getGenerationHolder(),
diff --git a/searchlib/src/vespa/searchlib/attribute/singlenumericenumattribute.hpp b/searchlib/src/vespa/searchlib/attribute/singlenumericenumattribute.hpp
index 3b037561483..82106904495 100644
--- a/searchlib/src/vespa/searchlib/attribute/singlenumericenumattribute.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/singlenumericenumattribute.hpp
@@ -92,10 +92,10 @@ SingleValueNumericEnumAttribute<B>::onLoadEnumerated(ReaderBase &attrReader)
     EnumVector enumHist;
     if (this->hasPostings()) {
         loaded.reserve(numValues);
-        this->fillEnumIdx(attrReader, eidxs, loaded);
+        this->load_enumerated_data(attrReader, eidxs, loaded);
     } else {
         EnumVector(eidxs.size(), 0).swap(enumHist);
-        this->fillEnumIdx(attrReader, eidxs, enumHist);
+        this->load_enumerated_data(attrReader, eidxs, enumHist);
     }
     EnumIndexVector().swap(eidxs);
     if (this->hasPostings()) {
diff --git a/searchlib/src/vespa/searchlib/attribute/stringbase.cpp b/searchlib/src/vespa/searchlib/attribute/stringbase.cpp
index 75e195ec351..f393af6b208 100644
--- a/searchlib/src/vespa/searchlib/attribute/stringbase.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/stringbase.cpp
@@ -358,9 +358,9 @@ StringAttribute::onLoadEnumerated(ReaderBase &attrReader)
     timer.SetNow();
     LOG(debug, "start fillEnumIdx");
     if(hasPostings()) {
-        fillEnumIdx(attrReader, eidxs, loaded);
+        load_enumerated_data(attrReader, eidxs, loaded);
     } else {
-        fillEnumIdx(attrReader, eidxs, enumHist);
+        load_enumerated_data(attrReader, eidxs, enumHist);
     }
     LOG(debug, "done fillEnumIdx, %8.3f s elapsed",
         timer.MilliSecsToNow() / 1000);
@@ -435,36 +435,33 @@ void StringAttribute::fillValues(LoadedVector & )
 }
 
 void
-StringAttribute::fillEnum0(const void *, size_t , EnumIndexVector &)
+StringAttribute::fillEnum0(const void*, size_t, EnumIndexVector&)
 {
-    fprintf(stderr, "StringAttribute::fillEnum0\n");
+    LOG_ABORT("Should not be reached");
 }
 
-
 void
-StringAttribute::fillEnumIdx(ReaderBase &, const EnumIndexVector &, LoadedEnumAttributeVector &)
+StringAttribute::load_enumerated_data(ReaderBase&, const EnumIndexVector&, LoadedEnumAttributeVector&)
 {
-    fprintf(stderr, "StringAttribute::fillEnumIdx (loaded)\n");
+    LOG_ABORT("Should not be reached");
 }
 
-
 void
-StringAttribute::fillEnumIdx(ReaderBase &, const EnumIndexVector &, EnumVector &)
+StringAttribute::load_enumerated_data(ReaderBase&, const EnumIndexVector&, EnumVector&)
 {
-    fprintf(stderr, "StringAttribute::fillEnumIdx (enumHist)\n");
+    LOG_ABORT("Should not be reached");
 }
 
-
 void
-StringAttribute::fillPostingsFixupEnum(const LoadedEnumAttributeVector &)
+StringAttribute::fillPostingsFixupEnum(const LoadedEnumAttributeVector&)
 {
-    fprintf(stderr, "StringAttribute::fillPostingsFixupEnum\n");
+    LOG_ABORT("Should not be reached");
 }
 
 void
-StringAttribute::fixupEnumRefCounts(const EnumVector &)
+StringAttribute::fixupEnumRefCounts(const EnumVector&)
 {
-    fprintf(stderr, "StringAttribute::fixupEnumRefCounts\n");
+    LOG_ABORT("Should not be reached");
 }
 
 vespalib::MemoryUsage
diff --git a/searchlib/src/vespa/searchlib/attribute/stringbase.h b/searchlib/src/vespa/searchlib/attribute/stringbase.h
index 39f40e0fffe..d6905e4d946 100644
--- a/searchlib/src/vespa/searchlib/attribute/stringbase.h
+++ b/searchlib/src/vespa/searchlib/attribute/stringbase.h
@@ -78,8 +78,8 @@ private:
     virtual void fillValues(LoadedVector & loaded);
 
     virtual void fillEnum0(const void *src, size_t srcLen, EnumIndexVector &eidxs);
-    virtual void fillEnumIdx(ReaderBase &attrReader, const EnumIndexVector &eidxs, attribute::LoadedEnumAttributeVector &loaded);
-    virtual void fillEnumIdx(ReaderBase &attrReader, const EnumIndexVector &eidxs, EnumVector &enumHist);
+    virtual void load_enumerated_data(ReaderBase &attrReader, const EnumIndexVector &eidxs, attribute::LoadedEnumAttributeVector &loaded);
+    virtual void load_enumerated_data(ReaderBase &attrReader, const EnumIndexVector &eidxs, EnumVector &enumHist);
     virtual void fillPostingsFixupEnum(const attribute::LoadedEnumAttributeVector &loaded);
     virtual void fixupEnumRefCounts(const EnumVector &enumHist);