From b0c559320ebf0f6927db542e4d6841e8ff151c70 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Thu, 1 Sep 2022 16:49:50 +0000 Subject: Minor fixes like adding 'explicit', 'override' and general unification. --- .../src/vespa/searchcommon/attribute/i_multi_value_attribute.h | 2 +- .../src/vespa/searchcommon/attribute/i_multi_value_read_view.h | 4 ++-- searchlib/src/vespa/searchlib/attribute/floatbase.h | 8 +++++--- searchlib/src/vespa/searchlib/attribute/floatbase.hpp | 6 ------ searchlib/src/vespa/searchlib/attribute/integerbase.h | 5 ++--- searchlib/src/vespa/searchlib/attribute/multivalueattribute.h | 2 -- searchlib/src/vespa/searchlib/attribute/singlenumericattribute.h | 4 ++-- 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; - virtual ~IMultiValueAttribute() {} + virtual ~IMultiValueAttribute() = default; virtual const IArrayReadView* make_read_view(ArrayTag, vespalib::Stash&) const { return nullptr; } virtual const IArrayReadView* make_read_view(ArrayTag, 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 class IMultiValueReadView { public: - virtual ~IMultiValueReadView() {} + virtual ~IMultiValueReadView() = default; virtual vespalib::ConstArrayRef get_values(uint32_t docid) const = 0; }; @@ -43,4 +43,4 @@ using IArrayEnumReadView = IArrayReadView; */ using IWeightedSetEnumReadView = IWeightedSetReadView; -}; +} 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; 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(); } + 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 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 @@ -48,12 +48,6 @@ FloatingPointAttributeTemplate::findFoldedEnums(const char *value) const return result; } -template -bool -FloatingPointAttributeTemplate::isUndefined(DocId doc) const { - return attribute::isUndefined(get(doc)); -} - template long FloatingPointAttributeTemplate::onSerializeForAscendingSort(DocId doc, void * serTo, long available, const common::BlobConverter * bc) const { 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(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(); } + 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(); } 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 -#include #include namespace search { @@ -31,7 +30,6 @@ protected: using ValueType = multivalue::ValueType_t; typedef std::vector ValueVector; using MultiValueArrayRef = vespalib::ConstArrayRef; - typedef typename ValueVector::iterator ValueVectorIterator; typedef std::vector > DocumentValues; using NonAtomicValueType = attribute::atomic_utils::NonAtomicValue_t; diff --git a/searchlib/src/vespa/searchlib/attribute/singlenumericattribute.h b/searchlib/src/vespa/searchlib/attribute/singlenumericattribute.h index 2e9303bef62..7b8d452b810 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() final; uint32_t getValueCount(DocId doc) const override { if (doc >= B::getNumDocs()) { -- cgit v1.2.3 From 35b7741fdf948bfdded1ebab6ce6e3dd9e763d33 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Thu, 1 Sep 2022 19:58:27 +0000 Subject: Use override --- searchlib/src/vespa/searchlib/attribute/singlenumericattribute.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searchlib/src/vespa/searchlib/attribute/singlenumericattribute.h b/searchlib/src/vespa/searchlib/attribute/singlenumericattribute.h index 7b8d452b810..fd2767eaee1 100644 --- a/searchlib/src/vespa/searchlib/attribute/singlenumericattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/singlenumericattribute.h @@ -44,7 +44,7 @@ public: explicit SingleValueNumericAttribute(const vespalib::string & baseFileName); // Only for testing SingleValueNumericAttribute(const vespalib::string & baseFileName, const AttributeVector::Config & c); - ~SingleValueNumericAttribute() final; + ~SingleValueNumericAttribute() override; uint32_t getValueCount(DocId doc) const override { if (doc >= B::getNumDocs()) { -- cgit v1.2.3