Merge pull request #23897 from vespa-engine/balder/minor-fixes-while-reading-codev8.47.18

Minor fixes like adding 'explicit', 'override' and general unification.

7 files changed, 12 insertions, 19 deletions

diff --git a/searchlib/src/vespa/searchcommon/attribute/i_multi_value_attribute.h b/searchlib/src/vespa/searchcommon/attribute/i_multi_value_attribute.h
index ea1fbe0b2b4..6cd58134960 100644
--- a/searchlib/src/vespa/searchcommon/attribute/i_multi_value_attribute.h
+++ b/searchlib/src/vespa/searchcommon/attribute/i_multi_value_attribute.h
@@ -30,7 +30,7 @@ public:
 
     using WeightedSetEnumTag = WeightedSetTag<vespalib::datastore::AtomicEntryRef>;
 
-    virtual ~IMultiValueAttribute() {}
+    virtual ~IMultiValueAttribute() = default;
 
     virtual const IArrayReadView<int8_t>* make_read_view(ArrayTag<int8_t>, vespalib::Stash&) const { return nullptr; }
     virtual const IArrayReadView<int16_t>* make_read_view(ArrayTag<int16_t>, vespalib::Stash&) const { return nullptr; }
diff --git a/searchlib/src/vespa/searchcommon/attribute/i_multi_value_read_view.h b/searchlib/src/vespa/searchcommon/attribute/i_multi_value_read_view.h
index 8e5005eae8d..bebd360b68c 100644
--- a/searchlib/src/vespa/searchcommon/attribute/i_multi_value_read_view.h
+++ b/searchlib/src/vespa/searchcommon/attribute/i_multi_value_read_view.h
@@ -15,7 +15,7 @@ namespace search::attribute {
 template <typename MultiValueType>
 class IMultiValueReadView {
 public:
-    virtual ~IMultiValueReadView() {}
+    virtual ~IMultiValueReadView() = default;
     virtual vespalib::ConstArrayRef<MultiValueType> get_values(uint32_t docid) const = 0;
 };
 
@@ -43,4 +43,4 @@ using IArrayEnumReadView = IArrayReadView<vespalib::datastore::AtomicEntryRef>;
  */
 using IWeightedSetEnumReadView = IWeightedSetReadView<vespalib::datastore::AtomicEntryRef>;
 
-};
+}
diff --git a/searchlib/src/vespa/searchlib/attribute/floatbase.h b/searchlib/src/vespa/searchlib/attribute/floatbase.h
index 40b0b9c72e2..288b66195e4 100644
--- a/searchlib/src/vespa/searchlib/attribute/floatbase.h
+++ b/searchlib/src/vespa/searchlib/attribute/floatbase.h
@@ -36,7 +36,7 @@ protected:
     using ChangeVector = ChangeVectorT<Change>;
     ChangeVector _changes;
 
-    virtual vespalib::MemoryUsage getChangeVectorMemoryUsage() const override;
+    vespalib::MemoryUsage getChangeVectorMemoryUsage() const override;
 private:
     uint32_t get(DocId doc, vespalib::string * v, uint32_t sz) const override;
     uint32_t get(DocId doc, const char ** v, uint32_t sz) const override;
@@ -60,8 +60,11 @@ public:
     virtual T get(DocId doc) const = 0;
     virtual T getFromEnum(EnumHandle e) const = 0;
     T defaultValue() const { return isMutable() ? 0.0 : attribute::getUndefined<T>(); }
+    bool isUndefined(DocId doc) const override {
+        return attribute::isUndefined(get(doc));
+    }
 protected:
-    FloatingPointAttributeTemplate(const vespalib::string & name);
+    explicit FloatingPointAttributeTemplate(const vespalib::string & name);
     FloatingPointAttributeTemplate(const vespalib::string & name, const Config & c);
     ~FloatingPointAttributeTemplate() override;
     virtual bool findEnum(T v, EnumHandle & e) const = 0;
@@ -73,7 +76,6 @@ protected:
 private:
     bool findEnum(const char *value, EnumHandle &e) const override;
     std::vector<EnumHandle> findFoldedEnums(const char *value) const override;
-    bool isUndefined(DocId doc) const override;
 
     long onSerializeForAscendingSort(DocId doc, void * serTo, long available, const common::BlobConverter * bc) const override;
     long onSerializeForDescendingSort(DocId doc, void * serTo, long available, const common::BlobConverter * bc) const override;
