diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-12 11:52:52 +0200 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-12 12:35:30 +0200 |
commit | a5fb97673ce7351bd2921c4cb507e51cb85d9bce (patch) | |
tree | 675d98df0e929d04fd57585fe14d839729bfe07d /searchsummary | |
parent | 209472f6181b51c920b50d81e4ec76007a9a5118 (diff) |
add override in searchsummary module
Diffstat (limited to 'searchsummary')
15 files changed, 80 insertions, 80 deletions
diff --git a/searchsummary/src/tests/docsumformat/docsum-pack.cpp b/searchsummary/src/tests/docsumformat/docsum-pack.cpp index bb01027d116..36ef5706355 100644 --- a/searchsummary/src/tests/docsumformat/docsum-pack.cpp +++ b/searchsummary/src/tests/docsumformat/docsum-pack.cpp @@ -63,7 +63,7 @@ public: void TestBasicInplace(); void TestCompressInplace(); - int Main(); + int Main() override; }; MyApp::MyApp() diff --git a/searchsummary/src/tests/docsummary/positionsdfw_test.cpp b/searchsummary/src/tests/docsummary/positionsdfw_test.cpp index 1892fa96179..8f900700d5d 100644 --- a/searchsummary/src/tests/docsummary/positionsdfw_test.cpp +++ b/searchsummary/src/tests/docsummary/positionsdfw_test.cpp @@ -33,7 +33,7 @@ class Test : public vespalib::TestApp { void requireThat2DPositionFieldIsWritten(); public: - int Main(); + int Main() override; }; int @@ -51,21 +51,21 @@ struct MyEnvironment : IDocsumEnvironment { MyEnvironment() : attribute_man(0) {} - virtual IAttributeManager *getAttributeManager() { return attribute_man; } - virtual string lookupIndex(const string &s) const { return s; } - virtual juniper::Juniper *getJuniper() { return 0; } + virtual IAttributeManager *getAttributeManager() override { return attribute_man; } + virtual string lookupIndex(const string &s) const override { return s; } + virtual juniper::Juniper *getJuniper() override { return 0; } }; class MyAttributeContext : public IAttributeContext { const IAttributeVector &_attr; public: MyAttributeContext(const IAttributeVector &attr) : _attr(attr) {} - virtual const IAttributeVector *getAttribute(const string &) const { + virtual const IAttributeVector *getAttribute(const string &) const override { return &_attr; } - virtual const IAttributeVector *getAttributeStableEnum( - const string &) const { abort(); } - virtual void getAttributeList(vector<const IAttributeVector *> &) const + virtual const IAttributeVector * + getAttributeStableEnum(const string &) const override { abort(); } + virtual void getAttributeList(vector<const IAttributeVector *> &) const override { abort(); } }; @@ -74,24 +74,24 @@ class MyAttributeManager : public IAttributeManager { public: MyAttributeManager(const IAttributeVector &attr) : _attr(attr) {} - virtual AttributeGuard::UP getAttribute(const string &) const { + virtual AttributeGuard::UP getAttribute(const string &) const override { abort(); } - virtual AttributeGuard::UP getAttributeStableEnum(const string &) const { + virtual AttributeGuard::UP getAttributeStableEnum(const string &) const override { abort(); } - virtual void getAttributeList(vector<AttributeGuard> &) const { + virtual void getAttributeList(vector<AttributeGuard> &) const override { abort(); } - virtual IAttributeContext::UP createContext() const { + virtual IAttributeContext::UP createContext() const override { return IAttributeContext::UP(new MyAttributeContext(_attr)); } }; struct MyGetDocsumsStateCallback : GetDocsumsStateCallback { - virtual void FillSummaryFeatures(GetDocsumsState *, IDocsumEnvironment *) {} - virtual void FillRankFeatures(GetDocsumsState *, IDocsumEnvironment *) {} - virtual void ParseLocation(GetDocsumsState *) {} + virtual void FillSummaryFeatures(GetDocsumsState *, IDocsumEnvironment *) override {} + virtual void FillRankFeatures(GetDocsumsState *, IDocsumEnvironment *) override {} + virtual void ParseLocation(GetDocsumsState *) override {} }; template <typename AttrType> diff --git a/searchsummary/src/tests/extractkeywords/extractkeywordstest.h b/searchsummary/src/tests/extractkeywords/extractkeywordstest.h index 9e9ba3ac09c..2b24ce39136 100644 --- a/searchsummary/src/tests/extractkeywords/extractkeywordstest.h +++ b/searchsummary/src/tests/extractkeywords/extractkeywordstest.h @@ -19,7 +19,7 @@ private: search::docsummary::KeywordExtractor *_extractor; - int Main(); + int Main() override; void Usage(char *progname); bool ShowResult(int testNo, const char *actual, const char *correct); bool RunTest(int i, bool verify); diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp index 869cffb7661..5a140c6790f 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp @@ -82,8 +82,8 @@ public: GeneralResult *gres, GetDocsumsState *state, ResType type, - vespalib::slime::Inserter &target); - virtual bool isDefaultValue(uint32_t docid, const GetDocsumsState * state) const; + vespalib::slime::Inserter &target) override; + virtual bool isDefaultValue(uint32_t docid, const GetDocsumsState * state) const override; }; bool SingleAttrDFW::isDefaultValue(uint32_t docid, const GetDocsumsState * state) const @@ -181,7 +181,7 @@ public: GeneralResult *gres, GetDocsumsState *state, ResType type, - vespalib::slime::Inserter &target); + vespalib::slime::Inserter &target) override; }; diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.h b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.h index 77f524740b5..92908038d68 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.h @@ -14,10 +14,10 @@ private: vespalib::string _attrName; protected: const attribute::IAttributeVector & vec(const GetDocsumsState & s) const; - virtual const vespalib::string & getAttributeName() const { return _attrName; } + virtual const vespalib::string & getAttributeName() const override { return _attrName; } public: AttrDFW(const vespalib::string & attrName); - virtual bool IsGenerated() const { return true; } + virtual bool IsGenerated() const override { return true; } }; } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.h b/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.h index 2f86e8ef5f1..00fb63144ce 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.h @@ -55,12 +55,12 @@ public: EmptyDFW(); virtual ~EmptyDFW(); - virtual bool IsGenerated() const { return true; } + virtual bool IsGenerated() const override { return true; } virtual void insertField(uint32_t docid, GeneralResult *gres, GetDocsumsState *state, ResType type, - vespalib::slime::Inserter &target); + vespalib::slime::Inserter &target) override; }; //-------------------------------------------------------------------------- @@ -76,12 +76,12 @@ public: bool Init(const ResultConfig & config, const char *inputField); - virtual bool IsGenerated() const { return false; } + virtual bool IsGenerated() const override { return false; } virtual void insertField(uint32_t docid, GeneralResult *gres, GetDocsumsState *state, ResType type, - vespalib::slime::Inserter &target); + vespalib::slime::Inserter &target) override; }; //-------------------------------------------------------------------------- diff --git a/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp index c903c7cbb78..8760a12fb82 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp @@ -71,7 +71,7 @@ public: TermVisitor(juniper::IQueryVisitor *visitor) : _visitor(visitor), _item() {} - virtual void visitProperty(const Property::Value &key, const Property &values); + virtual void visitProperty(const Property::Value &key, const Property &values) override; }; @@ -142,9 +142,9 @@ public: return true; } - virtual bool Traverse(juniper::IQueryVisitor *v) const; + virtual bool Traverse(juniper::IQueryVisitor *v) const override; - virtual int Weight(const juniper::QueryItem* item) const + virtual int Weight(const juniper::QueryItem* item) const override { if (item->_si != NULL) { return item->_si->GetWeight().percent(); @@ -152,7 +152,7 @@ public: return item->_data->_weight; } } - virtual juniper::ItemCreator Creator(const juniper::QueryItem* item) const + virtual juniper::ItemCreator Creator(const juniper::QueryItem* item) const override { // cast master: Knut Omang if (item->_si != NULL) { @@ -161,7 +161,7 @@ public: return juniper::CREA_ORIG; } } - virtual const char *Index(const juniper::QueryItem* item, size_t *len) const + virtual const char *Index(const juniper::QueryItem* item, size_t *len) const override { if (item->_si != NULL) { *len = item->_si->getIndexName().size(); @@ -172,7 +172,7 @@ public: } } - virtual bool UsefulIndex(const juniper::QueryItem* item) const + virtual bool UsefulIndex(const juniper::QueryItem* item) const override { vespalib::stringref index; diff --git a/searchsummary/src/vespa/searchsummary/docsummary/juniperdfw.h b/searchsummary/src/vespa/searchsummary/docsummary/juniperdfw.h index 981885754bd..582ba90747d 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/juniperdfw.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/juniperdfw.h @@ -29,7 +29,7 @@ protected: uint32_t _langFieldEnumValue; juniper::Juniper *_juniper; private: - virtual bool IsGenerated() const { return false; } + virtual bool IsGenerated() const override { return false; } JuniperDFW(const JuniperDFW &); JuniperDFW & operator=(const JuniperDFW &); }; @@ -42,7 +42,7 @@ public: const char *fieldName, const char *langFieldName, const ResultConfig & config, - const char *inputField); + const char *inputField) override; protected: JuniperTeaserDFW(juniper::Juniper * juniper) : JuniperDFW(juniper) { } }; @@ -61,7 +61,7 @@ public: GeneralResult *gres, GetDocsumsState *state, ResType type, - vespalib::slime::Inserter &target); + vespalib::slime::Inserter &target) override; }; } // namespace docsummary diff --git a/searchsummary/src/vespa/searchsummary/docsummary/juniperproperties.h b/searchsummary/src/vespa/searchsummary/docsummary/juniperproperties.h index 5e9cdce48c7..c743ad48637 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/juniperproperties.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/juniperproperties.h @@ -53,7 +53,7 @@ public: void configure(const vespa::config::search::summary::JuniperrcConfig &cfg); // Inherit doc from IJuniperProperties. - const char *GetProperty(const char *name, const char *def = NULL); + const char *GetProperty(const char *name, const char *def = NULL) override; /** * Sets the value of a given named property. If the property already exists, it is overwritten. If it does not diff --git a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.h b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.h index 3c1382c1eda..7dceb311b7f 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.h @@ -21,12 +21,12 @@ public: RankFeaturesDFW(); virtual ~RankFeaturesDFW(); void init(IDocsumEnvironment * env); - virtual bool IsGenerated() const { return true; } + virtual bool IsGenerated() const override { return true; } virtual void insertField(uint32_t docid, GeneralResult *gres, GetDocsumsState *state, ResType type, - vespalib::slime::Inserter &target); + vespalib::slime::Inserter &target) override; }; } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h index 7da574fe1fd..48fddb64148 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h @@ -30,12 +30,12 @@ public: SummaryFeaturesDFW(); virtual ~SummaryFeaturesDFW(); void init(IDocsumEnvironment * env); - virtual bool IsGenerated() const { return true; } + virtual bool IsGenerated() const override { return true; } virtual void insertField(uint32_t docid, GeneralResult *gres, GetDocsumsState *state, ResType type, - vespalib::slime::Inserter &target); + vespalib::slime::Inserter &target) override; static uint32_t writeString(const vespalib::stringref & str, ResType type, search::RawBuf * target); }; diff --git a/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.cpp index 0fa34cf2e16..cff0c45ac59 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/summaryfieldconverter.cpp @@ -240,7 +240,7 @@ class SummaryFieldValueConverter : protected ConstFieldValueVisitor FieldValue::UP _field_value; FieldValueConverter &_structuredFieldConverter; - virtual void visit(const ArrayFieldValue &value) { + virtual void visit(const ArrayFieldValue &value) override { _field_value = _structuredFieldConverter.convert(value); } @@ -248,17 +248,17 @@ class SummaryFieldValueConverter : protected ConstFieldValueVisitor void visitPrimitive(const T &t) { _field_value.reset(t.clone()); } - virtual void visit(const IntFieldValue &value) { visitPrimitive(value); } - virtual void visit(const LongFieldValue &value) { visitPrimitive(value); } - virtual void visit(const ShortFieldValue &value) { visitPrimitive(value); } - virtual void visit(const ByteFieldValue &value) { + virtual void visit(const IntFieldValue &value) override { visitPrimitive(value); } + virtual void visit(const LongFieldValue &value) override { visitPrimitive(value); } + virtual void visit(const ShortFieldValue &value) override { visitPrimitive(value); } + virtual void visit(const ByteFieldValue &value) override { int8_t signedValue = value.getAsByte(); _field_value.reset(new ShortFieldValue(signedValue)); } - virtual void visit(const DoubleFieldValue &value) { visitPrimitive(value); } - virtual void visit(const FloatFieldValue &value) { visitPrimitive(value); } + virtual void visit(const DoubleFieldValue &value) override { visitPrimitive(value); } + virtual void visit(const FloatFieldValue &value) override { visitPrimitive(value); } - virtual void visit(const StringFieldValue &value) { + virtual void visit(const StringFieldValue &value) override { if (_tokenize) { SummaryHandler handler(value.getValue(), _str); handleIndexingTerms(handler, value); @@ -267,30 +267,30 @@ class SummaryFieldValueConverter : protected ConstFieldValueVisitor } } - virtual void visit(const AnnotationReferenceFieldValue & v ) { + virtual void visit(const AnnotationReferenceFieldValue & v ) override { _field_value = _structuredFieldConverter.convert(v); } - virtual void visit(const Document & v) { + virtual void visit(const Document & v) override { _field_value = _structuredFieldConverter.convert(v); } virtual void - visit(const PredicateFieldValue &value) + visit(const PredicateFieldValue &value) override { _str << value.toString(); } virtual void - visit(const RawFieldValue &value) + visit(const RawFieldValue &value) override { visitPrimitive(value); } - virtual void visit(const MapFieldValue & v) { + virtual void visit(const MapFieldValue & v) override { _field_value = _structuredFieldConverter.convert(v); } - virtual void visit(const StructFieldValue &value) { + virtual void visit(const StructFieldValue &value) override { if (*value.getDataType() == *SearchDataType::URI) { FieldValue::UP uriAllValue = value.getValue("all"); if (uriAllValue.get() != NULL && @@ -303,7 +303,7 @@ class SummaryFieldValueConverter : protected ConstFieldValueVisitor _field_value = _structuredFieldConverter.convert(value); } - virtual void visit(const WeightedSetFieldValue &value) { + virtual void visit(const WeightedSetFieldValue &value) override { _field_value = _structuredFieldConverter.convert(value); } @@ -342,14 +342,14 @@ class SlimeFiller : public ConstFieldValueVisitor { Inserter &_inserter; bool _tokenize; - virtual void visit(const AnnotationReferenceFieldValue & v ) { + virtual void visit(const AnnotationReferenceFieldValue & v ) override { (void)v; Cursor &c = _inserter.insertObject(); Memory key("error"); Memory val("cannot convert from annotation reference field"); c.setString(key, val); } - virtual void visit(const Document & v) { + virtual void visit(const Document & v) override { (void)v; Cursor &c = _inserter.insertObject(); Memory key("error"); @@ -357,7 +357,7 @@ class SlimeFiller : public ConstFieldValueVisitor { c.setString(key, val); } - virtual void visit(const MapFieldValue & v) { + virtual void visit(const MapFieldValue & v) override { Cursor &a = _inserter.insertArray(); Symbol keysym = a.resolve("key"); Symbol valsym = a.resolve("value"); @@ -375,7 +375,7 @@ class SlimeFiller : public ConstFieldValueVisitor { } } - virtual void visit(const ArrayFieldValue &value) { + virtual void visit(const ArrayFieldValue &value) override { Cursor &a = _inserter.insertArray(); if (value.size() > 0) { ArrayInserter ai(a); @@ -386,7 +386,7 @@ class SlimeFiller : public ConstFieldValueVisitor { } } - virtual void visit(const StringFieldValue &value) { + virtual void visit(const StringFieldValue &value) override { if (_tokenize) { asciistream tmp; SummaryHandler handler(value.getValue(), tmp); @@ -397,45 +397,45 @@ class SlimeFiller : public ConstFieldValueVisitor { } } - virtual void visit(const IntFieldValue &value) { + virtual void visit(const IntFieldValue &value) override { int32_t v = value.getValue(); _inserter.insertLong(v); } - virtual void visit(const LongFieldValue &value) { + virtual void visit(const LongFieldValue &value) override { int64_t v = value.getValue(); _inserter.insertLong(v); } - virtual void visit(const ShortFieldValue &value) { + virtual void visit(const ShortFieldValue &value) override { int16_t v = value.getValue(); _inserter.insertLong(v); } - virtual void visit(const ByteFieldValue &value) { + virtual void visit(const ByteFieldValue &value) override { int8_t v = value.getAsByte(); _inserter.insertLong(v); } - virtual void visit(const DoubleFieldValue &value) { + virtual void visit(const DoubleFieldValue &value) override { double v = value.getValue(); _inserter.insertDouble(v); } - virtual void visit(const FloatFieldValue &value) { + virtual void visit(const FloatFieldValue &value) override { float v = value.getValue(); _inserter.insertDouble(v); } virtual void - visit(const PredicateFieldValue &value) + visit(const PredicateFieldValue &value) override { vespalib::slime::inject(value.getSlime().get(), _inserter); } virtual void - visit(const RawFieldValue &value) + visit(const RawFieldValue &value) override { std::pair<const char *, size_t> buf = value.getAsRaw(); _inserter.insertData(Memory(buf.first, buf.second)); } - virtual void visit(const StructFieldValue &value) { + virtual void visit(const StructFieldValue &value) override { if (*value.getDataType() == *SearchDataType::URI) { FieldValue::UP uriAllValue = value.getValue("all"); if (uriAllValue.get() != NULL && @@ -455,7 +455,7 @@ class SlimeFiller : public ConstFieldValueVisitor { } } - virtual void visit(const WeightedSetFieldValue &value) { + virtual void visit(const WeightedSetFieldValue &value) override { Cursor &a = _inserter.insertArray(); if (value.size() > 0) { Symbol isym = a.resolve("item"); @@ -498,7 +498,7 @@ public: : _tokenize(tokenize) {} - FieldValue::UP convert(const FieldValue &input) { + FieldValue::UP convert(const FieldValue &input) override { vespalib::Slime slime; SlimeInserter inserter(slime); SlimeFiller visitor(inserter, _tokenize); diff --git a/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.h b/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.h index a12455e61a3..709eac15c07 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.h @@ -23,13 +23,13 @@ public: virtual ~TextExtractorDFW() {} bool init(const vespalib::string & fieldName, const vespalib::string & inputField, const ResultConfig & config); // Inherit doc - virtual bool IsGenerated() const { return false; } + virtual bool IsGenerated() const override { return false; } // Inherit doc virtual void insertField(uint32_t docid, GeneralResult *gres, GetDocsumsState *state, ResType type, - vespalib::slime::Inserter &target); + vespalib::slime::Inserter &target) override; }; } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/tokenizer.h b/searchsummary/src/vespa/searchsummary/docsummary/tokenizer.h index efd07e16b68..15adff6fa0e 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/tokenizer.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/tokenizer.h @@ -36,10 +36,10 @@ public: Tokenizer(const char * buf, size_t len); // Inherit doc - virtual void reset(const char * buf, size_t len); - virtual size_t getBufferSize() const { return _end - _begin; } - virtual bool hasMoreTokens(); - virtual Token getNextToken(); + virtual void reset(const char * buf, size_t len) override; + virtual size_t getBufferSize() const override { return _end - _begin; } + virtual bool hasMoreTokens() override; + virtual Token getNextToken() override; }; } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/urlresult.h b/searchsummary/src/vespa/searchsummary/docsummary/urlresult.h index e882a5a9ed8..907ef1207e8 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/urlresult.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/urlresult.h @@ -36,7 +36,7 @@ public: badurlresult(uint32_t partition, uint32_t docid, HitRank metric); virtual ~badurlresult(); - virtual int unpack(const char *buf, const size_t buflen); + virtual int unpack(const char *buf, const size_t buflen) override; }; @@ -72,8 +72,8 @@ public: ResEntry *GetEntry(uint32_t idx); ResEntry *GetEntry(const char *name); ResEntry *GetEntryFromEnumValue(uint32_t val); - virtual bool IsGeneral() const { return true; } - virtual int unpack(const char *buf, const size_t buflen); + virtual bool IsGeneral() const override { return true; } + virtual int unpack(const char *buf, const size_t buflen) override; bool inplaceUnpack(const DocsumStoreValue &value) { if (value.valid()) { |