diff --git a/searchlib/src/vespa/searchlib/attribute/floatbase.hpp b/searchlib/src/vespa/searchlib/attribute/floatbase.hpp
index b406f5e85b1..ca634629d66 100644
--- a/searchlib/src/vespa/searchlib/attribute/floatbase.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/floatbase.hpp
@@ -49,12 +49,6 @@ FloatingPointAttributeTemplate<T>::findFoldedEnums(const char *value) const
 }
 
 template<typename T>
-bool
-FloatingPointAttributeTemplate<T>::isUndefined(DocId doc) const {
-    return attribute::isUndefined(get(doc));
-}
-
-template<typename T>
 long
 FloatingPointAttributeTemplate<T>::onSerializeForAscendingSort(DocId doc, void * serTo, long available, const common::BlobConverter * bc) const {
     (void) bc;
diff --git a/searchlib/src/vespa/searchlib/attribute/integerbase.h b/searchlib/src/vespa/searchlib/attribute/integerbase.h
index 170d6fcf941..7cb791e204e 100644
--- a/searchlib/src/vespa/searchlib/attribute/integerbase.h
+++ b/searchlib/src/vespa/searchlib/attribute/integerbase.h
@@ -11,7 +11,7 @@ namespace search {
 class IntegerAttribute : public NumericAttribute
 {
 public:
-    ~IntegerAttribute();
+    ~IntegerAttribute() override;
     bool update(DocId doc, largeint_t v) {
         return AttributeVector::update(_changes, doc, NumericChangeData<largeint_t>(v));
     }
@@ -58,6 +58,7 @@ public:
     virtual T get(DocId doc) const = 0;
     virtual T getFromEnum(EnumHandle e) const = 0;
     T defaultValue() const { return isMutable() ? 0 : attribute::getUndefined<T>(); }
+    bool isUndefined(DocId doc) const override { return attribute::isUndefined(get(doc)); }
 protected:
     IntegerAttributeTemplate(const vespalib::string & name);
     IntegerAttributeTemplate(const vespalib::string & name, const Config & c);
@@ -67,8 +68,6 @@ protected:
     virtual void load_enum_store(LoadedVector&) {}
     virtual void fillValues(LoadedVector &) {}
     virtual void load_posting_lists(LoadedVector&) {}
-
-    bool isUndefined(DocId doc) const override { return get(doc) == attribute::getUndefined<T>(); }
     const Change _defaultValue;
 private:
     bool findEnum(const char *value, EnumHandle &e) const override;
diff --git a/searchlib/src/vespa/searchlib/attribute/multivalueattribute.h b/searchlib/src/vespa/searchlib/attribute/multivalueattribute.h
index 1d0e8d04ca8..c6dc7dc977d 100644
--- a/searchlib/src/vespa/searchlib/attribute/multivalueattribute.h
+++ b/searchlib/src/vespa/searchlib/attribute/multivalueattribute.h
@@ -6,7 +6,6 @@
 #include "attributevector.h"
 #include "multi_value_mapping.h"
 #include <vespa/searchcommon/attribute/i_multi_value_attribute.h>
-#include <vespa/searchcommon/attribute/i_multi_value_read_view.h>
 #include <vespa/searchcommon/attribute/multi_value_traits.h>
 
 namespace search {
@@ -31,7 +30,6 @@ protected:
     using ValueType = multivalue::ValueType_t<MultiValueType>;
     typedef std::vector<MultiValueType>                   ValueVector;
     using MultiValueArrayRef = vespalib::ConstArrayRef<MultiValueType>;
-    typedef typename ValueVector::iterator                ValueVectorIterator;
     typedef std::vector<std::pair<DocId, ValueVector> >   DocumentValues;
     using NonAtomicValueType = attribute::atomic_utils::NonAtomicValue_t<ValueType>;
 
diff --git a/searchlib/src/vespa/searchlib/attribute/singlenumericattribute.h b/searchlib/src/vespa/searchlib/attribute/singlenumericattribute.h
index 2e9303bef62..fd2767eaee1 100644
--- a/searchlib/src/vespa/searchlib/attribute/singlenumericattribute.h
+++ b/searchlib/src/vespa/searchlib/attribute/singlenumericattribute.h
@@ -41,10 +41,10 @@ protected:
     }
 
 public:
-    SingleValueNumericAttribute(const vespalib::string & baseFileName);  // Only for testing
+    explicit SingleValueNumericAttribute(const vespalib::string & baseFileName);  // Only for testing
     SingleValueNumericAttribute(const vespalib::string & baseFileName, const AttributeVector::Config & c);
 
-    ~SingleValueNumericAttribute();
+    ~SingleValueNumericAttribute() override;
 
     uint32_t getValueCount(DocId doc) const override {
         if (doc >= B::getNumDocs()) {